Fix newlines in instrument names

miiizen · miiizen · commit d678f910e6f4 · 2025-11-12T07:53:51.000Z
diff --git a/src/engraving/dom/instrument.cpp b/src/engraving/dom/instrument.cpp
@@ -884,11 +884,6 @@ String StaffName::toPlainText() const
     return TextBase::unEscape(m_name);
 }
 
-StaffName StaffName::fromPlainText(const String& plainText, int pos)
-{
-    return { TextBase::plainToXmlText(plainText), pos };
-}
-
 //---------------------------------------------------------
 //   operator==
 //---------------------------------------------------------
diff --git a/src/engraving/dom/instrument.h b/src/engraving/dom/instrument.h
@@ -54,7 +54,6 @@ class StaffName
     StaffName(const String& xmlText, int pos = 0);
 
     String toPlainText() const;
-    static StaffName fromPlainText(const String& plainText, int pos = 0);
 
     bool operator==(const StaffName&) const;
     String toString() const;
diff --git a/src/engraving/rw/read460/tread.cpp b/src/engraving/rw/read460/tread.cpp
@@ -4032,6 +4032,7 @@ void TRead::read(StaffName* item, XmlReader& xml)
 {
     item->setPos(xml.intAttribute("pos", 0));
     String name = xml.readXml();
+    lineBreakFromTag(name);
     if (name.startsWith(u"<html>")) {
         // compatibility to old html implementation:
         name = HtmlParser::parse(name);
diff --git a/src/engraving/rw/write/twrite.cpp b/src/engraving/rw/write/twrite.cpp
@@ -2145,10 +2145,12 @@ void TWrite::write(const MidiArticulation* item, XmlWriter& xml)
 void TWrite::write(const StaffName& item, XmlWriter& xml, const char* tag)
 {
     if (!item.name().isEmpty()) {
+        String name = item.name();
+        lineBreakToTag(name);
         if (item.pos() == 0) {
-            xml.writeXml(String::fromUtf8(tag), item.name());
+            xml.writeXml(String::fromUtf8(tag), name);
         } else {
-            xml.writeXml(String(u"%1 pos=\"%2\"").arg(String::fromUtf8(tag)).arg(item.pos()), item.name());
+            xml.writeXml(String(u"%1 pos=\"%2\"").arg(String::fromUtf8(tag)).arg(item.pos()), name);
         }
     }
 }
diff --git a/src/importexport/mei/tests/data/label-01.mscx b/src/importexport/mei/tests/data/label-01.mscx
@@ -30,13 +30,8 @@
         </Staff>
       <trackName></trackName>
       <Instrument id="piano">
-        <longName>Very long
-Instrument Name
-that does not
-fit within
-one line</longName>
-        <shortName>Vl.
-I/II</shortName>
+        <longName>Very long<br/>Instrument Name<br/>that does not<br/>fit within<br/>one line</longName>
+        <shortName>Vl.<br/>I/II</shortName>
         <trackName></trackName>
         <instrumentId>keyboard.piano</instrumentId>
         <Channel>
diff --git a/src/importexport/musicxml/tests/data/testFinaleInstr_ref.mscx b/src/importexport/musicxml/tests/data/testFinaleInstr_ref.mscx
@@ -1206,8 +1206,7 @@
       <trackName>Tuba
 (String Bass)</trackName>
       <Instrument id="tuba">
-        <longName>Tuba
-(String Bass)</longName>
+        <longName>Tuba<br/>(String Bass)</longName>
         <shortName>Tuba</shortName>
         <trackName>Tuba
 (String Bass)</trackName>
diff --git a/src/importexport/musicxml/tests/data/testSystemBrackets3_ref.mscx b/src/importexport/musicxml/tests/data/testSystemBrackets3_ref.mscx
@@ -31,8 +31,7 @@
       <trackName>Backing
 Vocals</trackName>
       <Instrument id="voice">
-        <longName>Backing
-Vocals</longName>
+        <longName>Backing<br/>Vocals</longName>
         <shortName>B. Vx.</shortName>
         <trackName>Voice</trackName>
         <minPitchP>38</minPitchP>
@@ -126,10 +125,8 @@ Vocals</longName>
       <trackName>Electric
 Guitar 1</trackName>
       <Instrument id="electric-guitar">
-        <longName>Electric
-Guitar 1</longName>
-        <shortName>Elec.
-Gtr. 1</shortName>
+        <longName>Electric<br/>Guitar 1</longName>
+        <shortName>Elec.<br/>Gtr. 1</shortName>
         <trackName>Electric Guitar</trackName>
         <minPitchP>40</minPitchP>
         <maxPitchP>88</maxPitchP>
@@ -256,10 +253,8 @@ Gtr. 1</shortName>
       <trackName>Electric
 Guitar 2</trackName>
       <Instrument id="electric-guitar">
-        <longName>Electric
-Guitar 2</longName>
-        <shortName>Elec.
-Gtr. 2</shortName>
+        <longName>Electric<br/>Guitar 2</longName>
+        <shortName>Elec.<br/>Gtr. 2</shortName>
         <trackName>Electric Guitar</trackName>
         <minPitchP>40</minPitchP>
         <maxPitchP>88</maxPitchP>
@@ -385,10 +380,8 @@ Gtr. 2</shortName>
       <trackName>Acoustic
 Guitar</trackName>
       <Instrument id="guitar-steel">
-        <longName>Acoustic
-Guitar</longName>
-        <shortName>Ac.
-Gtr.</shortName>
+        <longName>Acoustic<br/>Guitar</longName>
+        <shortName>Ac.<br/>Gtr.</shortName>
         <trackName>Acoustic Guitar</trackName>
         <minPitchP>40</minPitchP>
         <maxPitchP>84</maxPitchP>
@@ -483,8 +476,7 @@ Gtr.</shortName>
       <trackName>Piano 2</trackName>
       <Instrument id="piano">
         <longName>Piano 2</longName>
-        <shortName>Pno.
-2</shortName>
+        <shortName>Pno.<br/>2</shortName>
         <trackName>Piano</trackName>
         <minPitchP>21</minPitchP>
         <maxPitchP>108</maxPitchP>

Original file line number	Diff line number	Diff line change
`@@ -4032,6 +4032,7 @@ void TRead::read(StaffName* item, XmlReader& xml)`
`4032`	`4032`	`{`
`4033`	`4033`	`item->setPos(xml.intAttribute("pos", 0));`
`4034`	`4034`	`String name = xml.readXml();`
	`4035`	`+ lineBreakFromTag(name);`
`4035`	`4036`	`if (name.startsWith(u"<html>")) {`
`4036`	`4037`	`// compatibility to old html implementation:`
`4037`	`4038`	`name = HtmlParser::parse(name);`
Original file line number	Diff line number	Diff line change
`@@ -2145,10 +2145,12 @@ void TWrite::write(const MidiArticulation* item, XmlWriter& xml)`
`2145`	`2145`	`void TWrite::write(const StaffName& item, XmlWriter& xml, const char* tag)`
`2146`	`2146`	`{`
`2147`	`2147`	`if (!item.name().isEmpty()) {`
	`2148`	`+ String name = item.name();`
	`2149`	`+ lineBreakToTag(name);`
`2148`	`2150`	`if (item.pos() == 0) {`
`2149`		`- xml.writeXml(String::fromUtf8(tag), item.name());`
	`2151`	`+ xml.writeXml(String::fromUtf8(tag), name);`
`2150`	`2152`	`} else {`
`2151`		`- xml.writeXml(String(u"%1 pos=\"%2\"").arg(String::fromUtf8(tag)).arg(item.pos()), item.name());`
	`2153`	`+ xml.writeXml(String(u"%1 pos=\"%2\"").arg(String::fromUtf8(tag)).arg(item.pos()), name);`
`2152`	`2154`	`}`
`2153`	`2155`	`}`
`2154`	`2156`	`}`