Merge branch 'lilypond/translation'

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

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 93c45520ed3aa95114ac989f016b559f0e24af74..09b3d56ef15bdca32692a61361a3676277dff534 100644 (file)
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.12.0"
+@c \version "2.13.36"

 
 @node Text
 @section Text
 
 @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}.
 
 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
 
 
 @funindex \textSpannerUp


@@ -183,6 +185,16 @@ object property.  This syntax is described in @ref{Line styles}.
 @code{\textSpannerNeutral}.
 @endpredefined
 
 @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:
 
 @seealso
 Notation Reference:


@@ -190,10 +202,12 @@ Notation Reference:
 @ref{Dynamics}.
 
 Snippets:
 @ref{Dynamics}.
 
 Snippets:

-@rlsr{Text}.
+@rlsr{Text},
+@rlsr{Expressive marks}.

 
 Internals Reference:
 
 Internals Reference:

-@rinternals{TextSpanner}.
+@rinternals{TextSpanner},
+@rinternals{Dynamics}.

 
 
 @node Text marks
 
 
 @node Text marks


@@ -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
 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
 
 When used inside a word, some font-switching or formatting commands
 may produce an unwanted blank space.  This can easily be solved by


@@ -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
     \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.)
       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 {
     \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)
       y su hermano Manuel con grandes ventanas abiertas
       a través de las que se ve el patio
       donde se celebra una alegre fiesta)


@@ -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
 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 {
 
 @lilypond[quote,verbatim,relative=1]
 c1^\markup {


@@ -1198,10 +1212,10 @@ c^\markup {
 c
 c^\markup {
   \combine
 c
 c^\markup {
   \combine

-    \musicglyph #"accordion.accDiscant"
+    \musicglyph #"accordion.discant"

     \combine
     \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
 
 }
 @end lilypond