Update from Valentin.

diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index 6038acd44512a1127ae5f361f22f603ed13ed8a3..5f201da473cf7e8ded9f9e6aaef8059415af6b78 100644 (file)
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -121,16 +121,8 @@ a4_\markup { \tiny scherz. \bold molto } f
 @code{\textLengthOff}.
 
 By default, text indications do not influence the note spacing.
-However, their widths can be taken into account using the following
-syntax:
-
-@example 
-\textLengthOn
-@var{note}@code{-"text"}
-\textLengthOff
-@end example 
-
-In the following example, the first text string does not affect 
+However, their widths can be taken into account:
+in the following example, the first text string does not affect 
 spacing, whereas the second one does.
 
 @lilypond[quote,fragment,ragged-right,verbatim,relative=1]
@@ -138,9 +130,16 @@ d8^"pizz." e f g \textLengthOn a4_"scherzando" f
 @end lilypond
 
 
-@snippets
+@seealso
+
+Notation Reference: @ref{Text markup}.
+
+Snippets: @lsrdir{Text,Text}
+
+Internals Reference: @internalsref{TextScript}.
+
+@knownissues
 
-@c FIXME: add an example and LSR-ize this? -vv
 Checking to make sure that text scripts and lyrics are within the
 margins is a relatively large computational task.  To speed up
 processing, lilypond does not perform such calculations by
@@ -151,15 +150,6 @@ default; to enable it, use
 @end example
 
 
-@seealso
-
-Notation Reference: @ref{Text markup}.
-
-Snippets: @lsrdir{Text,Text}
-
-Internals Reference: @internalsref{TextScript}.
-
-
 @node Text spanners
 @subsubsection Text spanners
 
@@ -175,26 +165,24 @@ spanners; attach @code{\startTextSpan} and @code{\stopTextSpan} to
 the first and last notes of the spanner.
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-c1
-\override TextSpanner #'bound-details #'left #'text = "faster" 
-c2\startTextSpan b c\stopTextSpan a
+c2
+\override TextSpanner #'bound-details #'left #'text = "rit." 
+a4\startTextSpan c
+b2 e,\stopTextSpan
 @end lilypond
 
 @noindent
-The string to be printed, as well as the style, is set through
-object properties. It can accept @code{\markup} blocks as well:
+The string to be printed is set through
+object properties. By default, it is printed in italic characters;
+however, different formatting can be obtained using
+@code{\markup} blocks:
 
-@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-c1
-\textSpannerDown
-\override TextSpanner #'bound-details #'left #'text =
-  \markup { \upright "rall" } 
-c2\startTextSpan b c\stopTextSpan a
-\break
-\textSpannerUp
+@lilypond[quote,ragged-right,fragment,relative=2,verbatim]
+c2
 \override TextSpanner #'bound-details #'left #'text =
-  \markup { \italic "rit" } 
-c2\startTextSpan b c\stopTextSpan a
+  \markup { \upright "rit." } 
+a4\startTextSpan c
+b2 e,\stopTextSpan
 @end lilypond
 
 @predefined
@@ -206,6 +194,12 @@ c2\startTextSpan b c\stopTextSpan a
 @funindex textSpannerNeutral
 @code{\textSpannerNeutral}.
 
+@c TODO: Document Line Styles? -vv
+@ignore
+The line style, as well as the text string, can be defined as an
+object property, as described in @ref{Line Styles}.
+@end ignore
+
 
 @snippets