From f90fe01eabd5234461b4d4d3e70da65871acafc2 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@enote.com>
Date: Wed, 22 May 2024 22:20:44 +0200
Subject: [PATCH] MusicXML: set all note components invisible

Backport of #22943
---
 importexport/musicxml/importmxmlpass2.cpp | 19 +++++++++++++++++--
 mtest/musicxml/io/testColors.xml          |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
index 4c476bbe92e7f..f9b96c7cceefc 100644
--- a/importexport/musicxml/importmxmlpass2.cpp
+++ b/importexport/musicxml/importmxmlpass2.cpp
@@ -59,6 +59,7 @@
 #include "libmscore/slur.h"
 #include "libmscore/staff.h"
 #include "libmscore/stafftext.h"
+#include "libmscore/stem.h"
 #include "libmscore/sym.h"
 #include "libmscore/system.h"
 #include "libmscore/tempo.h"
@@ -5962,6 +5963,7 @@ Note* MusicXMLParserPass2::note(const QString& partId,
       NoteHead::Scheme headScheme = NoteHead::Scheme::HEAD_AUTO;
       const QColor noteColor { _e.attributes().value("color").toString() };
       QColor noteheadColor = QColor::Invalid;
+      QColor stemColor = QColor::Invalid;
       bool noteheadParentheses = false;
       QString noteheadFilled;
       int velocity = round(_e.attributes().value("dynamics").toDouble() * 0.9);
@@ -6037,8 +6039,10 @@ Note* MusicXMLParserPass2::note(const QString& partId,
                         staff = -1;
                         }
                   }
-            else if (_e.name() == "stem")
+            else if (_e.name() == "stem") {
+                  stemColor.setNamedColor(_e.attributes().value("color").toString());
                   stem(stemDir, noStem);
+                  }
             else if (_e.name() == "tie") {
                   tieType = _e.attributes().value("type").toString();
                   _e.skipCurrentElement();
@@ -6214,14 +6218,24 @@ Note* MusicXMLParserPass2::note(const QString& partId,
                   note->setHeadScheme(headScheme);
             if (noteColor.isValid()/* && preferences.getBool(PREF_IMPORT_MUSICXML_IMPORTLAYOUT)*/)
                   note->setColor(noteColor);
+            Stem* stem = c->stem();
+            if (!stem) {
+                  stem = new Stem(_score);
+                  if (stemColor.isValid())
+                        stem->setColor(stemColor);
+                  else if (noteColor.isValid())
+                        stem->setColor(noteColor);
+                  c->add(stem);
+                  }
             setNoteHead(note, noteheadColor, noteheadParentheses, noteheadFilled);
             note->setVisible(hasHead && printObject); // TODO also set the stem to invisible
+            stem->setVisible(printObject);
 
             if (!grace) {
                   handleSmallness(cue || isSmall, note, c);
                   note->setPlay(!cue);          // cue notes don't play
                   note->setHeadGroup(headGroup);
-                  if (noteColor != QColor::Invalid)
+                  if (noteColor.isValid())
                         note->setColor(noteColor);
                   setNoteHead(note, noteheadColor, noteheadParentheses, noteheadFilled);
                   note->setVisible(hasHead && printObject); // TODO also set the stem to invisible
@@ -6278,6 +6292,7 @@ Note* MusicXMLParserPass2::note(const QString& partId,
                   }
 
             if (acc) {
+                  acc->setVisible(printObject);
                   note->add(acc);
                   // save alter value for user accidental
                   if (acc->accidentalType() != AccidentalType::NONE)
diff --git a/mtest/musicxml/io/testColors.xml b/mtest/musicxml/io/testColors.xml
index da020898bdb66..00569787918a1 100644
--- a/mtest/musicxml/io/testColors.xml
+++ b/mtest/musicxml/io/testColors.xml
@@ -120,7 +120,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
+        <stem color="#2468AC">down</stem>
         <notations>
           <slur type="start" color="#EFCDAB" number="1"/>
           </notations>