Combine font face and size into one tag if both are changed

musescore · Mar 31, 2024 · daf4541 · daf4541
1 parent de120c3
commit daf4541
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/engraving/dom/textbase.cpp b/src/engraving/dom/textbase.cpp
@@ -2216,11 +2216,16 @@ String TextBase::genText(const LayoutData* ldata) const
                 }
             }
 
-            if (format.fontSize() != fmt.fontSize()) {
-                text += String(u"<font size=\"%1\"/>").arg(format.fontSize());
-            }
-            if (format.fontFamily() != "ScoreText" && format.fontFamily() != fmt.fontFamily()) {
-                text += String(u"<font face=\"%1\"/>").arg(TextBase::escape(format.fontFamily()));
+            if (format.fontSize() != fmt.fontSize()
+                || (format.fontFamily() != "ScoreText" && format.fontFamily() != fmt.fontFamily())) {
+                text += String(u"<font");
+                if (format.fontSize() != fmt.fontSize()) {
+                    text += String(u" size=\"%1\"").arg(format.fontSize());
+                }
+                if (format.fontFamily() != "ScoreText" && format.fontFamily() != fmt.fontFamily()) {
+                    text += String(u" face=\"%1\"").arg(TextBase::escape(format.fontFamily()));
+                }
+                text += u"/>";
             }
 
             VerticalAlignment va = format.valign();