Skip to content
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

Jump to bottom

Fix Cubase XML chord symbol import #24967

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −6
Draft

Fix Cubase XML chord symbol import #24967

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdba150
Fix Cubase XML chord symbol import
Jojo-Schmitz Sep 29, 2024
d98d7c4
Use `trimmed()` where needed
Jojo-Schmitz Sep 29, 2024
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
11 changes: 5 additions & 6 deletions src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3083,7 +3083,7 @@ void MusicXMLParserPass2::staffTuning(StringData* t)
int octave = 0;
while (m_e.readNextStartElement()) {
if (m_e.name() == "tuning-alter") {
alter = m_e.readInt();
alter = m_e.readText().trimmed().toInt();
} else if (m_e.name() == "tuning-octave") {
octave = m_e.readInt();
} else if (m_e.name() == "tuning-step") {
Expand Down Expand Up @@ -5704,7 +5704,7 @@ void MusicXMLParserPass2::key(const String& partId, Measure* measure, const Frac
flushAlteredTone(key, keyStep, keyAlter, keyAccidental, smufl);
keyStep = m_e.readText();
} else if (m_e.name() == "key-alter") {
keyAlter = m_e.readText();
keyAlter = m_e.readText().trimmed();
} else if (m_e.name() == "key-accidental") {
smufl = m_e.attribute("smufl");
keyAccidental = m_e.readText();
Expand Down Expand Up @@ -7391,8 +7391,7 @@ void MusicXMLParserPass2::harmony(const String& partId, Measure* measure, const
} else if (m_e.name() == "root-alter") {
// attributes: print-object, print-style
// location (left-right)
// Cubase exports this value with a trailing newline
alter = m_e.readText().simplified().toInt();
alter = m_e.readText().trimmed().toInt();
} else {
skipLogCurrElem();
}
Expand Down Expand Up @@ -7434,7 +7433,7 @@ void MusicXMLParserPass2::harmony(const String& partId, Measure* measure, const
} else if (m_e.name() == "bass-alter") {
// attributes: print-object, print-style
// location (left-right)
alter = m_e.readInt();
alter = m_e.readText().trimmed().toInt();
} else {
skipLogCurrElem();
}
Expand All @@ -7448,7 +7447,7 @@ void MusicXMLParserPass2::harmony(const String& partId, Measure* measure, const
if (m_e.name() == "degree-value") {
degreeValue = m_e.readInt();
} else if (m_e.name() == "degree-alter") {
degreeAlter = m_e.readInt();
degreeAlter = m_e.readText().trimmed().toInt();
} else if (m_e.name() == "degree-type") {
degreeType = m_e.readText();
} else {
Expand Down