fix #47106 change semantic of section break

musescore · Feb 25, 2015 · 2d53773 · 2d53773
1 parent 94ad084
commit 2d53773
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2223,7 +2223,9 @@ bool Score::layoutSystem(qreal& minWidth, qreal systemWidth, bool isFirstSystem,
                               case LayoutMode::LINE:
                               case LayoutMode::PAGE:
                               case LayoutMode::SYSTEM:
-                                    continueFlag = !(curMeasure->lineBreak() || curMeasure->pageBreak());
+                                    continueFlag = !(curMeasure->lineBreak()
+                                                     || curMeasure->sectionBreak()
+                                                     || curMeasure->pageBreak());
                                     break;
                               }
                         }
@@ -2295,7 +2297,7 @@ bool Score::layoutSystem(qreal& minWidth, qreal systemWidth, bool isFirstSystem,
             switch (_layoutMode) {
                   case LayoutMode::PAGE:
                   case LayoutMode::SYSTEM:
-                        pbreak = curMeasure->pageBreak() || curMeasure->lineBreak();
+                        pbreak = curMeasure->pageBreak() || curMeasure->lineBreak() || curMeasure->sectionBreak();
                         break;
                   case LayoutMode::FLOAT:
                   case LayoutMode::LINE:
@@ -2475,7 +2477,9 @@ bool Score::layoutSystem1(qreal& minWidth, bool isFirstSystem, bool longName)
                               case LayoutMode::LINE:
                               case LayoutMode::PAGE:
                               case LayoutMode::SYSTEM:
-                                    continueFlag = !(curMeasure->lineBreak() || curMeasure->pageBreak());
+                                    continueFlag = !(curMeasure->lineBreak()
+                                                    || curMeasure->sectionBreak()
+                                                    || curMeasure->pageBreak());
                                     break;
                               }
                         }
@@ -2504,7 +2508,7 @@ bool Score::layoutSystem1(qreal& minWidth, bool isFirstSystem, bool longName)
             switch (_layoutMode) {
                   case LayoutMode::PAGE:
                   case LayoutMode::SYSTEM:
-                        pbreak = curMeasure->pageBreak() || curMeasure->lineBreak();
+                        pbreak = curMeasure->pageBreak() || curMeasure->lineBreak() || curMeasure->sectionBreak();
                         break;
                   case LayoutMode::FLOAT:
                   case LayoutMode::LINE: