Fix GH#23119: Ensure TextLineBase properties are written for hairpins

Backport of musescore#23125
Jojo-Schmitz · Aug 11, 2024 · c71d801 · c71d801
1 parent 7068b40
commit c71d801
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/libmscore/hairpin.cpp b/libmscore/hairpin.cpp
@@ -585,7 +585,10 @@ Hairpin::Hairpin(Score* s)
       initElementStyle(&hairpinStyle);
 
       resetProperty(Pid::BEGIN_TEXT_PLACE);
+      resetProperty(Pid::END_TEXT_PLACE);
       resetProperty(Pid::CONTINUE_TEXT_PLACE);
+      resetProperty(Pid::BEGIN_HOOK_HEIGHT);
+      resetProperty(Pid::END_HOOK_HEIGHT);
       resetProperty(Pid::HAIRPIN_TYPE);
       resetProperty(Pid::LINE_VISIBLE);
 
@@ -671,18 +674,10 @@ void Hairpin::write(XmlWriter& xml) const
       writeProperty(xml, Pid::VELO_CHANGE);
       writeProperty(xml, Pid::HAIRPIN_CIRCLEDTIP);
       writeProperty(xml, Pid::DYNAMIC_RANGE);
-//      writeProperty(xml, Pid::BEGIN_TEXT);
-      writeProperty(xml, Pid::END_TEXT);
-//      writeProperty(xml, Pid::CONTINUE_TEXT);
-      writeProperty(xml, Pid::LINE_VISIBLE);
       writeProperty(xml, Pid::SINGLE_NOTE_DYNAMICS);
       writeProperty(xml, Pid::VELO_CHANGE_METHOD);
 
-      for (const StyledProperty& spp : *styledProperties()) {
-            if (!isStyled(spp.pid))
-                  writeProperty(xml, spp.pid);
-            }
-      SLine::writeProperties(xml);
+      TextLineBase::writeProperties(xml);
       xml.etag();
       }
 
@@ -840,6 +835,7 @@ QVariant Hairpin::propertyDefault(Pid id) const
 
             case Pid::BEGIN_TEXT_PLACE:
             case Pid::CONTINUE_TEXT_PLACE:
+            case Pid::END_TEXT_PLACE:
                   return int(PlaceText::LEFT);
 
             case Pid::BEGIN_TEXT_OFFSET:
@@ -853,7 +849,7 @@ QVariant Hairpin::propertyDefault(Pid id) const
 
             case Pid::BEGIN_HOOK_HEIGHT:
             case Pid::END_HOOK_HEIGHT:
-                  return Spatium(0.0);
+                  return Spatium(1.9);
 
             case Pid::LINE_VISIBLE:
                   return true;

diff --git a/mtest/musicxml/io/testInferredCrescLines2_ref.mscx b/mtest/musicxml/io/testInferredCrescLines2_ref.mscx
@@ -140,8 +140,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>3</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>
@@ -672,8 +672,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>2</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>
@@ -1293,8 +1293,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>3</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>

diff --git a/mtest/musicxml/io/testInferredCrescLines_ref.mscx b/mtest/musicxml/io/testInferredCrescLines_ref.mscx
@@ -140,8 +140,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>2</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>
@@ -251,8 +251,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>2</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>
@@ -300,8 +300,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>2</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>
@@ -446,8 +446,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>3</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>
@@ -551,8 +551,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>2</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>

diff --git a/mtest/musicxml/io/testInferredDynamicsExpression_ref.mscx b/mtest/musicxml/io/testInferredDynamicsExpression_ref.mscx
@@ -257,8 +257,8 @@
           <Spanner type="HairPin">
             <HairPin>
               <subtype>2</subtype>
-              <endText></endText>
               <lineVisible>0</lineVisible>
+              <endText></endText>
               </HairPin>
             <next>
               <location>