From fdfadc66443340acd9275c5cf9f306ac4cc594da Mon Sep 17 00:00:00 2001
From: dotmg <mahefa@homemade.mg>
Date: Mon, 11 Aug 2025 15:26:11 +0200
Subject: [PATCH] FFPM140: B dans U / z-z / -.-,

---
 .../src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt | 5 +++++
 .../src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt      | 2 +-
 .../src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt     | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
index 30ef44f..1e13f9e 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
@@ -91,6 +91,11 @@ class ParseULine (var line: String, var measure: Int) {
                 'K' -> repeat(5) { parseUStage2('4')}
                 'G' -> repeat(4) { parseUStage2('4')  }
                 'C' -> repeat(3) { parseUStage2('4') }
+                'B' -> run {
+                    parseUStage2('4')
+                    parseUStage2('4')
+                    parseUStage2('3')
+                }
                 '8' -> repeat(2) { parseUStage2('4') }
                 '4', '3', '2', '1', 't' -> parseUStage2(it)
                 '6' -> repeat(2) { parseUStage2('3')}
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 9d5a929..e09400a 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mg.dot.feufaro.FileRepository
 
-//todo: split voices (ffpm19) ${S:mfs} in N4:
+//todo: split voices (ffpm19/ews22) ${S:mfs} in N4:
 
 class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository: FileRepository) {
     private val T: MutableList<PTemplate> = mutableListOf()
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 c07f733..9e6aba3 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt
@@ -55,6 +55,8 @@ class TUNote (private val detailNote: MutableList<Note> = mutableListOf()){
             .replace("'", "¹")
             .replace(Regex("[zZ][zZ\\.,]+(?![drmfslt])"), "")
             .replace(Regex("^-\\.,"), "")
+            .replace(" ,z", "")
+            .replace(Regex("^-.- *,"), "-. ,")
             .replace(Regex("\\.-\\s*$"), "")
             .replace(Regex(" ,-\\s*$"), "")
             .replace(Regex("\\((-[\\.,;][a-zA-Z][ia]*[¹²³₁₂₃]?)\\)"), "$1")