Correction ffpm 357 & 358 + thinJar

composeApp/build.gradle.kts

@@ -200,3 +200,22 @@ tasks.configureEach {
         dependsOn(generateFilesIndex)
     }
 }
+tasks.register<Copy>("exportLibs") {
+    group = "distribution"
+    description = "Copie les bibliothèques partagées pour le Thin JAR"
+
+    // On utilise named("...") pour éviter l'erreur de compilation du script
+    // Dans un projet KMP, la configuration s'appelle généralement "desktopRuntimeClasspath" 
+    // ou "jvmRuntimeClasspath" selon le nom de votre cible.
+    
+    val configName = if (configurations.findByName("desktopRuntimeClasspath") != null) {
+        "desktopRuntimeClasspath"
+    } else {
+        "jvmRuntimeClasspath"
+    }
+
+    from(configurations.named(configName))
+    into(layout.buildDirectory.dir("libs/shared"))
+    
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}

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

@@ -1,9 +1,9 @@
 M0:|c:G|m:6/4|t:FFPM 357 Efa tonga atỳ izao|a:Philip Paul Bliss 1838-1876 Nad. J.A. Houlder 1844-1932|h:Philip Paul Bliss 1838-1876|r:8.6.8.6.6.6.4.4.6
-U0:z0:84444 84C/ 44484 (CC) /84444 84C/ 44484 O/ 84(44)4 88/ 84(44)4 88/ 444C 444C/  44484 (84C)/ O
+U0:z0:84444 84C/ 44484 (CC) /84444 84C/ 44484 O/ 84(44)4 CC/ 84(44)4 CC/ ${$}444C 444C/  44484 ${[1}(84${DS}C)/ ${[2}O
 N1:#s, mmmfmmrr/ srrmrds/ mmmfmmrr/ srrmrd/ #t, mmmfsls/ mmmfsls/ sfff/ fmmm/ mrdrtdms/ d
-N2:#m, ssslssff/ fffsfm/ ssslssff/ fffsfm/ #s, dddrmfm/ dddrmfm/ mrrr/ rddd/ s6wd/ s
-N3:#t, d6tt/ t5dw/ d6tt/ t5d/ d3wd3/ d3wd3/ s8/ sfmfrlwwm
-N4:#s, d5s3/ s5dw/ d5s3/ s5d/ d3wd3/ d3wd3/ s4/ d4/ s5dwwd
-Y1:Efa tonga atỳ izao/Teny fi_ainana:/Raiso mba ho fi_ainanao,/Teny fi_ainana./He! ny teny tsara,/Teny manan-kery:/${R=}Tenin'ny Ray,/Tsara tokoa,/Teny fi_ainana.
+N2:#m, ssslssff/ fffsfm-/ ssslssff/ fffsfm/ #s, dddrmfm/ dddrmfm/ mrrr/ rddd/ s6wd/ s
+N3:#t, d6tt/ t5dw/ d6tt/ t5d/ d3wd3/ d3wd3/ s8/ sfmfrmwwm
+N4:#s, d5s3/ s5dw/ d5s3/ s5d,/ d3wd3/ d3wd3/ s4/ d4/ s5dwwd
+Y1:Efa tonga atỳ izao/Teny fi_ainana:/Raiso mba ho fi_ainanao,/Teny fi_ainana./He! ny teny tsara,/Teny manan-kery:/${R=}Tenin'ny Ray,/Tsara tokoa,/Teny fi_ainana./na.
 Y2:Io no Filazantsara soa,/Teny fi_ainana:/Teny mamy indrindra koa,/Teny fi_ainana./Raisonao ny teny,/Teny soa nomeny:
 Y3:Ry mpanota! Henoy izao,/Teny fi_ainana;/Fa fi_ainana ho anao,/Teny fi_ainana./Kristy no nomena/Mba ho famonjena:

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

@@ -2,7 +2,7 @@ M0:|t:FFPM 358 He, ry namako mahantra|c:A|m:3/4|r:8.7.8.7.D|a:H. Randzavola 1873
 U0:z8:y 6222 44/22 6222 8/y 6222 44/22 6222 8/22 6222 44/22 6222 8/22 6222 44/22 2244 8/22 6222 44/22 2244 8
 N1:#s, mmmmrdsd/dmrtdrm/mmfmrdmr/rrrltdt/lsdrdlsd/drmdfmr/mfs'mrdrd/tlsdmrm/mfs'mrdrd/tlsdmrd
 N2:#m, ssssfmmm/mssssss/sslsfmss/ssFFsls/fsmfmfmm/sssmlss/ssssssfl/sfmmsss/sssdtlll/sfmssss
-N3:#t, d7s/sdtrdtd/d4tddt/ttlr4/rtd6/dtd4t/drmdtdld/d5td/drmsfmff/dddmsfm
+N3:#l, d7s,/s,dtrdtd/d4tddt/ttlr4/rtd6/dtd4t/drmdtdld/d5td/drmsfmff/dddmsfm
 N4:#d, d8/ddsfmrd/d'4slss/ssrrrrs/ssd6/msd'4s/d'3drmff/ffs4d'/d'4slff/ffs4d
 Y1:He, ry namako mahantra,/Indro Jeso Tompo tia,/I\lay Mpamonjy feno antra,/No mitady ny mania!/Olom-bery tsy mba foiny/Ka na diso aza re/Mbola tiany sy antsoiny/Hanam-pifali_am-be/Mbola tiany sy antsoiny/Hanam-pifali_am-be
 Y2:He, fa tsy mba misy fetra/Ny homena lova soa/Fa ny olona rehetra/Samy tiany avokoa!/Nefa\ izay be hataka\ andro/Dia hanenina tokoa/Misy fetra ny fotoana/Azo amindrana fo/Misy fetra ny fotoana/Azo amindrana fo 

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

@@ -17,7 +17,6 @@ import java.io.File
 import kotlin.math.min
 
 //@todo: split voices (ffpm19/ews22) ${S:mfs} in N4:, idem ffpm-212
-//@todo: ffpm-172-2 ${O:1} non fonctionnel
 //@todo: ffpm-164.txt O10:s3:mflswss // alternative notes for stanza 3 only
 //@todo: ews-47.txt DS/$ + [12][3]
 //@todo: ffpm-99-2.txt triolet.mid + triolet (m--)