mahefa/feufaro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug z8 or zC or...

Browse source
This commit is contained in:
dotmg 2025-08-18 17:30:41 +02:00
parent d290214d7b
commit a427b3d619
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
composeApp/src/commonMain/kotlin/mg/dot/feufaro/musicXML/SolfaXML.kt
View file

@ -24,6 +24,9 @@ class SolfaXML {
} }
} }
fun setMeasure(numerator: Int?, denominator: Int?) { fun setMeasure(numerator: Int?, denominator: Int?) {
if ((meta.getOrDefault("m", null) != null) && numerator == null) {
return
}
var measure1 = numerator ?: 4 var measure1 = numerator ?: 4
var measure2 = denominator ?: 4 var measure2 = denominator ?: 4
if (measure2 == 2) { if (measure2 == 2) {

7
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/ParseULine.kt
View file

@ -121,6 +121,9 @@ class ParseULine (var line: String, var measure: Int) {
} }
'(', ')', '/' -> parsedString += it '(', ')', '/' -> parsedString += it
} }
if (it != 'z') {
charX = '-'
}
} }
} }
private fun parseUStage2(codeChar : Char) { private fun parseUStage2(codeChar : Char) {
@ -156,7 +159,9 @@ class ParseULine (var line: String, var measure: Int) {
noteChar = charX noteChar = charX
} }
parsedString += noteChar + sequence parsedString += noteChar + sequence
charX = '-' if (charX != 'z') {
charX = '-'
}
} }
private fun parseUStage3() { private fun parseUStage3() {
parsedString = parsedString.replace("-,-", "") parsedString = parsedString.replace("-,-", "")