Merge branch 'stable'

[lilypond.git] / input / regression / spacing-stick-out.ly

diff --git a/input/regression/spacing-stick-out.ly b/input/regression/spacing-stick-out.ly
index 18ad1bfb045813ae00d8739f4192f78dbdaf90de..d89ee89e22face4d0f3090e8a2e1c6ad32385c7e 100644 (file)
--- a/input/regression/spacing-stick-out.ly
+++ b/input/regression/spacing-stick-out.ly
@@ -1,16 +1,18 @@
 
 \header {
 
-  texidoc = "Unless @code{allow-outside-line} is set for the relevant
+  texidoc = "If @code{keep-inside-line} is set for the relevant
   PaperColumn, LilyPond will space a line to prevent text sticking out
   of the right margin."
 
 }
 
-\version "2.5.2"
+\version "2.12.0"
+
+\layout { ragged-right = ##t } 
 
-\layout { raggedright = ##t } 
 \relative {
+  \override Score.PaperColumn #'keep-inside-line = ##t 
   c1 c1^"This is a really long text" c
 }