Merge pull request #2061 from MarcSabatella/64856-lyric-accents

fix #64856: accented characters in lyrics not aligned correctly
musescore · Jun 11, 2015 · 8ff1ded · 8ff1ded
2 parents 00c45cc + 4e77374
commit 8ff1ded
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp
@@ -311,7 +311,7 @@ void Lyrics::layout1()
       // 2) at least one other character (indicating start of actual lyric)
       // 3) string of non-word characters at end of syllable
       //QRegularExpression leadingPattern("(^[\\d\\W]+)([^\\d\\W]+)");
-      QRegularExpression punctuationPattern("(^[\\d\\W]*)([^\\d\\W].*?)([\\d\\W]*$)");
+      QRegularExpression punctuationPattern("(^[\\d\\W]*)([^\\d\\W].*?)([\\d\\W]*$)", QRegularExpression::UseUnicodePropertiesOption);
       QRegularExpressionMatch punctuationMatch = punctuationPattern.match(s);
       if (punctuationMatch.hasMatch()) {
             // leading and trailing punctuation

diff --git a/vtest/lyrics-3-ref.png b/vtest/lyrics-3-ref.png
diff --git a/vtest/lyrics-3.mscz b/vtest/lyrics-3.mscz