Fix newlines in instrument names

miiizen · miiizen · commit 49f84a7901ab · 2025-11-11T16:41:43.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);
         }
     }
 }

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`	`}`