Merge pull request #602 from mgavioli/basestyle_and_defaultstyle

Default style, base style, saving and reading score file styles.
musescore · Dec 28, 2013 · 74ef206 · 74ef206
2 parents e3e61d5 + 2d76253
commit 74ef206
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -1081,8 +1081,8 @@ bool StyleData::isDefault(StyleIdx idx) const
 
 //---------------------------------------------------------
 //   save
-//    if optimize is true, save only if different to default
-//    style
+//    if optimize is true, save only data which are different
+//    from built-in style ( MScore::baseStyle() )
 //---------------------------------------------------------
 
 void StyleData::save(Xml& xml, bool optimize) const
@@ -1103,7 +1103,7 @@ void StyleData::save(Xml& xml, bool optimize) const
                   }
             }
       for (int i = 0; i < TEXT_STYLES; ++i) {
-            if (!optimize || _textStyles[i] != MScore::defaultStyle()->textStyle(i))
+            if (!optimize || _textStyles[i] != MScore::baseStyle()->textStyle(i))
                   _textStyles[i].write(xml);
             }
       for (int i = TEXT_STYLES; i < _textStyles.size(); ++i)
@@ -1114,7 +1114,7 @@ void StyleData::save(Xml& xml, bool optimize) const
             xml.etag();
             }
       for (int i = 0; i < ARTICULATIONS; ++i) {
-            if (optimize && _articulationAnchor[i] == MScore::defaultStyle()->articulationAnchor(i))
+            if (optimize && _articulationAnchor[i] == MScore::baseStyle()->articulationAnchor(i))
                   continue;
             const ArticulationInfo& ai = Articulation::articulationList[i];
             xml.tag(ai.name + "Anchor", int(_articulationAnchor[i]));

diff --git a/mscore/file.cpp b/mscore/file.cpp
@@ -308,7 +308,7 @@ Score* MuseScore::readScore(const QString& name)
       if (name.isEmpty())
             return 0;
 
-      Score* score = new Score(MScore::defaultStyle());
+      Score* score = new Score(MScore::baseStyle());  // start with built-in style
       setMidiPrefOperations(name);
       Score::FileError rv = Ms::readScore(score, name, false);
       if (rv == Score::FILE_TOO_OLD || rv == Score::FILE_TOO_NEW) {