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

${S:mfs} in N: for notes splitting

Browse source
This commit is contained in:
dotmg 2025-08-01 11:26:12 +02:00
parent 200fbf325b
commit 12ffacc1f7
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,17 @@
M0:|c:D|m:4/4|t:FF9 Isaorana anie Jehovah|a:Dr Rakotovazaha|h:Ramarolahy Aina Nirina Jaona M0:|c:D|m:4/4|t:FF9 Isaorana anie Jehovah|a:Dr Rakotovazaha|h:Ramarolahy Aina Nirina Jaona
U0:zC:44444 4444 62(44)C/4 6244 6244 62446244 6244 62(44) C/46244 62422 6244 C/22422(22)(22) (22)(22)422 222244 22222222/${x4} 4222222 ${x0}/222222(22) ${DC}C/${$}22 611422 4C/222244 22222222 222244 222244/22222222 22222222 42244 C/44444 4444 4444 4(22)4/46244 42244 88 C${DS} ${Fin} U0:zC:44444 4444 62(44)C/4 6244 6244 62446244 6244 62(44) C/46244 62422 6244 C/22422(22)(22) (22)(22)422 222244 22222222/${x4} 4222222 ${x0}/222222(22) ${DC}C/${$}22 611422 4C/222244 22222222 222244 222244/22222222 22222222 42244 C/44444 4444 4444 4(22)4/46244 42244 88 C${DS} ${Fin}
N1:s,dmltd'lsmrzmrd dmmmml--lttttd' tlsfmrdrfmrd dmrfmsflsfmmrrd zzmm-m-zz(s-) (s-)ssltsrslls-7 mmm(m-) zz msf(m-)zz d'tls-3 fsf(m-)zz rrmfmdrt,d dmsllsttd'd' d'-3d'ls-7 f-3sf m--fs- l-3s-3f-3m-3 rlfmrd sd'--Tl--lr'--d't -3sttd'r'd's --dmrd N1:s,dmltd'lsmrzmrd dmmmml--lttttd' tlsfmrdrfmrd dmrfmsflsfmmrrd zzmm-m-zz(s-) (s-)ssltsrslls-7 mmm(m-) zz msf(m-)zz d'tls-3 fsf(m-)zz rrmfmdrt,d dmsllsttd'd' d'-3d'ls-7 f-3sf m--fs- l-3s-3f-3m-3 rlfmrd sd'--Tl--lr'--d't -3sttd'r'd's --dmrd
N2:#s,sdml'mmfmdlrdts z4 dmrmFS'-z mmmfmrdtslldts z10 ddtts zzd(d-) (d-) zzdtdrmmms'rtrFF(r-) - m)(f-) --z3 dms'fmz6 mrf(m-)-- rrr(d-)zz l'l'd3s'3s dms'l'l's'ffmm (f-)--ff(m-) -6 (r-)--rr(d-)-rm - dtdrmrdt ltdlsdtd ldddts mm--s'f-- s'F--Fs'---Ff4 md--ddts N2:#s,sdml'mmfmdlrdts z4 dmrmFS'-z mmmfmrdtslldts z10 ddtts zzd(d-) (d-) zzdtdrmmms'rtrFF(r-) - m)(f-) --z3 (dm)s'fmz6 mrf(m-)-- rrr(d-)zz l'l'd3s'3s dms'l'l's'ffmm (f-)--ff(m-) -6 (r-)--rr(d-)-rm - dtdrmrdt ltdlsdtd ldddts mm--s'f-- s'F--Fs'---Ff4 md--ddts
N3:s,dmlSlt#rdsflsfm z4 sdtddt-z Slsddt sfmffsfm msflst ldtls sffm zz sltdtsd (s-)(d-)dddr'tstd d(t-)-dr'---sltd-zzslts-zzlttdzz-lttd-zz ffslsmfrm d,msllsrrss (l-)--ld(d-) -6 (t-)--tt(s-) -s d- d--- (d-) - - (t-) - - (s-) -- ldlsfm zz ms--ld--lr'-z #m rdtz rrdts(d-) - msfm N3:s,dmlSlt#rdsflsfm z4 sdtddt-z Slsddt sfmffsfm msflst ldtls sffm zz sltdtsd (s-)(d-)dddr'tstd d(t-)-dr'---sltd-zzslts-zzlttdzz-lttd-zz ffslsmfrm d,msllsrrss (l-)--ld(d-) -6 (t-)--tt(s-) -s d- d--- (d-) - - (t-) - - (s-) -- ldlsfm zz ms--ld--lr'-z #m rdtz rrdts(d-) - msfm
N4:s,dmlmlrmdfrss, dz4dl, t, drm-z mlmfdt, drmfrss, d z10 s,4d, s, d m(m-)mrdm(sf)(mr)ddd r6s,s,t,rsfmr (d--ms) mrdzzddms lsfmdl,D rs,s, drmdffmrss,s, s, d dmsllss, s, dd (fl)d'lf- dt, dmsmd#s,lrdtlss dtdrmd (f-)--(m-)--(r-)--(d-)-- f,3ssd zzdm--ff-zFl-zt'l's' zs4ds'mdlssd N4:s,dmlmlrmdfrss, dz4dl, t, drm-z mlmfdt, drmfrss, d z10 s,4d, s, d m(m-)mrdm(sf)(mr)ddd r6s,s,t,rsfmr (d--ms) mrdzzddms lsfmdl,D rs,s, drmdffmrss,s, s, d dmsllss, s, dd (fl)d'lf- dt, dmsmd#s,lrdtlss dtdrmd (f-)--(m-)--(r-)--(d-)-- f,3ssd zzdm--ff-zFl-zt'l's' zs4ds'mdlssd
O1:v3:____Andri_amanitra_3Ani\e O1:v234:____Andri_amanitra_3Ani\e
O2:v24:__________Andriamanitra O2:v24:__________Andriamanitra
O3:v4:Izy\ irery\ i_hany no nanao Izy\ irery\ ihany no nanao nanao fahagagana I___saorana___Mandrakizay Mandrakizay deraina Mandrakizay deraina O3:v4:Izy\ irery\ i_hany no nanao Izy\ irery\ ihany no nanao nanao fahagagana I____saorana__Mandrakizay Mandrakizay deraina Mandrakizay deraina
O4:v34:Ame\n_3Ame\n_3Ame\n O4:v34:_2Ame\n_3Ame\n_3Ame\n_3Ame\n!
O5:v3:Izy irery O5:v3:Izy irery
O6:v3:_ny fahagagana O6:v3:_ny fahagagana
Y1:Isaorana isaorana anie Jehova\h/${O:1}Andri_amanitra_3Andri_amanitra Andri_amanitry ny Isra_ely/${O:2}Isaorana anie Jehova\h/Andri_amanitra/${O:3}_2${O:5}Ire_ry _no nanao Izy\ irery\ ihany no nanao${O:6}_6/Isaorana, _3Isaorana _3mandrakizay_4Mandrakizay_3/ny anarany Masina/Ary aoka ny tany rehetra,/Ho _3henika _7ny _3vonina_3hiny/_Ho_4he_4ni_4ka_4ny voninahiny/Ame\n!${O:4}_3Ame\n!_3Ame\n!_3Ame\n!_3Isaorana Jehova\h_3Ame\n! Ame\n! O7:v2:I_saorana
O8:v4:Ho henika _2ny famirapiratry ny voninahitr'i Jehova\h Ray Tsitoha
O9:v2:Ny famirapiratry ny voninahitr'i Jehova\h
O10:v4:va\h Ame\n
Y1:Isaorana isaorana anie Jehova\h/${O:1}Andri_amanitra_3Andri_amanitra Andri_amanitry ny Isra_ely/${O:2}Isaorana anie Jehova\h/Andri_amanitra/${O:3}_2${O:5}Ire_ry _no nanao Izy\ irery\ ihany no nanao${O:6}_6/Isaora${O:7}na, _3Isaorana _3mandrakizay_4Mandrakizay_3/ny anarany Masina/Ary aoka ny tany rehetra,/${O:8}Ho _3henika _7ny _3vonina_3hiny/_${O:9}Ho_4he_4ni_4ka_4ny voninahiny/${O:4}Ame\n!_3Ame\n!_3Ame\n!_3Ame\n!_3Isaorana Jeho${O:10}va\h_3Ame\n! Ame\n!

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

@ -7,6 +7,8 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import mg.dot.feufaro.FileRepository import mg.dot.feufaro.FileRepository
//todo: split voices (ffpm19) ${S:mfs} in N4:
class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository: FileRepository) { class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository: FileRepository) {
private val T: MutableList<PTemplate> = mutableListOf() private val T: MutableList<PTemplate> = mutableListOf()
private val N: MutableList<POneVoiceNote> = mutableListOf() private val N: MutableList<POneVoiceNote> = mutableListOf()
@ -179,6 +181,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
val voiceNumber = noteLine.substring(0, 1).toInt() val voiceNumber = noteLine.substring(0, 1).toInt()
val templateStripped = REGEX_TEMPLATE_COMMENT.replace(templateString, "") val templateStripped = REGEX_TEMPLATE_COMMENT.replace(templateString, "")
val templateCharArray = templateStripped.toCharArray() val templateCharArray = templateStripped.toCharArray()
val noteLine = REGEX_TEMPLATE_COMMENT.replace(noteLine, "")
val lineRepeated = REGEX_REPETITION.replace(noteLine.substring(1)) { matchResult -> val lineRepeated = REGEX_REPETITION.replace(noteLine.substring(1)) { matchResult ->
val (charIterated, iteration) = matchResult.destructured val (charIterated, iteration) = matchResult.destructured
val nTimes = iteration.toInt() val nTimes = iteration.toInt()