From 200fbf325b8741946f7138cad5e8f6f0e49189c9 Mon Sep 17 00:00:00 2001 From: dotmg Date: Thu, 31 Jul 2025 20:20:16 +0200 Subject: [PATCH] Regex("^-\.z$") = blanc --- .../commonMain/composeResources/files/ews-22.txt | 11 +++++++++++ .../src/commonMain/composeResources/files/ff-9.txt | 13 +++++++++++++ .../commonMain/composeResources/files/ffpm-19.txt | 11 +++++++++++ .../kotlin/mg/dot/feufaro/solfa/TUNote.kt | 1 + 4 files changed, 36 insertions(+) create mode 100644 composeApp/src/commonMain/composeResources/files/ews-22.txt create mode 100644 composeApp/src/commonMain/composeResources/files/ff-9.txt create mode 100644 composeApp/src/commonMain/composeResources/files/ffpm-19.txt diff --git a/composeApp/src/commonMain/composeResources/files/ews-22.txt b/composeApp/src/commonMain/composeResources/files/ews-22.txt new file mode 100644 index 0000000..13fe00d --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/ews-22.txt @@ -0,0 +1,11 @@ +M0:|c:C|m:4/4|t:EWS 22 My God I thank Thee|u:https://hymnary.org/hymn/NCH1937/page/223|a:Adelaide Anne Procter (1825-1864)|h:Frederick C. Maker (1844-1927)|r:8.4.8.4.8.4 +U0:z0:44444444/488C/44444444/488C/44444444/488C +N1:sd'd'tlsmdrmlr/mmmd'tlsFmrls/sllsdffmdrfm +N2:sd'd'tlsmdt,ddt,/ddrmmmmrdddt,/rrrmddt,dddt,d +N3:sd'd'tlsmdssls/ssSlr'd'TlslFs/tttd'slssslss +N4:sd'd'tlsmds,dfs/ddt,l,t,dDrmFrs,/sffmmrrd${S:mfs}m,f,s,d +E1:My God, I thank thee, who hast made/The earth so bright;/So full of splen_dor and of joy,/Beau_ty and light;/So ma_ny glo_rious things are here,/No_ble and right. +E2:I thank thee, Lord, that thou hast made/Joy to a_bound;/So ma_ny gent_le thoughts and deeds/Circ_ling us round,/That in the dark_est spot of earth/Some love is found. +E3:I thank thee, too, that all our joy/Is touched with pain,/That sha_dows fall on bright_est hours,/That thorns re_main;/So that earth's bliss may be our guide,/And not our chain. +E4:For thou who know_est, Lord, how soon/Our weak heart clings,/Hast given us joys, ten_der and true,/Yet all with wings;/So that we see gleam_ing on high/Di_vi_ner things. +E5:I thank Thee, Lord, that Thou hast kept/The best in store;/We have e_nough, yet not too much/To long for more:/A yearn_ing for a deep_er peace/Not known be_fore./ diff --git a/composeApp/src/commonMain/composeResources/files/ff-9.txt b/composeApp/src/commonMain/composeResources/files/ff-9.txt new file mode 100644 index 0000000..aa7ce89 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/ff-9.txt @@ -0,0 +1,13 @@ +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} +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 +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 +O1:v3:____Andri_amanitra_3Ani\e +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 +O4:v34:Ame\n_3Ame\n_3Ame\n +O5:v3:Izy irery +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! diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-19.txt b/composeApp/src/commonMain/composeResources/files/ffpm-19.txt new file mode 100644 index 0000000..e491881 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/ffpm-19.txt @@ -0,0 +1,11 @@ +M0:|c:C|m:4/4|t:FFPM 19 Misaotra Anao, 'zahay izao|u:https://hymnary.org/hymn/NCH1937/page/223|a:Adelaide Anne Procter (1825-1864) R. Baron 1847-1907 (dikany malalaka)|h:Frederick C. Maker (1844-1927)|r:8.4.8.4.8.4 +U0:z0:44444444/488C/44444444/488C/44444444/488C +N1:sd'd'tlsmdrmlr/mmmd'tlsFmrls/sllsdffmdrfm +N2:sd'd'tlsmdt,ddt,/ddrmmmmrrddt,/rrrmddt,dddt,d +N3:sd'd'tlsmdssls/ssSlr'd'TlslFs/tttd'slssslss +N4:sd'd'tlsmds,dfs/ddt,l,t,dDrmFrs,/sffmmrrd${S:mfs}m,f,s,d +Y1:Misaotra\ Anao zahay izao/Jehova\h Ray!/Fa efa notohizanao/Ny andronay,/Ka tonga\ atỳ an-tranonao,/Indray zahay. +Y2:Misaotra\ Anao ‘zahay izao,/Ry Mpanome!/Ny so_a avy aminao/Tsy lany re,/Fa isan-andro misy vao,/Ka maro be. +Y3:Misaotra\ Anao’zahay izao,/Ry Rainay soa!/Ny helokay navelanao,/Nefa\ iza moa/No mahalaza\ izay natao?/Fa be tokoa. +Y4:Misaotra\ Anao’zahay izao,/Ry mora fo!/Ny mafy tsy sakananao/Tsy mba hanjo,/Fa be ny faniri_anao/Anay hadio. +Y5:Misaotra\ Anao’zahay izao,/Ry Tomponay!/Ao aminao an-danitra\ ao/Honenanay,/Fa misy fitsaharana\ ao/Mandrakizay. \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt index 69d324b..c07f733 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt @@ -58,6 +58,7 @@ class TUNote (private val detailNote: MutableList = mutableListOf()){ .replace(Regex("\\.-\\s*$"), "") .replace(Regex(" ,-\\s*$"), "") .replace(Regex("\\((-[\\.,;][a-zA-Z][ia]*[¹²³₁₂₃]?)\\)"), "$1") + .replace(Regex("^-\\.z$"), "") .replace("-", "―") .replace(".", "\u2022") .replace("z", "")