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 1d445c81fb8c9dac9b88764d082c2c8fdfe9f90c..82256aac1899a49edac0097d279fddfc856e4418 100644 (file)
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,15 +1,22 @@
+
+\version "2.10.0"
+
 \header{
-texidoc="
-Text is set with empty horizontal dimensions.  The boolean property
-textNonEmpty is used to respect the horizontal size of text.
-";
-}
-\score { \notes {
-\property Voice.TextScript \override #'no-spacing-rods = ##f
-c4_"very wide and long text" c4
+  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
 }
 
-\paper {
-  linewidth  = -1.0;
-  }
+\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
 }
+
+