diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/MarkersPopup.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/MarkersPopup.kt index 3ab28c0..5e9009a 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/MarkersPopup.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/MarkersPopup.kt @@ -124,7 +124,7 @@ private val markerGroups = listOf( Marker("Fine", "Fin"), Marker("Fiverenana", "Réfrain"), Marker("Isan\'andininy", "Réfrain"), - Marker("Fine", "Fin"), + Marker("Fin", "Fin"), Marker("𝄌", "Coda"), Marker("To_Coda", "Aller à la Coda"), Marker("||:", "Début de reprise"), diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt index ae47133..ddc3a34 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt @@ -569,7 +569,7 @@ class SharedScreenModel(private val fileRepository: FileRepository) : ScreenMode .replace(Regex("""(D\.?C\.?)\s*(al\s*Coda)""", RegexOption.IGNORE_CASE), "D.C.alCoda") .replace(Regex("""(D\.?S\.?)\s*(al\s*Coda)""", RegexOption.IGNORE_CASE), "D.S.alCoda") - val allStaticMarkers = getAllMarker() + val allStaticMarkers = getAllMarker().sortedByDescending { it.length } val tempoRegex = Regex("""^(♩\s*=\s*\d+)""", RegexOption.IGNORE_CASE) val modulaRegex = Regex("""^(D(?:ô|o)?\s*dia\s*(?:C|Db|D|Eb|E|F|Gb|G|Ab|A|Bb|B))""", RegexOption.IGNORE_CASE)