Isolate nuances marker

2026-09-15 16:29:31 +03:00 · 2026-09-15 16:29:31 +03:00 · 3a0141e34d
commit 3a0141e34d
parent 92ead8b7c2
1 changed files with 9 additions and 1 deletions
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/PTemplate.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/PTemplate.kt
@ -78,7 +78,15 @@ class PTemplate (val template: String, val separatorAfter: String, private val m
                continue
            }

-            val matchedMarker = allStaticMarkers.find { remaining.startsWith(it, ignoreCase = true) }
+            val matchedMarker = allStaticMarkers
+                .sortedByDescending { it.length }
+                .find { marker ->
+                    remaining.startsWith(marker, ignoreCase = true) &&
+                            (remaining.length == marker.length ||
+                                    !remaining[marker.length].isLetter())
+                }
+
+
            if (matchedMarker != null) {
                tokens.add(matchedMarker)
                remaining = remaining.substring(matchedMarker.length)