add w as alternative replacement for -

composeApp/src/commonMain/composeResources/files/config.json

@@ -2,7 +2,7 @@
   "themeMode": "DARK",
   "fontSize": 18.5,
   "playlist": [
-    "assets://ffpm-38.txt",
+    "assets://ffpm-101.txt",
     "assets://ews-13.txt",
     "assets://ffpm-38.txt",
     "assets://ffpm-57.txt",
@@ -18,7 +18,8 @@
     "assets://ffpm-489.txt",
     "assets://ffpm-21.txt",
     "assets://ffpm-179.txt",
-    "assets://ff-33.txt"
+    "assets://ff-33.txt",
+    "assets://ffpm-38.txt"
   ],
   "buttonContainerColorHex": "#FFFF8855",
   "buttonContentColorHex": "#FF000055",

composeApp/src/commonMain/composeResources/files/ffpm-101.txt

@@ -0,0 +1,11 @@
+M0:|c:Eb|m:6/4|r:C.M|a:H. Rabarivelo|h:J. Foster|t:FFPM 101 Ny Hazo fijaliana, ry Jeso Tomponay
+U0:zK:4(44)484848/4 84(44)4(4448)/4 (44)484(44)48/4 84(44)4(4448)
+N1:d#r m-sddttl/ lsmsfrf--m/ sd-dttl-ls/msmsfrd,---
+N2:#s, dd-ddrrmd/ tddt-trwwd/ ddrRrrdrdd/ dtdrwtdsls
+N3:#m msdTllsSl/ fsss-sslss/ mlwlsSfwfs/ ssslwfmwfm
+N4:ddwmlFsmf/ rmds, ws, dwww/ mlwFsmfwfm/ #f, drdfwsdwww
+Y1:Ny hazo fijali_ana,/Ry Jeso Tomponay/Dia tena fahori_ana/Fa ti_anao ‘zahay.
+Y2:Ny hazo fijali_ana/Dia manambara\ izao/Fa be ny fahori_ana/Nihatra taminao.
+Y3:Ny hazo fijali_ana/No mampiseho koa/Fa tokony hari_ana/Ny ota mahavoa.
+Y4:Isaoranay dia\ isaoranay/Hianao ry Tomponay,/Fa be ny fiti_avana/Nataonao taminay.
+Q0:${N:new}N3:#m msdTllsSl/ fsss-sslsw/ mlwlsSfwfs/ ssslwfmwfm

composeApp/src/commonMain/composeResources/files/ffpm-103.txt

@@ -0,0 +1,21 @@
+M0:|c:Bb|m:4/4|r:L.M.|a:T. Kingo 1634-1703 Nad. C. Borchgrevink, 1841-1919|h:B. Gesius 1560-1613 (eo ho eo)
+U0:zC:${x3} 44444444/${x0} 4444444$Q4
+N1:#f, m, lSltrdt/ tdrmdrtd/ mrdtlsfm, /tdrmldtl
+N2:#d, mmmdflmS/ Slsssffm/ sssffsrt/ mml4Sl
+N3:#s, m,ltllldm/ mmrddlrd/ drmrtdlS/ tlldfmrd
+N4:#d, mdmfrflm/ #m, rdtdmfsd,/ dtdr#d, rmrm/ Slfdrmml
+Y1:Ny hazo fijali_ana/Tsy maintsy hotsarovana!/Heno_y ry fanahiko,/Ny tenin’ny Mpamonjiko.
+Y2:Ny teny vo_alohany/Mihevitra ny rafiny:/«Mba mamelà ny helony,/Fa jamba ny fanahiny!»
+Y3:Izaho koa Jesosy ô!/Dia jamba sady ratsy fo;/Ka mba jereo sy i_antrao,/fa te-ho tonga olonao.
+Y4:I\lay meloka tanilany/Naniry mba horaisiny,/Nomeny toky tsara io:/«Ho any Paradisa\ anio»
+Y5:Ra\ha avy ny anjarako/Ka tapitra ny androko,/Mba raiso aho, Tompo ô,/Ho any paradisanao.
+Y6:Dia hitany ny reniny/Tomany teo akaikiny,/Toy ny tsindronin-defona/Ka feno fisento_ana.
+Y7:Dia Jaona no natolony/Ho zanany ho solony./«Mba raisonao, ry Jaona ô/Ho reninao ny reniko!»
+Y8:Tsarovy aho Tompo ô!/Ra\ha ao am-pahori_ako/Iraho ny mpi_anatrao/Hanampy ny mpanomponao!
+Y9:Ny teniny fa\ha_efatra/No tena mampangovitra;/Ni_antso izy hoe: «Ry Ray,/Nahoana Aho no afoy ?»
+Y10:Izao no dia nandaozana/Anao tam-pahori_ana;/Hahafaka ny tahotro,/Ra\ha tonga ny foto_ako.
+Y11:Ny otako i\zay nentiny/Nahory ny fanahiny,/Ka nitarainany ho_e:/«Mangetaheta Aho re!»
+Y12:Mangidy, ry Jesosy ô,/Ny loza ni_aretanao,/Ka aoka mba ho mamiko/Ny avotra, i\zay vitanao!
+Y13:Hoy izy\ indray: «Tanteraka:»/He! Teny mahasambatra,/Tanteraka ny asany,/Vo_avotra ny olony.
+Y14:Ny teny farany indray/Nilaza ny rahatrizay:/«Atolotro ny aiko i\zao,/Ry Ray, ho eo an-tanananao!»
+Y15:Izany di_a mamiko/Hi_orina\ ao anatiko,/Ka teny hotononiko/Eo amim-pa\hafatesako!

composeApp/src/commonMain/composeResources/files/ffpm-105.txt

@@ -0,0 +1,11 @@
+M0:|c:A|m:3/4 Milanto|r:8.6.7.6.7.6.8.6.|a:Hira anglisy Nad. C. Borchgrevink, 1841-1919|h:A. Ralison 1863-1932|t:FFPM 105 Tsinjovy ilay havoana
+U0:z8:4 (44)4 84 84 8/4 (44)4 84 Gz4/4 84 84 C (44)/4 84 84 Gz4/4 84 84 C 6z2/4 84 84 Gz4/4 84 84 84 8/4 84 84 Gz4
+N1:#s, ssmssddtr/ ddtlsls/ smdsdlfm/ rddtrd/ s5ll/ sttllt/ sddrrmmf/ lsdmrd
+N2:#d, mmdmmmfff/ ff-fffm/msmmsfl-/ lsssfm/ m5ff/ f6/ s7l/ fmmsfm
+N3:#s, dd-ddssst/ dr-dttd/ ddsdddrD/ rmmrtd/ d6r/ rrrddr/ tddttddd/ d4td
+N4:#d, dd-dddrrs/ ss-sssd/ d4mfrm/ fs4d/ d5fr/ rs5/ fmmssd'2f/ fs4d
+Y1:Tsinjovy\ ilay havo_ana,/Ary Jerosale\ma,/Fa i_o no Golgota/Mba tadidio, ange!/Fa tao nivesatra\ ota/Ny Tompo masina;/Nijaly sy nolavina,/Ka novono_ina.
+Y2:Tsy takatra heverina/Ny entan-dehibe,/I\zay nentin’ny Mpisolo/Ka mba diniho, re!/Fa nentiny daholo/Ny heloka natao:/Fa tonga Izy hanavao/Izao tontolo\ izao.
+Y3:Ny helotsika koa izao/Dia nivesarany,/Ka manaraha Azy,/Mba ho mpi_anany,/Ra\ha tao Golgota Izy,/Ny rany nitete,/Ka vita ho antsika re,/Ny vonjy lehibe.
+Q0:${N:new}U0:z8:4 (44)4 84 84 8/4 (44)4 84 K/4 84 84 C (44)/4 84 84 K/4 84 84 C 6z2/4 84 84 K/4 84 84 84 $Q8/4 84 84 K
+

composeApp/src/commonMain/composeResources/files/ffpm-106.txt

@@ -0,0 +1,10 @@
+M0:|c:D|m:4/4 Miadana|r:11.11.12.12.|a:P. Nilsen Lund, 1842-1914|h:P. Nilsen Lund, 1842-1914
+U0:z0:84488 444484/4 84488 4444G/ 844844 444484/4 844844 4444G
+N1:#r smlsmffrsfm/ slldsdr'dtls/ dmlssslsdmmr/ mfltdsddrdtd
+N2:#t, d7ttrd/ mfflsmrmrdt/ md7mddt/ ddffmmsmfmrm
+N3:#m msfssffs4/ d5s4Fs/ ssfmmmfms4/ sllssdddlsss
+N4:#s, ddfmdrrsstd/ dfffmdtdrrs/ d10ss/ dffrddml'fs'sd
+Y1:Indro, ny fiti_avana nijaly/Teo amin’ny hazo fijali_ana;/Ary ny ratsy nivonona hifaly/Handresy ny Zanakalahy Tokana.
+Y2:Indro, Ny Fiti_avana mahery/Nitondra ny heloky ny olony;/Izy ni_ady hanafaka ny very,/Ny ainy no avotra ka natolony.
+Y3:Izay nijaly mafy tao Golgota,/Voahombo ny tongotra\ aman-tanany;/Izy nisolo antsika\ izay mpanota,/Ka fadiranovana ny fanahiny.
+Y4:Ô, ry Mpamonjy, mba hazòny aho/Hijery ny Hazo fijali_anao!/Olona meloka aho ka afaho/Hi_aloka amin’ny fiti_avanao.

composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/MusicXML.kt

@@ -82,7 +82,7 @@ class MusicXML(private val fileRepository: FileRepository) {
         }
     }
     suspend fun load() {
-        val xmlContent = fileRepository.readFileContent("assets://13.musicxml")
+        val xmlContent = fileRepository.readFileContent("assets://13.xml")
         val xslContent = fileRepository.readFileContent("assets://timepart.xsl")
         xmlString = performXsltTransformation(xmlContent, xslContent)
         val solfaXML = SolfaXML()

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

@@ -65,7 +65,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
         templateCharArray.forEach {  // D.-R
             when (it) {
                 'D', 'R', 'M', 'F', 'S', 'L', 'T',
-                    'd', 'r', 'm', 'f', 's', 'l', 't', 'w' -> {
+                    'd', 'r', 'm', 'f', 's', 'l', 't', -> {
                     nextNIndex++
                     if (!inGroup) {
                         nextLIndex ++
@@ -81,7 +81,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
                 }
                 '.', ',', ->
                     unitObject.addMarker(it)
-                '-', 'Z', 'z' ->
+                '-', 'Z', 'z', 'w' ->
                     N.indices.forEach { voiceNumber ->
                         unitObject.addBlank(voiceNumber, it)
                     }
@@ -230,7 +230,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
         templateCharArray.forEach {
             when (it) {
                 'D', 'R', 'M', 'F', 'S', 'L', 'T',
-                    'd', 'r', 'm', 'f', 's', 'l', 't', 'w' -> {
+                    'd', 'r', 'm', 'f', 's', 'l', 't', -> {
                         if (firstInLoop) {
                             replacement = if (noteCharIterator.hasNext()) noteCharIterator.next() else 'd'
                             firstInLoop = false
@@ -243,16 +243,17 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
                             result += replacement
                             replacement = if (noteCharIterator.hasNext()) noteCharIterator.next() else 'd'
                             if (replacement in setOf('d', 'r', 'm', 'f', 's', 'l', 't' , 'z', '(',
-                                    'D', 'R', 'M', 'F', 'S', 'L', 'T', '-', 'Z')) {
+                                    'D', 'R', 'M', 'F', 'S', 'L', 'T', '-', 'w', 'Z')) {
                                 break
                             }
                         }
                 }
-                '/', '-', 'z', 'Z' -> {}
+                '/', '-', 'z', 'Z', 'w' -> {}
                 ',' -> result += ";"
                 else -> result += it
             }
         }
+        result = result.replace("w", "-")
         result = rearrangeNote(result)
         loadN(voiceNumber, result)
     }

composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt

@@ -158,7 +158,7 @@ class TimeUnitObject (val pTemplate: PTemplate, val prevTUO: TimeUnitObject?) {
         }
     }
     fun addBlank(voiceNumber: Int, blank: Char) {
-        val blankString = if (blank == '-') "-" else ""
+        val blankString = if (blank == '-' || blank == 'w') "-" else ""
         addNote(voiceNumber, blankString, '0')
     }
     fun getNum(): Int {