Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index d108520536a3e6b68108584112d71ffb8cad12c3..3f1d612441ce7d9d6f9f8a63b44edd6812b8196c 100644 (file)
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.12.0"
+@c \version "2.13.36"
 
 @node Text
 @section Text
@@ -167,6 +167,8 @@ e,\stopTextSpan
 
 The line style, as well as the text string, can be defined as an
 object property.  This syntax is described in @ref{Line styles}.
+Text spanners are part of the @code{Dynamics} context; see
+@rinternals{Dynamics}.
 
 
 @funindex \textSpannerUp
@@ -183,6 +185,16 @@ object property.  This syntax is described in @ref{Line styles}.
 @code{\textSpannerNeutral}.
 @endpredefined
 
+@knownissues
+LilyPond is only able to handle one text spanner per voice.
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{dynamics-text-spanner-postfix.ly}
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{dynamics-custom-text-spanner-postfix.ly}
 
 @seealso
 Notation Reference:
@@ -190,10 +202,12 @@ Notation Reference:
 @ref{Dynamics}.
 
 Snippets:
-@rlsr{Text}.
+@rlsr{Text},
+@rlsr{Expressive marks}.
 
 Internals Reference:
-@rinternals{TextSpanner}.
+@rinternals{TextSpanner},
+@rinternals{Dynamics}.
 
 
 @node Text marks
@@ -398,7 +412,7 @@ syntax called @qq{markup mode}.
 @cindex markup expressions
 @cindex expressions, markup
 @cindex markup syntax
-@cindex synatax, markup
+@cindex syntax, markup
 
 The markup syntax is similar to LilyPond's usual syntax: a
 @code{\markup} expression is enclosed in curly braces @code{@{
@@ -480,7 +494,7 @@ Snippets:
 @rlsr{Text}.
 
 Installed files:
-@file{scm/@/markup@/.scm}.
+@file{scm/markup.scm}.
 
 
 @knownissues
@@ -605,7 +619,7 @@ or dynamics, do not provide all characters, as mentioned in @ref{New
 dynamic marks} and @ref{Manual repeat marks}.
 
 @c \concat is actually documented in Align (it is not
-@c a font-switching command). But we need it here. -vv
+@c a font-switching command).  But we need it here. -vv
 
 When used inside a word, some font-switching or formatting commands
 may produce an unwanted blank space.  This can easily be solved by
@@ -676,7 +690,7 @@ Internals Reference:
 @rinternals{TextScript}.
 
 Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm}.
+@file{scm/define-markup-commands.scm}.
 
 
 @node Text alignment
@@ -890,7 +904,7 @@ as shown in the following example.
     \line \bold { Acto I }
     \wordwrap \italic {
       (La escena representa el corral de una casa de
-      gitanos en el Albaicín de Granada. Al fondo una
+      gitanos en el Albaicín de Granada.  Al fondo una
       puerta por la que se ve el negro interior de
       una Fragua, iluminado por los rojos resplandores
       del fuego.)
@@ -900,7 +914,7 @@ as shown in the following example.
     \line \bold { Acto II }
     \override #'(line-width . 50)
     \justify \italic {
-      (Calle de Granada. Fachada de la casa de Carmela
+      (Calle de Granada.  Fachada de la casa de Carmela
       y su hermano Manuel con grandes ventanas abiertas
       a través de las que se ve el patio
       donde se celebra una alegre fiesta)
@@ -932,7 +946,7 @@ Internals Reference:
 @rinternals{TextScript}.
 
 Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm}.
+@file{scm/define-markup-commands.scm}.
 
 
 @node Graphic notation inside markup
@@ -1075,7 +1089,7 @@ Advanced graphic features include the ability to include external
 image files converted to the Encapsulated PostScript format
 (@emph{eps}), or to directly embed graphics into the input file, using
 native PostScript code.  In such a case, it may be useful to
-explicitely specify the size of the drawing, as demonstrated below:
+explicitly specify the size of the drawing, as demonstrated below:
 
 @lilypond[quote,verbatim,relative=1]
 c1^\markup {
@@ -1113,8 +1127,8 @@ Internals Reference:
 @rinternals{TextScript}.
 
 Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm},
-@file{scm/@/stencil@/.scm}.
+@file{scm/define-markup-commands.scm},
+@file{scm/stencil.scm}.
 
 
 @node Music notation inside markup
@@ -1198,10 +1212,10 @@ c^\markup {
 c
 c^\markup {
   \combine
-    \musicglyph #"accordion.accDiscant"
+    \musicglyph #"accordion.discant"
     \combine
-      \raise #0.5 \musicglyph #"accordion.accDot"
-      \raise #1.5 \musicglyph #"accordion.accDot"
+      \raise #0.5 \musicglyph #"accordion.dot"
+      \raise #1.5 \musicglyph #"accordion.dot"
 }
 @end lilypond
 
@@ -1245,9 +1259,9 @@ Internals Reference:
 @rinternals{TextScript}.
 
 Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm},
-@file{scm/@/fret@/-diagrams@/.scm},
-@file{scm/@/harp@/-pedals@/.scm}.
+@file{scm/define-markup-commands.scm},
+@file{scm/fret-diagrams.scm},
+@file{scm/harp-pedals.scm}.
 
 
 @node Multi-page markup
@@ -1311,7 +1325,7 @@ Internals Reference:
 @rinternals{TextScript}.
 
 Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm}.
+@file{scm/define-markup-commands.scm}.
 
 
 @funindex \markuplines
@@ -1482,7 +1496,7 @@ Snippets:
 
 @c A source file gets never installed...
 @c Installed files:
-@c @file{lily/@/font@/-config@/-scheme@/.cc}.
+@c @file{lily/font-config-scheme.cc}.
 
 
 @node Entire document fonts