New ffpm & ews files

2026-01-20 20:45:16 +01:00 · 2026-01-20 20:45:16 +01:00 · c14a4c8d9b
commit c14a4c8d9b
parent 8512d5432f
16 changed files with 49 additions and 41 deletions
--- a/composeApp/src/commonMain/composeResources/files/config.json
+++ b/composeApp/src/commonMain/composeResources/files/config.json
@ -2,6 +2,28 @@
  "themeMode": "DARK",
  "fontSize": 18.5,
  "playlist": [
+    "assets://ews-361-2.txt",
+    "assets://ffpm-336.txt",
+    "assets://ews-350.txt",
+    "assets://ews-103.txt",
+    "assets://ews-101.txt",
+    "assets://ffpm-143.txt",
+    "assets://ews-99.txt",
+    "assets://ffpm-146.txt",
+    "assets://ews-106.txt",
+    "assets://ews-102.txt",
+    "assets://ews-98.txt",
+    "assets://ffpm-142.txt",
+    "assets://ews-97.txt",
+    "assets://ffpm-139.txt",
+    "assets://ews-96.txt",
+    "assets://ffpm-666.txt",
+    "assets://ews-95.txt",
+    "assets://ffpm-107.txt",
+
+    "assets://ews-416.txt",
+    "assets://ews-250.txt",
+    "assets://ews-94.txt",
    "assets://ffpm-745.txt",
    "assets://ffpm-722.txt",
    "assets://ffpm-92.txt",
--- a/composeApp/src/commonMain/composeResources/files/ews-11.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-11.txt
@ -1,4 +1,4 @@
-M0:|t:All Glory, Laud, and Honor|c:Bb|m:4/4|a:Theodulph of Orleans, 760-821. tr. John Mason Neale (1818-1866)|h:Melchoir Teschner (1584-1635)|r:7.6.7.6.D
+M0:|t:EWS 11 All Glory, Laud, and Honor|c:Bb|m:4/4|a:Theodulph of Orleans, 760-821. tr. John Mason Neale (1818-1866)|h:Melchoir Teschner (1584-1635)|r:7.6.7.6.D
 U0:zC:44444(422)4/4(22)444C/44444(422)4/4(22)444C/4(22)(22)44(44)4/4444(22)C/44444(44)4/4444(22)C
 N1:d,s,s,l,t,d--dmr-ddt,dd,s,s,l,t,d--dmr-ddt,ddm-m-rdt,l,s,t,dt,l,l,-s,s,m,s,l,s,s,f,m,s,f,m,r,r,-d,
 N2:d,r,d,d,f,f,m,r,m,s,s,f,m,r,r,m,d,r,d,d,f,f,m,r,m,s,s,f,m,r,r,m,m,s,-l,-l,F ,s,F ,r,s,m,s,s,F ,-s,r,d,d,d,d,r,t,,d,d,d,d,d,t,,-d,
--- a/composeApp/src/commonMain/composeResources/files/ews-16.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-16.txt
@ -1,4 +1,4 @@
-M0:|h:Genevan Psalter, 1551 Edition, attr. Louis Bourgeois (1510-1561)|c:G|m:4/4|a:Paraphrased, William Kethe -c. 1954; Thomas Ken (1637-1711)|r:LM
+M0:|h:Genevan Psalter, 1551 Edition, attr. Louis Bourgeois (1510-1561)|c:G|m:4/4|a:Paraphrased, William Kethe -c. 1954; Thomas Ken (1637-1711)|r:LM|t:EWS 16 All people that on earth do dwell
 U0:z8:84444888/84444888/84444888/84(22)4(22)(44)(44)8
 N1:ddt,l,s,drmmmmrdfmrdrmrdl,t,dsmd-rf-m-r-d-
 N2:s,s,s,m,m,m,s,s,s,s,dt,dddt,ds,s,s,s,l,f,m,s,s,d-t,l,t,d-t,-s,
--- a/composeApp/src/commonMain/composeResources/files/ews-17.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-17.txt
@ -1,4 +1,4 @@
-M0:|h:Siraslund Gesangbuch, 1665|c:G|m:3/4
+M0:|h:Siraslund Gesangbuch, 1665|c:G|m:3/4|t:EWS 17 Praise to the Lord, the Almighty
 U0:z0:444624444444(444)C/444624444444(444)C/444C/4444(22)(22)C/444444(42222)C
 N1:ddsmrdt,l,s,l,t,dr--dddsmrdt,l,s,l,t,dr--dssslmfssf-m-rs,l,t,drmr----d
 N2:s,l,s,dt,l,s,f,m,f,f,m,l,s,f,m,s,l,s,dt,l,s,f,m,f,f,m,l,s,f,m,drddddrdl,t,d-t,s,f,f,m,l,S,l,--s,f,m,
--- a/composeApp/src/commonMain/composeResources/files/ews-21.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-21.txt
@ -1,5 +1,5 @@
 I0:ews-13.txt:E\d+|M0:|O:
-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
+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|t:EWS 21 Ye choirs of new Jerusalem
 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.
 O2:v3:To wake the\ im_pris_oned dead, _2To wake the\ im_pris_oned dead _2To wake the\ im_pris_oned dead To wake the\ im_pris__oned dead.
 O3:v3:Where Je_sus goes be_fore, _2Where Je_sus goes be_fore _2Where Je_sus goes be_fore Where Je_sus goes _be_fore.
--- a/composeApp/src/commonMain/composeResources/files/ews-456.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-456.txt
@ -1,4 +1,4 @@
-M0:|c:G|m:3/4|r:11.11.11.11.12.12.11.11|t:456 - To God Be The Glory|n:15|l:10|a:Fanny Crosby (1875)|h:William Howard Doane (1875: 1832-1915)|x:https://hymnary.org/tune/duke_street_hatton
+M0:|c:G|m:3/4|r:11.11.11.11.12.12.11.11|t:EWS 456 To God Be The Glory|n:15|l:10|a:Fanny Crosby (1875)|h:William Howard Doane (1875: 1832-1915)|x:https://hymnary.org/tune/duke_street_hatton
 T0:{:D|(D:D):D.D|D:D:D|D:D:D|D:-/D|D:D:D|D:D:D|D:D:(D.D)|D:-/D|(D:D):D.D|D:D:D|D:D:D|D:-/D|D:D:D|D:D:D|D:D:D|D:-/D.,D|D:-:D.,D|D:-:D.,D|D:D:D|D:-/D.,D|D:-:D.,D|D:-:D.D|D:D:D|D:-/D|(D:D):D.D|D:D:D|D:D:D|D:-/D|D:D:D|D:D:D|D:D:D|D:-}
 N1:s,s,-l,t,ds,drs,rm/mfl,fmdmmrl,-r/s,s,-l,t,ds,drs,rm/msfrdt,dmmrd/mfsmfssmdrmr/rmfrmffrssfm/s,s,-l,t,ds,drs,rm/msfrdt,dmmrd
 N2:m,m,s,f,f,m,m,s,s,s,s,s,/s,l,f,l,s,s,s,F,F,l,-s,/f,m,s,f,f,m,m,s,s,s,s,s,/T,l,l,l,s,s,s,s,s,f,m,/s,s,ds,s,ds,s,s,s,s,s,/s,dt,t,dt,s,s,s,s,s,s,/m,m,s,f,f,m,m,s,s,s,s,s,/T,l,l,l,s,s,s,s,s,f,m,
--- a/composeApp/src/commonMain/composeResources/files/ffpm-103.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-103.txt
@ -1,4 +1,4 @@
-M0:|c:Bb|m:4/4|r:L.M.|a:Thomas Hansen Kingo 1634-1703 Nad. C. Borchgrevink, 1841-1919|h:B. Gesius 1560-1613 (eo ho eo)
+M0:|c:Bb|m:4/4|r:L.M.|a:Thomas Hansen Kingo 1634-1703 Nad. C. Borchgrevink, 1841-1919|h:B. Gesius 1560-1613 (eo ho eo)|t:FFPM 103 Ny hazo fijaliana
 U0:zC:${x3} 44444444/${x0} 4444444$Q4
 N1:#f, m, lSltrdt/ tdrmdrtd/ mrdtlsfm, /tdrmldtl
 N2:#d, mmmdflmS/ Slsssffm/ sssffsrt/ mml4Sl
--- a/composeApp/src/commonMain/composeResources/files/ffpm-106.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-106.txt
@ -1,4 +1,4 @@
-M0:|c:D|m:4/4 Miadana|r:11.11.12.12.|a:P. Nilsen Lund, 1842-1914|h:P. Nilsen Lund, 1842-1914
+M0:|c:D|m:4/4 Miadana|r:11.11.12.12.|a:P. Nilsen Lund, 1842-1914|h:P. Nilsen Lund, 1842-1914|t:FFPM 106 Indro ny fitiavana nijaly
 U0:z0:84488 444484/4 84488 4444G/ 844844 444484/4 844844 4444G
 N1:#r smlsmffrsfm/ slldsdr'dtls/ dmlssslsdmmr/ mfltdsddrdtd
 N2:#t, d7ttrd/ mfflsmrmrdt/ md7mddt/ ddffmmsmfmrm
--- a/composeApp/src/commonMain/composeResources/files/ffpm-143.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-143.txt
@ -1,27 +1,10 @@
-Y1:Vi- ta i- zao ny fa- ndre- se- na Hale- loi-a!Je- so Kri- sty no ho- bi- na, Ha-le- loi-a!A- zo re ny fa- mo- nje- na, Ha-le- loi-a!Ve- ri- nay ta- ry E- de- na, Ha-le- loi-a!
-
-2. Ka izao dia arahabaina, Haleloia!
-'Lay Mpanjakanay hajaina, Haleloia!
-Ka na zovy mitaraina, Haleloia!
-Misy vonjy azo maina, Haleloia!
-
-3. Betlehema ni andohana, Haleloia!
-Kalvary niafarana, Haleloia!
-Fasana tsy nahatana, Haleloia!
-Toro teo 'lay menarana, Haleloia!
-
-4. Saro-bidy re ny rany! Haleloia!
-Ny fiti avany tsy lany, Haleloia!
-Ny fatoranay vahany, Haleloia!
-Ka hobio nareo, ry tany, Haleloia!
-
-t:143 Vita izao ny fandresena
-h:E.J. Hopkins, 1818 - 1901
-a:I. Rajaonson
-r:8.4.8.4. D
-c:C
-m:4/4
-N1:s–sltd'ltsd'–r'm'r'–d'–s–sltd'ltsd'–r'm'r'–d'–m–fslfmrrrmr–s–s–smfsd'lsd'–r'm'r'–d'–
-N2:m–mffsfrrs–lsf–m–s–sfissfisrs–lff–m–d–rddl,dt,t,d–r'–ddt,s–m–mddssilms–fifif–m–
-N3:#td–ddfmrrtd––ddtd–m–mrrddrtd––ddtd#t,–s–fmmrmffm–slff–t–#td–dmrddddm–rddtd–
-N4:d–dfrmfssm–fds–d–d–d'd'tllssm–frs–d–d–ddl,rrs,s,l,–f,r,s,–s,–d–dllmmfms–lrs–d–
+M0:|t:FFPM 143 Vita izao ny fandresena|h:Edward John Hopkins, 1818-1901|a:I. Rajaonson|r:8.4.8.4. D|c:C|m:4/4
+U0:z0:6244 4444/(84)4 (44)8/ 6244 4444/ (84)4(44)8/${c:G}6244 4444/ (84)4(44)${c:C}8/ 6244 4444/ (84)4(44)8 
+N1:ssltd'lts/d'r'm'r'-d'/ssltd'ltsd'r'm'r'-d'/mfslfmrr/drmr-s/ssmfsd'ls/d'r'm'r'-d'
+N2:mmffsfrr/slsf-m/ssFssFsr/slff-m/drddl,dt,t,/d-ddt,s/mmddsSlm/sFFf-m
+N3:#t dddfmrrt/d-ddtd/mmrrddrt/d-ddtd#t, sfmmrmff/mlff-t/#t ddmrdddd/mrddtd
+N4:ddfrmfss/mfds-d/dd'd'tllss/mfrs-d/dddl,rrs,s,/l,f,r,s,-s,/ddllmmfm/slrs-d
+Y1:Vita\ izao ny fandresena/Haleloi_a!/Jeso Kristy no hobina,/Haleloi_a!/Azo re ny famonjena,/Haleloi_a!/Verinay tarỳ Edena,/Haleloi_a!
+Y2:Ka izao dia ara\habaina,/Haleloi_a!/'Lay Mpanjakanay hajaina, Haleloi_a!/Ka na zovy mitaraina, Haleloi_a!/Misy vonjy azo maina, Haleloi_a!
+Y3:Betlehema ni\andohana, Haleloi_a!/Kalvary ni_afarana, Haleloi_a!/Fasana tsy nahatana, Haleloi_a!/Toro teo 'lay menarana, Haleloi_a!
+Y4:Saro-bidy re ny rany! Haleloi_a!/Ny fiti\avany tsy lany, Haleloi_a!/Ny fatoranay vahany, Haleloi_a!/Ka hobionareo, ry tany, Haleloi_a!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-147.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-147.txt
@ -1,9 +1,9 @@
-M0:|t:FFPM 147 Lasa ny Mpanavotsika|a:Dr Rabary 1877-1913|r:8.7.8.7.4.7|h:W.L. Viner, 1790-1867|c:A|m:4/4
+M0:|t:FFPM 147 Lasa ny Mpanavotsika|a:Dr Rabary 1877-1913|r:8.7.8.7.4.7|h:William Litton Viner 1790-1867|c:A|m:4/4
 U0:z0:4(22)44 (22)(22)44/ 4(22)(22)4 448/ 4(22)44 4444 4(22)44 4(22)(44)/ 4(22)44 4(22)44/ 4(22)(22)4 4(22)8
 N1:dt,l,s,m,l,-d-s,m,mrdl,-rdt,d mmfsmfrmdmmfsmfm-r- dt,l,s,m,l,d-s,m,mrdl,-rdt,-d
 N2:m,s,f,m,m,f,-f,-m,m,s,s,-s,f,l,s,s,s, s,s,-s,l,l,s,s,m,dt,l,s,s,f,s,-s,f, m,f,-m,m,f,f,-m,d,s,s,-s,f,l,s,-f,m,
 N3:dd-ddd-d-dddt,dd-fmrm ddrmmrt,dddd-dDrd-t,- s,l,t,dT,l,l,t,ds,dt,dd-fmr-d
-N4:d,d,-d,d,f,s,l,t,d,d,d,r,m,f,-r,s,s,d, dd-dDrs,dd,l,s,f,m,l,r,m,f,s,- d,d,-d,d,d,d,-dd,d,r,m,f,-r,s,s,-d,
+N4:d,d,-d,d,f,s,l,t,dd,d,r,m,f,-r,s,s,d, dd-dDrs,dd,l,s,f,m,l,r,m,f,s,- d,d,-d,d,d,d,-dd,d,r,m,f,-r,s,s,-d,
 Y1:Lasa ny Mpanavotsika,/Ao andanitra ary,/Mba hanoman-trano tsara,/Hito_erantsika ao./Mifalia, mifalia,/Ho tafiditra ao tokoa.
 Y2:Lasa ny Mpisorontsika/Ao an-danitra arỳ/Ho Mpisolo vava ko_a/Ho an'olo-marobe./Matoki_a/Matoki_a/Tsy ho very Hi_anao.
 Y3:Lasa ny Mpanjakantsika/Ao an-danitra arỳ,/Mba handray ny fanjakana/Mety ho anjarany./Mihobi_a/Mihobi_a/Asandrato re ny feo.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-194.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-194.txt
@ -1,4 +1,4 @@
-M0:a:P Nilsen-Lund,1842-1914|h:P Nilsen-Lund,1842-1914|c:Bb|m:3/4 Miadanadana
+M0:a:P Nilsen-Lund,1842-1914|h:P Nilsen-Lund,1842-1914|c:Bb|m:3/4 Miadanadana|t:FFPM 194 Andriananahary ô, Endrey
 T0:{:.,S|S.,S:S.,S:S.,S|M/D:D.,D|R:F:T.,T|D:${DC}-/D|T.,D:R:(D.,T)|D.,R:M/D|T.,D:R:(D.,T)|D.,R:${DC}M.:}
 N1:s,s,s,s,s,s,s,mdddrft,t,ddt,drdt,drmdt,drdt,drm
 N2:s,s,s,s,s,s,s,s,s,l,l,l,l,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,
--- a/composeApp/src/commonMain/composeResources/files/ffpm-336.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-336.txt
@ -1,2 +1,4 @@
-M0:|t:FFPM 336 Ampodio izahay, Jehovah|a:John Fawcett1739-1817 nad. J. Richardson 1844-1922|r:8.7.8.7.4.7|h:W.L. Viner, 1790-1867|c:A|m:4/4 Faingampaingana
+M0:|t:FFPM 336 Ampodio izahay, Jehovah|a:John Fawcett1739-1817 nad. J. Richardson 1844-1922|r:8.7.8.7.4.7|h:William Litton Viner 1790-1867|c:A|m:4/4 Faingampaingana
 I0:ffpm-147.txt:^(M|Y)
+Y1:Ampodio ‘zahay, Jehova\h/Amin’ny fiti_anao,/Na\ aiza na\ aiza no haleha,/Aoka ho vimbininao!/Ô, ambino, Ô ambino/Izahay mpanomponao!
+Y2:Fa ny Teny renay anie/Aoka ho tadidy koa,/Ka mba hi_asanay saina/Hahazo_anay ny soa/Isan’andro Isan'andro/I\zay hi_ainanay atỳ!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-549.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-549.txt
@ -1,4 +1,4 @@
-M0:|c:F|m:4/4 Faingampaingana|r:8 (im-10)|t:549. Jesosy no asandratro|n:19|l:15|a:Rajaobelona 1868-1938|h:P. Nilsen-Lund
+M0:|c:F|m:4/4 Faingampaingana|r:8 (im-10)|t:549. Jesosy no asandratro|n:19|l:15|a:Rajaobelona 1868-1938|h:P. Nilsen-Lund|t:FFPM 549 Jesosy no asandratro
 S0:/|:! 
 T0:{:(D.R)|M:M!M.,R:M.,F|S:-!-/(D.R)|M:M!M.,S:F.,M|R:-!-/(D.R)|M:M!M.,R:M.,S|L:-!-/L|S.,M:D.,R!M:R|D:-!-/(R.M)|F:F!M.,M:R.,R|D:-!-/R|M:L!S.,S:F.,F|S:-!-/(D.R)|M:M!M.,R:M.,S|L:-!-/L|S.,M:D.,R!M:R|D:-!-/(R.M)|F:-!-:R|S.,L:S.,F!M/S|L.,L:S.,F!M:R|D:-!-}
 N1:drmmmrmfs/drmmmsfmr/drmmmrmsl/lsmdrmrd/ rmffmmrrd/rmlssFFs/drmmmrmsl/lsmdrmrd/ rmfrslsfm/sllsfmrd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-61.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-61.txt
@ -1,4 +1,4 @@
-M0:|c:G|m:4/4 Miadanadana|h:P. Nilsen-Lund 1842-1914|a:Cecil Frances Alexander, 1818-1895 Nad. C. Borchgrevink 1841-1919|r:878777
+M0:|c:G|m:4/4 Miadanadana|h:P. Nilsen-Lund 1842-1914|a:Cecil Frances Alexander, 1818-1895 Nad. C. Borchgrevink 1841-1919|r:878777|t:FFPM 61 Tany Betlehema fahiny
 B0:https://dacb.org/stories/madagascar/nilsen-lund-peder/
 U0:z0:442222 42z2/44 22226${DC}z2 442222 6z2/44 22226z2
 Q0:${N:New}U0:z0:442222 42z2/44 2222${DC}8 442222 6z2/44 22228
--- a/composeApp/src/commonMain/composeResources/files/ffpm-9.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-9.txt
@ -1,4 +1,4 @@
-M0:|h:Genevan Psalter, 1551 Edition, attr. Louis Bourgeois (1510-1561)|c:G|m:4/4|a:Th. Ken 1637-1711|r:LM
+M0:|h:Genevan Psalter, 1551 Edition, attr. Louis Bourgeois (1510-1561)|c:G|m:4/4|a:Th. Ken 1637-1711|r:LM|t:FFPM 9 Ry Tompo Zanaharinay
 U0:z8:84444888/84444888/84444888/84(22)4(22)(44)(44)8
 N1:ddt,l,s,drmmmmrdfmrdrmrdl,t,dsmd-rf-m-r-d-
 N2:#m, sssmmmss/ssssmlss/ssssmffm/ss-Fsf-s-sfm
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
@ -21,6 +21,7 @@ import mg.dot.feufaro.midi.MidiWriterKotlin
 //@todo: ews-80.txt ${m:12/4}
 //@todo: ews-81.txt ${R=}${D:....}
 //@todo: bug ffpm-629.txt sssszd au lieu de ssss-d(-rrrrtdr)
+//@todo: bug ews-103.txt Triolet adds one blank

 class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository: FileRepository) {
    private val T: MutableList<PTemplate> = mutableListOf()