LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #26021 - Issues with non-conformant Figured Bass entries

Browse source 
Figured Bass which do not conform to F.B. 'rules' have several issues. See http://musescore.org/en/node/26021 for details.
This commit is contained in:
Maurizio M. Gavioli 2014-06-11 10:46:35 +02:00
parent 243d64fae2
commit aeed353dbe
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libmscore/figuredbass.cpp
View file

@ -939,17 +939,17 @@ void FiguredBass::write(Xml& xml) const
xml.tag("onNote", onNote());
if (ticks() > 0)
xml.tag("ticks", ticks());
// if unparseable items or non-standard style, write full text data
if (items.size() < 1 || textStyleType() != TextStyleType::FIGURED_BASS) {
if (items.size() < 1)
Text::writeProperties(xml, true);
else
// if all items parsed and not unstled, we simnply have a special style: write it
// if unparseable items, write full text data
if (items.size() < 1)
Text::writeProperties(xml, true);
else {
if (textStyleType() != TextStyleType::FIGURED_BASS)
// if all items parsed and not unstiled, we simply have a special style: write it
xml.tag("style", textStyle().name());
for(FiguredBassItem* item : items)
item->write(xml);
Element::writeProperties(xml);
}
for(FiguredBassItem* item : items)
item->write(xml);
Element::writeProperties(xml);
xml.etag();
}
@ -984,7 +984,8 @@ void FiguredBass::read(XmlReader& e)
e.unknown();
}
// if items could be parsed set normalized text
setText(normalizedText); // this is the text to show while editing
if (items.size() > 0)
setText(normalizedText); // this is the text to show while editing
}
//---------------------------------------------------------
@ -1006,7 +1007,7 @@ void FiguredBass::layout()
// if in edit mode or if style has been changed,
// do nothing else, keeping default laying out and formatting
if(editMode() || textStyleType() != TextStyleType::FIGURED_BASS) {
if(editMode() || items.size() < 1 || textStyleType() != TextStyleType::FIGURED_BASS) {
Text::layout();
return;
}