Merge branch 'lilypond/translation' of ssh://thsoft@git.sv.gnu.org/srv/git/lilypond...

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

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 599990edb6580573c97e0ad6d391f240a59c257e..d9ee4c52e56a0f7593cc1f19095502dc503841cb 100644 (file)
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -3,10 +3,11 @@
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the

-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..

 @end ignore
 
 @end ignore
 

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

 
 @node Text
 @section Text
 
 @node Text
 @section Text


@@ -62,19 +63,18 @@ in @ref{Direction and placement}.
 a8^"pizz." g f e a4-"scherz." f
 @end lilypond
 
 a8^"pizz." g f e a4-"scherz." f
 @end lilypond
 

-This syntax is actually a shorthand; more complex text
-formatting may be added to a note by explicitly using a
-@code{\markup} block, as described in @ref{Formatting text}.
+This syntax is actually a shorthand; more complex text formatting may be
+added to a note by explicitly using a @code{\markup} block, as described
+in @ref{Formatting text}.

 
 @lilypond[quote,verbatim,relative=2]
 a8^\markup { \italic pizz. } g f e
 a4_\markup { \tiny scherz. \bold molto } f
 @end lilypond
 
 
 @lilypond[quote,verbatim,relative=2]
 a8^\markup { \italic pizz. } g f e
 a4_\markup { \tiny scherz. \bold molto } f
 @end lilypond
 

-By default, text indications do not influence the note spacing.
-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.
+By default, text indications do not influence the note spacing. 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,verbatim,relative=2]
 a8^"pizz." g f e
 
 @lilypond[quote,verbatim,relative=2]
 a8^"pizz." g f e


@@ -82,6 +82,11 @@ a8^"pizz." g f e
 a4_"scherzando" f
 @end lilypond
 
 a4_"scherzando" f
 @end lilypond
 

+In addition to text scripts, articulations can be attached to notes.
+For more information, see @ref{Articulations and ornamentations}.
+
+For more information about the relative ordering of text scripts and
+articulations, see @rlearning{Placement of objects}.

 
 @funindex \textLengthOn
 @funindex textLengthOn
 
 @funindex \textLengthOn
 @funindex textLengthOn


@@ -95,9 +100,13 @@ a4_"scherzando" f
 
 
 @seealso
 
 
 @seealso

+Learning Manual:
+@rlearning{Placement of objects}.
+

 Notation Reference:
 @ref{Formatting text},
 Notation Reference:
 @ref{Formatting text},

-@ref{Direction and placement}.
+@ref{Direction and placement},
+@ref{Articulations and ornamentations}.

 
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.


@@ -113,14 +122,12 @@ Internals Reference:
 
 
 @knownissues
 
 
 @knownissues

-

 Checking to make sure that text scripts and lyrics are within the
 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
-default; to enable it, use
+margins requires additonal calculations. In cases where slightly faster
+performance is desired, use

 
 @example
 
 @example

-\override Score.PaperColumn #'keep-inside-line = ##t
+\override Score.PaperColumn #'keep-inside-line = ##f

 @end example
 
 
 @end example
 
 


@@ -131,8 +138,9 @@ default; to enable it, use
 
 Some performance indications, e.g., @notation{rallentando} or
 @notation{accelerando}, are written as text and are extended over
 
 Some performance indications, e.g., @notation{rallentando} or
 @notation{accelerando}, are written as text and are extended over

-multiple notes with dotted lines.  Such objects, called @qq{spanners},
-may be created from one note to another using the following syntax:
+multiple notes with dotted lines.  Such objects, called
+@qq{spanners}, may be created from one note to another using the
+following syntax:

 
 @lilypond[verbatim,quote,relative=2]
 \override TextSpanner #'(bound-details left text) = "rit."
 
 @lilypond[verbatim,quote,relative=2]
 \override TextSpanner #'(bound-details left text) = "rit."


@@ -146,8 +154,8 @@ e,\stopTextSpan
 @noindent
 The string to be printed is set through object properties.  By default
 it is printed in italic characters, but different formatting can be
 @noindent
 The string to be printed is set through object properties.  By default
 it is printed in italic characters, but different formatting can be

-obtained using @code{\markup} blocks, as described in @ref{Formatting
-text}.
+obtained using @code{\markup} blocks, as described in
+@ref{Formatting text}.

 
 @lilypond[quote,relative=2,verbatim]
 \override TextSpanner #'(bound-details left text) =
 
 @lilypond[quote,relative=2,verbatim]
 \override TextSpanner #'(bound-details left text) =


@@ -159,7 +167,6 @@ 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}.
 

-

 @funindex \textSpannerUp
 @funindex textSpannerUp
 @funindex \textSpannerDown
 @funindex \textSpannerUp
 @funindex textSpannerUp
 @funindex \textSpannerDown


@@ -174,14 +181,26 @@ 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:
 @ref{Line styles},
 
 @seealso
 Notation Reference:
 @ref{Line styles},

-@ref{Dynamics}.
+@ref{Dynamics},
+@ref{Formatting text}.

 
 Snippets:
 
 Snippets:

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

 
 Internals Reference:
 @rinternals{TextSpanner}.
 
 Internals Reference:
 @rinternals{TextSpanner}.


@@ -204,8 +223,8 @@ Internals Reference:
 @funindex \markup
 @funindex markup
 
 @funindex \markup
 @funindex markup
 

-Various text elements may be added to a score using
-the syntax described in @ref{Rehearsal marks}:
+Various text elements may be added to a score using the syntax described
+in @ref{Rehearsal marks}:

 
 @c \mark needs to be placed on a separate line (it's not
 @c attached to an object like \markup is). -vv
 
 @c \mark needs to be placed on a separate line (it's not
 @c attached to an object like \markup is). -vv


@@ -239,10 +258,11 @@ or fermata, by specifying the appropriate symbol name as explained in
 @end lilypond
 
 @noindent
 @end lilypond
 
 @noindent

-Such objects are only typeset above the top staff of the score; depending on
-whether they are specified at the end or the middle of a bar, they
-can be placed above the bar line or between notes.  When specified at a
-line break, the mark will be printed at the beginning of the next line.
+Such objects are only typeset above the top staff of the score;
+depending on whether they are specified at the end or the middle of a
+bar, they can be placed above the bar line or between notes.  When
+specified at a line break, the mark will be printed at the beginning of
+the next line.

 
 @lilypond[quote,verbatim,relative=2]
 \mark "Allegro"
 
 @lilypond[quote,verbatim,relative=2]
 \mark "Allegro"


@@ -294,8 +314,8 @@ Internals Reference:
 @funindex markup
 
 A @code{\markup} block can exist by itself, outside of any
 @funindex markup
 
 A @code{\markup} block can exist by itself, outside of any

-any @code{\score} block, as a @qq{top-level
-expression}.  This syntax is described in @ref{File structure}.
+@code{\score} block, as a @qq{top-level expression}.  This syntax
+is described in @ref{File structure}.

 
 @lilypond[verbatim,quote]
 \markup {
 
 @lilypond[verbatim,quote]
 \markup {


@@ -389,11 +409,11 @@ syntax called @qq{markup mode}.
 @cindex markup expressions
 @cindex expressions, markup
 @cindex markup syntax
 @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
 
 The markup syntax is similar to LilyPond's usual syntax: a

-@code{\markup} expression is enclosed in curly braces @code{@{
-@dots{} @}}.  A single word is regarded as a minimal expression,
+@code{\markup} expression is enclosed in curly braces
+@code{@{@dots{} @}}.  A single word is regarded as a minimal expression,

 and therefore does not need to be enclosed with braces.
 
 Unlike simple @qq{quoted text} indications, @code{\markup} blocks may
 and therefore does not need to be enclosed with braces.
 
 Unlike simple @qq{quoted text} indications, @code{\markup} blocks may


@@ -470,12 +490,11 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

-Installed files:
-@file{scm/@/markup@/.scm}.
+Installed Files:
+@file{scm/markup.scm}.

 
 
 @knownissues
 
 
 @knownissues

-

 Syntax errors for markup mode can be confusing.
 
 
 Syntax errors for markup mode can be confusing.
 
 


@@ -592,11 +611,11 @@ example, there is no difference between the first and the second word.
 
 @noindent
 Some of these font families, used for specific items such as numbers
 
 @noindent
 Some of these font families, used for specific items such as numbers

-or dynamics, do not provide all characters, as mentioned in @ref{New
-dynamic marks} and @ref{Manual repeat marks}.
+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 \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


@@ -666,8 +685,14 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm}.
+Installed Files:
+@file{scm/define-markup-commands.scm}.
+
+@knownissues
+Using the font sizing commands @code{\teeny}, @code{\tiny},
+@code{\small}, @code{\normalsize}, @code{\large}, and
+@code{\huge} will lead to inconsistent line spacing compared to
+using @code{\fontsize}.

 
 
 @node Text alignment
 
 
 @node Text alignment


@@ -729,7 +754,8 @@ a,-\markup { \halign #2 poco }
 @noindent
 Some objects may have alignment procedures of their own, and therefore
 are not affected by these commands.  It is possible to move such
 @noindent
 Some objects may have alignment procedures of their own, and therefore
 are not affected by these commands.  It is possible to move such

-markup objects as a whole, as shown for instance in @ref{Text marks}.
+markup objects as a whole, as shown for instance in
+@ref{Text marks}.

 
 @cindex text, vertical alignment
 @cindex vertical text alignment
 
 @cindex text, vertical alignment
 @cindex vertical text alignment


@@ -881,7 +907,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.)


@@ -891,7 +917,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)


@@ -922,8 +948,8 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm}.
+Installed Files:
+@file{scm/define-markup-commands.scm}.

 
 
 @node Graphic notation inside markup
 
 
 @node Graphic notation inside markup


@@ -1066,7 +1092,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 {


@@ -1095,7 +1121,8 @@ An exhaustive list of graphics-specific commands can be found in
 @seealso
 Notation Reference:
 @ref{Graphic},
 @seealso
 Notation Reference:
 @ref{Graphic},

-@ref{Editorial annotations}.
+@ref{Editorial annotations},
+@ref{Align}.

 
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.


@@ -1103,9 +1130,9 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm},
-@file{scm/@/stencil@/.scm}.
+Installed Files:
+@file{scm/define-markup-commands.scm},
+@file{scm/stencil.scm}.

 
 
 @node Music notation inside markup
 
 
 @node Music notation inside markup


@@ -1161,8 +1188,8 @@ d-\markup {
 
 More generally, any available musical symbol may be included
 separately in a markup object, as demonstrated below; an exhaustive
 
 More generally, any available musical symbol may be included
 separately in a markup object, as demonstrated below; an exhaustive

-list of these symbols and their names can be found in @ref{The Feta
-font}.
+list of these symbols and their names can be found in
+@ref{The Feta font}.

 
 @lilypond[quote,verbatim,relative=2]
 c2
 
 @lilypond[quote,verbatim,relative=2]
 c2


@@ -1173,8 +1200,9 @@ c16
 c2^\markup { \musicglyph #"timesig.neomensural94" }
 @end lilypond
 
 c2^\markup { \musicglyph #"timesig.neomensural94" }
 @end lilypond
 

-Another way of printing non-text glyphs is described in @ref{Fonts
-explained}.  This is useful for printing braces of various sizes.
+Another way of printing non-text glyphs is described in
+@ref{Fonts explained}.  This is useful for printing braces of various
+sizes.

 
 The markup mode also supports diagrams for specific
 instruments:
 
 The markup mode also supports diagrams for specific
 instruments:


@@ -1189,10 +1217,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
 


@@ -1235,10 +1263,10 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm},
-@file{scm/@/fret@/-diagrams@/.scm},
-@file{scm/@/harp@/-pedals@/.scm}.
+Installed Files:
+@file{scm/define-markup-commands.scm},
+@file{scm/fret-diagrams.scm},
+@file{scm/harp-pedals.scm}.

 
 
 @node Multi-page markup
 
 
 @node Multi-page markup


@@ -1301,8 +1329,8 @@ Extending:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm}.
+Installed Files:
+@file{scm/define-markup-commands.scm}.

 
 
 @funindex \markuplines
 
 
 @funindex \markuplines


@@ -1350,10 +1378,8 @@ a1^\markup {
   \vcenter {
     \override #'(font-encoding . fetaBraces)
     \lookup #"brace120"
   \vcenter {
     \override #'(font-encoding . fetaBraces)
     \lookup #"brace120"

-    \override #'(font-encoding . fetaNumber)
-    \column { 1 3 }
-    \override #'(font-encoding . fetaDynamic)
-    sf
+    \override #'(font-encoding . fetaText)
+    \column { 1 3 sf }

     \override #'(font-encoding . fetaMusic)
     \lookup #"noteheads.s0petrucci"
   }
     \override #'(font-encoding . fetaMusic)
     \lookup #"noteheads.s0petrucci"
   }


@@ -1374,9 +1400,9 @@ left braces; right braces may be obtained by rotation, see
 @ref{Rotating objects}.
 
 Three families of text fonts are made available: the @emph{roman}
 @ref{Rotating objects}.
 
 Three families of text fonts are made available: the @emph{roman}

-(serif) font, that defaults to New Century Schoolbook, the @emph{sans}
-font and the monospaced @emph{typewriter} font -- these last two
-families are determined by the Pango installation.
+(serif) font, that defaults to New Century Schoolbook, the
+@emph{sans} font and the monospaced @emph{typewriter} font -- these
+last two families are determined by the Pango installation.

 
 Each family may include different shapes and series.  The following
 example demonstrates the ability to select alternate families, shapes,
 
 Each family may include different shapes and series.  The following
 example demonstrates the ability to select alternate families, shapes,


@@ -1395,8 +1421,8 @@ c4^smaller
 
 @noindent
 A similar syntax may be used in markup mode; however in this case it
 
 @noindent
 A similar syntax may be used in markup mode; however in this case it

-is preferable to use the simpler syntax explained in @ref{Selecting
-font and font size}:
+is preferable to use the simpler syntax explained in
+@ref{Selecting font and font size}:

 
 @lilypond[quote,verbatim]
 \markup {
 
 @lilypond[quote,verbatim]
 \markup {


@@ -1429,6 +1455,7 @@ possible to use other fonts, as explained in the following sections:
 Notation Reference:
 @ref{The Feta font},
 @ref{Music notation inside markup},
 Notation Reference:
 @ref{The Feta font},
 @ref{Music notation inside markup},

+@ref{Rotating objects},

 @ref{Selecting font and font size},
 @ref{Font}.
 
 @ref{Selecting font and font size},
 @ref{Font}.
 


@@ -1474,8 +1501,8 @@ Snippets:
 @rlsr{Text}.
 
 @c A source file gets never installed...
 @rlsr{Text}.
 
 @c A source file gets never installed...

-@c Installed files:
-@c @file{lily/@/font@/-config@/-scheme@/.cc}.
+@c Installed Files:
+@c @file{lily/font-config-scheme.cc}.

 
 
 @node Entire document fonts
 
 
 @node Entire document fonts