Merge pull request #4295 from jthistle/279280-default-bold-not-saved
fix #279280: changes to font style for text that is bold by default are not saved
This commit is contained in:
commit
eb47a254ca
13 changed files with 5 additions and 28 deletions
|
@ -379,16 +379,16 @@ void ScoreElement::writeProperty(XmlWriter& xml, Pid pid) const
|
|||
return;
|
||||
}
|
||||
PropertyFlags f = propertyFlags(pid);
|
||||
QVariant d = (f == PropertyFlags::NOSTYLE) ? propertyDefault(pid) : QVariant();
|
||||
QVariant d = (f != PropertyFlags::STYLED) ? propertyDefault(pid) : QVariant();
|
||||
|
||||
if (pid == Pid::FONT_STYLE) {
|
||||
FontStyle ds = FontStyle(d.isValid() ? d.toInt() : 0);
|
||||
FontStyle fs = FontStyle(p.toInt());
|
||||
if ((fs & FontStyle::Bold) != (ds & FontStyle::Bold))
|
||||
if ((fs & FontStyle::Bold) != (ds & FontStyle::Bold))
|
||||
xml.tag("bold", fs & FontStyle::Bold);
|
||||
if ((fs & FontStyle::Italic) && (ds & FontStyle::Italic))
|
||||
xml.tag("italic", fs & FontStyle::Bold);
|
||||
if ((fs & FontStyle::Underline) && (ds & FontStyle::Underline))
|
||||
if ((fs & FontStyle::Italic) != (ds & FontStyle::Italic))
|
||||
xml.tag("italic", fs & FontStyle::Italic);
|
||||
if ((fs & FontStyle::Underline) != (ds & FontStyle::Underline))
|
||||
xml.tag("underline", fs & FontStyle::Underline);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -180,7 +180,6 @@
|
|||
<root>19</root>
|
||||
<extension>33</extension>
|
||||
<name>dim</name>
|
||||
<family>FreeSerif</family>
|
||||
</Harmony>
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
|
@ -195,7 +194,6 @@
|
|||
<Harmony>
|
||||
<root>14</root>
|
||||
<name>7</name>
|
||||
<family>FreeSerif</family>
|
||||
</Harmony>
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
|
|
|
@ -91,7 +91,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Clefs</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -100,7 +100,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>fing</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -96,7 +96,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Hairpin</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -91,7 +91,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>keysig</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -91,7 +91,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>notes</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -91,7 +91,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Title</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
@ -106,14 +105,12 @@
|
|||
<sigD>4</sigD>
|
||||
</TimeSig>
|
||||
<StaffText>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>staff text</text>
|
||||
</StaffText>
|
||||
<Chord>
|
||||
<durationType>quarter</durationType>
|
||||
<Lyrics>
|
||||
<syllabic>begin</syllabic>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>ly</text>
|
||||
</Lyrics>
|
||||
<Note>
|
||||
|
@ -125,7 +122,6 @@
|
|||
<durationType>quarter</durationType>
|
||||
<Lyrics>
|
||||
<syllabic>end</syllabic>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>rics</text>
|
||||
</Lyrics>
|
||||
<Note>
|
||||
|
|
|
@ -1675,23 +1675,18 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<size>24</size>
|
||||
<text><font size="28"/><font face="MuseJazz"/><b>Title</b></text>
|
||||
</Text>
|
||||
<Text>
|
||||
<style>Subtitle</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="MuseJazz"/>Subtitle</text>
|
||||
</Text>
|
||||
<Text>
|
||||
<style>Composer</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="MuseJazz"/>Composer</text>
|
||||
</Text>
|
||||
<Text>
|
||||
<style>Lyricist</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="MuseJazz"/>Lyricist</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -96,22 +96,18 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>title</text>
|
||||
</Text>
|
||||
<Text>
|
||||
<style>Subtitle</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>subtitle</text>
|
||||
</Text>
|
||||
<Text>
|
||||
<style>Composer</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Composer</text>
|
||||
</Text>
|
||||
<Text>
|
||||
<style>Lyricist</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Lyrics</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -89,7 +89,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Tuplets</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -89,7 +89,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Tuplet 1.3 file</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
|
@ -89,7 +89,6 @@
|
|||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<family>FreeSerif</family>
|
||||
<text><font face="Times New Roman"/>Tuplet 1.3 file</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
|
|
Loading…
Reference in a new issue