From f831ec2d1cfc4a235229da693f8f4dad811164b0 Mon Sep 17 00:00:00 2001
From: dotmg <mahefa@homemade.mg>
Date: Sun, 13 Jul 2025 18:13:00 +0200
Subject: [PATCH] =?UTF-8?q?Bugfix=20:=20=C3=B2=20is=20a=20malagasy=20vowel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../files/.fuse_hidden0000206a0000000a          | Bin 12288 -> 0 bytes
 .../composeResources/files/config.json          |  12 +++---------
 .../commonMain/composeResources/files/ff-8.txt  |   9 +++++++++
 .../composeResources/files/ffmp-16.txt          |  10 ++++++++++
 .../composeResources/files/ffpm-16.txt          |  10 ++++++++++
 .../composeResources/files/ffpm-428.txt         |   8 ++++----
 .../kotlin/mg/dot/feufaro/solfa/Solfa.kt        |   4 ++--
 7 files changed, 38 insertions(+), 15 deletions(-)
 delete mode 100644 composeApp/src/commonMain/composeResources/files/.fuse_hidden0000206a0000000a
 create mode 100644 composeApp/src/commonMain/composeResources/files/ff-8.txt
 create mode 100644 composeApp/src/commonMain/composeResources/files/ffmp-16.txt
 create mode 100644 composeApp/src/commonMain/composeResources/files/ffpm-16.txt

diff --git a/composeApp/src/commonMain/composeResources/files/.fuse_hidden0000206a0000000a b/composeApp/src/commonMain/composeResources/files/.fuse_hidden0000206a0000000a
deleted file mode 100644
index 2882ddd6cb222f29450213a991164f54a7466e7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeHNL2n#26rQ$RXel7zisWsO+M=CxcC$q3R6SHGOGCAxO4CY3ks>Fa>AD$@Bil`x
zC5T?RafA!v#Dy#3!mS+n10aEb078JojXU4-?6wK2g6Iv!PF_6rdw%bG-+QxB6tB<T
zSRAs2PA|cDHc37@<wo-BBsq2?NwgT{g&@VjBUiUZUgZZHLCf!|N}9WlkBrW>kU77l
zJRjtD3SkZ3FnY_l{NmOYcXor8+EhcKs;Oo<cjk`W$Q>_KNk5A%o%VYR9sid9*Vxe@
zGH|FFxZ{g-;bbz`>&_AnGpAbY`RA@5YD!}Ak%7oSWFRsS8Hfx-1|kEIfy2gt-#U`K
zi=>ZE5<fnfkNjhvEaMazhzvvqA_I|u$UtNuG7uSv3`7PZ1CfEq!2gf|A(Q0y6G_r}
z3gGeo|LNcVA3u{Mmm$ACoh0u=E<pY`nItblzJcv~5IXZR<P7B4WPSqk@yYWM%qJly
zAWuS$LZ)`KJ`H&RLUw-w!_ScKCi5?t|C&61kNG#q?qrX2KS6$kd^_1A+aDlbK|Y7X
z5gCXKL<S-Qk%2?V0O#EfTgfZIoY3pSTRhYZ7y3l%b2c)}E5R4Xg7%!ML>seIh84=;
z#+|4H9|)$Eup*VB#2N;w5Y?ujgBP``cJF<7v65B^Eh<I+2dX*Q;e4RBS;mIJGxKKC
z2xfCu)og|C_;vV-f=7g27X+n2z^~D9<^$%MA(j}`{E7gi;1@WWIKdxZGRUm*!UiM?
zned^iut^zJMgT>x!%84Dl$+kdT}E5e<4C|m%>aroV?jI0;~3x->UJ=408C4Bo@fY9
zFe83~dm^k!E8|x|kpyW>RH+vgA{04bjKwyXhMx}KOGBHv%I)6!g!8!$yMibqkh`s{
zX`*{!06vvg08pDR5hB!MQ;fj|BalQ{!xupdRo=b#!P0H8Y4c6f5X`>(ti>O02j97=
zgaJk1%ozr1*<~t%;Ug+4QoJI{ZDH&4)9Qs%u`(a2^}Ge9R5)f>ex45j!U-n=YD-=i
zGHu!kDNJ28B^Zh_*L6U;ObAgb!|bFLXoc7T6x_5Q0BrVAwTe1s+9}G4O`L8`8f>xh
z;9EWTiL?xR9k)dJK8>Yqd_T~>x=BEqj->vhHrI-}-0;hWZJP>Yp)`~j&^c;v#BH-p
z!2khATA{n%U}%Z${i$eE8jstoXj~jEsJp3e;4CD9)<F9O6LNwsSV2`qC3AG5vgkf^
zJ{u7t1f%y1nBYq))E%_r;%vY~%}mWW0LT#;k+*(_J){`XL!XaKj(73?r)+4*0abo6
zWOn}xzFY^o;HRlJ9^S;e(VkL3sfK#B_|0bYvnIkSRdG)UiZBVV`Zy6<$<4Wpr~pwi
zUws4_tB+=5?a_3=UoWHjtUZ2#;G?@Y-2<9-t$D2u>e|*zZ!ceXXJ2EYaUVA2KFvWb
zyBa<-|8vi_lBIq&W81PBg)6;GC6n{4EVb>s@mNYoTecnPnDiwE6dnhd44YDiW4<h0
z>YPlL<}&S^#wfH656gvinrZC@81U)zIE7k5&0uipk`4+RjA+;C!osV?W9bT=EcLP(
z*LH~M+_h2yBm#LWy(>#!0+eR~DdMj{ZKaif$s}oD%V-zoaE7BuL8jg_mn?NN2fsiP
z+#)8Dnkn0EP@Z-gE<C`LmN}iKQbLeWq1lXYBQ6Ni2m~cyH44`*+g@7juuiR&$@ST6
zJe$>Zzpm>u{odJex9ffXOs{vguII5}y~$v-*XzxPuSQ4DK|h(uGMLp1$#6E?*~nho
z(OHl8cWidGGu-jnU~qNFaP@u9`#$Z?9g!^yd>qr|{fd53b<fSdl6KE6%<qh#!LLSV
NDt4)Z{r+s4{0)i*DF*-m

diff --git a/composeApp/src/commonMain/composeResources/files/config.json b/composeApp/src/commonMain/composeResources/files/config.json
index e582c35..c09f282 100644
--- a/composeApp/src/commonMain/composeResources/files/config.json
+++ b/composeApp/src/commonMain/composeResources/files/config.json
@@ -2,6 +2,7 @@
   "themeMode": "DARK",
   "fontSize": 18.5,
   "playlist": [
+    "assets://ffpm-16.txt",
     "assets://ffpm-428.txt",
     "assets://ffpm-449.txt",
     "assets://ffpm-489.txt",
@@ -10,17 +11,10 @@
     "assets://ff-33.txt",
     "assets://ffpm-297.txt",
     "assets://ffpm-33.txt",
+    "assets://ff-8.txt",
     "assets://ffpm-444-2.txt",
     "assets://ffpm-760.txt",
-    "assets://ews-456.txt",
-    "assets://ews-1.txt",
-    "assets://ews-2.txt",
-    "assets://ews-3.txt",
-    "assets://ews-4.txt",
-    "assets://ews-5.txt",
-    "assets://ews-6.txt",
-    "assets://ews-7.txt",
-    "assets://ews-8.txt"
+    "assets://ews-456.txt"
   ],
   "buttonContainerColorHex": "#FFFF8855",
   "buttonContentColorHex": "#FF000055",
diff --git a/composeApp/src/commonMain/composeResources/files/ff-8.txt b/composeApp/src/commonMain/composeResources/files/ff-8.txt
new file mode 100644
index 0000000..ab3a823
--- /dev/null
+++ b/composeApp/src/commonMain/composeResources/files/ff-8.txt
@@ -0,0 +1,9 @@
+M0:|c:Ab|m:3/4|r:P.M|t:FF 8 Masoko manganohano|a:Georges Andriamanantena|h:Daniel Rakotoarivony
+U0:z0:842244CC/842244CC/842244C(84)/842244CC/84224422442244/84224422442244/84224422442244/842244(444)C
+N1:#s,sF,sdms'fl/sltdrfmm/sF,sdmsfl'-/#dsmsfrmdd/dflfdl(s-)--(m-)--/srslsf(m-)--(m-)--/dfld'tl(s-)--(m-)--/slmfmrd--d
+N2:#r,mRmmsTlf/rrssslss/mRmmsTllt/dstlsfmm/ll(d-)-f#f,mrdsdrmd/rr(t-)-rdtdlsFsT/ll(d-)-f'mrdsdrmd/rrttdtstls
+N3:#s,dddrmddd/tdrdtrdd/dddrmddrR/mdrtdtss/#ddd(f-)-lsfmrmfsm/ff(r-)-fsFsfmRms/dd(f-)-lsfmrmfsm/ffrrsfmsfm
+N4:#d,d5mff/s6dd/d5mffF/s6dd/ff(f-)-l#r,d3d, msdl/ss(s-)-sd4d,3m/ff(f-)-ld3d,msdl/s6d,--d,
+Y1:Masoko manganohano,/Nitomany feno rano/No\ho ny helok’efa vita,/Dia mitony ra\ha nahita/Masona_o be fi_an_4tra_3/Ry Mpamonjy ny maha_4ntra_4/O Vo_avotrao ‘lay ve_4ry_4/Ry fitiavana mahery.
+Y2.Tanako mangadihady/Nisarangotra nitady/Fanavotana sy Vonjy/F’efa resy ka nilonjy./Dia noraisinao ry To_4mpo_4/Na dia tànana malo_4to_4/O vo_avotrao ‘lay ve_4ry_4/Ry Fitiavana mahery.
+Y3:Foko tena fahavalo/Nefa resy ka mimalo/Ra\ha nifona fa naditra/Hitanao nipitrapitra./Babo tsy\ afaka ho ai_4za_4/’Zao noraisinao\ ho sakai_4za_4/O vo_avotrao ‘lay ve_4ry_4/Ry Fitiavana mahery.
diff --git a/composeApp/src/commonMain/composeResources/files/ffmp-16.txt b/composeApp/src/commonMain/composeResources/files/ffmp-16.txt
new file mode 100644
index 0000000..a27a76c
--- /dev/null
+++ b/composeApp/src/commonMain/composeResources/files/ffmp-16.txt
@@ -0,0 +1,10 @@
+M0:|c:Bb|m:4/4|r:L.M.D.|t:FFPM 16 Avia, ry vazan-tany ô|a:T. Rowlands, 1852-1921|h:(Cantiques Populaires)
+U0:z0:4y444(22)(44)/4y4(22)448/4y44444/4 622222(C4)/ 4y44448/ 4y4(22)44(44)/ 4y2222(448)/4222222G
+N1:#f,sssssdmrds/lltdtllss/sfffllss/dtdrdtls-/dssssdll/ttdrmrdsms/lldrdtlsdm/rrrddttd
+N2:#d,m6sfm-/ffslsffmm/rrrrffmm/ssstlsFsf/m5lff/rrmfsfmmdm/f5sfm-s/fffmmrm
+N3:#s,d5sd-d-/d5-d3/t5d3/mr5dt-/d8/s3tt-ddsd/ddllldddsd/llls5
+N4:#d,d6-d-/f5-d3/s5d3/dr6s-/d5f3/s5-d3-/f7d--/f3s4d
+Y1:Avia, ry vazantany ô!/Sy mponina\ ao an-danitra/Miraisa feo ka mihirà/Ny fanavotan-dehibe,/Zay amonjena marobe/Dia vita re ka miderà./Zay amonjena marobe/Dia vita re ka miderà.
+Y2:Avia, ry fi_angonana\ ô!/Mba asandrato re ny feo/Hidera ny Mpanavotra;/Na\ atỳ an’efitra\ aza\ izao,/ Hirao am-pandehanana/Ny hira soan’i Zi_ona / Hirao am-pandehanana/Ny hira soan’i Zi_ona 
+Y3:Avia, ry vo_avonjy ô!/Ka mifali_a avokoa,/Fa afa-doza hianareo;/Miraisa feo ka mihirà/ Derao, derao fa mendrika/Ilay nanavotra\ anareo / Derao, derao fa mendrika/Ilay nanavotra\ anareo 
+Y4:Avia, ry olom-bery ô!/Izay mandre ny teny soa/Hoe: «Manatòna Ahy ‘zao»;/Anio ny Tompo mba fidio/ Ny fiti_avany valio;/Ny fiderany koa hirao / Ny fiti_avany valio;/Ny fiderany koa hirao 
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-16.txt b/composeApp/src/commonMain/composeResources/files/ffpm-16.txt
new file mode 100644
index 0000000..b465013
--- /dev/null
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-16.txt
@@ -0,0 +1,10 @@
+M0:|c:Bb|m:4/4|r:L.M.D.|t:FFPM 16 Avia, ry vazan-tany ô|a:T. Rowlands, 1852-1921|h:(Cantiques Populaires)
+U0:z0:4y444(22)(44)/4y4(22)448/4y44444/4 622222(C4)/ 4y44448/ 4y4(22)44(44)/ 4y2222(448)/4222222G
+N1:#f,sssssdmrds/lltdtllss/sfffllss/dtdrdtls-/dssssdll/ttdrmrdsm,s/lldrdtlsdm/rrrddttd
+N2:#d,m6sfm-/ffslsffmm/rrrrffmm/ssstlsFsf/m5lff/rrmfsfmmdm/f5sfm-s/fffmmrrm
+N3:#s,d5sd-d-/d5-d3/t5d3/mr5dt-/d8/s3tt-ddsd/ddllldddsd/llls5
+N4:#d,d7-d-/f5-d3/s5d3/dr6s-/d5f3/s5-d3-/f7d--/f3s4d
+Y1:Avia, ry vazantany ô!/Sy mponina\ ao an-danitra/Miraisa feo ka mihirà/Ny fanavotan-dehibe,/Zay amonjena marobe/Dia vita re ka miderà./Zay amonjena marobe/Dia vita re ka miderà.
+Y2:Avia, ry fi_angonana\ ô!/Mba asandrato re ny feo/Hidera ny Mpanavotra;/Na\ atỳ an’efitra\ aza\ izao,/Hirao am-pandehanana/Ny hira soan’i Zi_ona/Hirao am-pandehanana/Ny hira soan’i Zi_ona 
+Y3:Avia, ry vo_avonjy ô!/Ka mifali_a avokoa,/Fa afa-doza hianareo;/Miraisa feo ka mihirà/Derao, derao fa mendrika/Ilay nanavotra\ anareo/Derao, derao fa mendrika/Ilay nanavotra\ anareo 
+Y4:Avia, ry olom-bery ô!/Izay mandre ny teny soa/Hoe: «Manatòna Ahy ‘zao»;/Anio ny Tompo mba fidio/Ny fiti_avany valio;/Ny fiderany koa hirao/Ny fiti_avany valio;/Ny fiderany koa hirao 
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-428.txt b/composeApp/src/commonMain/composeResources/files/ffpm-428.txt
index a92479c..c244bd0 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-428.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-428.txt
@@ -1,10 +1,10 @@
 M0:|c:G|m:2/4|r:P.M|t:FFPM 428 Reko izao ry Tompo|a:Rasoamahenina 1905-1986|h:Ranoason D. 1940-
 U0:z0:yy4yyy(42)z11tt4(22)yy6z11 22222222 (22)22626262yy6z116262 222262 22222222 (22)y8
 N1:s#s,mmdssSldfrmdd #l,sFl'smdlltdmrlr sm--dd--dfmrfm #t,sllllmmrdr smdddfmrfm s,l,tdrmsdfm-rrd
-N2:#s,sdddssSldltdssdtrdtslltldtlt zzddz-ssTldlrdrdlll ddtlttds sTldtrdslsltdtlld-tt s
-N3:mssmmmmfmrssmmmRfmsm mmsFFFFszzsmz-mmmdmrs ssmDDmFFFFsrsm mmdmrssmfrmfsrmrslsfm
-N4:#r,dddddddfsltd-d d6 llmr4szzddzzd,d,sfslt dtllllr4stddd dsfsltdmfsltdtlfs-ssd
-Y1:Reko i\zao ry Tompo izany antsonao,/Mi_antso izany mpanompo mba ho irakao!${R=}Inty, inty, inty aho Jeso/Inty, inty, iraho ho aho Jeso/Ekeko re ny\ ho miaramilanao/Ho vonona hanao ny sitrakao, ka iraho!
+N2:#s,sdddssSldltdssdtrdtslltldtlt zzdd--ssTldlrdrdlll ddtlttds sTldtrdslsltdtlld-tt s
+N3:mssmmmmfmrssmmmRfmsm mmsFFFFszzsm--mmmdmrs ssmDDmFFFFsrsm mmdmrssmfrmfsrmrslsfm
+N4:#r,dddddddfsltd-d d6 llmr4szzdd--d,d,sfslt dtllllr4stddd dsfsltdmfsltdtlfs-ssd
+Y1:Reko i\zao ry Tompo izany antsonao,/Mi_antso izany mpanompo mba ho irakao!${R=}Inty,_3inty_3inty a\ho Jeso/Inty, inty, iraho a\ho Jeso/Ekeko re ny\ ho miaramilanao/Ho vonona hanao ny sitrakao, ka ira\ho!
 Y2:O di_ovy Tompo izany molotro/Ka ny fo madio hanompo no atolotro!
 Y3:Tsy hande\ha irery fa hiaraka\ Aminao/Ka dia mba ome_o ny hery sy Fanahinao!
 Y4:Reko i\zao ny toky hoe: «Momba a\hy Ianao »/Ry Jesosy Tompo sy Zoky, vonona aho izao!
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 5ce768f..26bf1bd 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
@@ -25,8 +25,8 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
         val REGEX_PARSE_META            = Regex("\\|(?=[a-z]:)")
         val REGEX_LYRICS_COMMENT        = Regex("\\$\\{([^\\}]:[^\\}]*)\\}")
         val REGEX_LYRICS_REPETITION     = Regex("_(\\d)")
-        val REGEX_VOWELS_STAGE1         = Regex("[aeiouyàéỳ,;\\.\\-:!\\)](?![ aeiouyàéỳ,;\\.\\-:!\\)])", RegexOption.IGNORE_CASE)
-        val REGEX_VOWELS_STAGE2         = Regex("([aeiouyàéỳ,;\\.\\-:!])__", RegexOption.IGNORE_CASE)
+        val REGEX_VOWELS_STAGE1         = Regex("[aeiouyòàéỳ,;\\.\\-:!\\)](?![ aeiouyòàéỳ,;\\.\\-:!\\)])", RegexOption.IGNORE_CASE)
+        val REGEX_VOWELS_STAGE2         = Regex("([aeiouyòàéỳ,;\\.\\-:!])__", RegexOption.IGNORE_CASE)
         val REGEX_VOWELS_STAGE3         = Regex("_([\\?\\!:,;\\.»\\)]+)")
         val REGEX_MALAGASY_MN           = Regex("([aeio])_([nm])([tdjkbp])")
         val REGEX_MALAGASY_MN_DASHED    = Regex("([aeio][nm])\\-([tdjkbp])")