Skip to content

Commit

Permalink
MuseJazz compatibility for Musescore 1.3 files
Browse files Browse the repository at this point in the history
  • Loading branch information
@lasconic
lasconic committed Oct 12, 2016
1 parent 9dd7944 commit 3c02b5e
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 33 deletions.
2 changes: 2 additions & 0 deletions libmscore/read114.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,8 @@ Score::FileError MasterScore::read114(XmlReader& e)

// convert 1.2 text styles
s.setName(convertOldTextStyleNames(s.name()));
if (s.family() == "MuseJazz")
s.setFamily("MuseJazz Text");

if (s.name() == "Lyrics Odd Lines" || s.name() == "Lyrics Even Lines")
s.setAlign((s.align() & ~ Align(AlignmentFlags::VMASK)) | AlignmentFlags::BASELINE);
Expand Down
10 changes: 7 additions & 3 deletions libmscore/text.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2319,10 +2319,14 @@ bool Text::readProperties(XmlReader& e)
_text = e.readXml();
// 2.0 and 2.0.1 had unicode symbols
_text.replace("<sym>unicode", "<sym>met");
_text.replace("<font face=\"MuseJazz\"/>", "<font face=\"MuseJazz Text\"/>");
if (score()->mscVersion() == 206)
_text.replace("<font face=\"MuseJazz\"/>", "<font face=\"MuseJazz Text\"/>");
}
else if (tag == "html-data") { // 114 only
QString t = e.readXml().trimmed();
t.replace("font-family:'MuseJazz';", "font-family:'MuseJazz Text';");
setXmlText(convertFromHtml(t));
}
else if (tag == "html-data")
setXmlText(convertFromHtml(e.readXml().trimmed()));
else if (tag == "subtype") // obsolete
e.skipCurrentElement();
else if (tag == "frameWidth") { // obsolete
Expand Down
60 changes: 30 additions & 30 deletions mtest/libmscore/compat114/textstyles-ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<valign>top</valign>
<offsetType>absolute</offsetType>
<name>Title</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>28</size>
<bold>1</bold>
</TextStyle>
Expand All @@ -51,23 +51,23 @@
<yoffset>10</yoffset>
<offsetType>absolute</offsetType>
<name>Subtitle</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>14</size>
</TextStyle>
<TextStyle>
<halign>right</halign>
<valign>bottom</valign>
<offsetType>absolute</offsetType>
<name>Composer</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
</TextStyle>
<TextStyle>
<halign>left</halign>
<valign>bottom</valign>
<offsetType>absolute</offsetType>
<name>Lyricist</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
</TextStyle>
<TextStyle>
Expand All @@ -77,7 +77,7 @@
<yoffset>7</yoffset>
<offsetType>spatium</offsetType>
<name>Lyrics Odd Lines</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>10</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -88,7 +88,7 @@
<yoffset>7</yoffset>
<offsetType>spatium</offsetType>
<name>Lyrics Even Lines</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>10</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -97,7 +97,7 @@
<valign>center</valign>
<offsetType>absolute</offsetType>
<name>Fingering</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>8</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -108,7 +108,7 @@
<yoffset>-5</yoffset>
<offsetType>spatium</offsetType>
<name>String Number</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>8</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
<frameWidthS>0.1</frameWidthS>
Expand All @@ -122,7 +122,7 @@
<valign>center</valign>
<offsetType>absolute</offsetType>
<name>Instrument Name (Long)</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -131,7 +131,7 @@
<valign>center</valign>
<offsetType>absolute</offsetType>
<name>Instrument Name (Short)</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -140,7 +140,7 @@
<valign>bottom</valign>
<offsetType>absolute</offsetType>
<name>Instrument Name (Part)</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>18</size>
</TextStyle>
<TextStyle>
Expand All @@ -150,7 +150,7 @@
<yoffset>8</yoffset>
<offsetType>spatium</offsetType>
<name>Dynamics</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<italic>1</italic>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
Expand All @@ -162,7 +162,7 @@
<yoffset>-4</yoffset>
<offsetType>spatium</offsetType>
<name>Tempo</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<bold>1</bold>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
Expand All @@ -173,7 +173,7 @@
<valign>top</valign>
<offsetType>spatium</offsetType>
<name>Metronome</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<bold>1</bold>
</TextStyle>
Expand All @@ -182,7 +182,7 @@
<valign>center</valign>
<offsetType>spatium</offsetType>
<name>Measure Number</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>8</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -193,15 +193,15 @@
<yoffset>6</yoffset>
<offsetType>spatium</offsetType>
<name>Translator</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>11</size>
</TextStyle>
<TextStyle>
<halign>center</halign>
<valign>center</valign>
<offsetType>spatium</offsetType>
<name>Tuplet</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>8</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -212,7 +212,7 @@
<yoffset>-4</yoffset>
<offsetType>spatium</offsetType>
<name>System</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>10</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
<systemFlag>1</systemFlag>
Expand All @@ -224,7 +224,7 @@
<yoffset>5.5</yoffset>
<offsetType>spatium</offsetType>
<name>Staff</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>10</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -235,7 +235,7 @@
<yoffset>-2.5</yoffset>
<offsetType>spatium</offsetType>
<name>Chord Symbol</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>15</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -246,7 +246,7 @@
<yoffset>-4</yoffset>
<offsetType>spatium</offsetType>
<name>Rehearsal Mark</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
<frameWidthS>0.15</frameWidthS>
Expand All @@ -262,7 +262,7 @@
<yoffset>-4</yoffset>
<offsetType>spatium</offsetType>
<name>Repeat Text Right</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>13</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
<systemFlag>1</systemFlag>
Expand All @@ -274,7 +274,7 @@
<yoffset>-0.1</yoffset>
<offsetType>spatium</offsetType>
<name>Volta</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>9</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -283,7 +283,7 @@
<valign>top</valign>
<offsetType>spatium</offsetType>
<name>Frame</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>11</size>
<bold>1</bold>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
Expand All @@ -293,7 +293,7 @@
<valign>center</valign>
<offsetType>spatium</offsetType>
<name>Text Line</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
Expand All @@ -302,7 +302,7 @@
<valign>baseline</valign>
<offsetType>spatium</offsetType>
<name>Glissando</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>8</size>
<italic>1</italic>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
Expand All @@ -314,7 +314,7 @@
<yoffset>-2</yoffset>
<offsetType>spatium</offsetType>
<name>Technique</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>12</size>
<italic>1</italic>
</TextStyle>
Expand All @@ -325,7 +325,7 @@
<yoffset>-10</yoffset>
<offsetType>absolute</offsetType>
<name>Copyright</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>9</size>
</TextStyle>
<TextStyle>
Expand All @@ -335,7 +335,7 @@
<yoffset>-10</yoffset>
<offsetType>absolute</offsetType>
<name>Page Number Odd</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>10</size>
</TextStyle>
<TextStyle>
Expand All @@ -345,7 +345,7 @@
<yoffset>-10</yoffset>
<offsetType>absolute</offsetType>
<name>Page Number Even</name>
<family>MuseJazz</family>
<family>MuseJazz Text</family>
<size>10</size>
</TextStyle>
<ChordList>
Expand Down

0 comments on commit 3c02b5e

Please sign in to comment.