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 6b45288c8e9e8bcd5ca75b483a16aa6c235b9692..82256aac1899a49edac0097d279fddfc856e4418 100644 (file)
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,24 +1,22 @@
 
-\version "1.9.8"
+\version "2.10.0"
 
 \header{
-    texidoc="
-Text is set with empty horizontal dimensions.  The boolean property
-TextScript.no-spacing-rods is used to control the horizontal size of text.
-"
+  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.  " }
+
+\layout {
+  line-width = 3.0\cm
 }
 
-\score{
-    \notes\relative c''{
-       %% \emptyText
-       %% short for \property Voice.TextScript \set #'no-spacing-rods = ##t
-       c2_"very wide and long text" c | \break
-       %% short for \property Voice.TextScript \set #'no-spacing-rods = ##f
-       \fatText
-       c_"very wide and long text" c
-    }
-    \paper {
-       linewidth  = 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
 }
 
+