Properly deal with </font>

instead of ignoring it altogether, reset font face and -size back to what it was before `<font ...>` Also fix some code warnings shown by QtCreator.
Jojo-Schmitz · Mar 18, 2024 · 29a15da · 29a15da
1 parent 8f174ef
commit 29a15da
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/libmscore/textbase.cpp b/libmscore/textbase.cpp
@@ -10,10 +10,7 @@
 //  the file LICENCE.GPL
 //=============================================================================
 
-#include "text.h"
 #include "textedit.h"
-#include "jump.h"
-#include "marker.h"
 #include "score.h"
 #include "segment.h"
 #include "measure.h"
@@ -1264,7 +1261,6 @@ QString TextBlock::remove(int column, TextCursor* cursor)
       QString s;
       for (auto i = _fragments.begin(); i != _fragments.end(); ++i) {
             int idx  = 0;
-            int rcol = 0;
             for (const QChar& c : qAsConst(i->text)) {
                   if (col == column) {
                         if (c.isSurrogate()) {
@@ -1285,7 +1281,6 @@ QString TextBlock::remove(int column, TextCursor* cursor)
                   if (c.isHighSurrogate())
                         continue;
                   ++col;
-                  ++rcol;
                   }
             }
       insertEmptyFragmentIfNeeded(cursor); // without this, cursorRect can't calculate the y position of the cursor correctly
@@ -1326,7 +1321,6 @@ QString TextBlock::remove(int start, int n, TextCursor* cursor)
       int col = 0;
       QString s;
       for (auto i = _fragments.begin(); i != _fragments.end();) {
-            int rcol = 0;
             bool inc = true;
             for( int idx = 0; idx < i->text.length(); ) {
                   QChar c = i->text[idx];
@@ -1353,7 +1347,6 @@ QString TextBlock::remove(int start, int n, TextCursor* cursor)
                   if (c.isHighSurrogate())
                         continue;
                   ++col;
-                  ++rcol;
                   }
             if (inc)
                   ++i;
@@ -1697,6 +1690,8 @@ void TextBase::createLayout()
                   }
             else if (state == 1) {
                   if (c == '>') {
+                        static QString prevFontFace;
+                        static qreal prevFontSize = 0;
                         bool unstyleFontStyle = false;
                         state = 0;
                         if (token == "b") {
@@ -1749,19 +1744,31 @@ void TextBase::createLayout()
                         else if (token.startsWith("font ")) {
                               token = token.mid(5);
                               if (token.startsWith("size=\"")) {
+                                    prevFontSize = cursor.format()->fontSize();
                                     cursor.format()->setFontSize(parseNumProperty(token.mid(6)));
                                     setPropertyFlags(Pid::FONT_SIZE, PropertyFlags::UNSTYLED);
                                     }
                               else if (token.startsWith("face=\"")) {
                                     QString face = parseStringProperty(token.mid(6));
                                     face = unEscape(face);
+                                    prevFontFace = cursor.format()->fontFamily();
                                     cursor.format()->setFontFamily(face);
                                     setPropertyFlags(Pid::FONT_FACE, PropertyFlags::UNSTYLED);
                                     }
                               else
                                     qDebug("cannot parse html property <%s> in text <%s>",
                                        qPrintable(token), qPrintable(_text));
                               }
+                        else if ( token == "/font" ) {
+                              if (prevFontSize) {
+                                    cursor.format()->setFontSize(prevFontSize);
+                                    prevFontSize = 0;
+                                    }
+                              if (!prevFontFace.isEmpty()) {
+                                    cursor.format()->setFontFamily(prevFontFace);
+                                    prevFontFace = "";
+                                    }
+                              }
                         if (unstyleFontStyle)
                               setPropertyFlags(Pid::FONT_STYLE, PropertyFlags::UNSTYLED);
                         }