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

Bugfix U:13 should be D,D.- and not D,D

Browse source
This commit is contained in:
dotmg 2025-08-16 09:11:02 +02:00
parent 81c8c9a411
commit d290214d7b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,7 +162,8 @@ class ParseULine (var line: String, var measure: Int) {
parsedString = parsedString.replace("-,-", "") parsedString = parsedString.replace("-,-", "")
.replace(Regex("([:!|])-,-([:!|])"), "$1-$2") .replace(Regex("([:!|])-,-([:!|])"), "$1-$2")
.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("([:!|])\\)/"), ")$1/") .replace(Regex("([:!|])\\)/"), ")$1/")
.replace(Regex("[:!|]/"), "/") .replace(Regex("[:!|]/"), "/")

2
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TUNote.kt
View file

@ -58,7 +58,7 @@ class TUNote (private val detailNote: MutableList<Note> = mutableListOf()){
.replace(Regex("^-\\.,"), "") .replace(Regex("^-\\.,"), "")
.replace(" ,z", "") .replace(" ,z", "")
.replace(Regex("^-.- *,"), "-. ,") .replace(Regex("^-.- *,"), "-. ,")
.replace(Regex("\\.-\\s*$"), "") .replace(Regex("(?<!,[drmfslt])\\.-\\s*$"), "")
.replace(Regex(" ,-\\s*$"), "") .replace(Regex(" ,-\\s*$"), "")
.replace(Regex("\\((-[\\.,;][a-zA-Z][ia]*[¹²³₁₂₃]?)\\)"), "$1") .replace(Regex("\\((-[\\.,;][a-zA-Z][ia]*[¹²³₁₂₃]?)\\)"), "$1")
.replace(Regex("^-\\.z$"), "") .replace(Regex("^-\\.z$"), "")