diff --git a/src/engraving/data/styles/legacy-style-defaults-v1.mss b/src/engraving/data/styles/legacy-style-defaults-v1.mss index ca921046dd014..56f443751b73f 100644 --- a/src/engraving/data/styles/legacy-style-defaults-v1.mss +++ b/src/engraving/data/styles/legacy-style-defaults-v1.mss @@ -1127,5 +1127,8 @@ 0 true 1.76389 + 11.0 + 11.0 + 9.0 diff --git a/src/engraving/data/styles/legacy-style-defaults-v2.mss b/src/engraving/data/styles/legacy-style-defaults-v2.mss index 09a7e6697afc6..d0feee4eb448b 100644 --- a/src/engraving/data/styles/legacy-style-defaults-v2.mss +++ b/src/engraving/data/styles/legacy-style-defaults-v2.mss @@ -1127,5 +1127,8 @@ 0 true 1.76389 + 11.0 + 11.0 + 9.0 diff --git a/src/engraving/data/styles/legacy-style-defaults-v3.mss b/src/engraving/data/styles/legacy-style-defaults-v3.mss index 7276c466efcb1..0cce56826f459 100644 --- a/src/engraving/data/styles/legacy-style-defaults-v3.mss +++ b/src/engraving/data/styles/legacy-style-defaults-v3.mss @@ -1127,5 +1127,8 @@ 0 true 1.76389 + 11.0 + 11.0 + 9.0 diff --git a/src/engraving/data/styles/legacy-style-defaults-v302.mss b/src/engraving/data/styles/legacy-style-defaults-v302.mss index e8184e2315e33..1fdff5e65f40d 100644 --- a/src/engraving/data/styles/legacy-style-defaults-v302.mss +++ b/src/engraving/data/styles/legacy-style-defaults-v302.mss @@ -1290,6 +1290,9 @@ 1 0 302 + 11.0 + 11.0 + 9.0sion> 1.74978 diff --git a/src/engraving/data/styles/migration-306-style-Edwin.mss b/src/engraving/data/styles/migration-306-style-Edwin.mss index ff1ba8c7adc8b..af43a1b3db728 100644 --- a/src/engraving/data/styles/migration-306-style-Edwin.mss +++ b/src/engraving/data/styles/migration-306-style-Edwin.mss @@ -97,5 +97,8 @@ Edwin Edwin Edwin + 11.0 + 11.0 + 9.0 diff --git a/src/engraving/data/styles/migration-306-style-Leland.mss b/src/engraving/data/styles/migration-306-style-Leland.mss index 606481b899975..c13a826fb54cb 100644 --- a/src/engraving/data/styles/migration-306-style-Leland.mss +++ b/src/engraving/data/styles/migration-306-style-Leland.mss @@ -26,5 +26,8 @@ 0.11 0.1 0.1 + 11.0 + 11.0 + 9.0 diff --git a/src/engraving/dom/dynamic.cpp b/src/engraving/dom/dynamic.cpp index 20292dcb04055..18791c4ced898 100644 --- a/src/engraving/dom/dynamic.cpp +++ b/src/engraving/dom/dynamic.cpp @@ -107,7 +107,6 @@ const std::vector Dynamic::DYN_LIST = { static const ElementStyle dynamicsStyle { { Sid::dynamicsMinDistance, Pid::MIN_DISTANCE }, { Sid::avoidBarLines, Pid::AVOID_BARLINES }, - { Sid::dynamicsSize, Pid::DYNAMICS_SIZE }, { Sid::centerOnNotehead, Pid::CENTER_ON_NOTEHEAD }, }; @@ -133,7 +132,6 @@ Dynamic::Dynamic(const Dynamic& d) m_changeInVelocity = d.m_changeInVelocity; m_velChangeSpeed = d.m_velChangeSpeed; _avoidBarLines = d._avoidBarLines; - _dynamicsSize = d._dynamicsSize; _centerOnNotehead = d._centerOnNotehead; } @@ -461,8 +459,6 @@ PropertyValue Dynamic::getProperty(Pid propertyId) const return m_velChangeSpeed; case Pid::AVOID_BARLINES: return avoidBarLines(); - case Pid::DYNAMICS_SIZE: - return _dynamicsSize; case Pid::CENTER_ON_NOTEHEAD: return _centerOnNotehead; case Pid::PLAY: @@ -502,9 +498,6 @@ bool Dynamic::setProperty(Pid propertyId, const PropertyValue& v) case Pid::AVOID_BARLINES: setAvoidBarLines(v.toBool()); break; - case Pid::DYNAMICS_SIZE: - _dynamicsSize = v.toDouble(); - break; case Pid::CENTER_ON_NOTEHEAD: _centerOnNotehead = v.toBool(); break; @@ -648,7 +641,7 @@ Shape Dynamic::symShapeWithCutouts(SymId id) const { Staff* stf = staff(); double staffMag = stf ? stf->staffMag(tick()) : 1.0; - Shape shape = score()->engravingFont()->shapeWithCutouts(id, magS() * staffMag * dynamicsSize()); + Shape shape = score()->engravingFont()->shapeWithCutouts(id, magS() * staffMag * symbolScale()); for (ShapeElement& element : shape.elements()) { element.setItem(this); } diff --git a/src/engraving/dom/dynamic.h b/src/engraving/dom/dynamic.h index f3f6136f02b24..0373c8196c97b 100644 --- a/src/engraving/dom/dynamic.h +++ b/src/engraving/dom/dynamic.h @@ -141,7 +141,6 @@ class Dynamic final : public TextBase private: M_PROPERTY(bool, avoidBarLines, setAvoidBarLines) - M_PROPERTY(double, dynamicsSize, setDynamicsSize) M_PROPERTY(bool, centerOnNotehead, setCenterOnNotehead) std::pair parseDynamicText(const String&) const; diff --git a/src/engraving/dom/expression.cpp b/src/engraving/dom/expression.cpp index e8aa0114c51da..006c953214e0b 100644 --- a/src/engraving/dom/expression.cpp +++ b/src/engraving/dom/expression.cpp @@ -80,7 +80,7 @@ double Expression::computeDynamicExpressionDistance(const Dynamic* snappedDyn) c String dynamicTextString = snappedDyn->xmlText(); String f = String::fromStdString("dynamicForte"); double distance = (dynamicTextString.endsWith(f) ? 0.2 : 0.5) * spatium(); - distance *= 0.5 * (snappedDyn->dynamicsSize() + (size() / 10)); + distance *= 0.5 * (snappedDyn->symbolScale() + (size() / 10)); return distance; } diff --git a/src/engraving/dom/textbase.cpp b/src/engraving/dom/textbase.cpp index 49ba81301e977..019d32770ae06 100644 --- a/src/engraving/dom/textbase.cpp +++ b/src/engraving/dom/textbase.cpp @@ -23,6 +23,7 @@ #include #include +#include "dom/harppedaldiagram.h" #include "draw/fontmetrics.h" #include "iengravingfont.h" @@ -877,37 +878,22 @@ Font TextFragment::font(const TextBase* t) const String family; Font::Type fontType = Font::Type::Unknown; if (format.fontFamily() == "ScoreText") { - if (t->isDynamic() - || t->isStringTunings() - || t->isPlayTechAnnotation() - || t->textStyleType() == TextStyleType::OTTAVA - || t->textStyleType() == TextStyleType::HARP_PEDAL_DIAGRAM - || t->textStyleType() == TextStyleType::TUPLET - || t->textStyleType() == TextStyleType::PEDAL - ) { + if (t->hasSymbolScale()) { std::string fontName = engravingFonts()->fontByName(t->style().styleSt(Sid::musicalSymbolFont).toStdString())->family(); family = String::fromStdString(fontName); fontType = Font::Type::MusicSymbol; - if (!t->isStringTunings()) { - m = MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE; - if (t->isDynamic()) { - m *= t->getProperty(Pid::DYNAMICS_SIZE).toDouble() * spatiumScaling; - if (t->style().styleB(Sid::dynamicsOverrideFont)) { - std::string fontName2 = engravingFonts()->fontByName(t->style().styleSt(Sid::dynamicsFont).toStdString())->family(); - family = String::fromStdString(fontName2); - } - } else { - for (const auto& a : *textStyle(t->textStyleType())) { - if (a.type == TextStylePropertyType::MusicalSymbolsScale) { - m *= t->style().styleD(a.sid); - if (t->sizeIsSpatiumDependent()) { - m *= spatiumScaling; - } - break; - } - } - } + + m = MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE; + m *= t->getProperty(Pid::MUSICAL_SYMBOLS_SCALE).toDouble(); + if (t->sizeIsSpatiumDependent()) { + m *= spatiumScaling; } + + if (t->style().styleB(Sid::dynamicsOverrideFont)) { + std::string fontName2 = engravingFonts()->fontByName(t->style().styleSt(Sid::dynamicsFont).toStdString())->family(); + family = String::fromStdString(fontName2); + } + // We use a default font size of 10pt for historical reasons, // but SMuFL standard is 20pt so multiply x2 here. m *= 2; @@ -918,9 +904,6 @@ Font TextFragment::font(const TextBase* t) const if (t->sizeIsSpatiumDependent()) { m *= spatiumScaling; } - } else { - family = t->style().styleSt(Sid::musicalTextFont); - fontType = Font::Type::MusicSymbolText; } // check if all symbols are available font.setFamily(family, fontType); @@ -2627,6 +2610,8 @@ PropertyValue TextBase::getProperty(Pid propertyId) const return voiceAssignment(); case Pid::MUSIC_SYMBOL_SIZE: return symbolSize(); + case Pid::MUSICAL_SYMBOLS_SCALE: + return symbolScale(); default: return EngravingItem::getProperty(propertyId); } @@ -2716,6 +2701,9 @@ bool TextBase::setProperty(Pid pid, const PropertyValue& v) case Pid::MUSIC_SYMBOL_SIZE: setSymbolSize(v.toDouble()); break; + case Pid::MUSICAL_SYMBOLS_SCALE: + setSymbolScale(v.toDouble()); + break; default: rv = EngravingItem::setProperty(pid, v); break; @@ -2763,8 +2751,6 @@ PropertyValue TextBase::propertyDefault(Pid id) const return AutoOnOff::AUTO; case Pid::VOICE_ASSIGNMENT: return VoiceAssignment::ALL_VOICE_IN_INSTRUMENT; - case Pid::MUSIC_SYMBOL_SIZE: - return styleValue(Pid::FONT_SIZE, getPropertyStyle(Pid::FONT_SIZE)); default: for (const auto& p : *textStyle(TextStyleType::DEFAULT)) { if (p.pid == id) { @@ -3082,8 +3068,6 @@ void TextBase::initTextStyleType(TextStyleType tid) for (const auto& p : *textStyle(tid)) { setProperty(getTextPID(p.pid), styleValue(p.pid, p.sid)); } - - resetProperty(Pid::MUSIC_SYMBOL_SIZE); } RectF TextBase::drag(EditData& ed) @@ -3408,4 +3392,17 @@ void TextBase::undoChangeProperty(Pid id, const PropertyValue& v, PropertyFlags } } } + +bool mu::engraving::TextBase::hasSymbolScale() const +{ + bool hasSymbolScale = isDynamic() + || isStringTunings() + || isPlayTechAnnotation() + || (isHarpPedalDiagram() && toHarpPedalDiagram(this)->isDiagram()) + || (parent() && parent()->isOttavaSegment()) + || (parent() && parent()->isTuplet()) + || (parent() && parent()->isPedalSegment()); + + return hasSymbolScale; +} } diff --git a/src/engraving/dom/textbase.h b/src/engraving/dom/textbase.h index 44c404e4965ac..ba4da45fad8a7 100644 --- a/src/engraving/dom/textbase.h +++ b/src/engraving/dom/textbase.h @@ -498,7 +498,12 @@ class TextBase : public EngravingItem double symbolSize() const { return m_symbolSize; } void setSymbolSize(double v) { m_symbolSize = v; } - inline bool hasSymbolSize() const { return isMarker() || isTempoText() || isSystemText() || isStaffText(); } + + double symbolScale() const { return m_symbolScale; } + void setSymbolScale(double v) { m_symbolScale = v; } + + bool hasSymbolScale() const; + bool hasSymbolSize() const { return !hasSymbolScale(); } protected: TextBase(const ElementType& type, EngravingItem* parent = 0, TextStyleType tid = TextStyleType::DEFAULT, @@ -561,6 +566,7 @@ class TextBase : public EngravingItem bool m_primed = 0; double m_symbolSize = 18.0; + double m_symbolScale = 1.0; TextCursor* m_cursor = nullptr; diff --git a/src/engraving/rendering/score/alignmentlayout.cpp b/src/engraving/rendering/score/alignmentlayout.cpp index 324e6341ba121..0509309ec06af 100644 --- a/src/engraving/rendering/score/alignmentlayout.cpp +++ b/src/engraving/rendering/score/alignmentlayout.cpp @@ -212,7 +212,7 @@ double AlignmentLayout::yOpticalCenter(const EngravingItem* item) break; case AlignV::BASELINE: if (item->isDynamic()) { - curY -= 0.46 * item->spatium() * toDynamic(item)->dynamicsSize(); // approximated half x-height of dynamic + curY -= 0.46 * item->spatium() * toDynamic(item)->symbolScale(); // approximated half x-height of dynamic } else { curY -= 0.5 * toExpression(item)->fontMetrics().xHeight(); } diff --git a/src/engraving/rw/compat/compatutils.cpp b/src/engraving/rw/compat/compatutils.cpp index 6bd239c4857c5..2ae8f15571be4 100644 --- a/src/engraving/rw/compat/compatutils.cpp +++ b/src/engraving/rw/compat/compatutils.cpp @@ -47,6 +47,7 @@ #include "dom/textline.h" #include "editing/transpose.h" #include "style/styledef.h" +#include "dom/tempotext.h" #include "engraving/style/textstyle.h" @@ -977,3 +978,39 @@ void CompatUtils::setTextLineTextPositionFromAlign(TextLineBase* tl) tl->setPropertyFlags(Pid::END_TEXT_POSITION, PropertyFlags::UNSTYLED); } } + +void mu::engraving::compat::CompatUtils::setMusicSymbolSize470(MStyle& style) +{ + // Music symbols have their own point size in 4.7 + // Initialize this to the text type's default font size + for (TextStyleType textStyleType : allTextStyles()) { + if (textStyleType == TextStyleType::REPEAT_LEFT || textStyleType == TextStyleType::REPEAT_RIGHT) { + continue; + } + + const TextStyle* ts = textStyle(textStyleType); + Sid musicSymbolSizeSid = Sid::NOSTYLE; + Sid fontSizeSid = Sid::NOSTYLE; + + for (size_t i = 0; i < TEXT_STYLE_SIZE; ++i) { + if (ts->at(i).pid == Pid::MUSIC_SYMBOL_SIZE) { + musicSymbolSizeSid = ts->at(i).sid; + } + + if (ts->at(i).pid == Pid::FONT_SIZE) { + fontSizeSid = ts->at(i).sid; + } + } + + if (musicSymbolSizeSid == Sid::NOSTYLE || fontSizeSid == Sid::NOSTYLE) { + continue; + } + + double size = style.value(fontSizeSid).toDouble(); + if (textStyleType == TextStyleType::TEMPO) { + size *= TempoText::DEFAULT_SYM_SIZE_RATIO; + } + + style.set(musicSymbolSizeSid, size); + } +} diff --git a/src/engraving/rw/compat/compatutils.h b/src/engraving/rw/compat/compatutils.h index 5a405029140f9..3ae479ae89f6d 100644 --- a/src/engraving/rw/compat/compatutils.h +++ b/src/engraving/rw/compat/compatutils.h @@ -49,6 +49,7 @@ class CompatUtils static const std::map ALIGN_VALS_TO_CONVERT; static Sid positionStyleFromAlign(Sid align); static void setTextLineTextPositionFromAlign(TextLineBase* tl); + static void setMusicSymbolSize470(MStyle& style); private: static void replaceStaffTextWithPlayTechniqueAnnotation(MasterScore* score); diff --git a/src/engraving/rw/read400/tread.cpp b/src/engraving/rw/read400/tread.cpp index 419ff550b5929..8c0624fb5570a 100644 --- a/src/engraving/rw/read400/tread.cpp +++ b/src/engraving/rw/read400/tread.cpp @@ -574,8 +574,9 @@ void TRead::read(Dynamic* d, XmlReader& e, ReadContext& ctx) d->setVelChangeSpeed(TConv::fromXml(e.readAsciiText(), DynamicSpeed::NORMAL)); } else if (tag == "size" && mscVersion < 400) { e.skipCurrentElement(); + } else if (tag == "dynamicsSize") { + d->setSymbolScale(e.readDouble()); } else if (readProperty(d, tag, e, ctx, Pid::AVOID_BARLINES)) { - } else if (readProperty(d, tag, e, ctx, Pid::DYNAMICS_SIZE)) { } else if (readProperty(d, tag, e, ctx, Pid::CENTER_ON_NOTEHEAD)) { } else if (!readProperties(static_cast(d), e, ctx)) { e.unknown(); diff --git a/src/engraving/rw/read410/tread.cpp b/src/engraving/rw/read410/tread.cpp index 8d026e6e038fd..5a8804d54672a 100644 --- a/src/engraving/rw/read410/tread.cpp +++ b/src/engraving/rw/read410/tread.cpp @@ -779,8 +779,9 @@ void TRead::read(Dynamic* d, XmlReader& e, ReadContext& ctx) d->setVelChangeSpeed(TConv::fromXml(e.readAsciiText(), DynamicSpeed::NORMAL)); } else if (tag == "play") { d->setPlayDynamic(e.readBool()); + } else if (tag == "dynamicsSize") { + d->setSymbolScale(e.readDouble()); } else if (readProperty(d, tag, e, ctx, Pid::AVOID_BARLINES)) { - } else if (readProperty(d, tag, e, ctx, Pid::DYNAMICS_SIZE)) { } else if (readProperty(d, tag, e, ctx, Pid::CENTER_ON_NOTEHEAD)) { } else if (readProperty(d, tag, e, ctx, Pid::ANCHOR_TO_END_OF_PREVIOUS)) { } else if (!readProperties(static_cast(d), e, ctx)) { diff --git a/src/engraving/rw/read460/tread.cpp b/src/engraving/rw/read460/tread.cpp index 3a0d7ffe509af..9fab2155084bd 100644 --- a/src/engraving/rw/read460/tread.cpp +++ b/src/engraving/rw/read460/tread.cpp @@ -774,8 +774,9 @@ void TRead::read(Dynamic* d, XmlReader& e, ReadContext& ctx) d->setVelChangeSpeed(TConv::fromXml(e.readAsciiText(), DynamicSpeed::NORMAL)); } else if (tag == "play") { d->setPlayDynamic(e.readBool()); + } else if (ctx.mscVersion() < 470 && tag == "dynamicsSize") { + d->setSymbolScale(e.readDouble()); } else if (readProperty(d, tag, e, ctx, Pid::AVOID_BARLINES)) { - } else if (readProperty(d, tag, e, ctx, Pid::DYNAMICS_SIZE)) { } else if (readProperty(d, tag, e, ctx, Pid::CENTER_ON_NOTEHEAD)) { } else if (readProperty(d, tag, e, ctx, Pid::ANCHOR_TO_END_OF_PREVIOUS)) { } else if (!readProperties(static_cast(d), e, ctx)) { @@ -4467,6 +4468,7 @@ bool TRead::readProperties(TextBase* t, XmlReader& e, ReadContext& ctx) } else if (readProperty(t, tag, e, ctx, Pid::DIRECTION)) { } else if (readProperty(t, tag, e, ctx, Pid::CENTER_BETWEEN_STAVES)) { } else if (readProperty(t, tag, e, ctx, Pid::MUSIC_SYMBOL_SIZE)) { + } else if (readProperty(t, tag, e, ctx, Pid::MUSICAL_SYMBOLS_SCALE)) { } else if (!readItemProperties(t, e, ctx)) { return false; } diff --git a/src/engraving/rw/write/twrite.cpp b/src/engraving/rw/write/twrite.cpp index f3c6872e8491c..1c2cfad9a6442 100644 --- a/src/engraving/rw/write/twrite.cpp +++ b/src/engraving/rw/write/twrite.cpp @@ -1245,7 +1245,6 @@ void TWrite::write(const Dynamic* item, XmlWriter& xml, WriteContext& ctx) writeProperty(item, xml, Pid::DYNAMIC_TYPE); writeProperty(item, xml, Pid::VELOCITY); writeProperty(item, xml, Pid::AVOID_BARLINES); - writeProperty(item, xml, Pid::DYNAMICS_SIZE); writeProperty(item, xml, Pid::CENTER_ON_NOTEHEAD); writeProperty(item, xml, Pid::PLAY); writeProperty(item, xml, Pid::ANCHOR_TO_END_OF_PREVIOUS); @@ -1285,9 +1284,6 @@ void TWrite::writeProperties(const TextBase* item, XmlWriter& xml, WriteContext& writeProperty(item, xml, spp.pid); } } - if (item->hasSymbolSize()) { - writeProperty(item, xml, Pid::MUSIC_SYMBOL_SIZE); - } for (const auto& spp : *textStyle(item->textStyleType())) { if (item->isStyled(spp.pid) || (spp.pid == Pid::FONT_SIZE && item->getProperty(spp.pid).toDouble() == TextBase::UNDEFINED_FONT_SIZE) diff --git a/src/engraving/style/style.cpp b/src/engraving/style/style.cpp index 71b502de7f70f..fd730ad01cf98 100644 --- a/src/engraving/style/style.cpp +++ b/src/engraving/style/style.cpp @@ -628,6 +628,9 @@ void MStyle::read(XmlReader& e, compat::ReadChordListHook* readChordListHook, in if (mscVersion < 470) { set(Sid::dividerLeftAlignToSystemBarline, false); set(Sid::dividerRightAlignToSystemBarline, false); + + // Musical symbol size + compat::CompatUtils::setMusicSymbolSize470(*this); } if (mscVersion < 460) { diff --git a/src/engraving/style/styledef.cpp b/src/engraving/style/styledef.cpp index b382e5e5cdbc5..84cc5f68fcdcb 100644 --- a/src/engraving/style/styledef.cpp +++ b/src/engraving/style/styledef.cpp @@ -132,7 +132,6 @@ const std::array StyleDef::styleValue styleDef(figuredBassFontFamily, String(u"MScoreBC")), - //styleDef(figuredBassFontSize, PropertyValue(8.0)), styleDef(figuredBassYOffset, 6.0), styleDef(figuredBassLineHeight, 1.0), styleDef(figuredBassAlignment, 0), @@ -1977,6 +1976,81 @@ const std::array StyleDef::styleValue styleDef(chordlineThickness, 0.16_sp), styleDef(dummyMusicalSymbolsScale, 1.0), + styleDef(dummyMusicalSymbolSize, 12.0), + + styleDef(articulationMusicalSymbolSize, 8.0), + styleDef(bendMusicalSymbolSize, 8.0), + styleDef(chordSymbolAMusicalSymbolSize, 10.0), + styleDef(chordSymbolBMusicalSymbolSize, 10.0), + styleDef(composerMusicalSymbolSize, 10.0), + styleDef(copyrightMusicalSymbolSize, 9.0), + styleDef(defaultMusicalSymbolSize, 10.0), + styleDef(dynamicsMusicalSymbolSize, 10.0), + styleDef(expressionMusicalSymbolSize, 10.0), + styleDef(figuredBassMusicalSymbolSize, 8.0), + styleDef(fingeringMusicalSymbolSize, 8.0), + styleDef(footerMusicalSymbolSize, 9.0), + styleDef(frameMusicalSymbolSize, 10.0), + styleDef(fretDiagramFingeringMusicalSymbolSize, 6.0), + styleDef(fretDiagramFretNumberMusicalSymbolSize, 6.0), + styleDef(glissandoMusicalSymbolSize, 8.0), + styleDef(hairpinMusicalSymbolSize, 10.0), + styleDef(hammerOnPullOffTappingMusicalSymbolSize, 8.0), + styleDef(harpPedalDiagramMusicalSymbolSize, 10.0), + styleDef(harpPedalTextDiagramMusicalSymbolSize, 8.0), + styleDef(headerMusicalSymbolSize, 9.0), + styleDef(instrumentChangeMusicalSymbolSize, 10.0), + styleDef(letRingMusicalSymbolSize, 10.0), + styleDef(lhGuitarFingeringMusicalSymbolSize, 8.0), + styleDef(longInstrumentMusicalSymbolSize, 10.0), + styleDef(lyricistMusicalSymbolSize, 10.0), + styleDef(lyricsEvenMusicalSymbolSize, 10.0), + styleDef(lyricsOddMusicalSymbolSize, 10.0), + styleDef(measureNumberAlternateMusicalSymbolSize, 10.0), + styleDef(measureNumberMusicalSymbolSize, 8.0), + styleDef(metronomeMusicalSymbolSize, 12.0), + styleDef(mmRestRangeMusicalSymbolSize, 8.0), + styleDef(nashvilleNumberMusicalSymbolSize, 12.0), + styleDef(noteLineMusicalSymbolSize, 10.0), + styleDef(ottavaMusicalSymbolSize, 10.0), + styleDef(pageNumberMusicalSymbolSize, 11.0), + styleDef(palmMuteMusicalSymbolSize, 10.0), + styleDef(partInstrumentMusicalSymbolSize, 14.0), + styleDef(pedalMusicalSymbolSize, 10.0), + styleDef(rehearsalMarkMusicalSymbolSize, 14.0), + styleDef(repeatLeftMusicalSymbolSize, 18.0), + styleDef(repeatPlayCountMusicalSymbolSize, 10.0), + styleDef(repeatRightMusicalSymbolSize, 18.0), + styleDef(rhGuitarFingeringMusicalSymbolSize, 8.0), + styleDef(romanNumeralMusicalSymbolSize, 12.0), + styleDef(shortInstrumentMusicalSymbolSize, 10.0), + styleDef(staffTextMusicalSymbolSize, 10.0), + styleDef(stickingMusicalSymbolSize, 10.0), + styleDef(stringNumberMusicalSymbolSize, 8.0), + styleDef(stringTuningsMusicalSymbolSize, 9.0), + styleDef(subTitleMusicalSymbolSize, 14.0), + styleDef(systemTextLineMusicalSymbolSize, 10.0), + styleDef(systemTextMusicalSymbolSize, 10.0), + styleDef(tabFretNumberMusicalSymbolSize, 9.0), + styleDef(tempoChangeMusicalSymbolSize, 12.0), + styleDef(tempoMusicalSymbolSize, 20.0), + styleDef(textLineMusicalSymbolSize, 10.0), + styleDef(titleMusicalSymbolSize, 22.0), + styleDef(translatorMusicalSymbolSize, 10.0), + styleDef(tupletMusicalSymbolSize, 9.0), + styleDef(user1MusicalSymbolSize, 10.0), + styleDef(user2MusicalSymbolSize, 10.0), + styleDef(user3MusicalSymbolSize, 10.0), + styleDef(user4MusicalSymbolSize, 10.0), + styleDef(user5MusicalSymbolSize, 10.0), + styleDef(user6MusicalSymbolSize, 10.0), + styleDef(user7MusicalSymbolSize, 10.0), + styleDef(user8MusicalSymbolSize, 10.0), + styleDef(user9MusicalSymbolSize, 10.0), + styleDef(user10MusicalSymbolSize, 10.0), + styleDef(user11MusicalSymbolSize, 10.0), + styleDef(user12MusicalSymbolSize, 10.0), + styleDef(voltaMusicalSymbolSize, 11.0), styleDef(autoplaceEnabled, true), styleDef(defaultsVersion, Constants::MSC_VERSION), diff --git a/src/engraving/style/styledef.h b/src/engraving/style/styledef.h index 2b1141adb67d0..5e77de9f9ac52 100644 --- a/src/engraving/style/styledef.h +++ b/src/engraving/style/styledef.h @@ -149,7 +149,6 @@ enum class Sid : short { lyricsEvenPosition, figuredBassFontFamily, - // figuredBassFontSize, figuredBassYOffset, figuredBassLineHeight, figuredBassAlignment, @@ -1994,6 +1993,81 @@ enum class Sid : short { chordlineThickness, dummyMusicalSymbolsScale, + dummyMusicalSymbolSize, + + articulationMusicalSymbolSize, + bendMusicalSymbolSize, + chordSymbolAMusicalSymbolSize, + chordSymbolBMusicalSymbolSize, + composerMusicalSymbolSize, + copyrightMusicalSymbolSize, + defaultMusicalSymbolSize, + dynamicsMusicalSymbolSize, + expressionMusicalSymbolSize, + figuredBassMusicalSymbolSize, + fingeringMusicalSymbolSize, + footerMusicalSymbolSize, + frameMusicalSymbolSize, + fretDiagramFingeringMusicalSymbolSize, + fretDiagramFretNumberMusicalSymbolSize, + glissandoMusicalSymbolSize, + hairpinMusicalSymbolSize, + hammerOnPullOffTappingMusicalSymbolSize, + harpPedalDiagramMusicalSymbolSize, + harpPedalTextDiagramMusicalSymbolSize, + headerMusicalSymbolSize, + instrumentChangeMusicalSymbolSize, + letRingMusicalSymbolSize, + lhGuitarFingeringMusicalSymbolSize, + longInstrumentMusicalSymbolSize, + lyricistMusicalSymbolSize, + lyricsEvenMusicalSymbolSize, + lyricsOddMusicalSymbolSize, + measureNumberAlternateMusicalSymbolSize, + measureNumberMusicalSymbolSize, + metronomeMusicalSymbolSize, + mmRestRangeMusicalSymbolSize, + nashvilleNumberMusicalSymbolSize, + noteLineMusicalSymbolSize, + ottavaMusicalSymbolSize, + pageNumberMusicalSymbolSize, + palmMuteMusicalSymbolSize, + partInstrumentMusicalSymbolSize, + pedalMusicalSymbolSize, + rehearsalMarkMusicalSymbolSize, + repeatLeftMusicalSymbolSize, + repeatPlayCountMusicalSymbolSize, + repeatRightMusicalSymbolSize, + rhGuitarFingeringMusicalSymbolSize, + romanNumeralMusicalSymbolSize, + shortInstrumentMusicalSymbolSize, + staffTextMusicalSymbolSize, + stickingMusicalSymbolSize, + stringNumberMusicalSymbolSize, + stringTuningsMusicalSymbolSize, + subTitleMusicalSymbolSize, + systemTextLineMusicalSymbolSize, + systemTextMusicalSymbolSize, + tabFretNumberMusicalSymbolSize, + tempoChangeMusicalSymbolSize, + tempoMusicalSymbolSize, + textLineMusicalSymbolSize, + titleMusicalSymbolSize, + translatorMusicalSymbolSize, + tupletMusicalSymbolSize, + user1MusicalSymbolSize, + user2MusicalSymbolSize, + user3MusicalSymbolSize, + user4MusicalSymbolSize, + user5MusicalSymbolSize, + user6MusicalSymbolSize, + user7MusicalSymbolSize, + user8MusicalSymbolSize, + user9MusicalSymbolSize, + user10MusicalSymbolSize, + user11MusicalSymbolSize, + user12MusicalSymbolSize, + voltaMusicalSymbolSize, autoplaceEnabled, defaultsVersion, diff --git a/src/engraving/style/textstyle.cpp b/src/engraving/style/textstyle.cpp index a569cf58163d1..8b762072619a7 100644 --- a/src/engraving/style/textstyle.cpp +++ b/src/engraving/style/textstyle.cpp @@ -43,6 +43,7 @@ const TextStyle defaultTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::defaultFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::defaultFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::defaultMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::defaultPosition, Pid::POSITION }, } }; @@ -62,6 +63,7 @@ const TextStyle titleTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::titleFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::titleFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::titleMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::titlePosition, Pid::POSITION }, } }; @@ -81,6 +83,7 @@ const TextStyle subTitleTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::subTitleFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::subTitleFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::subTitleMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::subTitlePosition, Pid::POSITION }, } }; @@ -100,6 +103,7 @@ const TextStyle composerTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::composerFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::composerFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::composerMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::composerPosition, Pid::POSITION }, } }; @@ -119,6 +123,7 @@ const TextStyle lyricistTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::lyricistFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::lyricistFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::lyricistMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::lyricistPosition, Pid::POSITION }, } }; @@ -138,6 +143,7 @@ const TextStyle lyricsEvenTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::lyricsEvenFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::lyricsEvenFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::lyricsEvenMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::lyricsEvenPosition, Pid::POSITION }, } }; @@ -157,6 +163,7 @@ const TextStyle lyricsOddTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::lyricsOddFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::lyricsOddFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::lyricsOddMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::lyricsOddPosition, Pid::POSITION }, } }; @@ -176,6 +183,7 @@ const TextStyle fingeringTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::fingeringFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::fingeringFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::fingeringMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::fingeringPosition, Pid::POSITION }, } }; @@ -194,6 +202,7 @@ const TextStyle tabFretNumberTextStyle { { { TextStylePropertyType::FrameRound, Sid::tabFretNumberFrameRound, Pid::FRAME_ROUND }, { TextStylePropertyType::FrameBorderColor, Sid::tabFretNumberFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::tabFretNumberFrameBgColor, Pid::FRAME_BG_COLOR }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::tabFretNumberMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, } }; @@ -213,6 +222,7 @@ const TextStyle lhGuitarFingeringTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::lhGuitarFingeringFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::lhGuitarFingeringFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::lhGuitarFingeringMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::lhGuitarFingeringPosition, Pid::POSITION }, } }; @@ -232,7 +242,8 @@ const TextStyle rhGuitarFingeringTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::rhGuitarFingeringFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::rhGuitarFingeringFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, - { TextStylePropertyType::Position, Sid::rhGuitarFingeringPosition, Pid::POSITION }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::rhGuitarFingeringMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, + { TextStylePropertyType::Position, Sid::rhGuitarFingeringPosition, Pid::POSITION }, } }; const TextStyle hammerOnPullOffTextStyle { { @@ -250,7 +261,8 @@ const TextStyle hammerOnPullOffTextStyle { { { TextStylePropertyType::FrameRound, Sid::hammerOnPullOffTappingFrameRound, Pid::FRAME_ROUND }, { TextStylePropertyType::FrameBorderColor, Sid::hammerOnPullOffTappingFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::hammerOnPullOffTappingFrameBgColor, Pid::FRAME_BG_COLOR }, - { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::hammerOnPullOffTappingMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, + { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, } }; const TextStyle stringNumberTextStyle { { @@ -269,6 +281,7 @@ const TextStyle stringNumberTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::stringNumberFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::stringNumberFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::stringNumberMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::stringNumberPosition, Pid::POSITION }, } }; @@ -288,6 +301,7 @@ const TextStyle stringTuningsStyle { { // identical to staffText except for font { TextStylePropertyType::FrameBorderColor, Sid::staffTextFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::staffTextFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::stringTuningsMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, } }; const TextStyle fretDiagramFingeringStyle { { @@ -306,6 +320,7 @@ const TextStyle fretDiagramFingeringStyle { { { TextStylePropertyType::FrameBorderColor, Sid::fretDiagramFingeringFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::fretDiagramFingeringFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::fretDiagramFingeringMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::fretDiagramFingeringPosition, Pid::POSITION }, } }; @@ -325,6 +340,7 @@ const TextStyle fretDiagramFretNumberStyle { { { TextStylePropertyType::FrameBorderColor, Sid::fretDiagramFretNumberFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::fretDiagramFretNumberFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::fretDiagramFretNumberMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, } }; const TextStyle harpPedalDiagramTextStyle { { @@ -343,6 +359,7 @@ const TextStyle harpPedalDiagramTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::harpPedalDiagramFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::harpPedalDiagramFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::harpPedalDiagramMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::harpPedalDiagramMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::harpPedalDiagramPosition, Pid::POSITION }, } }; @@ -361,7 +378,8 @@ const TextStyle articulationTextStyle { { { TextStylePropertyType::FrameRound, Sid::articulationFrameRound, Pid::FRAME_ROUND }, { TextStylePropertyType::FrameBorderColor, Sid::articulationFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::articulationFrameBgColor, Pid::FRAME_BG_COLOR }, - { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::articulationMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, } }; const TextStyle harpPedalTextDiagramTextStyle { { @@ -380,6 +398,7 @@ const TextStyle harpPedalTextDiagramTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::harpPedalTextDiagramFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::harpPedalTextDiagramFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::harpPedalTextDiagramMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::harpPedalTextDiagramPosition, Pid::POSITION }, } }; @@ -399,6 +418,7 @@ const TextStyle longInstrumentTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::longInstrumentFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::longInstrumentFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::longInstrumentMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::longInstrumentPosition, Pid::POSITION }, } }; @@ -418,7 +438,8 @@ const TextStyle shortInstrumentTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::shortInstrumentFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::shortInstrumentFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, - { TextStylePropertyType::Position, Sid::shortInstrumentPosition, Pid::POSITION }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::shortInstrumentMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, + { TextStylePropertyType::Position, Sid::shortInstrumentPosition, Pid::POSITION }, } }; const TextStyle partInstrumentTextStyle { { @@ -437,7 +458,8 @@ const TextStyle partInstrumentTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::partInstrumentFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::partInstrumentFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, - { TextStylePropertyType::Position, Sid::partInstrumentPosition, Pid::POSITION }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::partInstrumentMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, + { TextStylePropertyType::Position, Sid::partInstrumentPosition, Pid::POSITION }, } }; // With the single exception of text alignment, after 4.1 Dynamics use Expression text style @@ -457,6 +479,7 @@ const TextStyle dynamicsTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::expressionFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::expressionFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::dynamicsMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::dynamicsPosition, Pid::POSITION }, } }; @@ -476,6 +499,7 @@ const TextStyle expressionTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::expressionFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::expressionFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::expressionMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::expressionPosition, Pid::POSITION }, } }; @@ -495,6 +519,7 @@ const TextStyle tempoTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::tempoFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::tempoFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::tempoMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::tempoPosition, Pid::POSITION }, } }; @@ -514,6 +539,7 @@ const TextStyle tempoChangeTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::tempoChangeFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::tempoChangeFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::tempoChangeMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::tempoChangePosition, Pid::POSITION }, } }; @@ -533,6 +559,7 @@ const TextStyle metronomeTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::metronomeFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::metronomeFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::metronomeMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, } }; const TextStyle measureNumberTextStyle { { @@ -551,6 +578,7 @@ const TextStyle measureNumberTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::measureNumberFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::measureNumberFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::measureNumberMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::measureNumberPosition, Pid::POSITION }, } }; @@ -569,7 +597,8 @@ const TextStyle measureNumberAlternateTextStyle { { { TextStylePropertyType::FrameRound, Sid::measureNumberAlternateFrameRound, Pid::FRAME_ROUND }, { TextStylePropertyType::FrameBorderColor, Sid::measureNumberAlternateFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::measureNumberAlternateFrameBgColor, Pid::FRAME_BG_COLOR }, - { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::measureNumberAlternateMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::measureNumberAlternatePosition, Pid::POSITION }, } }; @@ -588,6 +617,7 @@ const TextStyle mmRestRangeTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::mmRestRangeFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::mmRestRangeFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::mmRestRangeMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::mmRestRangePosition, Pid::POSITION }, } }; @@ -607,6 +637,7 @@ const TextStyle translatorTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::translatorFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::translatorFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::translatorMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::translatorPosition, Pid::POSITION }, } }; @@ -626,6 +657,7 @@ const TextStyle tupletTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::tupletFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::tupletFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::tupletMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::tupletMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::tupletPosition, Pid::POSITION }, } }; @@ -645,6 +677,7 @@ const TextStyle systemTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::systemTextFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::systemTextFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::systemTextMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::systemTextPosition, Pid::POSITION }, } }; @@ -664,6 +697,7 @@ const TextStyle staffTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::staffTextFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::staffTextFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::staffTextMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::staffTextPosition, Pid::POSITION }, } }; @@ -683,6 +717,7 @@ const TextStyle chordSymbolTextStyleA { { { TextStylePropertyType::FrameBorderColor, Sid::chordSymbolAFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::chordSymbolAFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::chordSymbolAMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::chordSymPosition, Pid::POSITION }, } }; @@ -702,6 +737,7 @@ const TextStyle chordSymbolTextStyleB { { { TextStylePropertyType::FrameBorderColor, Sid::chordSymbolBFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::chordSymbolBFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::chordSymbolBMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::chordSymPosition, Pid::POSITION }, } }; @@ -721,6 +757,7 @@ const TextStyle romanNumeralTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::romanNumeralFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::romanNumeralFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::romanNumeralMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::chordSymPosition, Pid::POSITION }, } }; @@ -740,6 +777,7 @@ const TextStyle nashvilleNumberTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::nashvilleNumberFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::nashvilleNumberFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::nashvilleNumberMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::chordSymPosition, Pid::POSITION }, } }; @@ -759,6 +797,7 @@ const TextStyle rehearsalMarkTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::rehearsalMarkFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::rehearsalMarkFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::rehearsalMarkMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::rehearsalMarkPosition, Pid::POSITION }, } }; @@ -778,6 +817,7 @@ const TextStyle repeatPlayCountTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::repeatPlayCountFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::repeatPlayCountFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::repeatPlayCountMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::repeatPlayCountPosition, Pid::POSITION }, } }; @@ -797,6 +837,7 @@ const TextStyle repeatLeftTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::repeatLeftFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::repeatLeftFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::repeatLeftMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::repeatLeftPosition, Pid::POSITION }, } }; @@ -816,6 +857,7 @@ const TextStyle repeatRightTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::repeatRightFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::repeatRightFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::repeatRightMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::repeatRightPosition, Pid::POSITION }, } }; @@ -835,6 +877,7 @@ const TextStyle frameTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::frameFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::frameFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::frameMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::framePosition, Pid::POSITION }, } }; @@ -854,6 +897,7 @@ const TextStyle textLineTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::textLineFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::textLineFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::textLineMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::textLinePosition, Pid::BEGIN_TEXT_POSITION }, } }; @@ -873,6 +917,7 @@ const TextStyle systemTextLineTextStyle { { { 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::MusicalSymbolsSize, Sid::systemTextLineMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::systemTextLinePosition, Pid::POSITION }, } }; @@ -892,6 +937,7 @@ const TextStyle noteLineTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::noteLineFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::noteLineFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::noteLineMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::noteLinePosition, Pid::POSITION }, } }; @@ -911,6 +957,7 @@ const TextStyle glissandoTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::glissandoFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::glissandoFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::glissandoMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::glissandoPosition, Pid::POSITION }, } }; @@ -930,6 +977,7 @@ const TextStyle ottavaTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::ottavaFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::ottavaFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::ottavaMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::ottavaMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::ottavaPosition, Pid::BEGIN_TEXT_POSITION }, } }; @@ -949,6 +997,7 @@ const TextStyle voltaTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::voltaFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::voltaFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::voltaMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::voltaPosition, Pid::BEGIN_TEXT_POSITION }, } }; @@ -968,6 +1017,7 @@ const TextStyle pedalTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::pedalFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::pedalFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::pedalMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::pedalMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::pedalPosition, Pid::BEGIN_TEXT_POSITION }, } }; @@ -987,6 +1037,7 @@ const TextStyle letRingTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::letRingFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::letRingFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::letRingMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::letRingPosition, Pid::BEGIN_TEXT_POSITION }, } }; @@ -1006,6 +1057,7 @@ const TextStyle palmMuteTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::palmMuteFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::palmMuteFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::palmMuteMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::palmMutePosition, Pid::BEGIN_TEXT_POSITION }, } }; @@ -1025,6 +1077,7 @@ const TextStyle hairpinTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::hairpinFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::hairpinFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::hairpinMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::hairpinPosition, Pid::BEGIN_TEXT_POSITION }, } }; @@ -1044,6 +1097,7 @@ const TextStyle bendTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::bendFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::bendFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::bendMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::bendPosition, Pid::POSITION }, } }; @@ -1063,6 +1117,7 @@ const TextStyle headerTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::headerFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::headerFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::headerMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::headerPosition, Pid::POSITION }, } }; @@ -1082,6 +1137,7 @@ const TextStyle footerTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::footerFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::footerFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::footerMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::footerPosition, Pid::POSITION }, } }; @@ -1101,6 +1157,7 @@ const TextStyle copyrightTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::copyrightFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::copyrightFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::copyrightMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::copyrightPosition, Pid::POSITION }, } }; @@ -1120,6 +1177,7 @@ const TextStyle pageNumberTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::pageNumberFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::pageNumberFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::pageNumberMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::pageNumberPosition, Pid::POSITION }, } }; @@ -1139,6 +1197,7 @@ const TextStyle instrumentChangeTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::instrumentChangeFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::instrumentChangeFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::instrumentChangeMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::instrumentChangePosition, Pid::POSITION }, } }; @@ -1158,6 +1217,7 @@ const TextStyle stickingTextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::stickingFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::stickingFrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::stickingMusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::stickingPosition, Pid::POSITION }, } }; @@ -1177,6 +1237,7 @@ const TextStyle user1TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user1FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user1FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user1MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user1Position, Pid::POSITION }, } }; @@ -1196,6 +1257,7 @@ const TextStyle user2TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user2FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user2FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user2MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user2Position, Pid::POSITION }, } }; @@ -1215,6 +1277,7 @@ const TextStyle user3TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user3FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user3FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user3MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user3Position, Pid::POSITION }, } }; @@ -1234,6 +1297,7 @@ const TextStyle user4TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user4FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user4FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user4MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user4Position, Pid::POSITION }, } }; @@ -1253,6 +1317,7 @@ const TextStyle user5TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user5FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user5FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user5MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user5Position, Pid::POSITION }, } }; @@ -1272,6 +1337,7 @@ const TextStyle user6TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user6FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user6FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user6MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user6Position, Pid::POSITION }, } }; @@ -1291,6 +1357,7 @@ const TextStyle user7TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user7FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user7FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user7MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user7Position, Pid::POSITION }, } }; @@ -1310,6 +1377,7 @@ const TextStyle user8TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user8FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user8FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user8MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user8Position, Pid::POSITION }, } }; @@ -1329,6 +1397,7 @@ const TextStyle user9TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user9FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user9FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user9MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user9Position, Pid::POSITION }, } }; @@ -1348,6 +1417,7 @@ const TextStyle user10TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user10FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user10FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user10MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user10Position, Pid::POSITION }, } }; @@ -1367,6 +1437,7 @@ const TextStyle user11TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user11FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user11FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user11MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user11Position, Pid::POSITION }, } }; @@ -1386,6 +1457,7 @@ const TextStyle user12TextStyle { { { TextStylePropertyType::FrameBorderColor, Sid::user12FrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::user12FrameBgColor, Pid::FRAME_BG_COLOR }, { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsSize, Sid::user12MusicalSymbolSize, Pid::MUSIC_SYMBOL_SIZE }, { TextStylePropertyType::Position, Sid::user12Position, Pid::POSITION }, } }; diff --git a/src/engraving/style/textstyle.h b/src/engraving/style/textstyle.h index 0e7cd8a835fbd..c7d8d134c210b 100644 --- a/src/engraving/style/textstyle.h +++ b/src/engraving/style/textstyle.h @@ -19,8 +19,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef MU_ENGRAVING_TEXTSTYLE_H -#define MU_ENGRAVING_TEXTSTYLE_H +#pragma once #include "styledef.h" #include "../types/types.h" @@ -43,6 +42,7 @@ enum class TextStylePropertyType : char { FrameBorderColor, FrameFillColor, MusicalSymbolsScale, + MusicalSymbolsSize, Position }; @@ -52,7 +52,7 @@ struct TextStyleProperty { Pid pid; }; -constexpr size_t TEXT_STYLE_SIZE = 16; +constexpr size_t TEXT_STYLE_SIZE = 17; typedef std::array TextStyle; @@ -61,5 +61,3 @@ const std::vector& allTextStyles(); const std::vector& editableTextStyles(); const std::vector& primaryTextStyles(); } - -#endif // MU_ENGRAVING_TEXTSTYLE_H diff --git a/src/engraving/tests/beam_data/beamStemDir-01-ref.mscx b/src/engraving/tests/beam_data/beamStemDir-01-ref.mscx index a0797da5bb60b..ccc17e7a832bd 100644 --- a/src/engraving/tests/beam_data/beamStemDir-01-ref.mscx +++ b/src/engraving/tests/beam_data/beamStemDir-01-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/beam_data/flatBeams-ref.mscx b/src/engraving/tests/beam_data/flatBeams-ref.mscx index f3e58fcc3bcc2..f401580c271d1 100644 --- a/src/engraving/tests/beam_data/flatBeams-ref.mscx +++ b/src/engraving/tests/beam_data/flatBeams-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/beam_data/flipBeamStemDir-01-ref.mscx b/src/engraving/tests/beam_data/flipBeamStemDir-01-ref.mscx index ade3ee921c6d5..266b275c83118 100644 --- a/src/engraving/tests/beam_data/flipBeamStemDir-01-ref.mscx +++ b/src/engraving/tests/beam_data/flipBeamStemDir-01-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypaste27-ref.mscx b/src/engraving/tests/copypaste_data/copypaste27-ref.mscx index 10502d6384ce7..664ac916e2ee1 100644 --- a/src/engraving/tests/copypaste_data/copypaste27-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste27-ref.mscx @@ -6,6 +6,7 @@ 1 diff --git a/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx index 7f363b193c4fd..d9e93e4d45938 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx index 7f363b193c4fd..d9e93e4d45938 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx index 7f363b193c4fd..d9e93e4d45938 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx index 7f363b193c4fd..d9e93e4d45938 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx index da1f78e0a1908..cf0aefdceb269 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx index da1f78e0a1908..cf0aefdceb269 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx index 94f523187c26f..6c5774902baf7 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx index 52a7376321256..19b8bc5b77a43 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx index 2babbaba13cbd..8a6c9bf319039 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx index 28ddcd0d5c957..aa97ec86faf99 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx @@ -12,6 +12,7 @@ 1 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx index 4127dba42960e..47216c55332a6 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/copypaste_data/copypasteSplit01-ref.mscx b/src/engraving/tests/copypaste_data/copypasteSplit01-ref.mscx index 9b51244f30b9d..84eb3cc4e2a94 100644 --- a/src/engraving/tests/copypaste_data/copypasteSplit01-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteSplit01-ref.mscx @@ -6,6 +6,7 @@ 1 diff --git a/src/engraving/tests/copypaste_data/copypasteSplit02-ref.mscx b/src/engraving/tests/copypaste_data/copypasteSplit02-ref.mscx index bacfa8d4c6685..45ada0600eadb 100644 --- a/src/engraving/tests/copypaste_data/copypasteSplit02-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteSplit02-ref.mscx @@ -6,6 +6,7 @@ 1 diff --git a/src/engraving/tests/copypaste_data/copypasteSplit03-ref.mscx b/src/engraving/tests/copypaste_data/copypasteSplit03-ref.mscx index fe10bc2eb3e9d..446f03287de5f 100644 --- a/src/engraving/tests/copypaste_data/copypasteSplit03-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteSplit03-ref.mscx @@ -6,6 +6,7 @@ 1 diff --git a/src/engraving/tests/dynamic_tests.cpp b/src/engraving/tests/dynamic_tests.cpp index b431e153de1c5..d669498cb8432 100644 --- a/src/engraving/tests/dynamic_tests.cpp +++ b/src/engraving/tests/dynamic_tests.cpp @@ -84,10 +84,10 @@ TEST_F(Engraving_DynamicTests, test1) d = static_cast(ScoreRW::writeReadElement(dynamic)); EXPECT_EQ(d->avoidBarLines(), false); - dynamic->setProperty(Pid::DYNAMICS_SIZE, 0.5); - dynamic->setPropertyFlags(Pid::DYNAMICS_SIZE, PropertyFlags::UNSTYLED); + dynamic->setProperty(Pid::MUSICAL_SYMBOLS_SCALE, 0.5); + dynamic->setPropertyFlags(Pid::MUSICAL_SYMBOLS_SCALE, PropertyFlags::UNSTYLED); d = static_cast(ScoreRW::writeReadElement(dynamic)); - EXPECT_EQ(d->dynamicsSize(), 0.5); + EXPECT_EQ(d->symbolScale(), 0.5); dynamic->setProperty(Pid::CENTER_ON_NOTEHEAD, true); dynamic->setPropertyFlags(Pid::CENTER_ON_NOTEHEAD, PropertyFlags::UNSTYLED); diff --git a/src/engraving/tests/expression_data/expression-1-ref.mscx b/src/engraving/tests/expression_data/expression-1-ref.mscx index 48c6476734caa..88c3d051bbcc3 100644 --- a/src/engraving/tests/expression_data/expression-1-ref.mscx +++ b/src/engraving/tests/expression_data/expression-1-ref.mscx @@ -6,6 +6,7 @@ 1 diff --git a/src/engraving/tests/expression_data/expression-2-ref.mscx b/src/engraving/tests/expression_data/expression-2-ref.mscx index 2f7f5f714eefe..5b0ea581bdf92 100644 --- a/src/engraving/tests/expression_data/expression-2-ref.mscx +++ b/src/engraving/tests/expression_data/expression-2-ref.mscx @@ -6,6 +6,7 @@ 1 diff --git a/src/engraving/tests/harpdiagrams_data/textdiagram01-ref.mscx b/src/engraving/tests/harpdiagrams_data/textdiagram01-ref.mscx index 1850ff90fd4df..b8045a550fd70 100644 --- a/src/engraving/tests/harpdiagrams_data/textdiagram01-ref.mscx +++ b/src/engraving/tests/harpdiagrams_data/textdiagram01-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/keysig_data/keysig03-ref.mscx b/src/engraving/tests/keysig_data/keysig03-ref.mscx index 371cda42a0085..04c03fe2e13d9 100644 --- a/src/engraving/tests/keysig_data/keysig03-ref.mscx +++ b/src/engraving/tests/keysig_data/keysig03-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx b/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx index 41bc2f3d81061..052ecb6fed696 100644 --- a/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx b/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx index 403583a49faca..a8979f6cf8bd5 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx b/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx index ebfde0a038acd..fd15bcefe15e0 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_key_undo-ref.mscx b/src/engraving/tests/measure_data/measure-insert_bf_key_undo-ref.mscx index bdfe9cd3ebc1b..3e37a33d05d89 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_key_undo-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_key_undo-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/measure_data/mmrest-ref.mscx b/src/engraving/tests/measure_data/mmrest-ref.mscx index a3ac00a5c3012..4c754dc3fb4a2 100644 --- a/src/engraving/tests/measure_data/mmrest-ref.mscx +++ b/src/engraving/tests/measure_data/mmrest-ref.mscx @@ -22,6 +22,7 @@ 1 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx b/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx index 37e574c7afbda..92810cdea6734 100644 --- a/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx +++ b/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx @@ -21,6 +21,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-del.mscx b/src/engraving/tests/parts_data/part-measure-repeat-del.mscx index 4af214bbed3c3..cef348ef120fd 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-del.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-del.mscx @@ -204,6 +204,27 @@ 0.5 + 10 + 10 + 10 + 9 + 10 + 10 + 9 + 10 + 9 + 10 + 10 + 10 + 10 + 10 + 11 + 14 + 10 + 10 + 22 + 10 + 9 301 1 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx b/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx index 57091ade1e4be..a97f92ba14004 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx @@ -204,6 +204,27 @@ 0.5 + 10 + 10 + 10 + 9 + 10 + 10 + 9 + 10 + 9 + 10 + 10 + 10 + 10 + 10 + 11 + 14 + 10 + 10 + 22 + 10 + 9 301 1 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx b/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx index 013087956809c..c0195842259ba 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx @@ -204,6 +204,27 @@ 0.5 + 10 + 10 + 10 + 9 + 10 + 10 + 9 + 10 + 9 + 10 + 10 + 10 + 10 + 10 + 11 + 14 + 10 + 10 + 22 + 10 + 9 301 1 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx b/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx index 4af214bbed3c3..cef348ef120fd 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx @@ -204,6 +204,27 @@ 0.5 + 10 + 10 + 10 + 9 + 10 + 10 + 9 + 10 + 9 + 10 + 10 + 10 + 10 + 10 + 11 + 14 + 10 + 10 + 22 + 10 + 9 301 1 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat.mscx b/src/engraving/tests/parts_data/part-measure-repeat.mscx index 5269d91d69877..96e555cb663d8 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat.mscx @@ -204,6 +204,27 @@ 0.5 + 10 + 10 + 10 + 9 + 10 + 10 + 9 + 10 + 9 + 10 + 10 + 10 + 10 + 10 + 11 + 14 + 10 + 10 + 22 + 10 + 9 301 1 1 diff --git a/src/engraving/tests/parts_data/partPropertyLinking-part-1.mscx b/src/engraving/tests/parts_data/partPropertyLinking-part-1.mscx index bec1a9889479d..d0927e2442aa7 100644 --- a/src/engraving/tests/parts_data/partPropertyLinking-part-1.mscx +++ b/src/engraving/tests/parts_data/partPropertyLinking-part-1.mscx @@ -63,12 +63,11 @@ mf 80 - 1.2 R_R H_H 0 0 - 1.2 + 1.2 S_S diff --git a/src/engraving/tests/parts_data/partStyle-score-ref.mscx b/src/engraving/tests/parts_data/partStyle-score-ref.mscx index c18d12634571a..e55dcc8f74aa3 100644 --- a/src/engraving/tests/parts_data/partStyle-score-ref.mscx +++ b/src/engraving/tests/parts_data/partStyle-score-ref.mscx @@ -11,6 +11,7 @@ Arial 48 1 + 48 301 1.364 diff --git a/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx b/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx index a2c1450842889..10ba3052a70f5 100644 --- a/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx +++ b/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx @@ -10,6 +10,7 @@ Arial 48 1 + 48 301 1.364 @@ -334,6 +335,7 @@ Arial 48 1 + 48 301 1.76389 @@ -546,6 +548,7 @@ Arial 48 1 + 48 301 1.76389 diff --git a/src/engraving/tests/parts_tests.cpp b/src/engraving/tests/parts_tests.cpp index 0d1989290c251..f5ec6a09cfeaf 100644 --- a/src/engraving/tests/parts_tests.cpp +++ b/src/engraving/tests/parts_tests.cpp @@ -1218,7 +1218,7 @@ TEST_F(Engraving_PartsTests, partPropertyLinking) EXPECT_TRUE(testItem); testItem->undoChangeProperty(Pid::PLACEMENT, PropertyValue::fromValue(PlacementV::ABOVE), PropertyFlags::NOSTYLE); - testItem->undoChangeProperty(Pid::DYNAMICS_SIZE, PropertyValue::fromValue(1.2), PropertyFlags::NOSTYLE); + testItem->undoChangeProperty(Pid::MUSICAL_SYMBOLS_SCALE, PropertyValue::fromValue(1.2), PropertyFlags::NOSTYLE); EXPECT_FALSE(testItem->isPositionLinkedToMaster()); EXPECT_FALSE(testItem->isAppearanceLinkedToMaster()); diff --git a/src/engraving/tests/selectionrange_data/selectionrangedelete06_partialnestedtuplets-ref.mscx b/src/engraving/tests/selectionrange_data/selectionrangedelete06_partialnestedtuplets-ref.mscx index 66bdddd66dbfa..3a65e8e81cf5f 100644 --- a/src/engraving/tests/selectionrange_data/selectionrangedelete06_partialnestedtuplets-ref.mscx +++ b/src/engraving/tests/selectionrange_data/selectionrangedelete06_partialnestedtuplets-ref.mscx @@ -11,6 +11,7 @@ 0 9 0 + 9 0 0 0 diff --git a/src/engraving/tests/split_data/split184061-keep-tie-ref.mscx b/src/engraving/tests/split_data/split184061-keep-tie-ref.mscx index 9654d3c2e8bdb..3f2591fa55c2c 100644 --- a/src/engraving/tests/split_data/split184061-keep-tie-ref.mscx +++ b/src/engraving/tests/split_data/split184061-keep-tie-ref.mscx @@ -32,6 +32,18 @@ 10 10 FreeSerif + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 16.6667 + 10 + 10 301 1.76389 diff --git a/src/engraving/tests/split_data/split184061-no-tie-ref.mscx b/src/engraving/tests/split_data/split184061-no-tie-ref.mscx index c7d18a7563841..10e6b57dba91c 100644 --- a/src/engraving/tests/split_data/split184061-no-tie-ref.mscx +++ b/src/engraving/tests/split_data/split184061-no-tie-ref.mscx @@ -32,6 +32,18 @@ 10 10 FreeSerif + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 16.6667 + 10 + 10 301 1.76389 diff --git a/src/inspector/models/notation/dynamics/dynamicsettingsmodel.cpp b/src/inspector/models/notation/dynamics/dynamicsettingsmodel.cpp index 20807f773703e..844b494c217d8 100644 --- a/src/inspector/models/notation/dynamics/dynamicsettingsmodel.cpp +++ b/src/inspector/models/notation/dynamics/dynamicsettingsmodel.cpp @@ -42,11 +42,11 @@ void DynamicsSettingsModel::createProperties() InspectorModelWithVoiceAndPositionOptions::createProperties(); m_avoidBarLines = buildPropertyItem(Pid::AVOID_BARLINES); - m_dynamicSize = buildPropertyItem(Pid::DYNAMICS_SIZE, - [this](const Pid pid, const QVariant& newValue) { + m_dynamicScale = buildPropertyItem(Pid::MUSICAL_SYMBOLS_SCALE, + [this](const Pid pid, const QVariant& newValue) { onPropertyValueChanged(pid, newValue.toDouble() / 100); }, - [this](const Sid sid, const QVariant& newValue) { + [this](const Sid sid, const QVariant& newValue) { updateStyleValue(sid, newValue.toDouble() / 100); emit requestReloadPropertyItems(); }); @@ -73,7 +73,7 @@ void DynamicsSettingsModel::loadProperties() InspectorModelWithVoiceAndPositionOptions::loadProperties(); loadPropertyItem(m_avoidBarLines); - loadPropertyItem(m_dynamicSize, [](const QVariant& elementPropertyValue) -> QVariant { + loadPropertyItem(m_dynamicScale, [](const QVariant& elementPropertyValue) -> QVariant { return muse::DataFormatter::roundDouble(elementPropertyValue.toDouble()) * 100; }); loadPropertyItem(m_centerOnNotehead); @@ -93,7 +93,7 @@ void DynamicsSettingsModel::resetProperties() InspectorModelWithVoiceAndPositionOptions::resetProperties(); m_avoidBarLines->resetToDefault(); - m_dynamicSize->resetToDefault(); + m_dynamicScale->resetToDefault(); m_centerOnNotehead->resetToDefault(); m_frameType->resetToDefault(); @@ -109,9 +109,9 @@ PropertyItem* DynamicsSettingsModel::avoidBarLines() const return m_avoidBarLines; } -PropertyItem* DynamicsSettingsModel::dynamicSize() const +PropertyItem* DynamicsSettingsModel::dynamicScale() const { - return m_dynamicSize; + return m_dynamicScale; } PropertyItem* DynamicsSettingsModel::centerOnNotehead() const diff --git a/src/inspector/models/notation/dynamics/dynamicsettingsmodel.h b/src/inspector/models/notation/dynamics/dynamicsettingsmodel.h index db352e7ad4e3d..bb97eec38c0b9 100644 --- a/src/inspector/models/notation/dynamics/dynamicsettingsmodel.h +++ b/src/inspector/models/notation/dynamics/dynamicsettingsmodel.h @@ -29,7 +29,7 @@ class DynamicsSettingsModel : public InspectorModelWithVoiceAndPositionOptions Q_OBJECT Q_PROPERTY(PropertyItem * avoidBarLines READ avoidBarLines CONSTANT) - Q_PROPERTY(PropertyItem * dynamicSize READ dynamicSize CONSTANT) + Q_PROPERTY(PropertyItem * dynamicScale READ dynamicScale CONSTANT) Q_PROPERTY(PropertyItem * centerOnNotehead READ centerOnNotehead CONSTANT) // Frame-related settings @@ -49,7 +49,7 @@ class DynamicsSettingsModel : public InspectorModelWithVoiceAndPositionOptions void resetProperties() override; PropertyItem* avoidBarLines() const; - PropertyItem* dynamicSize() const; + PropertyItem* dynamicScale() const; PropertyItem* centerOnNotehead() const; PropertyItem* frameType() const; @@ -64,7 +64,7 @@ class DynamicsSettingsModel : public InspectorModelWithVoiceAndPositionOptions private: PropertyItem* m_avoidBarLines = nullptr; - PropertyItem* m_dynamicSize = nullptr; + PropertyItem* m_dynamicScale = nullptr; PropertyItem* m_centerOnNotehead = nullptr; PropertyItem* m_frameType = nullptr; diff --git a/src/inspector/models/text/textsettingsmodel.cpp b/src/inspector/models/text/textsettingsmodel.cpp index 41d8dc8b5507f..3f31c9fe34761 100644 --- a/src/inspector/models/text/textsettingsmodel.cpp +++ b/src/inspector/models/text/textsettingsmodel.cpp @@ -96,6 +96,12 @@ void TextSettingsModel::createProperties() m_horizontalPosition = buildPropertyItem(textPositionId, onPropertyChanged, nullptr, onPropertyReset); m_symbolSize = buildPropertyItem(mu::engraving::Pid::MUSIC_SYMBOL_SIZE); + m_symbolScale = buildPropertyItem(mu::engraving::Pid::MUSICAL_SYMBOLS_SCALE, [this](const Pid pid, const QVariant& newValue) { + onPropertyValueChanged(pid, newValue.toDouble() / 100); + }, [this](const Sid sid, const QVariant& newValue) { + updateStyleValue(sid, newValue.toDouble() / 100); + emit requestReloadPropertyItems(); + }); m_isSizeSpatiumDependent = buildPropertyItem(mu::engraving::Pid::SIZE_SPATIUM_DEPENDENT); m_frameType = buildPropertyItem(mu::engraving::Pid::FRAME_TYPE, [this](const mu::engraving::Pid pid, const QVariant& newValue) { @@ -136,6 +142,7 @@ void TextSettingsModel::loadProperties() Pid::ALIGN, Pid::POSITION, Pid::MUSIC_SYMBOL_SIZE, + Pid::MUSICAL_SYMBOLS_SCALE, Pid::TEXT_SIZE_SPATIUM_DEPENDENT, Pid::FRAME_TYPE, Pid::FRAME_BG_COLOR, @@ -156,6 +163,7 @@ void TextSettingsModel::loadProperties() Pid::BEGIN_TEXT_ALIGN, Pid::BEGIN_TEXT_POSITION, Pid::MUSIC_SYMBOL_SIZE, + Pid::MUSICAL_SYMBOLS_SCALE, Pid::TEXT_SIZE_SPATIUM_DEPENDENT, Pid::FRAME_TYPE, Pid::FRAME_BG_COLOR, @@ -224,6 +232,12 @@ void TextSettingsModel::loadProperties(const PropertyIdSet& propertyIdSet) loadPropertyItem(m_symbolSize); } + if (muse::contains(propertyIdSet, Pid::MUSICAL_SYMBOLS_SCALE)) { + loadPropertyItem(m_symbolScale, [](const QVariant& elementPropertyValue) -> QVariant { + return static_cast(muse::DataFormatter::roundDouble(elementPropertyValue.toDouble() * 100.0)); + }); + } + if (muse::contains(propertyIdSet, Pid::TEXT_SIZE_SPATIUM_DEPENDENT)) { loadPropertyItem(m_isSizeSpatiumDependent); } @@ -287,6 +301,7 @@ void TextSettingsModel::resetProperties() m_textLineSpacing->resetToDefault(); m_isSizeSpatiumDependent->resetToDefault(); m_symbolSize->resetToDefault(); + m_symbolScale->resetToDefault(); m_frameType->resetToDefault(); m_frameBorderColor->resetToDefault(); @@ -376,6 +391,11 @@ PropertyItem* TextSettingsModel::symbolSize() const return m_symbolSize; } +PropertyItem* TextSettingsModel::symbolScale() const +{ + return m_symbolScale; +} + PropertyItem* TextSettingsModel::isSizeSpatiumDependent() const { return m_isSizeSpatiumDependent; diff --git a/src/inspector/models/text/textsettingsmodel.h b/src/inspector/models/text/textsettingsmodel.h index 9ec5c3cacca70..6491ee652a812 100644 --- a/src/inspector/models/text/textsettingsmodel.h +++ b/src/inspector/models/text/textsettingsmodel.h @@ -45,6 +45,7 @@ class TextSettingsModel : public AbstractInspectorModel Q_PROPERTY(PropertyItem * horizontalPosition READ horizontalPosition CONSTANT) Q_PROPERTY(PropertyItem * symbolSize READ symbolSize CONSTANT) + Q_PROPERTY(PropertyItem * symbolScale READ symbolScale CONSTANT) Q_PROPERTY(PropertyItem * isSizeSpatiumDependent READ isSizeSpatiumDependent CONSTANT) Q_PROPERTY(PropertyItem * frameType READ frameType CONSTANT) Q_PROPERTY(PropertyItem * frameBorderColor READ frameBorderColor CONSTANT) @@ -96,6 +97,7 @@ class TextSettingsModel : public AbstractInspectorModel PropertyItem* horizontalPosition() const; PropertyItem* symbolSize() const; + PropertyItem* symbolScale() const; PropertyItem* isSizeSpatiumDependent() const; PropertyItem* frameType() const; PropertyItem* frameBorderColor() const; @@ -179,6 +181,7 @@ public slots: PropertyItem* m_horizontalPosition = nullptr; PropertyItem* m_symbolSize = nullptr; + PropertyItem* m_symbolScale = nullptr; PropertyItem* m_isSizeSpatiumDependent = nullptr; PropertyItem* m_frameType = nullptr; PropertyItem* m_frameBorderColor = nullptr; diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/dynamics/DynamicsSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/dynamics/DynamicsSettings.qml index a2224614d8881..ce597a03c4042 100644 --- a/src/inspector/view/qml/MuseScore/Inspector/notation/dynamics/DynamicsSettings.qml +++ b/src/inspector/view/qml/MuseScore/Inspector/notation/dynamics/DynamicsSettings.qml @@ -46,7 +46,7 @@ Column { } SpinBoxPropertyView { - id: dynamicSize + id: dynamicScale anchors.left: parent.left @@ -56,7 +56,7 @@ Column { titleText: qsTrc("inspector", "Scale") measureUnitsSymbol: "%" - propertyItem: root.model ? root.model.dynamicSize : null + propertyItem: root.model ? root.model.dynamicScale : null decimals: 0 step: 1 @@ -69,7 +69,7 @@ Column { navigationName: "Avoid barlines" navigationPanel: root.navigationPanel - navigationRowStart: dynamicSize.navigationRowEnd + 1 + navigationRowStart: dynamicScale.navigationRowEnd + 1 titleText: qsTrc("inspector", "Avoid barlines") propertyItem: root.model ? root.model.avoidBarLines : null diff --git a/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml index 9d6ed6952488c..e7cf9aeb36dc5 100644 --- a/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml +++ b/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml @@ -63,6 +63,27 @@ Column { maxValue: 1000 } + SpinBoxPropertyView { + id: symbolScale + + anchors.left: parent.left + + navigationName: "Scale" + navigationPanel: root.navigationPanel + navigationRowStart: root.navigationRowStart + 1 + + titleText: qsTrc("inspector", "Scale") + measureUnitsSymbol: "%" + propertyItem: root.model ? root.model.symbolScale: null + visible: root.model ? !root.model.isSymbolSizeAvailable : false + + + decimals: 0 + step: 1 + minValue: 0 + maxValue: 1000 + } + Item { height: childrenRect.height width: parent.width @@ -76,7 +97,7 @@ Column { navigation.name: "Scale with staff size" navigation.panel: root.navigationPanel - navigation.row: symbolSize.navigationRowEnd + 1 + navigation.row: root.model.isSymbolSizeAvailable ? symbolSize.navigationRowEnd : symbolScale.navigationRowEnd + 1 text: qsTrc("inspector", "Scale with staff size") propertyItem: root.model ? root.model.isSizeSpatiumDependent : null diff --git a/src/notation/view/widgets/editstyle.cpp b/src/notation/view/widgets/editstyle.cpp index db64d5bae80d4..e990bd378da0c 100644 --- a/src/notation/view/widgets/editstyle.cpp +++ b/src/notation/view/widgets/editstyle.cpp @@ -1117,6 +1117,15 @@ EditStyle::EditStyle(QWidget* parent) textStyleValueChanged(TextStylePropertyType::MusicalSymbolsScale, textStyleMusicalSymbolsScale->value()); }); + // musical symbols size + WidgetUtils::setWidgetIcon(resetTextStyleMusicalSymbolsSize, IconCode::Code::UNDO); + connect(resetTextStyleMusicalSymbolsSize, &QToolButton::clicked, this, [=]() { + resetTextStyle(TextStylePropertyType::MusicalSymbolsSize); + }); + connect(textStyleMusicalSymbolsSize, &QDoubleSpinBox::valueChanged, this, [=]() { + textStyleValueChanged(TextStylePropertyType::MusicalSymbolsSize, textStyleMusicalSymbolsSize->value()); + }); + // line spacing WidgetUtils::setWidgetIcon(resetTextStyleLineSpacing, IconCode::Code::UNDO); connect(resetTextStyleLineSpacing, &QToolButton::clicked, this, [=]() { @@ -2751,6 +2760,11 @@ void EditStyle::textStyleChanged(int row) resetTextStyleMusicalSymbolsScale->setEnabled(styleValue(a.sid) != defaultStyleValue(a.sid)); break; + case TextStylePropertyType::MusicalSymbolsSize: + textStyleMusicalSymbolsSize->setValue(styleValue(a.sid).toDouble()); + resetTextStyleMusicalSymbolsSize->setEnabled(styleValue(a.sid) != defaultStyleValue(a.sid)); + break; + case TextStylePropertyType::FontStyle: textStyleFontStyle->setFontStyle(FontStyle(styleValue(a.sid).toInt())); resetTextStyleFontStyle->setEnabled(styleValue(a.sid) != defaultStyleValue(a.sid)); diff --git a/src/notation/view/widgets/editstyle.ui b/src/notation/view/widgets/editstyle.ui index 91ca4dd4d22ff..e9817fa69c503 100644 --- a/src/notation/view/widgets/editstyle.ui +++ b/src/notation/view/widgets/editstyle.ui @@ -12602,10 +12602,10 @@ followed by dashes Edit text style - + - + Offset: @@ -12628,7 +12628,7 @@ followed by dashes - + Style: @@ -12651,7 +12651,7 @@ followed by dashes - + Reset to default @@ -12678,7 +12678,7 @@ followed by dashes - + Color: @@ -12688,7 +12688,7 @@ followed by dashes - + @@ -12945,6 +12945,46 @@ followed by dashes + + + + + + Musical symbols size: + + + textStyleMusicalSymbolsSize + + + + + + + false + + + pt + + + 1.000000000000000 + + + + + + + Reset to default + + + Reset 'Musical symbols size' value + + + + + + + + @@ -12971,7 +13011,7 @@ followed by dashes - + Reset to default @@ -13023,7 +13063,7 @@ followed by dashes - + Reset to default @@ -13036,7 +13076,7 @@ followed by dashes - + Reset to default @@ -13049,7 +13089,7 @@ followed by dashes - + Qt::FocusPolicy::StrongFocus @@ -13079,7 +13119,7 @@ followed by dashes - + Align: @@ -13089,10 +13129,10 @@ followed by dashes - + - + @@ -13141,7 +13181,7 @@ followed by dashes - +