fix regression: full measure rest layout blocks

musescore · Jul 19, 2013 · 74a2fb2 · 74a2fb2
1 parent fbf6343
commit 74a2fb2
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 31 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -3227,16 +3227,17 @@ void Measure::layoutX(qreal stretch)
                   if (t == REST && (_multiMeasure > 0 || static_cast<Rest*>(e)->durationType() == TDuration::V_MEASURE)) {
                         Rest* rest = static_cast<Rest*>(e);
                         qreal x1 = 0.0, x2;
-                        track = track / VOICES * VOICES;
                         if (s != first()) {
                               Segment* ps;
                               for (ps = s->prev(); ps; ps = ps->prev()) {
                                     if (ps->element(track))
                                           break;
                                     }
-                              Element* e = ps->element(track/VOICES * VOICES);
-                              if (e)
-                                    x1 = ps->x() + e->x() + e->width();
+                              if (ps) {
+                                    Element* e = ps->element(track/VOICES * VOICES);
+                                    if (e)
+                                          x1 = ps->x() + e->x() + e->width();
+                                    }
                               }
                         Segment* ns;
                         for (ns = s->next(); ns; ns = ns->next()) {

diff --git a/mtest/libmscore/link/part13o.mscx b/mtest/libmscore/link/part13o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part14o.mscx b/mtest/libmscore/link/part14o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part15o.mscx b/mtest/libmscore/link/part15o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part16o.mscx b/mtest/libmscore/link/part16o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part17o.mscx b/mtest/libmscore/link/part17o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part18o.mscx b/mtest/libmscore/link/part18o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part19o.mscx b/mtest/libmscore/link/part19o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part20o.mscx b/mtest/libmscore/link/part20o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part21o.mscx b/mtest/libmscore/link/part21o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part22o.mscx b/mtest/libmscore/link/part22o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part23o.mscx b/mtest/libmscore/link/part23o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part24o.mscx b/mtest/libmscore/link/part24o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part4o.mscx b/mtest/libmscore/link/part4o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part5o.mscx b/mtest/libmscore/link/part5o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part6o.mscx b/mtest/libmscore/link/part6o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part7o.mscx b/mtest/libmscore/link/part7o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part8o.mscx b/mtest/libmscore/link/part8o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/link/part9o.mscx b/mtest/libmscore/link/part9o.mscx
@@ -32,7 +32,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">testpart1</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>

diff --git a/mtest/libmscore/measure/measure-1-ref.mscx b/mtest/libmscore/measure/measure-1-ref.mscx
@@ -33,7 +33,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">Test</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>
@@ -398,7 +398,6 @@ p, li { white-space: pre-wrap; }
       <showUnprintable>1</showUnprintable>
       <showFrames>1</showFrames>
       <showMargins>0</showMargins>
-      <metaTag name="Platform">X11</metaTag>
       <metaTag name="copyright"></metaTag>
       <metaTag name="movementNumber"></metaTag>
       <metaTag name="movementTitle"></metaTag>
@@ -668,7 +667,6 @@ p, li { white-space: pre-wrap; }
       <showUnprintable>1</showUnprintable>
       <showFrames>1</showFrames>
       <showMargins>0</showMargins>
-      <metaTag name="Platform">X11</metaTag>
       <metaTag name="copyright"></metaTag>
       <metaTag name="movementNumber"></metaTag>
       <metaTag name="movementTitle"></metaTag>

diff --git a/mtest/libmscore/measure/measure-2-ref.mscx b/mtest/libmscore/measure/measure-2-ref.mscx
@@ -33,7 +33,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">Test</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>
@@ -395,7 +395,6 @@ p, li { white-space: pre-wrap; }
       <showUnprintable>1</showUnprintable>
       <showFrames>1</showFrames>
       <showMargins>0</showMargins>
-      <metaTag name="Platform">X11</metaTag>
       <metaTag name="copyright"></metaTag>
       <metaTag name="movementNumber"></metaTag>
       <metaTag name="movementTitle"></metaTag>
@@ -663,7 +662,6 @@ p, li { white-space: pre-wrap; }
       <showUnprintable>1</showUnprintable>
       <showFrames>1</showFrames>
       <showMargins>0</showMargins>
-      <metaTag name="Platform">X11</metaTag>
       <metaTag name="copyright"></metaTag>
       <metaTag name="movementNumber"></metaTag>
       <metaTag name="movementTitle"></metaTag>

diff --git a/mtest/libmscore/measure/measure-3-ref.mscx b/mtest/libmscore/measure/measure-3-ref.mscx
@@ -33,7 +33,7 @@
     <metaTag name="movementTitle"></metaTag>
     <metaTag name="source"></metaTag>
     <metaTag name="workNumber"></metaTag>
-    <metaTag name="workTitle">Test</metaTag>
+    <metaTag name="workTitle"></metaTag>
     <PageList>
       <Page>
         <System>
@@ -406,7 +406,6 @@ p, li { white-space: pre-wrap; }
       <showUnprintable>1</showUnprintable>
       <showFrames>1</showFrames>
       <showMargins>0</showMargins>
-      <metaTag name="Platform">X11</metaTag>
       <metaTag name="copyright"></metaTag>
       <metaTag name="movementNumber"></metaTag>
       <metaTag name="movementTitle"></metaTag>
@@ -680,7 +679,6 @@ p, li { white-space: pre-wrap; }
       <showUnprintable>1</showUnprintable>
       <showFrames>1</showFrames>
       <showMargins>0</showMargins>
-      <metaTag name="Platform">X11</metaTag>
       <metaTag name="copyright"></metaTag>
       <metaTag name="movementNumber"></metaTag>
       <metaTag name="movementTitle"></metaTag>