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

FFPM140: B dans U / z-z / -.-,

Browse source
This commit is contained in:
dotmg 2025-08-11 15:26:11 +02:00
parent 12ffacc1f7
commit fdfadc6644
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,6 +91,11 @@ class ParseULine (var line: String, var measure: Int) {
'K' -> repeat(5) { parseUStage2('4')} 'K' -> repeat(5) { parseUStage2('4')}
'G' -> repeat(4) { parseUStage2('4') } 'G' -> repeat(4) { parseUStage2('4') }
'C' -> repeat(3) { parseUStage2('4') } 'C' -> repeat(3) { parseUStage2('4') }
'B' -> run {
parseUStage2('4')
parseUStage2('4')
parseUStage2('3')
}
'8' -> repeat(2) { parseUStage2('4') } '8' -> repeat(2) { parseUStage2('4') }
'4', '3', '2', '1', 't' -> parseUStage2(it) '4', '3', '2', '1', 't' -> parseUStage2(it)
'6' -> repeat(2) { parseUStage2('3')} '6' -> repeat(2) { parseUStage2('3')}

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

@ -7,7 +7,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import mg.dot.feufaro.FileRepository import mg.dot.feufaro.FileRepository
//todo: split voices (ffpm19) ${S:mfs} in N4: //todo: split voices (ffpm19/ews22) ${S:mfs} in N4:
class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository: FileRepository) { class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository: FileRepository) {
private val T: MutableList<PTemplate> = mutableListOf() private val T: MutableList<PTemplate> = mutableListOf()

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

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