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

Bugfix: y=2z11 ne doit pas changer le commentaire

Browse source
This commit is contained in:
dotmg 2025-08-15 05:17:44 +02:00
parent 15d1772c24
commit 5782425643
5 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
composeApp/src/commonMain/composeResources/files/ews-24.txt Normal file
View file

@ -0,0 +1,10 @@
M0:|c:Db|m:4/4|t:EWS 24 When the mists have rolled in splendor|a:Annie Elvira Hubbart (Herbert) (1844-1932)|h:Ira David Sankey (1883: 1840-1908)
U0:z0:313131313131314/313131313131314/313131313131314/31313113313131$Q4/31431313122314/31431313131314/31313131313131$Q4/31313113313${rit.}1$Q3$Q1$Q4/
N1:mfsssssd'tlssssssSlllllllllltd'tlsd'd'd'd'd'mfsllllr'r'd'tttttsltd'd'd'd'd'mfs---d'tls----sSl---ltd't----ltd'd'd'd'd'mfsllllr'r'd'tttttsltd'd'd'd'd'
N2:drmmmmmmsfmmffmmmffffffffFFsFsffmmmmmdrmffffFffffffffffmmfrmdrm---msfmmffmmmf--FFsls----ffmmmmmdrmffffFffffffffffmmfrm
N3:ssssssssssd'd'ttd'/sd'd'd'd'd'd'd'd'd'd'd'tr'r'/ttd'sssssd'd'd'd'd'll/td'r'r'r'r'r'td'r'd'Tlss/---sss-zzzd'ttd'z--d'd'd'd'tr'r'r'r'r'ttr'd'd'd'd'd'ssd'd'd'd'lltd'r'r'r'r'r'td'r'd'Tlss
N4:ddddddddddddrs,d/ddffffffffrrrrs/ssddddddddffffr/ssssssssssddddd/zzzddd-zzzdrs,d/zzzffrrrrsssssssmmmmddddffffrssssssssssddddd
O1:v34:_3We shall know _3as we are known,_4/Ne_ver more _3to walk a_lone,
E1:When the mists have rolled in splen_dor/From the beau_ty of the hills,/And the sun_light falls in glad_ness/On the ri_ver and the rills,/We re_call our Fa_ther's pro_mise/In the rain_bow of the spray:/We shall know each o_ther bet_ter/When the mists have cleared a_way./${R=}${O:1}We shall know _3as we are known,_4/Ne_ver more _3to walk a_lone,_4/In the dawn_ing of the morn_ing/Of that bright and hap_py day./We shall know each o_ther bet_ter,/When the mists have rolled a_way.
E2:Oft we tread the path be_fore us/With a wea_ry, bur_dened heart;/Oft we toil a_mid the sha_dows,/And our fields are far a_part:/But the Sa_vior's "come, ye bles_sed,"/All our la_bor will re_pay,/When we ga_ther in the morn_ing/Where the mists have rolled a_way.
E3:We shall come with joy and glad_ness,/We shall ga_ther round the throne;/Face to face with those that love us,/We shall know as we are known:/And the song of our re_demp_tion/Shall re_sound thro' end_less day,/When the sha_dows have de_par_ted,/And the mists have rolled a_way./

14
composeApp/src/commonMain/composeResources/files/ffpm-79-1.txt Normal file
View file

@ -0,0 +1,14 @@
M0:|c:D|m:4/4 Milamindamina|r:8.8.8.8|t:FFPM 79 Sambasamba Zanahary|a:Maintimolaly
Q0:${N:New}U0:z0:62y22 (62)2z2/y (62)y22 622222 /82222 622z2/22 62(y)22${DC}G/${$}y222114 (62)224/ 4(22)(22)22 (62)2222 4(22)4(22) 4y${DS Farany}8
U0:z0:62y22 (62)2z2/y (62)y22 622222 /82222 622z2/22 62(y)22C${DC}z4/${$}y222114 (62)224/ 4(22)(22)22 (62)2222 4(22)4(22) 4y${DS Farany}8
N1:#rsfmmflsfm/mmfmrmfrm-3zz/mfmflsfm/mmfmrmfrm/z8/dttll/z7lssflfmflslfmrrd,
N2:#t,mrddrfmrf/ddrdtdrtd-3zz/drdrfmrd/ddrdtdrtd/z8lssff/z7fmmrfrdrmffrdttd
N3:dd#mssdddss/s8-4zz/sdsddd,ss/s9/z8d5/z7d6sd3s3ffm
N4:#l,d7td/dds-5sffmrd/d6td/dd#s,s3ltsd/drmrs'dddz5/#ddmsd'smdz6d4s,t,dssd
Q0:${N:New}N1:#rsfmmflsfm/mmfmrmfrm-5/mfmflsfm/mmfmrmfrm/z8/dttll/z7lssflfmflslfmrrd,
Q0:${N:New}N2:#t,mrddrfmrf/ddrdtdrtd-5/drdrfmrd/ddrdtdrtd/z8lssff/z7fmmrfrdrmffrdttd
Q0:${N:New}N3:dd#mssdddss/s8-6/sdsddd,ss/s9/z8d5/z7d6sd3s3ffm
Q0:${N:New}N4:#l,d7td/dds-5sffmrd/d6td/dd#s,s3ltsd/drmrs'dddz5/#ddmsd'smdz6d4s,t,dssd
O1:v4:_4nampidinana_o
O2:v4:Tamy ny nampidinanao/_4malalana_o_5
Y1:Sambasamba Zanahary/Tamy ny ${O:1}nampidinanao_5/Ny Zanakao malalanao/Mba hisolo ny helokay!/${O:2}_8Ny Zanakao_6Malalana_o/Mba hisolo ny helokay

8
composeApp/src/commonMain/composeResources/files/ffpm-79-2.txt Normal file
View file

@ -0,0 +1,8 @@
M0:|c:C|m:3/4|t:FFPM 79 (2) Sambasamba Zanahary
U0:z0:84 (44)4 84 (44)4/ 84 (444) 444 4(44)/ 84 (44)4 84 (44)4 / 444 84 84 8/${$}4 84 84 84 624 444 444 444 444 444 444 2244 K${DS}4
N1:#m mfsddmfsdd/ llrtdtdtlsf/ mfsddmfsdd/ lllsfmr,m/ #f mrttmrtt--tdtl--ltls--slsf--(f-)sfm,z
N2:drm-mdrm-s/ fff--slsfmr/ drm-mdrm-m/ fffmrdt,d/ #r dtssdtss--slsf--fsfm--mfmr--(r-)mrd,z
N3:#m ssd-sssd-d/ ddl--tdtlsf/ssd-sssd-s/d4ssfm/ z2rrssr4 z3d4--s4--s5dtsz
N4:#t, ddd-ddtd-m/ffr'--slsfmr/ ddd-dddd-d/ fffsss, 2d/ z2s8/ z3fld'f--dmsd--/ s, trs4dz
O1:v34:_2Tamy ny nampidinanao/_3Ny Zanakao _2malalanao_2/Mba hisolo ny helokay!/
Y1:Sambasamba Zanahary/Tamy ny nampidinanao/Ny Zanakao malalanao/Mba hisolo ny helokay!/${O:1}Tamy ny nampidinanao/_2Ny Zanakao _2malalanao_2/Mba hisolo _2ny _helokay!/

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

@ -82,7 +82,7 @@ class MusicXML(private val fileRepository: FileRepository) {
}
}
suspend fun load() {
val xmlContent = fileRepository.readFileContent("assets://23.xml")
val xmlContent = fileRepository.readFileContent("assets://24.xml")
val xslContent = fileRepository.readFileContent("assets://timepart.xsl")
xmlString = performXsltTransformation(xmlContent, xslContent)
val solfaXML = SolfaXML()
@ -217,6 +217,7 @@ class MusicXML(private val fileRepository: FileRepository) {
init {
val parseScope = CoroutineScope(Dispatchers.Default)
parseScope.launch {
if (true)
load()
}
}

9
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
View file

@ -49,7 +49,7 @@ class ParseULine (var line: String, var measure: Int) {
val (nbIteration, iterable) = matchResult.destructured
val nTimes = nbIteration.toInt()
iterable.repeat(nTimes)
}.replace("y", "2z11").toCharArray()
}/*.replace("y", "2z11")*/.toCharArray()
var actualComment = ""
parsedChars.forEach {
@ -86,6 +86,13 @@ class ParseULine (var line: String, var measure: Int) {
'z', '-' -> run {
charX = it
}
'y' -> run {
parseUStage2('2')
charX = 'z'
parseUStage2('1')
charX = 'D'
parseUStage2('1')
}
'W' -> repeat(8) { parseUStage2('4')}
'S' -> repeat(7) { parseUStage2('4')}
'O' -> repeat(6) { parseUStage2('4')}