Factor out and complete all the 4.4 style changes

Jojo-Schmitz · Aug 16, 2024 · 5d1401d · 5d1401d
1 parent 0385bb2
commit 5d1401d
Show file tree

Hide file tree

Showing 5 changed files with 728 additions and 595 deletions.
diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -15,64 +15,65 @@
  Implementation of class Score (partial).
 */
 
-#include "score.h"
+#include "articulation.h"
+#include "audio.h"
+#include "barline.h"
+#include "beam.h"
+#include "box.h"
+#include "bracket.h"
+#include "breath.h"
+#include "chord.h"
+#include "clef.h"
+#include "excerpt.h"
 #include "fermata.h"
+#include "harmony.h"
+#include "image.h"
 #include "imageStore.h"
+#include "instrchange.h"
+#include "instrtemplate.h"
 #include "key.h"
-#include "sig.h"
-#include "clef.h"
-#include "tempo.h"
+#include "keysig.h"
+#include "layoutbreak.h"
+#include "line.h"
+#include "lyrics.h"
 #include "measure.h"
-#include "page.h"
-#include "undo.h"
-#include "system.h"
-#include "select.h"
-#include "segment.h"
-#include "xml.h"
-#include "text.h"
+#include "mscore.h"
 #include "note.h"
-#include "chord.h"
-#include "rest.h"
-#include "slur.h"
-#include "staff.h"
+#include "ottava.h"
+#include "page.h"
 #include "part.h"
-#include "style.h"
-#include "tuplet.h"
-#include "lyrics.h"
 #include "pitchspelling.h"
-#include "line.h"
-#include "volta.h"
+#include "rehearsalmark.h"
 #include "repeat.h"
-#include "ottava.h"
-#include "barline.h"
-#include "box.h"
-#include "utils.h"
-#include "excerpt.h"
 #include "repeatlist.h"
-#include "keysig.h"
-#include "beam.h"
+#include "rest.h"
+#include "revisions.h"
+#include "score.h"
+#include "scoreOrder.h"
+#include "segment.h"
+#include "select.h"
+#include "sig.h"
+#include "slur.h"
+#include "staff.h"
 #include "stafftype.h"
+#include "style.h"
+#include "sym.h"
+#include "synthesizerstate.h"
+#include "system.h"
+#include "tempo.h"
 #include "tempotext.h"
-#include "articulation.h"
-#include "revisions.h"
+#include "text.h"
 #include "tie.h"
 #include "tiemap.h"
-#include "layoutbreak.h"
-#include "harmony.h"
-#include "mscore.h"
-#include "scoreOrder.h"
+#include "tuplet.h"
+#include "undo.h"
+#include "utils.h"
+#include "volta.h"
+#include "xml.h"
+
 #ifdef OMR
 #include "omr/omr.h"
 #endif
-#include "bracket.h"
-#include "audio.h"
-#include "instrtemplate.h"
-#include "sym.h"
-#include "rehearsalmark.h"
-#include "breath.h"
-#include "instrchange.h"
-#include "synthesizerstate.h"
-#include "image.h"
 
 namespace Ms {
 
@@ -274,21 +275,8 @@ Score::Score(MasterScore* parent, bool forcePartStyle /* = true */)
             // inherit most style settings from parent
             _style = parent->style();
 
-            static const Sid styles[] = {
-                  Sid::pageWidth,
-                  Sid::pageHeight,
-                  Sid::pagePrintableWidth,
-                  Sid::pageEvenLeftMargin,
-                  Sid::pageOddLeftMargin,
-                  Sid::pageEvenTopMargin,
-                  Sid::pageEvenBottomMargin,
-                  Sid::pageOddTopMargin,
-                  Sid::pageOddBottomMargin,
-                  Sid::pageTwosided,
-                  Sid::spatium
-                  };
             // but borrow defaultStyle page layout settings
-            for (auto i : styles)
+            for (auto i : pageStyles())
                   _style.set(i, MScore::defaultStyle().value(i));
             // and force some style settings that just make sense for parts
             if (forcePartStyle) {