From 5490e44c1131f023a829a76d28d08b71f06c3557 Mon Sep 17 00:00:00 2001
From: dotmg <mahefa@homemade.mg>
Date: Thu, 10 Jul 2025 17:36:56 +0200
Subject: [PATCH] parseU: y = 2z11

---
 .../commonMain/composeResources/files/config.json   |  2 +-
 .../commonMain/composeResources/files/ffpm-46.txt   | 13 +++++++++++++
 .../kotlin/mg/dot/feufaro/solfa/ParseULine.kt       |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 composeApp/src/commonMain/composeResources/files/ffpm-46.txt

diff --git a/composeApp/src/commonMain/composeResources/files/config.json b/composeApp/src/commonMain/composeResources/files/config.json
index 0d5bedd..3a72ef6 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-38.txt",
+    "assets://ffpm-46.txt",
     "assets://ews-456.txt",
     "assets://ews-1.txt",
     "assets://ews-2.txt",
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-46.txt b/composeApp/src/commonMain/composeResources/files/ffpm-46.txt
new file mode 100644
index 0000000..2db986b
--- /dev/null
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-46.txt
@@ -0,0 +1,13 @@
+M0:|c:C|m:4/4|r:11.11.12.5.5.|t:FFPM 46 : O Ry Mpanefa Ny Toky Rehetra|a:Lina Sandell, 1832-1903. Nad. Valborg Anderssen, 1851-1935|h:Feon-kira finlandey 1857 eo ho eo
+U0:z0:${mf}422${f}422 (22)${>}22${=}44/ ${p}422(22)22 4y44/ ${<}42${=}2${f}422 ${>}(22)2${=}2${p}22$Q4/ 22222222 ${rit} 2222$Q8
+N1:#rmmmdtll-lsmd,/rrrs-lsrffmd,/mmmdtll-lsmd,m/#l,mrdrm---mrtdl
+N2:#s,dtrdrmr-rrdd/tttdtdrtrrdd/drrdrmr-rrddd/llltd---SSSSl
+N3:lmmmrdrmfssm/s4fmrs4m/sm3rdrmfssms/l5-3mmrmd
+N4:#s,lSSltdt-ttdd/s'ffmrdtsttdd/dttltdt-ttddd/(f---m)dld#m,m4l
+Y1:O! ry Mpanefa ny toky rehetra,/Mo_a ho ela vao tonga ny fetra?/Tena andrasanay ny fihavi_anao:/${R=}Aza ela, re! _3Aza ela, re!
+Y2:He! Izahay, fa vahiny mandalo/Indro manenjika ny fahavalo;/Ko_a henoy re ny senton’ny olonao:
+Y3:He! Ny vo_avotrao di_a mi_andry,/Na izahay na ireo nodimandry;/Tompo, tsinjovy ny fasan’ny olonao:
+Y4:Ary ny zavatra eto an-tany/Samy mi_ara-misento ihany,/Ka manantena ny mba hihavi_anao:
+Y5:Mbola ho ela va I\lay antenaina?/Tsia, fa akaiky izao ny maraina;/Ko\a andrandrao sy antso_y ny Tompo hoe:
+Y6:«Tsy mba ho ela, fa faingana Aho,/Ary hanafaka ny mitalaho»./«Eny, avi_a, faingàna, ry Tompo ô!»
+Y
diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
index 483a116..b7e08a8 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
@@ -45,7 +45,7 @@ class ParseULine (var line: String, var measure: Int) {
                 val (nbIteration, iterable) = matchResult.destructured
                 val nTimes = nbIteration.toInt()
                 iterable.repeat(nTimes)
-            }.toCharArray()
+            }.replace("y", "2z11").toCharArray()
         var actualComment = ""
         parsedChars.forEach {
             if (inComment) {
@@ -85,7 +85,7 @@ class ParseULine (var line: String, var measure: Int) {
                 'G' -> repeat(4) { parseUStage2('4')  }
                 'C' -> repeat(3) { parseUStage2('4') }
                 '8' -> repeat(2) { parseUStage2('4') }
-                '4', '3', '2', '1', 'y' -> parseUStage2(it)
+                '4', '3', '2', '1' -> parseUStage2(it)
                 '6' -> repeat(2) { parseUStage2('3')}
                 '9' -> repeat(3) { parseUStage2('3')}
                 'A' -> run {