diff --git a/composeApp/src/commonMain/composeResources/files/config.json b/composeApp/src/commonMain/composeResources/files/config.json index c3290de..2a18fd1 100644 --- a/composeApp/src/commonMain/composeResources/files/config.json +++ b/composeApp/src/commonMain/composeResources/files/config.json @@ -2,7 +2,7 @@ "themeMode": "DARK", "fontSize": 18.5, "playlist": [ - "assets://ffpm-211.txt", + "assets://ffpm-210.txt", "assets://ffpm-127.txt", "assets://ews-15.txt", "assets://ews-14.txt", diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-210.txt b/composeApp/src/commonMain/composeResources/files/ffpm-210.txt index db60ca4..73a5151 100644 --- a/composeApp/src/commonMain/composeResources/files/ffpm-210.txt +++ b/composeApp/src/commonMain/composeResources/files/ffpm-210.txt @@ -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 N1:#s, mrdlsdtlds/ ddtdmdr/ mfmrdllrdt/ drs'mtls/ mwwwmwwmwmwffwwwfwfwfwm/ sFlsm, sddtrdl/ rrsfmslfmwrwd N2:#m, mmffmssffm/ s5Fs/ SSttlmmlFs/ Fs4Fs/ sFlsmsddtdlt/ sltdrtltlms/ z12/ s5wflswfwm diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt index 8202450..2cc2c53 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt @@ -16,6 +16,14 @@ class POneStanzaLyrics { alternativeLyrics .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 { val alternativeL = alternativeLyrics.values.flatMap { it.values }.joinToString("\n") if (alternativeL != "") { return lyrics[1]+"\n"+alternativeL } diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt index f428ab7..a0c61f7 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt @@ -736,6 +736,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository private fun copyRefrainToStanza(stanzaNumber: Int) { for (i in refrainBeginsAt..L.size-1) { L[i].setLyrics(stanzaNumber, L[i].getLyrics(1)) + L[i].copyAlternativeLyrics(1, stanzaNumber) } } private fun addLyricsItem(stanzaNumber: Int, i: Int, lyricsItem: String) {