Tuplet numbers from musical symbols font

Author: XiaoMigros

src/engraving/dom/textbase.cpp

@@ -872,7 +872,7 @@ mu::draw::Font TextFragment::font(const TextBase* t) const
     draw::Font::Type fontType = draw::Font::Type::Unknown;
     if (format.fontFamily() == "ScoreText") {
         if (t->isDynamic() || t->textStyleType() == TextStyleType::OTTAVA || t->textStyleType() == TextStyleType::HARP_PEDAL_DIAGRAM
-            || t->isStringTunings()) {
+            || t->textStyleType() == TextStyleType::TUPLET || t->isStringTunings()) {
             std::string fontName = engravingFonts()->fontByName(t->style().styleSt(Sid::MusicalSymbolFont).toStdString())->family();
             family = String::fromStdString(fontName);
             fontType = draw::Font::Type::MusicSymbol;

src/engraving/rendering/dev/tupletlayout.cpp

@@ -54,6 +54,7 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
     //
     // create tuplet number if necessary
     //
+    const MStyle& style = ctx.conf().style();
     double _spatium = item->spatium();
     if (item->numberType() != TupletNumberType::NO_TEXT) {
         if (item->number() == nullptr) {
@@ -71,10 +72,21 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
         item->number()->setPropertyFlags(Pid::FONT_SIZE, item->propertyFlags(Pid::FONT_SIZE));
         item->number()->setPropertyFlags(Pid::FONT_STYLE, item->propertyFlags(Pid::FONT_STYLE));
         item->number()->setPropertyFlags(Pid::ALIGN, item->propertyFlags(Pid::ALIGN));
-        if (item->numberType() == TupletNumberType::SHOW_NUMBER) {
-            item->number()->setXmlText(String(u"%1").arg(item->ratio().numerator()));
+
+        String numberString = (item->numberType() == TupletNumberType::SHOW_NUMBER)
+                              ? String(u"%1").arg(item->ratio().numerator())
+                              : String(u"%1:%2").arg(item->ratio().numerator(), item->ratio().denominator());
+        if (style.styleB(Sid::tupletUseSymbols)) {
+            String smuflNum = String(u"");
+            for (size_t i = 0; i < numberString.size(); ++i) {
+                smuflNum.append(u"<sym>tuplet");
+                smuflNum.append(numberString.at(i).unicode());
+                smuflNum.append(u"</sym>");
+            }
+            smuflNum.replace(String(u":"), String(u"Colon"));
+            item->number()->setXmlText(smuflNum);
         } else {
-            item->number()->setXmlText(String(u"%1:%2").arg(item->ratio().numerator(), item->ratio().denominator()));
+            item->number()->setXmlText(numberString);
         }
 
         item->setIsSmall(true);
@@ -84,7 +96,7 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
                 break;
             }
         }
-        item->number()->mutldata()->setMag(item->isSmall() ? ctx.conf().styleD(Sid::smallNoteMag) : 1.0);
+        item->number()->mutldata()->setMag(item->isSmall() ? style.styleD(Sid::smallNoteMag) : 1.0);
     } else {
         if (item->number()) {
             if (item->number()->selected()) {
@@ -150,7 +162,6 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
     //
     //    calculate bracket start and end point p1 p2
     //
-    const MStyle& style = ctx.conf().style();
     double maxSlope      = style.styleD(Sid::tupletMaxSlope);
     bool outOfStaff      = style.styleB(Sid::tupletOufOfStaff);
     double vHeadDistance = style.styleMM(Sid::tupletVHeadDistance) * item->mag();

src/engraving/style/styledef.cpp

@@ -623,6 +623,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::tupletFontStyle,         "tupletFontStyle",         int(FontStyle::Italic) },
     { Sid::tupletColor,             "tupletColor",             PropertyValue::fromValue(Color::BLACK) },
     { Sid::tupletAlign,             "tupletAlign",             Align(AlignH::HCENTER, AlignV::VCENTER) },
+    { Sid::tupletUseSymbols,        "tupletUseSymbols",        false },
     { Sid::tupletBracketHookHeight, "tupletBracketHookHeight", Spatium(0.75) },
     { Sid::tupletOffset,            "tupletOffset",            PointF() },
     { Sid::tupletFrameType,         "tupletFrameType",         int(FrameType::NO_FRAME) },

src/engraving/style/styledef.h

@@ -634,6 +634,7 @@ enum class Sid {
     tupletFontStyle,
     tupletColor,
     tupletAlign,
+    tupletUseSymbols,
     tupletBracketHookHeight,
     tupletOffset,
     tupletFrameType,

src/notation/view/widgets/editstyle.cpp

@@ -472,6 +472,7 @@ EditStyle::EditStyle(QWidget* parent)
         { StyleId::tupletBracketType,       false, tupletBracketType,       resetTupletBracketType },
         { StyleId::tupletMaxSlope,          false, tupletMaxSlope,          resetTupletMaxSlope },
         { StyleId::tupletOufOfStaff,        false, tupletOutOfStaff,        0 },
+        { StyleId::tupletUseSymbols,        false, tupletUseSymbols,        0 },
 
         { StyleId::repeatBarTips,            false, showRepeatBarTips,            resetShowRepeatBarTips },
         { StyleId::startBarlineSingle,       false, showStartBarlineSingle,       resetShowStartBarlineSingle },

src/notation/view/widgets/editstyle.ui

@@ -6577,6 +6577,13 @@ By default, they will be placed such as that their right end are at the same lev
                     </item>
                    </widget>
                   </item>
+                  <item row="3" column="0" colspan="3">
+                   <widget class="QCheckBox" name="tupletUseSymbols">
+                    <property name="text">
+                     <string>Load number from musical symbols font</string>
+                    </property>
+                   </widget>
+                  </item>
                  </layout>
                 </widget>
                </item>
@@ -14280,6 +14287,7 @@ By default, they will be placed such as that their right end are at the same lev
   <tabstop>resetTupletNumberType</tabstop>
   <tabstop>tupletBracketType</tabstop>
   <tabstop>resetTupletBracketType</tabstop>
+  <tabstop>tupletUseSymbols</tabstop>
   <tabstop>tupletBracketWidth</tabstop>
   <tabstop>resetTupletBracketWidth</tabstop>
   <tabstop>tupletBracketHookHeight</tabstop>