Bugfix w3 & s,-.-,-

composeApp/src/commonMain/composeResources/files/META-INF/container.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<container>
+    <rootfiles>
+        <rootfile full-path="18.xml" media-type="application/vnd.recordare.musicxml+xml"/>
+    </rootfiles>
+</container>

composeApp/src/commonMain/composeResources/files/config.json

@@ -2,9 +2,13 @@
   "themeMode": "DARK",
   "fontSize": 18.5,
   "playlist": [
+    "assets://ews-21.txt",
+    "assets://ews-13.txt",
+    "assets://ffpm-137.txt",
+    "assets://ffpm-653.txt",
+    "assets://ews-19.txt",
     "assets://ffpm-131.txt",
     "assets://ffpm-54.txt",
-    "assets://ews-17.txt",
     "assets://ffpm-127.txt",
     "assets://ews-15.txt",
     "assets://ews-14.txt",

composeApp/src/commonMain/composeResources/files/ews-18.txt

@@ -0,0 +1,12 @@
+M0:|t:EWS 18 How lovely, how divinely sweet|h:Thomas Thorley|c:G|m:4/4|a:Anne Steele (1717-1778)|r:L.M.
+U0:z8:888(44)(44)(44)(44)C/4888(44)(44)88/8(44)(44)(44)(44)(44)(44)(444)/488(44)(44)(44)(44)88
+N1:s,drmdmsfmr-dmrdt,t,rdt,l,s,ssmslfrmsmdsmm-rs,drmdmsfmr-dz
+N2:s,s,s,s,-d-d-t,-ds,s,F,s,s,-l,s,F,s,dd-d-t,rs,-s,-mdd-t,s,s,s,s,-d-d-t,-dz
+N3:mdt,dmsml-rfmdrrrrt,r-dt,z16t,dt,dmsml-rfmz
+N4:d,m,s,d-d-f,-s,-d,dt,l,s,s,-r,-r,s,mmdmfrt,d-d-d,-s,--f,m,s,d-d-f,-s,-d,z
+E1:How love_ly, how di_vine_ly sweet,/O Lord, Thy sac_red courts ap_pear!/Fain would my long_ing pas_sions meet/The glo_ries of Thy pre_sence there.
+E2:Oh, blest the men, blest their em_ploy,/Whom Thine in_dul_gent fa_vors raise/To dwell in those a_bodes of joy,/And sing Thy ne_ver-_ceas_ing praise.
+E3:God is a sun; our brigh_test day/From His re_vi_ving pre_sence flows;/God is a shield through all the way,/To guard us from sur_round_ing foes.
+E4:O Lord of hosts, Thou God of grace,/How blest, di_vine_ly blest, is he,/Who trust Thy love and seeks Thy face,/And fix_es all his hopes on Thee!
+E5:Hap_py the men whom strength di_vine/With ar_dent love and zeal ins_pires;/Whose steps to Thy blest way in_cline/With wil_ling hearts and warm de_sires.
+E6:One day with_in Thy sac_red gate,/Af_fords _more real joy to me/Than thous_ands in the tents of state;/The mean_est place is bliss with Thee.

composeApp/src/commonMain/composeResources/files/ews-19.txt

@@ -0,0 +1,10 @@
+M0:|t:EWS 19 My heart its incense burning|h:(Unknown)|c:F|m:4/4|a:Johann Mathesius (1504-1565); tr: Henry Mills (1786-1867)|r:L.M.|u:https://hymnary.org/hymn/ELH1996/page/512
+U0:zC:44444(44)4/4(22)4448z4/4444(22)(44)4/44(22)448z4/444448z4/44444(44)4/44(22)4(22)(44)4/4(22)(22)448z4
+N1:ddsmddmrms-fmrd/ddsmd-dmrmsf-mrd/mmssmr/dmfsrS,t,dmsf-md-dmrms-f-mrd
+N2:s,s,t,dl,s,-s,s,r-ddt,s,/s,l,s,s,s,F,s,l,t,t,drdt,t,d/dt,t,ddt,/l,s,dt,l,m-l,l,t,l,-s,s,F,s,-s,s,s,-l,t,dt,s,
+N3:mmfsfmdt,drmfsfm/mmrddrmdt,ssl-sfm/smrdss/mddrl,t,mmdrdrmmrmdt,drmf-sfm
+N4:d,m,r,m,f,s,-s,dt,-l,s,s,d/dl,t,dl,-s,F,s,s,m,f,-s,s,d,/ds,f,m,d,s,/l,dl,s,f,m,S,l,l,s,l,t,dl,-s,-s,dt,-l,-s,s,d,
+E1:My heart its in_cense burn_ing,/I'll of_fer thanks and praise,/Now, with re_turn of morn_ing,/And through all fu_ture days;/I'll praise Thee on Thy throne,/Great Source of ev'_ry bles_sing,/My song to Thee ad_dres_sing/Through Christ, Thy on_ly Son.
+E2:Thy mer_cy claims my prai_ses!/This kept me through the night;/And now from sleep it rai_ses,/To greet the dawn_ing light./This, too, it is that hath/My ma_ny sins for_gi_ven,/Which, in the face of hea_ven,/So oft pro_voked Thy wrath.
+E3:In mer_cy still di_rect me/Through_out the com_ing day:/From Sa_tan's wiles pro_tect me,/From sin, and from dis_may:/De_fend from fire and storm,/From want and ev'_ry weak_ness,/From sor_rows and from sick_ness,/From sud_den death's a_larm.
+E4:Let an_gels keep their sta_tions,/Nor cease their guard of me,/A_vert_ing all temp_ta_tions/Which draw my soul from Thee!/Thy shield hold Thou a_bove!/Then no_thing shall dis_tress me,/To du_ty I'll ad_dress me,/Re_joic_ing in Thy love./

composeApp/src/commonMain/composeResources/files/ews-20.txt

@@ -0,0 +1,18 @@
+M0:|c:G|m:4/4|t:EWS 20 The God of Abraham praise|a:(attributed to): Daniel ben Judah; Paraphraser: Thomas Olivers (1770)|h:Meyer Lyon (1770: 1751-1799)|u:https://hymnary.org/hymn/PHLG2023/page/218
+U0:zC:44444C/4(22)444C/44444444/48(44)C/44444C/(22)(22)(22)44C/(22)44444(22)4/(22)8(44)C
+N1:m,l,t,drmdr-mfsmt,drmfst,dfmr-ddmmmmrdt,)(l,t,)(dr)ml,S,m,-l,t,drmrm)f(mr)dt,-l,
+N2:m,m,m,m,l,S,s,l,-l,l,s,s,m,m,s,s,l,s,f,m,l,s,s,f,m,s,s,t,l,s,s,m,)-(m,)-(l,)-s,f,m,m,-m,m,m,s,s,l,)-l,(t,)-l,S,-m,
+N3:ddt,l,l,t,dl,t,)Drt,dS,l,t,dddrdddt,-dmdrddt,r-d-(l,t,)z-t,S,-l,s,l,t,dl,Drf-mmrd
+N4:l,l,S,l,f,m,m,f,)-m,r,s,d,m,l,s,dl,m,s,l,f,s,s,-d,d,dS,l,m,s,S,-l,-(f,)-z-m,m,r,)d,m,l,s,d,f,m,)r,r,-m,m,-l,
+E1:The God of Ab_raham praise,/Who reigns en_throned a_bove;/An_cient of e_ver_last_ing days,/And God of Love;/Je_ho_vah, great I AM!/By earth and Heav’n con_fessed;/I bow and bless the sac_red name/For_e_ver blessed.
+E2:The God of Ab_raham praise,/At whose sup_reme com_mand/From earth I rise—_and seek the joys/At His right hand;/I all on earth for_sake,/Its wis_dom, fame, and power;/And Him my on_ly por_tion make,/My shield and tower.
+E3:The God of Ab_raham praise,/Whose all suf_fi_cient grace/Shall guide me all my hap_py days,/In all my ways./He calls a worm His friend,/He calls Him_self my God!/And He shall save me to the end,/Thro’ Je_sus’ blood.
+E4:He by Him_self has sworn;/I on His oath de_pend,/I shall, on ea_gle wings up_borne,/To Heav’n as_cend./I shall be_hold His face;/I shall His power a_dore,/And sing the won_ders of His grace/For_e_ver_more.
+E5:Tho’ na_ture’s strength de_cay,/And earth and hell with_stand,/To Ca_naan’s bounds I urge my way,/At His com_mand./The wa_tery deep I pass,/With Je_sus in my view;/And thro’ the howl_ing wild_er_ness/My way pur_sue.
+E6:The good_ly land I see,/With peace and plen_ty blessed;/A land of sac_red li_ber_ty,/And end_less rest./There milk and ho_ney flow,/And oil and wine a_bound,/And trees of life for_e_ver grow/With mer_cy crowned.
+E7:There dwells the Lord our king,/The Lord our right_eous_ness,/Tri_um_phant o’er the world and sin/The Prince of peace;/On Si_on’s sac_red height/His king_dom still main_tains,/And glo_rious with His saints in light/For_e_ver reigns.
+E8:He keeps His own se_cure,/He guards them by His side,/Ar_rays in gar_ments, white and pure,/His spot_less bride:/With streams of sac_red bliss,/With groves of li_ving joys/With all the fruits of pa_ra_dise/He still sup_plies.
+E9:Be_fore the great Three-_One/They all e_xult_ing stand;/And tell the won_ders He hath done,/Through all their land:/The listen_ing spheres at_tend,/And swell the grow_ing fame;/And sing, in songs which ne_ver end,/The wondr_ous name.
+E10:The God who reigns on high/The great ar_chan_gels sing,/And "Ho_ly, ho_ly, ho_ly!" cry,/"Al_migh_ty King!/Who was, and is, the same,/And e_ver_more shall be:/Je_ho_vah—_Fa_ther—_great I AM,/We wor_ship Thee!"
+E11:Be_fore the Sa_vior’s face/The ran_somed na_tions bow;/O’er_whelmed at His al_migh_ty grace,/For_e_ver new:/He shows His prints of love/They kind_le to a flame!/And sound thro’ all the worlds a_bove/The slaugh_tered Lamb.
+E12:The whole tri_um_phant host/Give thanks to God on high;/"Hail, Fa_ther, Son, and Ho_ly Ghost,"/They e_ver cry./Hail, Ab_raham’s God, and mine!/(I join the heav’n_ly lays)/All might and ma_jes_ty are Thine,/And end_less praise./

composeApp/src/commonMain/composeResources/files/ews-21.txt

@@ -0,0 +1,9 @@
+I0:ews-13.txt:E\d+|M0:|O:
+O1:v3:In strains of ho_ly_joy, _2in strains of ho_ly_joy _2in strains of ho_ly_joy In strains of ho__ly_joy.
+M0:|a:Fulbert of Chartres, tr: Robert Campbell|h:Thomas Jarman (1776-1861)|t:EWS 21 Sing, choirs of new Jerusalem|c:G|m:4/4
+E1:Ye choirs of new Je_ru_sa_lem,/Your sweet_est notes em_ploy,/Your sweet_est notes em_ploy,/The Pas_chal vic_to_ry to hymn/${O:1}_4In strains of ho_ly joy,/_2in strains of ho_ly joy,/_2in strains_3of ho_2ly joy.
+E2:For Judah’s Lion bursts His chains,/Crushing the serpent’s head;/And cries aloud through death’s domains/To wake the imprisoned dead.
+E3:From hell’s devouring jaws the prey/Alone our Leader bore;/His ransomed hosts pursue their way/Where Jesus goes before.
+E4:Triumphant in His glory now/To Him all power is given;/To Him in one communion bow/All saints in earth and heaven.
+E5:While we, His soldiers, praise our king,/His mercy we implore,/Within His palace bright to bring/And keep us evermore.
+E6:All glory to the Father be,/All glory to the Son,/All glory, Holy Ghost, to Thee,/While endless ages run.

composeApp/src/commonMain/composeResources/files/ffpm-137.txt

@@ -0,0 +1,9 @@
+M0:|c:C|m:4/4 Mavitrika|t:FFPM 137 Vita izao ny fandresena|h:S. Randrianandraina 1912-|a:S. Randrianandraina 1912-|r:15.12.7.0.7.7.7.0.7.10
+U0:z0:${f}4444 6244 6244 448/ ${c:G}4(22)44 4(22)44 44(422)Cz4/ ${c:C}${mf}4(22)44 4(22)8/ ${Organa...} 4(22)44 4(22)8/ ${f}4(22)44 (22)(22)(422) / ${<}6244${=}${>} (22)(22)8/ ${mf} 4(22)44 (22)(22)8 / ${Organa...} 6244 (1111)(22)8 / ${f} 4(22)44 (22)(22)(422)/ ${f} 62(2222) 624(22) 8$Q8 $QCz4
+N1:dms#s dmrdlsslddtd/#d mwfslswfmdmfmwrd/  mwfslswfm/ #d' mwfslswfm/ fwmrdrwwddtw/ #d d'lsdfmrwd/ mwfslswwfm/ #d' mfslswwwwfm/ fwmrdrwwddtw/ #t ddd-zzttdmrdtd
+N2:s, dmmsssfddfmffm/ #s, dwtdddtwdlddttws/dwtdddtwd/ #m dwtdddtwd/ sswsmlwwlssw/ s#s,fdllwtws/ dwtdddtltd/ #sdtdddrdtltd/ #d sswsmlFslssw/ sslfslsfmlwsfm
+N3:#m msdddtddssldrrd/ sswslsswsmssswfm/ sswslssws/ sswslssws/ f'wm'rddwwdrrw/ ddsmfwsfm/ sswslswsws/ ssslsw3sws/ rwm'rddwdwrrw/ dddwzzrtddwsss
+N4:ddddsfmfmmflssd/ dwrmfmrwdl,s,4wd/ dwrmfms,wd/ drwmfmrwd/ r'wd'tlFrmFssf/ mfml, rws, wd/ dwrmfmws, wd/ drmfmwwwrwd/ r'wd'tlFrmFssf/ mmfrmfsSlfwss, d
+Y1:Vita\ izao ny fandresena/Haleloia, halelo_ia/Azo koa ny famonjena,/Halelo_ia;/Resy re ny fasana/_7Sy ny fa\hafatesana/Fahavalo farany,/Fa Jeso nitsangana,/_7Tonga fanafahana;/${R=}Haleloia Haleloia Halelo_ia
+Y2:To izao izay nambara:/Haleloia, halelo_ia/Fa ny fatotra nivaha:/Halelo_ia./Fo_ana ny fasana./_7Jeso re nitsangana/Tamin-kery lehibe/Ka torio ry mino e!/_7Eran-tany mba ho re:/Haleloia
+Y3:Dia venteso ny hosana:/Haleloia, halelo_ia/Aoka tsy hihambahamba:/Halelo_ia./Fa\ efa velona tokoa/_7Lay Mpamonjy tsy mba roa/Zay nisolo voina\ anao;/Izy no nisantatra/_7Ny fiainan-tsambatra:/Haleloia

composeApp/src/commonMain/composeResources/files/ffpm-32.txt

@@ -0,0 +1,9 @@
+M0:|c:A|m:4/4|t:FFPM 32 Misaotra Anao izahay Jehovah Tompo|a:J. Rakotonirainy, 1926-...|h:Feon-kira hebreo tranainy (Siekla faha-17)
+U0:zC:44444C/44444C/(22)44444/4448(44)C/44444(84)/(22)(22)(22)44(84)/(22)44444/(22)4(22)8(44)C
+N1:m,l,t,drmdrmfsmt,-drmfst,dfmr-d/dmmmmr-dt,l,t,drml,l,S,/m,-l,t,drm/rmfmrdt,-l,
+N2:#m,mmmmlS/mlslss/s-sssd-/ssfssfm/ms5f/m-m-l-lfm-/m-mmmss/Slll-lS-m
+N3:#s, dlSllt/d4td/r-dtddr/rdldt-d/sd4t-/mrdrmrdddt/S-lSltd/mfrdrm-rd
+N4:#d,ldmlfm/lfmrsd/sfmsd'ls/fmlss-d/d3mds,-/S,-l,-l,-drm-/mrdmlsd/t,drmfmm-l
+Y1:Misaotra\ Anao I\zahay,/Jehova\h Tompo ô!/Fa efa naharay/Ny so_a taminao./Ka lalandava no/Hisaoranay Anao/Ho eo am-bavanay/Tokoa ny Teninao.
+Y2:Fa reharehanay/Sy famonjena koa/Ny Tompo tia anay,/Tsy manam-paharoa./Ny fandresena soa,/Ny fi_ononam-po/Dia avy taminao/Ka hery manavao.
+Y3:Ny olo-mino\ Anao/Sy\ ireo mpanomponao/Na velona na maty,/Dia misaotra\ Anao./Ka sambatra tokoa/Fa manana Anao/‘Zahay, ry rehareha\n’/Ny fanahy ô!

composeApp/src/commonMain/composeResources/files/ffpm-653.txt

@@ -0,0 +1,9 @@
+M0:|t:FFPM 653 Sakaiza, raha tia ny Tompo ianao|c:F|m:4/4|a:I.A. Brorson 1694-1764 nad. L. Dahle 1843-1925|h:Nic Herman 1500-1561|r:7.6.7.6.6.7.7.6
+U0:zC:44444(62)2z2/4 44448${DC}z4/4 44448z4/4444(22)82z2/ 44444(62)2z2/444448z4
+N1:ddsmddmr/msfmrd/mmssmr/dmfsr-md/msfmddmr/msfmrd
+N2:#s, ssstdd-t/ddddtd/dttddt/ldddt-dd/lstdld-t/ddddts
+N3:mmrsmmds/sslsfm/dsrsss/mslssfmm/drrmfs-s/sslsfm
+N4:#d,d'2tsls-s/dmfssd/lsfmds/lsfms-d'l/ltsd'f'm'd's/dmfssd
+Y1:Sakaiza, raha ti_a/Ny Tompo hi_anao;/${D:Faingàna ka avi_a/Hanaraka\ Azy\ izao!/}O, mba tsarovinao,/Fa Izy tsy nifaly,/Nale_ony nijaly/Mba hamonjena\ anao.
+Y2:Fanahy, mahereza,/Efao ny adinao,/${D:Fa làlana mideza/No hi_akaranao;/}Ny zava-tsoa atỳ/Dia zavatra mandalo;/Tsy azom-pahavalo/Ny lovanao arỳ.
+Y3:Ry Tompo, manomeza/Anay ny herinao;/${D:Fino_ana mateza/Mba atolorinao,/}Mba hanarahanay/Ny làlam-pamonjena,/Hahita\ Anao mitsena/Anay rahatrizay.

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

@@ -24,7 +24,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
         val REGEX_SINGLETON_PAREN       = Regex("[\\(\\[](.[¹²³₁₂₃]?)?[\\)\\]]") // @todo
         val REGEX_SHIFT_COMMA_UPWARD    = Regex("([^a-zA-Z]+)([',])")
         val REGEX_TEMPLATE_COMMENT      = Regex("(\\$[A-Z]|\\$\\{[^\\}]*\\})")
-        val REGEX_REPETITION            = Regex("([zdrmfslt-](?>[',]*))([1-9][0-9]*)", RegexOption.IGNORE_CASE)
+        val REGEX_REPETITION            = Regex("([zwdrmfslt-](?>[',]*))([1-9][0-9]*)", RegexOption.IGNORE_CASE)
         val REGEX_PARSE_META            = Regex("\\|(?=[a-z]:)")
         val REGEX_LYRICS_COMMENT        = Regex("\\$\\{([^\\}]:([^\\}]*))\\}|\\$\\{R!\\}")
         val REGEX_LYRICS_REPETITION     = Regex("_(\\d)")

composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt

@@ -55,7 +55,8 @@ class TUNote (private val detailNote: MutableList<Note> = mutableListOf()){
             .replace("'", "¹")
             .replace(Regex("[zZ][zZ\\.,]+(?![drmfslt])"), "")
             .replace(Regex("^-\\.,"), "")
-            .replace(Regex("\\.-$"), "")
+            .replace(Regex("\\.-\\s*$"), "")
+            .replace(Regex(" ,-\\s*$"), "")
             .replace(Regex("\\((-[\\.,;][a-zA-Z][ia]*[¹²³₁₂₃]?)\\)"), "$1")
             .replace("-", "―")
             .replace(".", "\u2022")