Merge with master

[lilypond.git] / input / regression / non-empty-text.ly

diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index fdd464806dcfa5c92b597ff53da935d187ba9d55..82256aac1899a49edac0097d279fddfc856e4418 100644 (file)
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,22 +1,22 @@
 
-\version "2.1.22"
+\version "2.10.0"
 
 \header{
-    texidoc=" Text is set with empty horizontal dimensions.  The
-boolean property @code{no-spacing-rods} in @code{TextScript} is used
+  texidoc=" By default, text is set with empty horizontal dimensions.  
+The boolean property @code{no-spacing-rods} in @code{TextScript} is used
 to control the horizontal size of text.  " }
 
-\score{
-    \notes\relative c''{
-       %% \emptyText
-       %% short for \override TextScript  #'no-spacing-rods = ##t
-       c2_"very wide and long text" c | \break
-       %% short for \override TextScript  #'no-spacing-rods = ##f
-       \fatText
-       c_"very wide and long text" c
-    }
-    \paper {
-       linewidth  = 3.0\cm
-    }
+\layout {
+  line-width = 3.0\cm
 }
 
+\relative c''{
+  %% \emptyText
+  %% short for \override TextScript  #'no-spacing-rods = ##t
+  c2_"very wide and long text" c | \break
+  %% short for \override TextScript  #'no-spacing-rods = ##f
+  \fatText
+  c_"very wide and long text" c
+}
+
+