From: Keith OHara <k-ohara5a5a@oco.net>
Date: Mon, 7 Mar 2011 04:10:35 +0000 (-0800)
Subject: Update two regression tests
X-Git-Tag: release/2.13.54-1~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4a1b55aec9028df82029c3bc6a8f9141a3b16c85;p=lilypond.git

Update two regression tests

Adapt two tests to compensate for the new default value of
keep-inside-line = ##t
---

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index f4d3c1d8d7..d8a596b2e6 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -11,21 +11,21 @@ lyrics do not collide with barlines.
     ragged-right = ##t
 }
 
-<<
-    \new Staff {
-	b1 \bar "|:" b1 \bar ":|"
+\relative c'' <<
+    \new Voice = "a"{
+	b1 \bar "|:" b1 \bar ":|" b1 \bar "|."
     }
-    \context Lyrics \with {
+    \new Lyrics \with {
 	\consists "Bar_engraver"
 	\consists "Separating_line_group_engraver"
-    } \lyricmode {
-	  looooooooooooooooooooooooooooooooooong1 syllable
+    } \lyricsto "a" {
+	  bars lengthened if
       }
-    \lyrics {
-	no Bar_Engraver_Bar_Engraver_Bar_Engraver
+    \new Lyrics \lyricsto "a" {
+	required for noncollision
     }
     \new Staff {
-	b1 b1
+	b1 b1 b1
     }
 >>
 \layout {
diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly
index b34c6d1c9c..18636147ca 100644
--- a/input/regression/mensural-ligatures.ly
+++ b/input/regression/mensural-ligatures.ly
@@ -17,6 +17,7 @@
   \context {
     \Score
     \override SpacingSpanner #'packed-spacing = ##t
+    \override PaperColumn #'keep-inside-line = ##f
   }
 }