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

Bugfix : ò is a malagasy vowel

Browse source
This commit is contained in:
dotmg 2025-07-13 18:13:00 +02:00
parent 4a2d2fbc6f
commit f831ec2d1c
7 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
composeApp/src/commonMain/composeResources/files/.fuse_hidden0000206a0000000a
View file

Binary file not shown.

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

@ -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",

9
composeApp/src/commonMain/composeResources/files/ff-8.txt Normal file
View file

@ -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.

10
composeApp/src/commonMain/composeResources/files/ffmp-16.txt Normal file
View file

@ -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

10
composeApp/src/commonMain/composeResources/files/ffpm-16.txt Normal file
View file

@ -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

8
composeApp/src/commonMain/composeResources/files/ffpm-428.txt
View file

@ -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!

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

@ -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])")