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

Fix! Resolve z & - duration on D.z,D

Browse source
This commit is contained in:
Hasinjato 2026-10-07 11:52:46 +03:00
parent 0c12e4ecd0
commit b1b6a5ca4b
1 changed files with 135 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
} }
val templateCharArray = pTemplate.template.toCharArray() val templateCharArray = pTemplate.template.toCharArray()
var nextMarker: Char = '0' var nextMarker: Char = '0'
templateCharArray.forEach { // D.-R templateCharArray.forEachIndexed { index, it -> // D.-R
when (it) { when (it) {
'D', 'R', 'M', 'F', 'S', 'L', 'T', 'D', 'R', 'M', 'F', 'S', 'L', 'T',
'd', 'r', 'm', 'f', 's', 'l', 't', 'd', 'r', 'm', 'f', 's', 'l', 't',
@ -128,7 +128,22 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
'.', ',' -> '.', ',' ->
unitObject.addMarker(it) unitObject.addMarker(it)
'-', 'Z', 'z', 'w' -> '-' -> {
val prevChar = templateCharArray.getOrNull(index - 1)
val nextChar = templateCharArray.getOrNull(index + 1)
val charToInsert = if (prevChar == '.' && nextChar == ',') {
' '
} else {
'-'
}
N.indices.forEach { voiceNumber ->
unitObject.addBlank(voiceNumber, charToInsert)
}
}
'Z', 'z', 'w' ->
N.indices.forEach { voiceNumber -> N.indices.forEach { voiceNumber ->
unitObject.addBlank(voiceNumber, it) unitObject.addBlank(voiceNumber, it)
} }
@ -1038,7 +1053,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
var actionTaken = "Keep" var actionTaken = "Keep"
if (rawBlockText.trim().isEmpty()) { if (rawBlockText.trim().isEmpty()) {
rawBlockText = if(isT0) "" else "z" rawBlockText = if(isT0) "" else "-"
actionTaken = if(isT0) "EMPTY->\"\"" else "EMPTY->z" actionTaken = if(isT0) "EMPTY->\"\"" else "EMPTY->z"
} }
@ -1777,6 +1792,8 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
val finalLines = (prefix + cleanedBlocks.joinToString("")) val finalLines = (prefix + cleanedBlocks.joinToString(""))
.replace("2z11", "y") .replace("2z11", "y")
.replace("31", "y")
.replace("3-", "y")
.replace(Regex("""\$\{.*?\}|/""")) { match -> .replace(Regex("""\$\{.*?\}|/""")) { match ->
if (match.value == "/") "/ " else match.value if (match.value == "/") "/ " else match.value
} }
@ -1894,7 +1911,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
.replace(",'", "") .replace(",'", "")
.replace("',", "") .replace("',", "")
val noteCharIterator = noteChar2.replace("/", "").toCharArray().iterator() val noteCharIterator = noteChar2.replace("/", "").replace(".", "").toCharArray().iterator()
var result = "" var result = ""
var firstInLoop = true var firstInLoop = true
var replacement: Char = 'x' var replacement: Char = 'x'
@ -2060,8 +2077,9 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
var midiDuration = 0 var midiDuration = 0
var nextDuration = 0 var nextDuration = 0
var lastNoteString = "" var lastNoteString = ""
var lastPhysicalNote = ""
val midiPitch = MidiPitch(voiceNumber) val midiPitch = MidiPitch(voiceNumber)
var nextComment: MutableList<String> = mutableListOf() val nextComment = mutableListOf<String>()
var trioletCount = -1 var trioletCount = -1
var nextTrioletDuration = 0 var nextTrioletDuration = 0
fun pushMidi(typeBlock: String = "note") { fun pushMidi(typeBlock: String = "note") {
@ -2097,7 +2115,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
midiPitch.duration = 0 midiPitch.duration = 0
lastNoteString = "" lastNoteString = ""
midiDuration = 0 midiDuration = 0
nextComment = mutableListOf() nextComment.clear()
} }
midiPitch.currentVoiceNumber(voiceNumber) midiPitch.currentVoiceNumber(voiceNumber)
@ -2115,6 +2133,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
} }
} }
var lastIt = ' ' var lastIt = ' '
var lastSignificantIt = ' '
val newN = POneVoiceNote() val newN = POneVoiceNote()
val lineRepeated = REGEX_REPETITION.replace(line) { matchResult -> val lineRepeated = REGEX_REPETITION.replace(line) { matchResult ->
val (charIterated, iteration) = matchResult.destructured val (charIterated, iteration) = matchResult.destructured
@ -2124,15 +2143,16 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
var commentNumber = -1 var commentNumber = -1
var inSplit = false var inSplit = false
var expectSplitBrace = false var expectSplitBrace = false
val lineChar = lineRepeated.toCharArray()
lineChar.forEach { var i = 0
while (i < lineRepeated.length) {
val it = lineRepeated[i]
when (it) { when (it) {
'|', ':', '!', '/' -> { '|', ':', '!', '/' -> {
if (it == '|' && lastIt == '[') { if (!(it == '|' && lastIt == '[') && lastIt !in "|:!/") {
// le séparateur split if (nextDuration > 0 && lastIt != '-') {
} else if (lastIt == '|' || lastIt == ':' || lastIt == '!' || lastIt == '/') { midiDuration += nextDuration
} else { }
midiDuration += nextDuration
nextDuration = 60 nextDuration = 60
} }
} }
@ -2152,29 +2172,60 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
} }
'.' -> { '.' -> {
if (lastIt == ';') { if (lastIt == ';' || lastSignificantIt == ';') {
pushMidi() pushMidi()
lastNoteString = "z" lastNoteString = "z"
midiDuration = 15 midiDuration = 15
nextDuration = 30 nextDuration = 30
} }
midiDuration += nextDuration - 30 if (lastSignificantIt == '-') {
nextDuration = 30 midiDuration += 30 - nextDuration
nextDuration = 30
} else {
if (nextDuration == 0) {
if (midiDuration == 0) {
midiDuration = 30
} else {
midiDuration -= 30
}
nextDuration = 30
} else if (nextDuration <= 30) {
midiDuration += nextDuration
} else {
midiDuration += nextDuration - 30
nextDuration = 30
}
}
} }
';' -> { ';' -> {
if (lastIt == '.') { if ((lastIt == '.' || lastSignificantIt == '.') && lastNoteString == "z" && midiDuration == 0) {
pushMidi() pushMidi()
lastNoteString = "z" lastNoteString = "z"
midiDuration = 15 midiDuration = 15
nextDuration = 15 nextDuration = 15
} }
if (nextDuration >= 45) { if (lastSignificantIt == '-') {
midiDuration += nextDuration - 45 midiDuration += 15 - nextDuration
nextDuration = 45
} else {
midiDuration += nextDuration - 15
nextDuration = 15 nextDuration = 15
} else {
if (nextDuration == 0) {
if (midiDuration == 0) {
midiDuration = 15
} else {
midiDuration -= 45
}
nextDuration = 15
} else if (nextDuration <= 15) {
midiDuration += nextDuration
nextDuration = 0
} else if (nextDuration >= 45) {
midiDuration += nextDuration - 45
nextDuration = 15
} else {
midiDuration += nextDuration - 15
nextDuration = 15
}
} }
} }
@ -2182,6 +2233,9 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
if(!inSplit ){ if(!inSplit ){
newN.appendLastNote(it) newN.appendLastNote(it)
lastNoteString += it lastNoteString += it
if (lastPhysicalNote.isNotEmpty() && lastPhysicalNote != "z") {
lastPhysicalNote += it
}
} else { } else {
newN.appendLastSplitNoteSuffix(it) newN.appendLastSplitNoteSuffix(it)
} }
@ -2202,12 +2256,14 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
nextDuration = 60 nextDuration = 60
} }
} }
var noteString = it.toString().lowercase()
if (it == 'D' || it == 'R' || it == 'F' || it == 'S') { val noteString = when (it) {
noteString += "i" 'D' -> "di"
} 'R' -> "ri"
if (it == 'T') { 'F' -> "fi"
noteString += "a" 'S' -> "si"
'T' -> "ta"
else -> it.lowercaseChar().toString()
} }
if(inSplit) { if(inSplit) {
newN.appendLastSplitNote(noteString) newN.appendLastSplitNote(noteString)
@ -2215,58 +2271,91 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
newN.addItem(noteString) newN.addItem(noteString)
when (noteString) { when (noteString) {
"-" -> { "-" -> {
midiDuration += if (nextDuration > 0) nextDuration else 20 if (lastNoteString == "z") {
nextDuration = 0 pushMidi()
val targetNote = if (lastPhysicalNote.isNotEmpty() && lastPhysicalNote != "z") lastPhysicalNote else "s"
lastNoteString = targetNote
}
midiDuration += if (nextDuration > 0) nextDuration else 60
if (nextDuration == 0) nextDuration = 60
} }
"z", "@" -> { "z" -> {
if (lastNoteString == "z") { if (lastNoteString == "z") {
midiDuration += nextDuration midiDuration += if (nextDuration > 0) nextDuration else 60
nextDuration = 0 nextDuration = 0
} else { } else {
pushMidi() pushMidi()
//noteString =
} }
lastNoteString = "z" lastNoteString = "z"
lastPhysicalNote = "z"
} }
"'", "(", ")", "{", "}", "," -> {} "'", "(", ")", "{", "}", "," -> {}
else -> { else -> {
pushMidi() pushMidi()
lastNoteString = noteString lastNoteString = noteString
lastPhysicalNote = noteString
} }
} }
} }
} }
'@' -> { '@' -> {
if(!inSplit) { if (!inSplit) {
if (lastNoteString == "z") { if (lastNoteString != "z") {
midiDuration += nextDuration var isProlongation = false
nextDuration = 0 var k = i + 1
} else { while (k < lineRepeated.length) {
pushMidi() val nextC = lineRepeated[k]
if (nextC == '-') {
isProlongation = true
break
}
if (nextC in "drmfsltDRFSTzZ|:!/") {
break
}
k++
}
if (!isProlongation) {
pushMidi()
lastNoteString = "z"
} else {
}
} }
lastNoteString = "z"
} }
} }
'i', 'a' -> 'i', 'a' -> {
lastNoteString += it lastNoteString += it
if (lastPhysicalNote.isNotEmpty() && lastPhysicalNote != "z") {
lastPhysicalNote += it
}
}
'&' -> { '&' -> {
commentNumber++ commentNumber++
nextComment.add(templateComments[commentNumber]) val comment = templateComments.getOrNull(commentNumber)
if (templateComments[commentNumber] == "\$T") { if (comment != null) {
nextTrioletDuration = 2 * nextDuration / 3 nextComment.add(comment)
trioletCount = 2 if (comment == "\$T") {
nextDuration = nextDuration - nextTrioletDuration } nextTrioletDuration = 2 * nextDuration / 3
trioletCount = 2
nextDuration -= nextTrioletDuration
}
}
} }
else -> { else -> {
expectSplitBrace = false expectSplitBrace = false
} }
} }
if (it != '~') {
lastSignificantIt = it
}
lastIt = it lastIt = it
i++
} }
pushMidi() pushMidi()
/*if (voiceNumber == 1) { /*if (voiceNumber == 1) {