Merge pull request #23473 from Jojo-Schmitz/fix-xml-or-style

Sync XML tags with Style ID names
musescore · Jul 10, 2024 · 1157e0f · 1157e0f
2 parents b2b9d57 + 1386a19
commit 1157e0f
Show file tree

Hide file tree

Showing 61 changed files with 1,982 additions and 1,877 deletions.
diff --git a/src/engraving/data/styles/gp-style.mss b/src/engraving/data/styles/gp-style.mss
@@ -6,7 +6,7 @@
     <fermataShowTabSimple>0</fermataShowTabSimple>
     <fermataShowTabCommon>1</fermataShowTabCommon>
     <dynamicsShowTabSimple>0</dynamicsShowTabSimple>
-    <dymanicsShowTabCommon>1</dymanicsShowTabCommon>
+    <dynamicsShowTabCommon>1</dynamicsShowTabCommon>
     <hairpinShowTabSimple>0</hairpinShowTabSimple>
     <hairpinShowTabCommon>1</hairpinShowTabCommon>
     <accentShowTabSimple>0</accentShowTabSimple>

diff --git a/src/engraving/dom/bracket.cpp b/src/engraving/dom/bracket.cpp
@@ -84,7 +84,7 @@ void Bracket::setStaffSpan(size_t a, size_t b)
     m_lastStaff = b;
 
     if (bracketType() == BracketType::BRACE
-        && style().styleSt(Sid::MusicalSymbolFont) != "Emmentaler" && style().styleSt(Sid::MusicalSymbolFont) != "Gonville") {
+        && style().styleSt(Sid::musicalSymbolFont) != "Emmentaler" && style().styleSt(Sid::musicalSymbolFont) != "Gonville") {
         int v = static_cast<int>(m_lastStaff - m_firstStaff + 1);
 
         // if staves inner staves are hidden, decrease span
@@ -94,7 +94,7 @@ void Bracket::setStaffSpan(size_t a, size_t b)
             }
         }
 
-        if (style().styleSt(Sid::MusicalSymbolFont) == "Leland") {
+        if (style().styleSt(Sid::musicalSymbolFont) == "Leland") {
             v = std::min(4, v);
         }
 

diff --git a/src/engraving/dom/cmd.cpp b/src/engraving/dom/cmd.cpp
@@ -2551,7 +2551,7 @@ void Score::cmdResetToDefaultLayout()
         Sid::tenutoGateTime,
         Sid::staccatoGateTime,
         Sid::slurGateTime,
-        Sid::SectionPause,
+        Sid::sectionPause,
         Sid::showHeader,
         Sid::headerFirstPage,
         Sid::headerOddEven,

diff --git a/src/engraving/dom/layoutbreak.cpp b/src/engraving/dom/layoutbreak.cpp
@@ -38,7 +38,7 @@ namespace mu::engraving {
 //---------------------------------------------------------
 
 static const ElementStyle sectionBreakStyle {
-    { Sid::SectionPause, Pid::PAUSE }
+    { Sid::sectionPause, Pid::PAUSE }
 };
 
 //---------------------------------------------------------
@@ -267,7 +267,7 @@ PropertyValue LayoutBreak::propertyDefault(Pid id) const
     case Pid::LAYOUT_BREAK:
         return PropertyValue();           // LAYOUT_BREAK_LINE;
     case Pid::PAUSE:
-        return style().styleD(Sid::SectionPause);
+        return style().styleD(Sid::sectionPause);
     case Pid::START_WITH_LONG_NAMES:
         return true;
     case Pid::START_WITH_MEASURE_ONE:

diff --git a/src/engraving/dom/score.cpp b/src/engraving/dom/score.cpp
@@ -5698,7 +5698,7 @@ void Score::doLayoutRange(const Fraction& st, const Fraction& et)
         end = std::max(et, spanner->tick2());
     }
 
-    m_engravingFont = engravingFonts()->fontByName(style().value(Sid::MusicalSymbolFont).value<String>().toStdString());
+    m_engravingFont = engravingFonts()->fontByName(style().value(Sid::musicalSymbolFont).value<String>().toStdString());
     m_layoutOptions.noteHeadWidth = m_engravingFont->width(SymId::noteheadBlack, style().spatium() / SPATIUM20);
 
     if (this->cmdState().layoutFlags & LayoutFlag::REBUILD_MIDI_MAPPING) {

diff --git a/src/engraving/dom/symbol.cpp b/src/engraving/dom/symbol.cpp
@@ -155,7 +155,7 @@ PropertyValue Symbol::propertyDefault(Pid propertyId) const
         return 1.0;
     case Pid::SCORE_FONT:
         if (m_scoreFont) {
-            return style().styleSt(Sid::MusicalSymbolFont);
+            return style().styleSt(Sid::musicalSymbolFont);
         } else {
             return String();
         }

diff --git a/src/engraving/dom/system.cpp b/src/engraving/dom/system.cpp
@@ -937,7 +937,7 @@ Spacer* System::downSpacer(staff_idx_t staffIdx) const
 
 double System::firstNoteRestSegmentX(bool leading)
 {
-    double margin = style().styleMM(Sid::HeaderToLineStartDistance);
+    double margin = style().styleMM(Sid::headerToLineStartDistance);
     for (const MeasureBase* mb : measures()) {
         if (mb->isMeasure()) {
             const Measure* measure = static_cast<const Measure*>(mb);

diff --git a/src/engraving/dom/textbase.cpp b/src/engraving/dom/textbase.cpp
@@ -280,8 +280,8 @@ RectF TextCursor::cursorRect() const
     const TextFragment* fragment = tline.fragment(static_cast<int>(column()));
 
     Font _font  = fragment ? fragment->font(m_text) : m_text->font();
-    if (_font.family() == m_text->style().styleSt(Sid::MusicalSymbolFont)) {
-        _font.setFamily(m_text->style().styleSt(Sid::MusicalTextFont), Font::Type::MusicSymbolText);
+    if (_font.family() == m_text->style().styleSt(Sid::musicalSymbolFont)) {
+        _font.setFamily(m_text->style().styleSt(Sid::musicalTextFont), Font::Type::MusicSymbolText);
         if (fragment) {
             _font.setPointSizeF(fragment->format.fontSize());
         }
@@ -889,7 +889,7 @@ Font TextFragment::font(const TextBase* t) const
             || t->textStyleType() == TextStyleType::REPEAT_LEFT
             || t->textStyleType() == TextStyleType::REPEAT_RIGHT
             ) {
-            std::string fontName = engravingFonts()->fontByName(t->style().styleSt(Sid::MusicalSymbolFont).toStdString())->family();
+            std::string fontName = engravingFonts()->fontByName(t->style().styleSt(Sid::musicalSymbolFont).toStdString())->family();
             family = String::fromStdString(fontName);
             fontType = Font::Type::MusicSymbol;
             if (!t->isStringTunings()) {
@@ -916,12 +916,12 @@ Font TextFragment::font(const TextBase* t) const
             // but Smufl standard is 20pt so multiply x2 here.
             m *= 2;
         } else if (t->isTempoText()) {
-            family = t->style().styleSt(Sid::MusicalTextFont);
+            family = t->style().styleSt(Sid::musicalTextFont);
             fontType = Font::Type::MusicSymbolText;
             // to keep desired size ratio (based on 20pt symbol size to 12pt text size)
             m *= 5.0 / 3.0;
         } else {
-            family = t->style().styleSt(Sid::MusicalTextFont);
+            family = t->style().styleSt(Sid::musicalTextFont);
             fontType = Font::Type::MusicSymbolText;
         }
         // check if all symbols are available

diff --git a/src/engraving/dom/tremolosinglechord.cpp b/src/engraving/dom/tremolosinglechord.cpp
@@ -75,7 +75,7 @@ double TremoloSingleChord::chordMag() const
 
 double TremoloSingleChord::minHeight() const
 {
-    const double sw = style().styleS(Sid::tremoloStrokeWidth).val() * chordMag();
+    const double sw = style().styleS(Sid::tremoloLineWidth).val() * chordMag();
     const double td = style().styleS(Sid::tremoloDistance).val() * chordMag();
     return (lines() - 1) * td + sw;
 }
@@ -167,7 +167,7 @@ PainterPath TremoloSingleChord::basePath(double /*stretch*/) const
     const double sp = spatium() * chordMag();
 
     double w2  = sp * style().styleS(Sid::tremoloWidth).val() * .5;
-    double lw  = sp * style().styleS(Sid::tremoloStrokeWidth).val();
+    double lw  = sp * style().styleS(Sid::tremoloLineWidth).val();
     double td  = sp * style().styleS(Sid::tremoloDistance).val();
 
     PainterPath ppath;

diff --git a/src/engraving/dom/tremolotwochord.cpp b/src/engraving/dom/tremolotwochord.cpp
@@ -103,7 +103,7 @@ double TremoloTwoChord::chordMag() const
 
 double TremoloTwoChord::minHeight() const
 {
-    const double sw = style().styleS(Sid::tremoloStrokeWidth).val() * chordMag();
+    const double sw = style().styleS(Sid::tremoloLineWidth).val() * chordMag();
     const double td = style().styleS(Sid::tremoloDistance).val() * chordMag();
     return (lines() - 1) * td + sw;
 }
@@ -602,7 +602,7 @@ PainterPath TremoloTwoChord::basePath(double stretch) const
 
     // overall width of two-note tremolos should not be changed if chordMag() isn't 1.0
     double w2  = sp * style().styleS(Sid::tremoloWidth).val() * .5 / (twoNotes() ? chordMag() : 1.0);
-    double lw  = sp * style().styleS(Sid::tremoloStrokeWidth).val();
+    double lw  = sp * style().styleS(Sid::tremoloLineWidth).val();
     double td  = sp * style().styleS(Sid::tremoloDistance).val();
 
     PainterPath ppath;

diff --git a/src/engraving/dom/undo.cpp b/src/engraving/dom/undo.cpp
@@ -1934,8 +1934,8 @@ void ChangeStyle::flip(EditData*)
     if (score->style().styleV(Sid::concertPitch) != style.value(Sid::concertPitch)) {
         score->cmdConcertPitchChanged(style.value(Sid::concertPitch).toBool());
     }
-    if (score->style().styleV(Sid::MusicalSymbolFont) != style.value(Sid::MusicalSymbolFont)) {
-        score->setEngravingFont(score->engravingFonts()->fontByName(style.styleSt(Sid::MusicalSymbolFont).toStdString()));
+    if (score->style().styleV(Sid::musicalSymbolFont) != style.value(Sid::musicalSymbolFont)) {
+        score->setEngravingFont(score->engravingFonts()->fontByName(style.styleSt(Sid::musicalSymbolFont).toStdString()));
     }
 
     score->setStyle(style, overlap);

diff --git a/src/engraving/engravingmodule.cpp b/src/engraving/engravingmodule.cpp
@@ -346,7 +346,7 @@ void EngravingModule::onInit(const IApplication::RunMode& mode)
 
 #ifndef ENGRAVING_NO_INTERNAL
         gpaletteScore->setStyle(DefaultStyle::baseStyle());
-        gpaletteScore->style().set(Sid::MusicalTextFont, String(u"Leland Text"));
+        gpaletteScore->style().set(Sid::musicalTextFont, String(u"Leland Text"));
         IEngravingFontPtr scoreFont = m_engravingfonts->fontByName("Leland");
         gpaletteScore->setEngravingFont(scoreFont);
         gpaletteScore->setNoteHeadWidth(scoreFont->width(SymId::noteheadBlack, gpaletteScore->style().spatium()) / SPATIUM20);

diff --git a/src/engraving/internal/engravingfont.cpp b/src/engraving/internal/engravingfont.cpp
@@ -439,10 +439,10 @@ void EngravingFont::loadEngravingDefaults(const JsonObject& engravingDefaultsObj
         // "beamSpacing" handled separately
         { "legerLineThickness",         { { Sid::ledgerLineWidth } } },
         { "legerLineExtension",         { { Sid::ledgerLineLength } } },
-        { "slurEndpointThickness",      { { Sid::SlurEndWidth } } },
-        { "slurMidpointThickness",      { { Sid::SlurMidWidth } } },
-        { "tieEndpointThickness",       { { Sid::TieEndWidth } } },
-        { "tieMidpointThickness",       { { Sid::TieMidWidth } } },
+        { "slurEndpointThickness",      { { Sid::slurEndWidth } } },
+        { "slurMidpointThickness",      { { Sid::slurMidWidth } } },
+        { "tieEndpointThickness",       { { Sid::tieEndWidth } } },
+        { "tieMidpointThickness",       { { Sid::tieMidWidth } } },
         { "thinBarlineThickness",       { { Sid::barWidth, Sid::doubleBarWidth } } },
         { "thickBarlineThickness",      { { Sid::endBarWidth } } },
         // "dashedBarlineThickness" not supported
@@ -496,7 +496,7 @@ void EngravingFont::loadEngravingDefaults(const JsonObject& engravingDefaultsObj
         applyEngravingDefault(key, engravingDefaultsObject.value(key).toDouble());
     }
 
-    m_engravingDefaults.insert({ Sid::MusicalTextFont, String(u"%1 Text").arg(String::fromStdString(m_family)) });
+    m_engravingDefaults.insert({ Sid::musicalTextFont, String(u"%1 Text").arg(String::fromStdString(m_family)) });
 }
 
 void EngravingFont::computeMetrics(EngravingFont::Sym& sym, const Smufl::Code& code)

diff --git a/src/engraving/rendering/dev/arpeggiolayout.cpp b/src/engraving/rendering/dev/arpeggiolayout.cpp
@@ -100,12 +100,12 @@ double ArpeggioLayout::insetWidth(const Arpeggio* item)
     case ArpeggioType::UP_STRAIGHT:
     case ArpeggioType::DOWN_STRAIGHT:
     {
-        return (item->width() - item->style().styleMM(Sid::ArpeggioLineWidth)) / 2;
+        return (item->width() - item->style().styleMM(Sid::arpeggioLineWidth)) / 2;
     }
 
     case ArpeggioType::BRACKET:
     {
-        return item->width() - item->style().styleMM(Sid::ArpeggioLineWidth) / 2;
+        return item->width() - item->style().styleMM(Sid::arpeggioLineWidth) / 2;
     }
     }
     return 0.0;
@@ -182,7 +182,7 @@ void ArpeggioLayout::clearAccidentals(Arpeggio* item, LayoutContext& ctx)
                 return true;
             }
             if (shapeElement.item()->type() == ElementType::ACCIDENTAL) {
-                // Pad accidentals with Sid::ArpeggioAccidentalDistance either side
+                // Pad accidentals with Sid::arpeggioAccidentalDistance either side
                 shapeElement.setTopLeft(PointF(shapeElement.topLeft().x() - arpeggioAccidentalDistance, shapeElement.topLeft().y()));
                 shapeElement.setWidth(shapeElement.width() + 2 * arpeggioAccidentalDistance);
             } else if (shapeElement.item()->type() == ElementType::LEDGER_LINE) {
@@ -290,7 +290,7 @@ double ArpeggioLayout::insetDistance(const Arpeggio* item, const LayoutContext&
     }
 
     double maximumInset = (paddingTable.at(ElementType::ARPEGGIO).at(ElementType::ACCIDENTAL)
-                           - ctx.conf().styleMM(Sid::ArpeggioAccidentalDistanceMin)) * mag_;
+                           - ctx.conf().styleMM(Sid::arpeggioAccidentalDistanceMin)) * mag_;
 
     RectF bbox = item->symBbox(furthestAccidental->symId());
     double center = furthestAccidental->note()->pos().y() * mag_;

diff --git a/src/engraving/rendering/dev/chordlayout.cpp b/src/engraving/rendering/dev/chordlayout.cpp
@@ -336,7 +336,7 @@ void ChordLayout::layoutTablature(Chord* item, LayoutContext& ctx)
     double mag_ = item->staff() ? item->staff()->staffMag(item) : 1.0;    // palette elements do not have a staff
     double dotNoteDistance = ctx.conf().styleMM(Sid::dotNoteDistance) * mag_;
     double minNoteDistance = ctx.conf().styleMM(Sid::minNoteDistance) * mag_;
-    double minTieLength = ctx.conf().styleMM(Sid::MinTieLength) * mag_;
+    double minTieLength = ctx.conf().styleMM(Sid::minTieLength) * mag_;
 
     for (Chord* c : item->graceNotes()) {
         layoutTablature(c, ctx);

diff --git a/src/engraving/rendering/dev/horizontalspacing.cpp b/src/engraving/rendering/dev/horizontalspacing.cpp
@@ -171,7 +171,7 @@ double HorizontalSpacing::minHorizontalDistance(const Segment* f, const Segment*
             if (!e || !e->isChord()) {
                 continue;
             }
-            double headerTieMargin = f->style().styleMM(Sid::HeaderToLineStartDistance);
+            double headerTieMargin = f->style().styleMM(Sid::headerToLineStartDistance);
             for (Note* note : toChord(e)->notes()) {
                 bool tieOrGlissBack = note->spannerBack().size() || (note->tieBack() && !note->tieBack()->segmentsEmpty());
                 if (!tieOrGlissBack || note->lineAttachPoints().empty()) {
@@ -183,11 +183,11 @@ double HorizontalSpacing::minHorizontalDistance(const Segment* f, const Segment*
                 }
                 double minLength = 0.0;
                 if (attachedLine->isTie()) {
-                    minLength = f->style().styleMM(Sid::MinTieLength);
+                    minLength = f->style().styleMM(Sid::minTieLength);
                 } else if (attachedLine->isGlissando()) {
                     bool straight = toGlissando(attachedLine)->glissandoType() == GlissandoType::STRAIGHT;
-                    minLength = straight ? f->style().styleMM(Sid::MinStraightGlissandoLength)
-                                : f->style().styleMM(Sid::MinWigglyGlissandoLength);
+                    minLength = straight ? f->style().styleMM(Sid::minStraightGlissandoLength)
+                                : f->style().styleMM(Sid::minWigglyGlissandoLength);
                 }
                 double tieStartPointX = f->minRight() + headerTieMargin;
                 double notePosX = w + note->pos().x() + toChord(e)->pos().x() + note->headWidth() / 2;
@@ -423,12 +423,12 @@ void HorizontalSpacing::computeNotePadding(const Note* note, const EngravingItem
 
             double minEndPointsDistance = 0.0;
             if (laPoint1.line()->isTie()) {
-                minEndPointsDistance = style.styleMM(Sid::MinTieLength);
+                minEndPointsDistance = style.styleMM(Sid::minTieLength);
             } else if (laPoint1.line()->isGlissando()) {
                 bool straight = toGlissando(laPoint1.line())->glissandoType() == GlissandoType::STRAIGHT;
                 double minGlissandoLength = straight
-                                            ? style.styleMM(Sid::MinStraightGlissandoLength)
-                                            : style.styleMM(Sid::MinWigglyGlissandoLength);
+                                            ? style.styleMM(Sid::minStraightGlissandoLength)
+                                            : style.styleMM(Sid::minWigglyGlissandoLength);
                 minEndPointsDistance = minGlissandoLength;
             } else if (laPoint1.line()->isGuitarBend()) {
                 double minBendLength = 2 * note->spatium(); // TODO: style

diff --git a/src/engraving/rendering/dev/slurtielayout.cpp b/src/engraving/rendering/dev/slurtielayout.cpp
@@ -2357,13 +2357,13 @@ void SlurTieLayout::layoutSegment(SlurSegment* item, LayoutContext& ctx, const P
 
 void SlurTieLayout::computeMidThickness(SlurTieSegment* slurTieSeg, double slurTieLengthInSp)
 {
-    const Millimetre endWidth = slurTieSeg->isTieSegment() ? slurTieSeg->style().styleMM(Sid::TieEndWidth)
-                                : slurTieSeg->style().styleMM(Sid::SlurEndWidth);
-    const Millimetre midWidth = slurTieSeg->isTieSegment() ? slurTieSeg->style().styleMM(Sid::TieMidWidth)
-                                : slurTieSeg->style().styleMM(Sid::SlurMidWidth);
+    const Millimetre endWidth = slurTieSeg->isTieSegment() ? slurTieSeg->style().styleMM(Sid::tieEndWidth)
+                                : slurTieSeg->style().styleMM(Sid::slurEndWidth);
+    const Millimetre midWidth = slurTieSeg->isTieSegment() ? slurTieSeg->style().styleMM(Sid::tieMidWidth)
+                                : slurTieSeg->style().styleMM(Sid::slurMidWidth);
     Staff* staff = slurTieSeg->score() ? slurTieSeg->score()->staff(slurTieSeg->vStaffIdx()) : nullptr;
     const double mag = staff ? staff->staffMag(slurTieSeg->slurTie()->tick()) : 1.0;
-    const double minTieLength = mag * slurTieSeg->style().styleS(Sid::MinTieLength).val();
+    const double minTieLength = mag * slurTieSeg->style().styleS(Sid::minTieLength).val();
     const double shortTieLimit = mag * 4.0;
     const double minTieThickness = mag * (0.15 * slurTieSeg->spatium() - endWidth);
     const double normalThickness = mag * (midWidth - endWidth);