bug z8 or zC or...
This commit is contained in:
parent
d290214d7b
commit
a427b3d619
2 changed files with 9 additions and 1 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -121,6 +121,9 @@ class ParseULine (var line: String, var measure: Int) {
|
|||
}
|
||||
'(', ')', '/' -> parsedString += it
|
||||
}
|
||||
if (it != 'z') {
|
||||
charX = '-'
|
||||
}
|
||||
}
|
||||
}
|
||||
private fun parseUStage2(codeChar : Char) {
|
||||
|
|
@ -156,8 +159,10 @@ class ParseULine (var line: String, var measure: Int) {
|
|||
noteChar = charX
|
||||
}
|
||||
parsedString += noteChar + sequence
|
||||
if (charX != 'z') {
|
||||
charX = '-'
|
||||
}
|
||||
}
|
||||
private fun parseUStage3() {
|
||||
parsedString = parsedString.replace("-,-", "")
|
||||
.replace(Regex("([:!|])-,-([:!|])"), "$1-$2")
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue