Clarify that break-align-anchor-alignment has to be set for

[lilypond.git] / Documentation / user / text.itely

diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index 6e8cfc80a67ffb0cb14ea50009123ff012e2c284..94e53f4e6faee9c9329f5e8a27c4340964883ecb 100644 (file)
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -9,6 +9,9 @@
 @node Text
 @section Text
 
+@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
+{text-headword.ly}
+
 This section explains how to include text (with various
 formatting) in your scores.
 
@@ -18,22 +21,6 @@ languages), simply insert the characters directly into the
 lilypond file.  The file must be saved as UTF-8.  For more
 information, see @ref{Text encoding}.
 
-@lilypond[fragment,ragged-right,staffsize=16,quote]
-c'4^\markup { bla \bold bla }
-@end lilypond
-
-@lilypond[fragment,ragged-right,staffsize=16,quote]
-c'4^\markup { bla \bold bla }
-@end lilypond
-
-@lilypond[fragment,ragged-right,staffsize=16,quote]
-c'4^\markup { bla \bold bla }
-@end lilypond
-
-@lilypond[fragment,ragged-right,staffsize=16,quote]
-c'4^\markup { bla \bold bla }
-@end lilypond
-
 @menu
 * Writing text::                
 * Text markup::                 
@@ -52,7 +39,7 @@ c'4^\markup { bla \bold bla }
 @end menu
 
 @node Overview of text entry
-@unnumberedsubsubsec Overview of text entry
+@subsubsection Overview of text entry
 
 There are four ways to add text to scores:
 
@@ -93,10 +80,14 @@ c4\mark "foo" c c c
 
 @end itemize
 
+@seealso
+
+Snippets: @lsrdir{Text,Text}
+
 
 
 @node Text scripts
-@unnumberedsubsubsec Text scripts
+@subsubsection Text scripts
 
 @cindex Text scripts
 @cindex text items, non-empty
@@ -105,15 +96,15 @@ c4\mark "foo" c c c
 It is possible to place arbitrary strings of text or @ref{Text
 markup}, above or below notes by using a string @code{c^"text"}.
 By default, these indications do not influence the note spacing,
-but by using the command @code{\fatText}, the widths will be taken
+but by using the command @code{\textLengthOn}, the widths will be taken
 into account
 
 @lilypond[quote,fragment,ragged-right,verbatim,relative=1]
-c4^"longtext" \fatText c4_"longlongtext" c4
+c4^"longtext" \textLengthOn c4_"longlongtext" c4
 @end lilypond
 
 @noindent
-To prevent text from influencing spacing, use @code{\emptyText}.
+To prevent text from influencing spacing, use @code{\textLengthOff}.
 
 More complex formatting may also be added to a note by using the
 markup command,
@@ -128,10 +119,10 @@ markup}.
 
 @refcommands
 
-@funindex \fatText
-@code{\fatText},
-@funindex \emptyText
-@code{\emptyText}.
+@funindex \textLengthOn
+@code{\textLengthOn},
+@funindex \textLengthOff
+@code{\textLengthOff}.
 
 
 @commonprop
@@ -148,13 +139,15 @@ default; to enable it, use
 
 @seealso
 
-In this manual: @ref{Text markup}.
+Notation Reference: @ref{Text markup}.
+
+Snippets: @lsrdir{Text,Text}
 
 Internals Reference: @internalsref{TextScript}.
 
 
 @node Text spanners
-@unnumberedsubsubsec Text spanners
+@subsubsection Text spanners
 
 @cindex Text spanners
 
@@ -195,17 +188,19 @@ c2\startTextSpan b c\stopTextSpan a
 To print a solid line, use
 
 @example
-\override TextSpanner #'dash-fraction = #'()
+\override TextSpanner #'style = #'line
 @end example
 
 
 @seealso
 
+Snippets: @lsrdir{Text,Text}
+
 Internals Reference: @internalsref{TextSpanner}.
 
 
 @node Text marks
-@unnumberedsubsubsec Text marks
+@subsubsection Text marks
 
 @cindex coda on bar line
 @cindex segno on bar line
@@ -292,7 +287,8 @@ Possible symbols for the @code{break-align-symbols} list are
 The text marks will, by default, be aligned with the middle of the
 notation object, but this can be changed by overriding the
 @code{break-align-anchor-alignment} and @code{break-align-anchor}
-properties for the appropriate grob.
+properties for the appropriate grob. For scores with multiple staves,
+this setting should be done for all the staves. 
 
 @lilypond[fragment,quote,ragged-right,verbatim]
 {
@@ -301,20 +297,20 @@ properties for the appropriate grob.
   \key cis \major
 
   % the RehearsalMark will be aligned with the left edge of the KeySignature
-  \once \override Staff.KeySignature #'break-align-anchor-alignment = #LEFT
+  \once \override Score.KeySignature #'break-align-anchor-alignment = #LEFT
   \mark \default
   cis1
   \key ces \major
 
   % the RehearsalMark will be aligned with the right edge of the KeySignature
-  \once \override Staff.KeySignature #'break-align-anchor-alignment = #RIGHT
+  \once \override Score.KeySignature #'break-align-anchor-alignment = #RIGHT
   \mark \default
   ces1
   \key cis \major
 
   % the RehearsalMark will be aligned with the left edge of the KeySignature
   % and then shifted right by 2 units.
-  \once \override Staff.KeySignature #'break-align-anchor = #2
+  \once \override Score.KeySignature #'break-align-anchor = #2
   \mark \default
   ces1
 }
@@ -344,6 +340,8 @@ staff, you may alter this to print them on every staff,
 
 @seealso
 
+Snippets: @lsrdir{Text,Text}
+
 Internals Reference: @internalsref{RehearsalMark}.
 
 
@@ -359,7 +357,7 @@ Internals Reference: @internalsref{RehearsalMark}.
 @end menu
 
 @node Text markup introduction
-@unnumberedsubsubsec Text markup introduction
+@subsubsection Text markup introduction
 
 @cindex markup
 @cindex text markup
@@ -462,7 +460,7 @@ To keep lists of words distinct, please use quotes @code{"} or
 the @code{\line} command
 
 @lilypond[quote,verbatim,fragment,relative=1]
-\fatText
+\textLengthOn
 c4^\markup{ \center-align { on three lines } }
 c4^\markup{ \center-align { "all one line" } }
 c4^\markup{ \center-align { { on three lines } } }
@@ -490,7 +488,7 @@ markup, you need to use the #'padding property or create an
 #0}).
 
 @lilypond[quote,verbatim,fragment,relative=1]
-\fatText
+\textLengthOn
 c'4^\markup{ \raise #5 "not raised" }
 \once \override TextScript #'padding = #3
 c'4^\markup{ raised }
@@ -507,6 +505,8 @@ advisable to cancel those properties with @code{normal-text}.  See
 
 This manual: @ref{Overview of text markup commands}.
 
+Snippets: @lsrdir{Text,Text}
+
 Internals Reference: @internalsref{TextScript}.
 
 Init files: @file{scm/@/new@/-markup@/.scm}.
@@ -522,7 +522,7 @@ Syntax errors for markup mode are confusing.
 
 
 @node Nested scores
-@unnumberedsubsubsec Nested scores
+@subsubsection Nested scores
 
 It is possible to nest music inside markups, by adding a
 @code{\score} block to a markup expression.  Such a score must
@@ -540,8 +540,12 @@ contain a @code{\layout} block.
 }
 @end lilypond
 
+@seealso
+
+Snippets: @lsrdir{Text,Text}
+
 @node Page wrapping text
-@unnumberedsubsubsec Page wrapping text
+@subsubsection Page wrapping text
 
 Whereas @code{\markup} is used to enter a non-breakable block of
 text, @code{\markuplines} can be used at top-level to enter lines
@@ -571,13 +575,15 @@ lists.  The built-in markup list commands are described in
 This manual: @ref{Overview of text markup list commands}, @ref{New
 markup list command definition}.
 
+Snippets: @lsrdir{Text,Text}
+
 @refcommands
 
 @funindex \markuplines
 @code{\markuplines}
 
 @node Font selection
-@unnumberedsubsubsec Font selection
+@subsubsection Font selection
 
 @cindex font selection
 @cindex font magnification
@@ -687,7 +693,7 @@ sans serif and monospaced text.  For example,
 
 @seealso
 
-Examples: @lsr{text,font@/-family@/-override.ly}.
+Snippets: @lsrdir{Text,Text}
 
 
 @node Special text concerns
@@ -701,7 +707,7 @@ Examples: @lsr{text,font@/-family@/-override.ly}.
 @end menu
 
 @node New dynamic marks
-@unnumberedsubsubsec New dynamic marks
+@subsubsection New dynamic marks
 
 It is possible to print new dynamic marks or text that should be
 aligned with dynamics.  Use @code{make-dynamic-script} to create
@@ -736,9 +742,13 @@ boxf = \markup{ \bracket { \dynamic f } }
 { c'1_\rndf c'1_\boxf }
 @end lilypond
 
+@seealso
+
+Snippets: @lsrdir{Text,Text}
+
 
 @node Text and line spanners
-@unnumberedsubsubsec Text and line spanners
+@subsubsection Text and line spanners
 
 Some performance indications, e.g., @i{rallentando} and
 @i{accelerando} and @i{trills} are written as text and are
@@ -757,7 +767,7 @@ to tune them.
 
 @lilypond[relative=2,ragged-right,verbatim,fragment]
 d2 \glissando d'2
-\once \override Glissando #'dash-fraction = #0.5
+\once \override Glissando #'style = #'dashed-line
 d,2 \glissando d'2
 \override Glissando #'style = #'dotted-line
 d,2 \glissando d'2
@@ -883,7 +893,7 @@ TODO: add this somewhere
 The music function \endSpanners terminates spanners and hairpins
 after exactly one note.
 
-@lilypond[verbatim,quote,raged-right,relative=2,fragment]
+@lilypond[verbatim,quote,ragged-right,relative=2,fragment]
 \endSpanners
 c2 \startTextSpan c2
 c2 \< c2
@@ -897,13 +907,14 @@ hairpins with \!.
 
 @seealso
 
+Snippets: @lsrdir{Text,Text}
+
 Internals Reference: @internalsref{TextSpanner},
 @internalsref{Glissando}, @internalsref{VoiceFollower},
 @internalsref{TrillSpanner},
 @internalsref{line-spanner-interface}.
 
-Examples: @lsr{expressive,line-styles.ly},
-@lsr{expressive,line-arrows.ly}
+