Merge pull request #2644 from heuchi/106916_LyricsLinesDontShow

fix #106916: Lyrics don't have underscores or hyphens
musescore · Jun 3, 2016 · 62c5ef2 · 62c5ef2
2 parents ded90e1 + 7b35194
commit 62c5ef2
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -3460,15 +3460,13 @@ bool Score::collectPage(LayoutContext& lc)
                         }
                   sp->layout();
                   }
-            }
 
-#if 0
-      for (Spanner* sp : _unmanagedSpanner) {
-            //if (sp->tick() >= etick || sp->tick2() < stick)
-            //     continue;
-            sp->layout();
+            for (Spanner* sp : _unmanagedSpanner) {
+                  if (sp->tick() >= etick || sp->tick2() < stick)
+                        continue;
+                  sp->layout();
+                  }
             }
-#endif
 
       page->rebuildBspTree();
       lc.pageChanged = lc.systemChanged || (lc.pageOldSystem != (page->systems().empty() ? 0 : page->systems().back()));