Merge pull request #25789 from rettinghaus/fix/spanner-color

fix #25783: write color once for line spanners
musescore · Dec 11, 2024 · b4f3204 · b4f3204
2 parents cab5fc2 + 34d9b19
commit b4f3204
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 6 deletions.
diff --git a/src/engraving/rw/write/twrite.cpp b/src/engraving/rw/write/twrite.cpp
@@ -1549,7 +1549,6 @@ void TWrite::writeProperties(const SLine* item, XmlWriter& xml, WriteContext& ct
     }
     writeProperty(item, xml, Pid::LINE_WIDTH);
     writeProperty(item, xml, Pid::LINE_STYLE);
-    writeProperty(item, xml, Pid::COLOR);
     writeProperty(item, xml, Pid::ANCHOR);
     writeProperty(item, xml, Pid::DASH_LINE_LEN);
     writeProperty(item, xml, Pid::DASH_GAP_LEN);

diff --git a/src/engraving/tests/spanners_data/linecolor01-ref.mscx b/src/engraving/tests/spanners_data/linecolor01-ref.mscx
@@ -98,7 +98,6 @@
               <endHookType>1</endHookType>
               <beginHookType>1</beginHookType>
               <color r="255" g="0" b="0" a="255"/>
-              <color r="255" g="0" b="0" a="255"/>
               <Segment>
                 <subtype>0</subtype>
                 <offset x="0" y="2.5"/>

diff --git a/src/importexport/mei/tests/data/color-01.mscx b/src/importexport/mei/tests/data/color-01.mscx
@@ -176,7 +176,6 @@
             <Ottava>
               <subtype>8va</subtype>
               <color r="4" g="51" b="255" a="255"/>
-              <color r="4" g="51" b="255" a="255"/>
               </Ottava>
             <next>
               <location>
@@ -188,7 +187,6 @@
             <HairPin>
               <subtype>0</subtype>
               <color r="4" g="51" b="255" a="255"/>
-              <color r="4" g="51" b="255" a="255"/>
               </HairPin>
             <next>
               <location>
@@ -380,7 +378,6 @@
             <Pedal>
               <endHookType>1</endHookType>
               <color r="148" g="33" b="146" a="255"/>
-              <color r="148" g="33" b="146" a="255"/>
               </Pedal>
             <next>
               <location>

diff --git a/src/importexport/mei/tests/data/trill-01.mscx b/src/importexport/mei/tests/data/trill-01.mscx
@@ -289,7 +289,6 @@
             <Trill>
               <subtype>trill</subtype>
               <color r="255" g="38" b="0" a="255"/>
-              <color r="255" g="38" b="0" a="255"/>
               <Ornament>
                 <Accidental>
                   <subtype>accidentalFlat</subtype>