From b8219ff94e281bdb845a0246ed82af21fa28c4b7 Mon Sep 17 00:00:00 2001 From: dotmg Date: Sat, 26 Jul 2025 07:16:23 +0200 Subject: [PATCH] add w as alternative replacement for - --- .../commonMain/composeResources/files/13.xml | 4085 +++++++++++++++++ .../composeResources/files/config.json | 5 +- .../composeResources/files/ffpm-101.txt | 11 + .../composeResources/files/ffpm-103.txt | 21 + .../composeResources/files/ffpm-105.txt | 11 + .../composeResources/files/ffpm-106.txt | 10 + .../mg/dot/feufaro/musicXML/MusicXML.kt | 2 +- .../kotlin/mg/dot/feufaro/solfa/Solfa.kt | 11 +- .../mg/dot/feufaro/solfa/TimeUnitObject.kt | 2 +- 9 files changed, 4149 insertions(+), 9 deletions(-) create mode 100644 composeApp/src/commonMain/composeResources/files/13.xml create mode 100644 composeApp/src/commonMain/composeResources/files/ffpm-101.txt create mode 100644 composeApp/src/commonMain/composeResources/files/ffpm-103.txt create mode 100644 composeApp/src/commonMain/composeResources/files/ffpm-105.txt create mode 100644 composeApp/src/commonMain/composeResources/files/ffpm-106.txt diff --git a/composeApp/src/commonMain/composeResources/files/13.xml b/composeApp/src/commonMain/composeResources/files/13.xml new file mode 100644 index 0000000..2b51cf4 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/13.xml @@ -0,0 +1,4085 @@ + + + + + LYNGHAM + Behold the Glories of the Lamb + + + Thomas Iarman, c. 1803 + IESUS CHRIST + + MuseScore 4.5.2 + 2025-07-23 + + + + + + + /home/mahefa/Images/13.jpg + + + + 5.7573 + 40 + + + 1864 + 1028 + + 80 + 80 + 80 + 80 + + + + 1.8 + 5.5 + 5 + 4.5 + 1 + 1 + 1.1 + 1 + 1.6 + 1.1 + 1.1 + 2.1 + 0.5 + 1.1 + 1 + 2.1 + 0.5 + 1 + 1.2 + 70 + 70 + 49 + + + + + + + lyricist + IESUS CHRIST + + + lyricist + 2.98 + + + lyricist + Behold the Glories of the Lamb + + + lyricist + Revelation 5:6—12; Isaac Watts, c. 1688 + + + title + LYNGHAM + + + composer + Thomas Iarman, c. 1803 + + + + Voice + Voice + + Voice Oohs + strings.group + + + + 1 + 54 + 77.9528 + 0 + + + + Voice + Voice + + Voice Oohs + strings.group + + + + 2 + 54 + 77.9528 + 0 + + + + + + + + + 60.49 + 0 + + 206.67 + + + + 4 + + 1 + + + + G + 2 + + + + + D + 4 + + 8 + 1 + half + up + + begin + Be + + + single + Let + + + single + “Wor + + + single + Now + + + single + Thou + + + single + To + + + + + + G + 4 + + 8 + 1 + half + up + + + + D + 4 + + 6 + 1 + quarter + + up + + end + hold + + + single + el + + + single + thy + + + single + to + + + single + hast + + + single + Him + + + + + + B + 4 + + 6 + 1 + quarter + + up + + + + D + 4 + + 2 + 1 + eighth + up + + single + the + + + single + ders + + + single + the + + + single + the + + + single + re + + + single + who + + + + + + C + 5 + + 2 + 1 + eighth + up + + + + + + D + 5 + + 3 + 1 + eighth + + up + begin + + + + + + + E + 5 + + 1 + 1 + 16th + up + continue + forward hook + + + + D + 5 + + 2 + 1 + eighth + up + continue + + + + C + 5 + + 2 + 1 + eighth + up + end + + + + B + 4 + + 4 + 1 + quarter + up + + + + + + + E + 4 + + 4 + 1 + quarter + up + + end + ries + + + single + ship + + + single + that + + + single + that + + + single + our + + + single + up + + + + + + C + 5 + + 4 + 1 + quarter + up + + + 16 + + + + D + 4 + + 12 + 2 + half + + down + + begin + glo + + + single + wor + + + single + Lamb + + + single + Lamb + + + single + deemed + + + single + sits + + + + 4 + + + + + + C + + major + + + + B + 4 + + 4 + 1 + quarter + up + + + + + + + G + 4 + + 4 + 1 + quarter + up + + + + + + + A + 4 + + 4 + 1 + quarter + up + + + + + + + F + 1 + 4 + + 4 + 1 + quarter + up + + + + + + 16 + + + + D + 4 + + 8 + 2 + half + down + + single + of + + + single + at + + + single + died,” + + + single + once + + + single + souls + + + single + on + + + + + D + 4 + + 8 + 2 + half + down + + single + the + + + single + His + + + single + they + + + single + was + + + single + with + + + single + the + + + + + + + D + 4 + + 12 + 1 + half + + up + + single + Lamb + + + single + feet, + + + single + cry, + + + single + slain + + + single + blood, + + + single + throne, + + + + + + G + 4 + + 12 + 1 + half + + up + + + + G + 4 + + 4 + 1 + quarter + up + + begin + a + + + single + the + + + single + “to + + + single + be + + + single + hast + + + single + the + + + + + + B + 4 + + 4 + 1 + quarter + up + + + + + + F + 1 + 4 + + 4 + 1 + quarter + up + + end + midst + + + single + church + + + single + be + + + single + end + + + single + set + + + single + God + + + + + + C + 5 + + 4 + 1 + quarter + up + + + + G + 4 + + 4 + 1 + quarter + up + + single + His + + + single + a + + + single + ex + + + single + less + + + single + the + + + single + whom + + + + + + B + 4 + + 4 + 1 + quarter + up + + + + A + 4 + + 4 + 1 + quarter + up + + + + E + 4 + + 4 + 1 + quarter + up + + end + ther’s + + + single + a + + + single + ed + + + single + ings + + + single + ’ners + + + single + a + + + + + + G + 4 + + 4 + 1 + quarter + up + + + 8 + + + + A + 4 + + 4 + 2 + quarter + down + + begin + Fa + + + single + dore + + + single + alt + + + single + bless + + + single + pris + + + single + we + + + + 4 + + + + + + + 60.49 + 0 + + 259.78 + + + + + A + 4 + + 12 + 1 + half + + up + + single + round, + + + single + paid; + + + + + A + 4 + + 4 + 1 + quarter + up + + single + the + + + single + be + + + + 16 + + + + F + 1 + 4 + + 12 + 2 + half + + down + + single + throne! + + + single + thus, + + + single + free, + + + single + dore, + + + + + F + 1 + 4 + + 4 + 2 + quarter + down + + begin + a + + + single + to + + + single + hast + + + single + the + + + + + + + B + 4 + + 3 + 1 + eighth + + up + begin + + + + A + 4 + + 1 + 1 + 16th + up + continue + forward hook + + + + B + 4 + + 2 + 1 + eighth + up + continue + + + + C + 5 + + 2 + 1 + eighth + up + end + + + + D + 5 + + 4 + 1 + quarter + up + + + + E + 5 + + 4 + 1 + quarter + up + + + 16 + + + + G + 4 + + 12 + 2 + half + + down + + + + G + 4 + + 4 + 2 + quarter + down + + + + + + D + 5 + + 8 + 1 + half + up + + + + C + 1 + 5 + + 8 + 1 + half + sharp + up + + + 16 + + + + F + 1 + 4 + + 8 + 2 + half + down + + + + E + 4 + + 8 + 2 + half + down + + + + + + D + 5 + + 16 + 1 + whole + + + 16 + + + + F + 1 + 4 + + 16 + 2 + whole + + single + throne! + + + single + round, + + + single + thus!” + + + single + paid; + + + single + free, + + + single + dore, + + + + + + + G + 4 + + 8 + 1 + half + up + + single + Pre + + + single + with + + + begin + “Wor + + + single + sal + + + single + hast + + + single + and + + + + + + D + 5 + + 8 + 1 + half + up + + + + G + 4 + + 4 + 1 + quarter + up + + single + pare + + + single + vi + + + end + thy + + + single + va + + + single + made + + + single + to + + + + + + D + 5 + + 4 + 1 + quarter + up + + + + G + 4 + + 4 + 1 + quarter + up + + single + new + + + single + als + + + single + the + + + single + tion, + + + single + us + + + single + the + + + + + + D + 5 + + 4 + 1 + quarter + up + + + + + + B + 4 + + 6 + 1 + quarter + + up + + + + + + + A + 4 + + 2 + 1 + eighth + up + + + + G + 4 + + 4 + 1 + quarter + up + + + + + single + and + + + single + that + + + + + G + 4 + + 4 + 1 + quarter + up + + single + ors + + + single + of + + + single + let + + + single + ry, + + + + + + B + 4 + + 4 + 1 + quarter + up + + + 16 + + + + G + 4 + + 12 + 2 + half + + down + + single + hon + + + single + full + + + single + Lamb,” + + + single + glo + + + single + kings + + + single + Lamb + + + + 4 + + + + + + + 60.49 + 0 + + 259.78 + + + + + F + 1 + 4 + + 4 + 1 + quarter + up + + + + + + single + for + + + single + 0 + + + single + us + + + single + joy, + + + single + priests + + + single + once + + + + + + C + 5 + + 4 + 1 + quarter + up + + + + G + 4 + + 4 + 1 + quarter + up + + + + + B + 4 + + 4 + 1 + quarter + up + + + + A + 4 + + 4 + 1 + quarter + up + + + + + + + + E + 4 + + 4 + 1 + quarter + up + + begin + re + + + single + re + + + single + to + + + + + + G + 4 + + 4 + 1 + quarter + up + + + 8 + + + + A + 4 + + 4 + 2 + quarter + down + + single + His + + + single + dors + + + single + was + + + + 4 + + + + + + F + 1 + 4 + + 12 + 1 + half + + up + + single + name, + + + single + sweet, + + + end + ply, + + + single + main + + + single + God, + + + single + slain, + + + + + + A + 4 + + 12 + 1 + half + + up + + + + 4 + 1 + quarter + + + + + + C + 5 + + 8 + 1 + half + + + + 4 + 1 + quarter + + + + G + 4 + + 4 + 1 + quarter + up + + + 4 + + + + G + 4 + + 4 + 2 + quarter + down + + single + and + + + single + and + + + single + “for + + + single + for + + + single + and + + + single + be + + + + + + + E + 4 + + 4 + 1 + quarter + up + + single + songs + + + single + harps + + + single + He + + + single + ev + + + single + we + + + single + glo + + + + + + C + 5 + + 4 + 1 + quarter + up + + + + E + 4 + + 4 + 1 + quarter + up + + single + be + + + single + of + + + single + was + + + single + er + + + single + shall + + + single + ry + + + + + + C + 5 + + 4 + 1 + quarter + up + + + + E + 4 + + 4 + 1 + quarter + up + + single + fore + + + single + sweet + + + single + slain + + + single + on + + + single + reign + + + single + ev + + + + + + C + 5 + + 4 + 1 + quarter + up + + + + E + 4 + + 4 + 1 + quarter + up + + single + un + + + single + er + + + single + for + + + single + Thy + + + single + with + + + single + er + + + + + + C + 5 + + 4 + 1 + quarter + up + + + + + + D + 4 + + 12 + 1 + half + + up + + single + known, + + + single + sound, + + + single + us, + + + single + head, + + + single + Thee, + + + single + more, + + + + + + B + 4 + + 12 + 1 + half + + up + + + + D + 4 + + 4 + 1 + quarter + up + + single + and + + + single + and + + + single + for + + + single + for + + + single + and + + + single + be + + + + + + B + 4 + + 4 + 1 + quarter + up + + + + + + + 60.49 + 0 + + 70 + + + + + D + 4 + + 4 + 1 + quarter + up + + single + songs + + + single + harps + + + single + He + + + single + ev + + + single + we + + + single + glo + + + + + + A + 4 + + 4 + 1 + quarter + up + + + + F + 1 + 4 + + 4 + 1 + quarter + up + + single + be + + + single + of + + + single + was + + + single + er + + + single + shall + + + single + ry + + + + + + A + 4 + + 4 + 1 + quarter + up + + + + F + 1 + 4 + + 2 + 1 + eighth + up + begin + + single + fore + + + begin + sweet + + + single + slain + + + single + on + + + single + reign + + + single + ev + + + + + + A + 4 + + 2 + 1 + eighth + up + + + + G + 4 + + 2 + 1 + eighth + up + continue + + single + Thy + + + single + with + + + + + + B + 4 + + 2 + 1 + eighth + up + + + + A + 4 + + 2 + 1 + eighth + up + continue + + + + + C + 5 + + 2 + 1 + eighth + up + + + + F + 1 + 4 + + 2 + 1 + eighth + up + end + + single + un + + + end + er + + + single + for + + + single + er + + + + + + A + 4 + + 2 + 1 + eighth + up + + + + + + D + 5 + + 12 + 1 + half + + up + + + + G + 4 + + 4 + 1 + quarter + up + + single + and + + + single + and + + + single + for + + + single + for + + + single + and + + + single + be + + + + + + D + 5 + + 4 + 1 + quarter + up + + + 16 + + + + G + 4 + + 4 + 2 + quarter + down + + + + + single + known, + + + single + sound, + + + single + us, + + + single + head, + + + single + Thee, + + + single + more, + + + + + F + 1 + 4 + + 4 + 2 + quarter + down + + + + G + 4 + + 4 + 2 + quarter + down + + + + + + 4 + + + + + + E + 5 + + 4 + 1 + quarter + up + + + + + + + D + 5 + + 4 + 1 + quarter + up + + + + F + 1 + 4 + + 4 + 1 + quarter + up + + + + + + + + C + 5 + + 4 + 1 + quarter + up + + + + G + 4 + + 4 + 1 + quarter + up + + single + be + + + single + of + + + single + was + + + single + er + + + single + shall + + + single + ry + + + + + + B + 4 + + 4 + 1 + quarter + up + + + 16 + + + + G + 4 + + 8 + 2 + half + down + + single + songs + + + single + harps + + + single + He + + + single + ev + + + single + we + + + single + glo + + + + 8 + + + + + + A + 4 + + 12 + 1 + half + + up + + + + A + 4 + + 4 + 1 + quarter + up + + + 16 + + + + G + 4 + + 8 + 2 + half + down + + single + fore + + + begin + sweet + + + single + slain + + + single + on + + + single + reign + + + single + ev + + + + + F + 1 + 4 + + 8 + 2 + half + down + + single + un + + + end + er + + + single + for + + + single + Thy + + + single + with + + + single + er + + + + + + + G + 4 + + 16 + 1 + whole + + single + known. + + + single + sound. + + + single + us.” + + + single + head. + + + single + Thee. + + + single + more. + + + + 16 + + + + G + 4 + + 16 + 2 + whole + + + light-heavy + + + + + + + + 240.97 + + + + 4 + + 1 + + + + F + 4 + + + + + B + 3 + + 8 + 1 + half + down + + + + G + 3 + + 6 + 1 + quarter + + up + + + + A + 3 + + 2 + 1 + eighth + up + + + 16 + + + + G + 3 + + 8 + 2 + half + down + + + + G + 3 + + 6 + 2 + quarter + + down + + + + G + 3 + + 2 + 2 + eighth + down + + + + + + B + 3 + + 3 + 1 + eighth + + up + begin + + + + + + + C + 4 + + 1 + 1 + 16th + up + continue + forward hook + + + + B + 3 + + 2 + 1 + eighth + up + continue + + + + A + 3 + + 2 + 1 + eighth + up + end + + + + G + 3 + + 4 + 1 + quarter + up + + + + + + + G + 3 + + 4 + 1 + quarter + up + + + 16 + + + + G + 3 + + 12 + 2 + half + + down + + + + B + 2 + + 4 + 2 + quarter + down + + + + + + G + 3 + + 4 + 1 + quarter + up + + + + + + + B + 3 + + 4 + 1 + quarter + up + + + + + + + C + 4 + + 4 + 1 + quarter + up + + + + + + + A + 3 + + 4 + 1 + quarter + up + + + + + + 16 + + + + D + 3 + + 8 + 2 + half + down + + + + D + 3 + + 8 + 2 + half + down + + + + + + G + 3 + + 12 + 1 + half + + down + + + + + B + 3 + + 12 + 1 + half + + down + + + + G + 3 + + 4 + 1 + quarter + down + + + + + D + 4 + + 4 + 1 + quarter + down + + + + + + A + 3 + + 4 + 1 + quarter + down + + + + + D + 4 + + 4 + 1 + quarter + down + + + + G + 3 + + 4 + 1 + quarter + down + + + + + D + 4 + + 4 + 1 + quarter + down + + + + F + 1 + 3 + + 4 + 1 + quarter + down + + + + + D + 4 + + 4 + 1 + quarter + down + + + + E + 3 + + 4 + 1 + quarter + down + + + + + C + 1 + 4 + + 4 + 1 + quarter + sharp + down + + + + + + 216.94 + + + + + D + 3 + + 12 + 1 + half + + down + + + + + D + 4 + + 12 + 1 + half + + down + + + + D + 3 + + 4 + 1 + quarter + down + + + + + D + 4 + + 4 + 1 + quarter + down + + + + + + D + 4 + + 6 + 1 + quarter + + up + + + + C + 4 + + 2 + 1 + eighth + up + + + + B + 3 + + 4 + 1 + quarter + up + + + + B + 3 + + 4 + 1 + quarter + up + + + 16 + + + + G + 3 + + 12 + 2 + half + + down + + + + E + 3 + + 4 + 2 + quarter + down + + + + + + A + 3 + + 8 + 1 + half + up + + + + 8 + 1 + half + + + 16 + + + + A + 3 + + 8 + 2 + half + down + + + + A + 2 + + 8 + 2 + half + down + + + + + A + 3 + + 8 + 2 + half + down + + + + + + A + 3 + + 16 + 1 + whole + + + 16 + + + + D + 3 + + 16 + 2 + whole + + + + + + G + 3 + + 8 + 1 + half + down + + + + + B + 3 + + 8 + 1 + half + down + + + + G + 3 + + 4 + 1 + quarter + down + + + + + B + 3 + + 4 + 1 + quarter + down + + + + G + 3 + + 4 + 1 + quarter + down + + + + + B + 3 + + 4 + 1 + quarter + down + + + + + + D + 4 + + 6 + 1 + quarter + + up + + + + C + 4 + + 2 + 1 + eighth + up + + + + B + 3 + + 4 + 1 + quarter + up + + + + D + 4 + + 4 + 1 + quarter + up + + + 16 + + + + G + 3 + + 12 + 2 + half + + down + + + + G + 3 + + 4 + 2 + quarter + down + + + + + + 209.85 + + + + + D + 4 + + 12 + 1 + half + + up + + + + C + 1 + 4 + + 4 + 1 + quarter + sharp + up + + + 16 + + + + A + 3 + + 4 + 2 + quarter + down + + + + + + + G + 3 + + 4 + 2 + quarter + down + + + + F + 1 + 3 + + 4 + 2 + quarter + down + + + + + + + E + 3 + + 4 + 2 + quarter + down + + + + + + D + 3 + + 12 + 1 + half + + down + + single + 1. + + + + + + D + 4 + + 12 + 1 + half + + down + + + + D + 3 + + 4 + 1 + quarter + down + + single + and + + + + + + D + 4 + + 4 + 1 + quarter + down + + + + + + G + 3 + + 4 + 1 + quarter + up + + + + A + 3 + + 4 + 1 + quarter + up + + + + B + 3 + + 4 + 1 + quarter + up + + + + G + 3 + + 4 + 1 + quarter + up + + + 16 + + + + G + 3 + + 4 + 2 + quarter + down + + single + songs + + + + + A + 3 + + 4 + 2 + quarter + down + + begin + be + + + + + B + 3 + + 4 + 2 + quarter + down + + end + fore + + + + + G + 3 + + 4 + 2 + quarter + down + + + + + + C + 3 + + 12 + 1 + half + + down + + end + known, + + + + + + G + 3 + + 12 + 1 + half + + down + + + + C + 3 + + 4 + 1 + quarter + down + + single + and + + + + + + G + 3 + + 4 + 1 + quarter + down + + + + + + G + 3 + + 4 + 1 + quarter + up + + + + D + 4 + + 4 + 1 + quarter + up + + begin + be + + + + + B + 3 + + 4 + 1 + quarter + up + + end + fore + + + + + G + 3 + + 4 + 1 + quarter + up + + + 16 + + + + G + 3 + + 4 + 2 + quarter + down + + single + songs + + + + + G + 3 + + 4 + 2 + quarter + down + + + + G + 3 + + 4 + 2 + quarter + down + + + + G + 3 + + 4 + 2 + quarter + down + + begin + un + + + + + + + 223.85 + + + + + F + 1 + 3 + + 4 + 1 + quarter + up + + + + + + + A + 3 + + 4 + 1 + quarter + up + + + + D + 4 + + 4 + 1 + quarter + up + + + + + + + C + 4 + + 4 + 1 + quarter + up + + single + and + + + + 16 + + + + D + 3 + + 12 + 2 + half + + down + + end + known, + + + + + D + 3 + + 4 + 2 + quarter + down + + + + + + G + 3 + + 4 + 1 + quarter + down + + single + songs + + + + + + B + 3 + + 4 + 1 + quarter + down + + + + A + 3 + + 4 + 1 + quarter + down + + single + be + + + + + B + 3 + + 4 + 1 + quarter + down + + single + fore + + + + + G + 3 + + 4 + 1 + quarter + down + + single + un + + + + + + B + 3 + + 4 + 1 + quarter + down + + + 12 + + + + A + 3 + + 4 + 2 + quarter + up + + + + G + 3 + + 4 + 2 + quarter + up + + + 4 + + + + + + C + 4 + + 4 + 1 + quarter + up + + + + D + 4 + + 4 + 1 + quarter + up + + single + and + + + + + D + 4 + + 4 + 1 + quarter + up + + single + songs + + + + + D + 4 + + 4 + 1 + quarter + up + + single + be + + + + 16 + + + + C + 4 + + 4 + 2 + quarter + down + + + + B + 3 + + 4 + 2 + quarter + down + + + + A + 3 + + 4 + 2 + quarter + down + + + + G + 3 + + 4 + 2 + quarter + down + + + + + + D + 3 + + 12 + 1 + half + + down + + single + fore + + + + + + D + 4 + + 12 + 1 + half + + down + + + + D + 3 + + 4 + 1 + quarter + down + + single + un + + + + + + C + 4 + + 4 + 1 + quarter + down + + + + + + B + 3 + + 16 + 1 + whole + + + 16 + + + + G + 2 + + 16 + 2 + whole + + single + known. + + + + light-heavy + + + + diff --git a/composeApp/src/commonMain/composeResources/files/config.json b/composeApp/src/commonMain/composeResources/files/config.json index 15417a4..6416eab 100644 --- a/composeApp/src/commonMain/composeResources/files/config.json +++ b/composeApp/src/commonMain/composeResources/files/config.json @@ -2,7 +2,7 @@ "themeMode": "DARK", "fontSize": 18.5, "playlist": [ - "assets://ffpm-38.txt", + "assets://ffpm-101.txt", "assets://ews-13.txt", "assets://ffpm-38.txt", "assets://ffpm-57.txt", @@ -18,7 +18,8 @@ "assets://ffpm-489.txt", "assets://ffpm-21.txt", "assets://ffpm-179.txt", - "assets://ff-33.txt" + "assets://ff-33.txt", + "assets://ffpm-38.txt" ], "buttonContainerColorHex": "#FFFF8855", "buttonContentColorHex": "#FF000055", diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-101.txt b/composeApp/src/commonMain/composeResources/files/ffpm-101.txt new file mode 100644 index 0000000..30f7e10 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/ffpm-101.txt @@ -0,0 +1,11 @@ +M0:|c:Eb|m:6/4|r:C.M|a:H. Rabarivelo|h:J. Foster|t:FFPM 101 Ny Hazo fijaliana, ry Jeso Tomponay +U0:zK:4(44)484848/4 84(44)4(4448)/4 (44)484(44)48/4 84(44)4(4448) +N1:d#r m-sddttl/ lsmsfrf--m/ sd-dttl-ls/msmsfrd,--- +N2:#s, dd-ddrrmd/ tddt-trwwd/ ddrRrrdrdd/ dtdrwtdsls +N3:#m msdTllsSl/ fsss-sslss/ mlwlsSfwfs/ ssslwfmwfm +N4:ddwmlFsmf/ rmds, ws, dwww/ mlwFsmfwfm/ #f, drdfwsdwww +Y1:Ny hazo fijali_ana,/Ry Jeso Tomponay/Dia tena fahori_ana/Fa ti_anao ‘zahay. +Y2:Ny hazo fijali_ana/Dia manambara\ izao/Fa be ny fahori_ana/Nihatra taminao. +Y3:Ny hazo fijali_ana/No mampiseho koa/Fa tokony hari_ana/Ny ota mahavoa. +Y4:Isaoranay dia\ isaoranay/Hianao ry Tomponay,/Fa be ny fiti_avana/Nataonao taminay. +Q0:${N:new}N3:#m msdTllsSl/ fsss-sslsw/ mlwlsSfwfs/ ssslwfmwfm diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-103.txt b/composeApp/src/commonMain/composeResources/files/ffpm-103.txt new file mode 100644 index 0000000..987a872 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/ffpm-103.txt @@ -0,0 +1,21 @@ +M0:|c:Bb|m:4/4|r:L.M.|a:T. Kingo 1634-1703 Nad. C. Borchgrevink, 1841-1919|h:B. Gesius 1560-1613 (eo ho eo) +U0:zC:${x3} 44444444/${x0} 4444444$Q4 +N1:#f, m, lSltrdt/ tdrmdrtd/ mrdtlsfm, /tdrmldtl +N2:#d, mmmdflmS/ Slsssffm/ sssffsrt/ mml4Sl +N3:#s, m,ltllldm/ mmrddlrd/ drmrtdlS/ tlldfmrd +N4:#d, mdmfrflm/ #m, rdtdmfsd,/ dtdr#d, rmrm/ Slfdrmml +Y1:Ny hazo fijali_ana/Tsy maintsy hotsarovana!/Heno_y ry fanahiko,/Ny tenin’ny Mpamonjiko. +Y2:Ny teny vo_alohany/Mihevitra ny rafiny:/«Mba mamelà ny helony,/Fa jamba ny fanahiny!» +Y3:Izaho koa Jesosy ô!/Dia jamba sady ratsy fo;/Ka mba jereo sy i_antrao,/fa te-ho tonga olonao. +Y4:I\lay meloka tanilany/Naniry mba horaisiny,/Nomeny toky tsara io:/«Ho any Paradisa\ anio» +Y5:Ra\ha avy ny anjarako/Ka tapitra ny androko,/Mba raiso aho, Tompo ô,/Ho any paradisanao. +Y6:Dia hitany ny reniny/Tomany teo akaikiny,/Toy ny tsindronin-defona/Ka feno fisento_ana. +Y7:Dia Jaona no natolony/Ho zanany ho solony./«Mba raisonao, ry Jaona ô/Ho reninao ny reniko!» +Y8:Tsarovy aho Tompo ô!/Ra\ha ao am-pahori_ako/Iraho ny mpi_anatrao/Hanampy ny mpanomponao! +Y9:Ny teniny fa\ha_efatra/No tena mampangovitra;/Ni_antso izy hoe: «Ry Ray,/Nahoana Aho no afoy ?» +Y10:Izao no dia nandaozana/Anao tam-pahori_ana;/Hahafaka ny tahotro,/Ra\ha tonga ny foto_ako. +Y11:Ny otako i\zay nentiny/Nahory ny fanahiny,/Ka nitarainany ho_e:/«Mangetaheta Aho re!» +Y12:Mangidy, ry Jesosy ô,/Ny loza ni_aretanao,/Ka aoka mba ho mamiko/Ny avotra, i\zay vitanao! +Y13:Hoy izy\ indray: «Tanteraka:»/He! Teny mahasambatra,/Tanteraka ny asany,/Vo_avotra ny olony. +Y14:Ny teny farany indray/Nilaza ny rahatrizay:/«Atolotro ny aiko i\zao,/Ry Ray, ho eo an-tanananao!» +Y15:Izany di_a mamiko/Hi_orina\ ao anatiko,/Ka teny hotononiko/Eo amim-pa\hafatesako! diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-105.txt b/composeApp/src/commonMain/composeResources/files/ffpm-105.txt new file mode 100644 index 0000000..f4a1eb0 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/ffpm-105.txt @@ -0,0 +1,11 @@ +M0:|c:A|m:3/4 Milanto|r:8.6.7.6.7.6.8.6.|a:Hira anglisy Nad. C. Borchgrevink, 1841-1919|h:A. Ralison 1863-1932|t:FFPM 105 Tsinjovy ilay havoana +U0:z8:4 (44)4 84 84 8/4 (44)4 84 Gz4/4 84 84 C (44)/4 84 84 Gz4/4 84 84 C 6z2/4 84 84 Gz4/4 84 84 84 8/4 84 84 Gz4 +N1:#s, ssmssddtr/ ddtlsls/ smdsdlfm/ rddtrd/ s5ll/ sttllt/ sddrrmmf/ lsdmrd +N2:#d, mmdmmmfff/ ff-fffm/msmmsfl-/ lsssfm/ m5ff/ f6/ s7l/ fmmsfm +N3:#s, dd-ddssst/ dr-dttd/ ddsdddrD/ rmmrtd/ d6r/ rrrddr/ tddttddd/ d4td +N4:#d, dd-dddrrs/ ss-sssd/ d4mfrm/ fs4d/ d5fr/ rs5/ fmmssd'2f/ fs4d +Y1:Tsinjovy\ ilay havo_ana,/Ary Jerosale\ma,/Fa i_o no Golgota/Mba tadidio, ange!/Fa tao nivesatra\ ota/Ny Tompo masina;/Nijaly sy nolavina,/Ka novono_ina. +Y2:Tsy takatra heverina/Ny entan-dehibe,/I\zay nentin’ny Mpisolo/Ka mba diniho, re!/Fa nentiny daholo/Ny heloka natao:/Fa tonga Izy hanavao/Izao tontolo\ izao. +Y3:Ny helotsika koa izao/Dia nivesarany,/Ka manaraha Azy,/Mba ho mpi_anany,/Ra\ha tao Golgota Izy,/Ny rany nitete,/Ka vita ho antsika re,/Ny vonjy lehibe. +Q0:${N:new}U0:z8:4 (44)4 84 84 8/4 (44)4 84 K/4 84 84 C (44)/4 84 84 K/4 84 84 C 6z2/4 84 84 K/4 84 84 84 $Q8/4 84 84 K + diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-106.txt b/composeApp/src/commonMain/composeResources/files/ffpm-106.txt new file mode 100644 index 0000000..64137b8 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/files/ffpm-106.txt @@ -0,0 +1,10 @@ +M0:|c:D|m:4/4 Miadana|r:11.11.12.12.|a:P. Nilsen Lund, 1842-1914|h:P. Nilsen Lund, 1842-1914 +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 +N3:#m msfssffs4/ d5s4Fs/ ssfmmmfms4/ sllssdddlsss +N4:#s, ddfmdrrsstd/ dfffmdtdrrs/ d10ss/ dffrddml'fs'sd +Y1:Indro, ny fiti_avana nijaly/Teo amin’ny hazo fijali_ana;/Ary ny ratsy nivonona hifaly/Handresy ny Zanakalahy Tokana. +Y2:Indro, Ny Fiti_avana mahery/Nitondra ny heloky ny olony;/Izy ni_ady hanafaka ny very,/Ny ainy no avotra ka natolony. +Y3:Izay nijaly mafy tao Golgota,/Voahombo ny tongotra\ aman-tanany;/Izy nisolo antsika\ izay mpanota,/Ka fadiranovana ny fanahiny. +Y4:Ô, ry Mpamonjy, mba hazòny aho/Hijery ny Hazo fijali_anao!/Olona meloka aho ka afaho/Hi_aloka amin’ny fiti_avanao. diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/MusicXML.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/MusicXML.kt index 3f9717e..09cf65f 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/MusicXML.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/MusicXML.kt @@ -82,7 +82,7 @@ class MusicXML(private val fileRepository: FileRepository) { } } suspend fun load() { - val xmlContent = fileRepository.readFileContent("assets://13.musicxml") + val xmlContent = fileRepository.readFileContent("assets://13.xml") val xslContent = fileRepository.readFileContent("assets://timepart.xsl") xmlString = performXsltTransformation(xmlContent, xslContent) val solfaXML = SolfaXML() diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt index 80a08a8..e95bfd8 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt @@ -65,7 +65,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository templateCharArray.forEach { // D.-R when (it) { 'D', 'R', 'M', 'F', 'S', 'L', 'T', - 'd', 'r', 'm', 'f', 's', 'l', 't', 'w' -> { + 'd', 'r', 'm', 'f', 's', 'l', 't', -> { nextNIndex++ if (!inGroup) { nextLIndex ++ @@ -81,7 +81,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository } '.', ',', -> unitObject.addMarker(it) - '-', 'Z', 'z' -> + '-', 'Z', 'z', 'w' -> N.indices.forEach { voiceNumber -> unitObject.addBlank(voiceNumber, it) } @@ -230,7 +230,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository templateCharArray.forEach { when (it) { 'D', 'R', 'M', 'F', 'S', 'L', 'T', - 'd', 'r', 'm', 'f', 's', 'l', 't', 'w' -> { + 'd', 'r', 'm', 'f', 's', 'l', 't', -> { if (firstInLoop) { replacement = if (noteCharIterator.hasNext()) noteCharIterator.next() else 'd' firstInLoop = false @@ -243,16 +243,17 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository result += replacement replacement = if (noteCharIterator.hasNext()) noteCharIterator.next() else 'd' if (replacement in setOf('d', 'r', 'm', 'f', 's', 'l', 't' , 'z', '(', - 'D', 'R', 'M', 'F', 'S', 'L', 'T', '-', 'Z')) { + 'D', 'R', 'M', 'F', 'S', 'L', 'T', '-', 'w', 'Z')) { break } } } - '/', '-', 'z', 'Z' -> {} + '/', '-', 'z', 'Z', 'w' -> {} ',' -> result += ";" else -> result += it } } + result = result.replace("w", "-") result = rearrangeNote(result) loadN(voiceNumber, result) } diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt index 3a02483..3fc2b32 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt @@ -158,7 +158,7 @@ class TimeUnitObject (val pTemplate: PTemplate, val prevTUO: TimeUnitObject?) { } } fun addBlank(voiceNumber: Int, blank: Char) { - val blankString = if (blank == '-') "-" else "" + val blankString = if (blank == '-' || blank == 'w') "-" else "" addNote(voiceNumber, blankString, '0') } fun getNum(): Int {