From a427b3d61985e0cc3f6656c363e6825992b188f3 Mon Sep 17 00:00:00 2001 From: dotmg Date: Mon, 18 Aug 2025 17:30:41 +0200 Subject: [PATCH] bug z8 or zC or... --- .../commonMain/kotlin/mg/dot/feufaro/musicXML/SolfaXML.kt | 3 +++ .../commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/SolfaXML.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/SolfaXML.kt index 3b78c98..e45005d 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/SolfaXML.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/SolfaXML.kt @@ -24,6 +24,9 @@ class SolfaXML { } } fun setMeasure(numerator: Int?, denominator: Int?) { + if ((meta.getOrDefault("m", null) != null) && numerator == null) { + return + } var measure1 = numerator ?: 4 var measure2 = denominator ?: 4 if (measure2 == 2) { 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 723600d..186fec4 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt @@ -121,6 +121,9 @@ class ParseULine (var line: String, var measure: Int) { } '(', ')', '/' -> parsedString += it } + if (it != 'z') { + charX = '-' + } } } private fun parseUStage2(codeChar : Char) { @@ -156,7 +159,9 @@ class ParseULine (var line: String, var measure: Int) { noteChar = charX } parsedString += noteChar + sequence - charX = '-' + if (charX != 'z') { + charX = '-' + } } private fun parseUStage3() { parsedString = parsedString.replace("-,-", "")