From d290214d7bcc5958757a601354d71796d7b8cc73 Mon Sep 17 00:00:00 2001
From: dotmg <mahefa@homemade.mg>
Date: Sat, 16 Aug 2025 09:11:02 +0200
Subject: [PATCH] Bugfix U:13 should be D,D.- and not D,D

---
 .../src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt   | 3 ++-
 .../src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 715efbe..723600d 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
@@ -162,7 +162,8 @@ class ParseULine (var line: String, var measure: Int) {
         parsedString = parsedString.replace("-,-", "")
             .replace(Regex("([:!|])-,-([:!|])"), "$1-$2")
             .replace(Regex("([:!|])-\\.-([:!|])"), "$1-$2")
-            .replace(Regex("[\\.,]-([:!|])"), "$1")
+            .replace(Regex(",-([:!|])"), "$1")
+            .replace(Regex("(?<!D)\\.-([:!|])"), "$1")
             .replace(Regex("[\\.,]([:!|])"), "$1")
             .replace(Regex("([:!|])\\)/"), ")$1/")
             .replace(Regex("[:!|]/"), "/")
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 dce4683..b449bbf 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt
@@ -58,7 +58,7 @@ class TUNote (private val detailNote: MutableList<Note> = mutableListOf()){
             .replace(Regex("^-\\.,"), "")
             .replace(" ,z", "")
             .replace(Regex("^-.- *,"), "-. ,")
-            .replace(Regex("\\.-\\s*$"), "")
+            .replace(Regex("(?<!,[drmfslt])\\.-\\s*$"), "")
             .replace(Regex(" ,-\\s*$"), "")
             .replace(Regex("\\((-[\\.,;][a-zA-Z][ia]*[¹²³₁₂₃]?)\\)"), "$1")
             .replace(Regex("^-\\.z$"), "")