mahefa/feufaro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Alternative Lyrics inside Refrain

Browse source
This commit is contained in:
dotmg 2025-09-19 10:01:56 +02:00
parent 2be13c5ec3
commit 890dc1065a
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composeApp/src/commonMain/composeResources/files/config.json
View file

@ -2,7 +2,7 @@
"themeMode": "DARK", "themeMode": "DARK",
"fontSize": 18.5, "fontSize": 18.5,
"playlist": [ "playlist": [
"assets://ffpm-211.txt", "assets://ffpm-210.txt",
"assets://ffpm-127.txt", "assets://ffpm-127.txt",
"assets://ews-15.txt", "assets://ews-15.txt",
"assets://ews-14.txt", "assets://ews-14.txt",

2
composeApp/src/commonMain/composeResources/files/ffpm-210.txt
View file

@ -1,4 +1,4 @@
M0:|c:Ab|m:4/4|t:FFPM 210 Zava-tsoa tokoa ny fitsipika|a:G. Ravelo 1886-1961|h:(Feon-kira anglisy)|r:10.7.10.7.12.10.12.10 M0:|c:Ab|m:4/4|t:FFPM 210 Zava-tsoa tokoa ny fitsipikao|a:G. Ravelo 1886-1961|h:(Feon-kira anglisy)|r:10.7.10.7.12.10.12.10
U0:z0:${x2} 2222422 448/ 222244G/ ${x0} 2222224 22228/ 2222(44) 22228/ 2222224 22228/ 2222(22)22 (22)(22)8 U0:z0:${x2} 2222422 448/ 222244G/ ${x0} 2222224 22228/ 2222(44) 22228/ 2222224 22228/ 2222(22)22 (22)(22)8
N1:#s, mrdlsdtlds/ ddtdmdr/ mfmrdllrdt/ drs'mtls/ mwwwmwwmwmwffwwwfwfwfwm/ sFlsm, sddtrdl/ rrsfmslfmwrwd N1:#s, mrdlsdtlds/ ddtdmdr/ mfmrdllrdt/ drs'mtls/ mwwwmwwmwmwffwwwfwfwfwm/ sFlsm, sddtrdl/ rrsfmslfmwrwd
N2:#m, mmffmssffm/ s5Fs/ SSttlmmlFs/ Fs4Fs/ sFlsmsddtdlt/ sltdrtltlms/ z12/ s5wflswfwm N2:#m, mmffmssffm/ s5Fs/ SSttlmmlFs/ Fs4Fs/ sFlsmsddtdlt/ sltdrtltlms/ z12/ s5wflswfwm

8
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt
View file

@ -16,6 +16,14 @@ class POneStanzaLyrics {
alternativeLyrics alternativeLyrics
.getOrPut(stanzaNumber) { mutableMapOf() } [voiceNumber] = text .getOrPut(stanzaNumber) { mutableMapOf() } [voiceNumber] = text
} }
fun copyAlternativeLyrics(fromStanzaNumber: Int, toStanzaNumber: Int) {
val toCopy = this.alternativeLyrics[fromStanzaNumber]
if (toCopy != null) {
alternativeLyrics
.getOrPut(toStanzaNumber) { toCopy }
}
}
override fun toString(): String { override fun toString(): String {
val alternativeL = alternativeLyrics.values.flatMap { it.values }.joinToString("\n") val alternativeL = alternativeLyrics.values.flatMap { it.values }.joinToString("\n")
if (alternativeL != "") { return lyrics[1]+"\n"+alternativeL } if (alternativeL != "") { return lyrics[1]+"\n"+alternativeL }

1
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
View file

@ -736,6 +736,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
private fun copyRefrainToStanza(stanzaNumber: Int) { private fun copyRefrainToStanza(stanzaNumber: Int) {
for (i in refrainBeginsAt..L.size-1) { for (i in refrainBeginsAt..L.size-1) {
L[i].setLyrics(stanzaNumber, L[i].getLyrics(1)) L[i].setLyrics(stanzaNumber, L[i].getLyrics(1))
L[i].copyAlternativeLyrics(1, stanzaNumber)
} }
} }
private fun addLyricsItem(stanzaNumber: Int, i: Int, lyricsItem: String) { private fun addLyricsItem(stanzaNumber: Int, i: Int, lyricsItem: String) {