Merge pull request #30661 from miiizen/30305-systemTextLineStyle

Expose system text line style to user

Author: miiizen

src/engraving/api/v1/apitypes.h

@@ -831,6 +831,7 @@ enum class Tid {
     HARP_PEDAL_TEXT_DIAGRAM  = int(mu::engraving::TextStyleType::HARP_PEDAL_TEXT_DIAGRAM),
 
     /// Line-oriented styles
+    SYSTEM_TEXTLINE  = int(mu::engraving::TextStyleType::SYSTEM_TEXTLINE),
     TEXTLINE  = int(mu::engraving::TextStyleType::TEXTLINE),
     NOTELINE  = int(mu::engraving::TextStyleType::NOTELINE),
     VOLTA     = int(mu::engraving::TextStyleType::VOLTA),

src/engraving/dom/textline.cpp

@@ -52,7 +52,6 @@ static const ElementStyle systemTextLineSegmentStyle {
 //---------------------------------------------------------
 
 static const ElementStyle textLineStyle {
-//       { Sid::textLineSystemFlag,                 Pid::SYSTEM_FLAG             },
     { Sid::textLineFontFace,                   Pid::BEGIN_FONT_FACE },
     { Sid::textLineFontFace,                   Pid::CONTINUE_FONT_FACE },
     { Sid::textLineFontFace,                   Pid::END_FONT_FACE },
@@ -81,7 +80,6 @@ static const ElementStyle textLineStyle {
 //---------------------------------------------------------
 
 static const ElementStyle systemTextLineStyle {
-//       { Sid::systemTextLineSystemFlag,           Pid::SYSTEM_FLAG             },
     { Sid::systemTextLineFontFace,             Pid::BEGIN_FONT_FACE },
     { Sid::systemTextLineFontFace,             Pid::CONTINUE_FONT_FACE },
     { Sid::systemTextLineFontFace,             Pid::END_FONT_FACE },
@@ -275,7 +273,7 @@ PropertyValue TextLine::propertyDefault(Pid propertyId) const
     case Pid::END_TEXT_PLACE:
         return TextPlace::LEFT;
     case Pid::TEXT_STYLE:
-        return TextStyleType::TEXTLINE;
+        return systemFlag() ? TextStyleType::SYSTEM_TEXTLINE : TextStyleType::TEXTLINE;
     default:
         return TextLineBase::propertyDefault(propertyId);
     }

src/engraving/style/styledef.cpp

@@ -1450,6 +1450,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
 
     styleDef(systemTextLineFontFace,                     "Edwin"),
     styleDef(systemTextLineFontSize,                     10.0),
+    styleDef(systemTextLineLineSpacing,                  1.0),
     styleDef(systemTextLineFontSpatiumDependent,         true),
     styleDef(systemTextLineFontStyle,                    int(FontStyle::Normal)),
     styleDef(systemTextLineColor,                        PropertyValue::fromValue(Color::BLACK)),

src/engraving/style/styledef.h

@@ -1467,6 +1467,7 @@ enum class Sid {
 
     systemTextLineFontFace,
     systemTextLineFontSize,
+    systemTextLineLineSpacing,
     systemTextLineFontSpatiumDependent,
     systemTextLineFontStyle,
     systemTextLineColor,

src/engraving/style/textstyle.cpp

@@ -855,6 +855,25 @@ const TextStyle textLineTextStyle { {
     { TextStylePropertyType::Position,             Sid::textLinePosition,                       Pid::POSITION },
 } };
 
+const TextStyle systemTextLineTextStyle { {
+    { TextStylePropertyType::FontFace,             Sid::systemTextLineFontFace,                 Pid::BEGIN_FONT_FACE },
+    { TextStylePropertyType::FontSize,             Sid::systemTextLineFontSize,                 Pid::BEGIN_FONT_SIZE },
+    { TextStylePropertyType::LineSpacing,          Sid::systemTextLineLineSpacing,              Pid::TEXT_LINE_SPACING },
+    { TextStylePropertyType::SizeSpatiumDependent, Sid::systemTextLineFontSpatiumDependent,     Pid::SIZE_SPATIUM_DEPENDENT },
+    { TextStylePropertyType::FontStyle,            Sid::systemTextLineFontStyle,                Pid::BEGIN_FONT_STYLE },
+    { TextStylePropertyType::Color,                Sid::systemTextLineColor,                    Pid::COLOR },
+    { TextStylePropertyType::TextAlign,            Sid::systemTextLineTextAlign,                Pid::ALIGN },
+    { TextStylePropertyType::Offset,               Sid::systemTextLinePosAbove,                 Pid::BEGIN_TEXT_OFFSET },
+    { TextStylePropertyType::FrameType,            Sid::systemTextLineFrameType,                Pid::FRAME_TYPE },
+    { TextStylePropertyType::FramePadding,         Sid::systemTextLineFramePadding,             Pid::FRAME_PADDING },
+    { TextStylePropertyType::FrameWidth,           Sid::systemTextLineFrameWidth,               Pid::FRAME_WIDTH },
+    { TextStylePropertyType::FrameRound,           Sid::systemTextLineFrameRound,               Pid::FRAME_ROUND },
+    { TextStylePropertyType::FrameBorderColor,     Sid::systemTextLineFrameFgColor,             Pid::FRAME_FG_COLOR },
+    { TextStylePropertyType::FrameFillColor,       Sid::systemTextLineFrameBgColor,             Pid::FRAME_BG_COLOR },
+    { TextStylePropertyType::MusicalSymbolsScale,  Sid::dummyMusicalSymbolsScale,               Pid::MUSICAL_SYMBOLS_SCALE },
+    { TextStylePropertyType::Position,             Sid::systemTextLinePosition,                 Pid::POSITION },
+} };
+
 const TextStyle noteLineTextStyle { {
     { TextStylePropertyType::FontFace,             Sid::noteLineFontFace,                      Pid::FONT_FACE },
     { TextStylePropertyType::FontSize,             Sid::noteLineFontSize,                      Pid::FONT_SIZE },
@@ -1427,6 +1446,7 @@ const TextStyle* textStyle(TextStyleType idx)
     case TextStyleType::HARP_PEDAL_TEXT_DIAGRAM: return &harpPedalTextDiagramTextStyle;
 
     case TextStyleType::TEXTLINE: return &textLineTextStyle;
+    case TextStyleType::SYSTEM_TEXTLINE: return &systemTextLineTextStyle;
     case TextStyleType::NOTELINE: return &noteLineTextStyle;
     case TextStyleType::VOLTA: return &voltaTextStyle;
     case TextStyleType::OTTAVA: return &ottavaTextStyle;

src/engraving/types/types.h

@@ -870,6 +870,7 @@ enum class TextStyleType : unsigned char {
 
     // Line-oriented styles
     TEXTLINE,
+    SYSTEM_TEXTLINE,
     NOTELINE,
     VOLTA,
     OTTAVA,

src/engraving/types/typesconv.cpp

@@ -1735,6 +1735,7 @@ static const std::vector<Item<TextStyleType> > TEXTSTYLE_TYPES = {
     { TextStyleType::ARTICULATION, "articulation", muse::TranslatableString("engraving", "Articulation") },
 
     { TextStyleType::TEXTLINE,          "textline",             muse::TranslatableString("engraving", "Text line") },
+    { TextStyleType::SYSTEM_TEXTLINE,   "system_textline",      muse::TranslatableString("engraving", "System text line") },
     { TextStyleType::NOTELINE,          "noteline",             muse::TranslatableString("engraving", "Note-anchored line") },
     { TextStyleType::VOLTA,             "volta",                muse::TranslatableString("engraving", "Volta") },
     { TextStyleType::OTTAVA,            "ottava",               muse::TranslatableString("engraving", "Ottava") },