Skip to content

Fix saving newlines in instrument names #30982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2025
Merged

Fix saving newlines in instrument names #30982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/engraving/dom/instrument.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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==
//---------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion src/engraving/dom/instrument.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/engraving/rw/read460/tread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions src/engraving/rw/write/twrite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
9 changes: 2 additions & 7 deletions src/importexport/mei/tests/data/label-01.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions src/importexport/musicxml/tests/data/testFinaleInstr_ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 8 additions & 16 deletions src/importexport/musicxml/tests/data/testSystemBrackets3_ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading