Set correct defaults for continue text

Author: miiizen

src/engraving/dom/pedal.cpp

@@ -88,6 +88,8 @@ Sid Pedal::getPropertyStyle(Pid pid) const
         return lineVisible() ? Sid::pedalEndText : Sid::pedalRosetteEndText;
     case Pid::BEGIN_TEXT:
         return beginHookType() == HookType::NONE ? Sid::pedalText : Sid::pedalHookText;
+    case Pid::CONTINUE_TEXT:
+        return beginHookType() == HookType::NONE ? Sid::pedalContinueText : Sid:: pedalContinueHookText;
     default:
         return TextLineBase::getPropertyStyle(pid);
     }
@@ -145,11 +147,7 @@ engraving::PropertyValue Pedal::propertyDefault(Pid propertyId) const
         return style().styleV(Sid::pedalLineStyle);
 
     case Pid::BEGIN_TEXT:
-        return style().styleV(getPropertyStyle(propertyId));
-
     case Pid::CONTINUE_TEXT:
-        return style().styleV(Sid::pedalContinueText);
-
     case Pid::END_TEXT:
         return style().styleV(getPropertyStyle(propertyId));
 

src/engraving/rw/read410/tread.cpp

@@ -3407,6 +3407,7 @@ void TRead::read(Pedal* p, XmlReader& e, ReadContext& ctx)
         } else if (TRead::readProperty(p, tag, e, ctx, Pid::BEGIN_HOOK_TYPE)) {
             if (p->beginHookType() != HookType::NONE) {
                 p->setBeginText(String());
+                p->setContinueText(String());
             }
         } else if (!readProperties(static_cast<TextLineBase*>(p), e, ctx)) {
             e.unknown();

src/engraving/style/styledef.cpp

@@ -286,6 +286,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::pedalText,               "pedalText",               String(u"<sym>keyboardPedalPed</sym>") },
     { Sid::pedalHookText,           "pedalHookText",           String() },
     { Sid::pedalContinueText,       "pedalContinueText",       String(u"(<sym>keyboardPedalPed</sym>)") },
+    { Sid::pedalContinueHookText,   "pedalContinueHookText",   String() },
     { Sid::pedalEndText,            "pedalEndText",            String() },
     { Sid::pedalRosetteEndText,     "pedalRosetteEndText",     String(u"<sym>keyboardPedalUp</sym>") },
 

src/engraving/style/styledef.h

@@ -300,6 +300,7 @@ enum class Sid {
     pedalText,
     pedalHookText,
     pedalContinueText,
+    pedalContinueHookText,
     pedalEndText,
     pedalRosetteEndText,
 

src/engraving/tests/spanners_data/linecolor01-ref.mscx

@@ -95,7 +95,6 @@
             <Pedal>
               <endHookType>1</endHookType>
               <beginHookType>1</beginHookType>
-              <continueText></continueText>
               <color r="255" g="0" b="0" a="255"/>
               <color r="255" g="0" b="0" a="255"/>
               <Segment>

src/engraving/tests/spanners_data/smallstaff01-ref.mscx

@@ -96,7 +96,6 @@
             <Pedal>
               <endHookType>1</endHookType>
               <beginHookType>1</beginHookType>
-              <continueText></continueText>
               <Segment>
                 <subtype>0</subtype>
                 <offset x="0" y="2.8"/>

src/importexport/mei/internal/meiconverter.cpp

@@ -2316,6 +2316,7 @@ void Convert::pedalFromMEI(engraving::Pedal* pedal, const libmei::Pedal& meiPeda
     } else {
         pedal->setBeginHookType(engraving::HookType::HOOK_90);
         pedal->setBeginText(String());
+        pedal->setContinueText(String());
         pedal->setEndHookType(engraving::HookType::HOOK_90);
     }
 

src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp

@@ -3300,6 +3300,7 @@ void MusicXMLParserDirection::pedal(const QString& type, const int /* number */,
             } else {
                 p->setBeginHookType(HookType::HOOK_90);
                 p->setBeginText(String());
+                p->setContinueText(String());
             }
             p->setEndHookType(HookType::HOOK_90);
             // if (placement == "") placement = "below";  // TODO ? set default