Doc: Various to NR from user email threads

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

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 41b8fb34a432f6dfc0626f038c8f0ec8330ef2d7..f7aa545f0fd0eb91ca303bb42a42465774d62c54 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.13.36"

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


@@ -82,6 +83,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,6 +101,9 @@ a4_"scherzando" f
 
 
 @seealso
 
 
 @seealso

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

 Notation Reference:
 @ref{Formatting text},
 @ref{Direction and placement}.
 Notation Reference:
 @ref{Formatting text},
 @ref{Direction and placement}.


@@ -105,6 +114,7 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

+

 @cindex text outside margin
 @cindex margin, text running over
 @cindex text, keeping inside margin
 @cindex text outside margin
 @cindex margin, text running over
 @cindex text, keeping inside margin


@@ -145,8 +155,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) =


@@ -157,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


@@ -173,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:


@@ -180,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


@@ -254,7 +278,7 @@ c  c
 @snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 @snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]

-{printing-marks-at-the-end-of-a-line-or-a-score.ly}
+{printing-marks-at-the-end-of-a-line.ly}

 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {aligning-marks-with-various-notation-objects.ly}
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {aligning-marks-with-various-notation-objects.ly}


@@ -274,16 +298,11 @@ Snippets:
 @rlsr{Text}.
 
 Internals Reference:
 @rlsr{Text}.
 
 Internals Reference:

+@rinternals{MarkEvent},
+@rinternals{Mark_engraver},

 @rinternals{RehearsalMark}.
 
 
 @rinternals{RehearsalMark}.
 
 

-@knownissues
-@c  To be removed when Issue 69 in the tracker gets fixed. -vv
-
-If a mark is entered at the end of the last bar of the score (where
-there is no next line), then the mark will not be printed at
-all.
-

 @node Separate text
 @unnumberedsubsubsec Separate text
 
 @node Separate text
 @unnumberedsubsubsec Separate text
 


@@ -298,8 +317,8 @@ all.
 @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 {


@@ -346,8 +365,10 @@ requires, are described in @ref{Multi-page markup}.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {stand-alone-two-column-markup.ly}
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {stand-alone-two-column-markup.ly}
 

+

 @seealso
 @seealso

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

 @ref{File structure},
 @ref{Multiple scores in a book},
 @ref{Multi-page markup}.
 @ref{File structure},
 @ref{Multiple scores in a book},
 @ref{Multi-page markup}.


@@ -355,7 +376,8 @@ Notation Reference: @ref{Formatting text},
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

-Internals Reference: @rinternals{TextScript}.
+Internals Reference:
+@rinternals{TextScript}.

 
 
 @node Formatting text
 
 
 @node Formatting text


@@ -390,7 +412,7 @@ 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
 @code{\markup} expression is enclosed in curly braces @code{@{
 
 The markup syntax is similar to LilyPond's usual syntax: a
 @code{\markup} expression is enclosed in curly braces @code{@{


@@ -471,8 +493,8 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

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

 
 
 @knownissues
 
 
 @knownissues


@@ -593,11 +615,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


@@ -667,8 +689,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


@@ -882,7 +910,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.)


@@ -892,7 +920,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)


@@ -920,10 +948,11 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

-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 +1095,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 {


@@ -1100,11 +1129,12 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

-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


@@ -1160,8 +1190,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


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

-@noindent
-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 +1219,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
 


@@ -1232,12 +1262,13 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

-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


@@ -1290,15 +1321,19 @@ An exhaustive list of markup list commands can be found in
 @seealso
 Notation Reference:
 @ref{Text markup list commands},
 @seealso
 Notation Reference:
 @ref{Text markup list commands},

-@ref{New markup list command definition}.

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

-Internals Reference: @rinternals{TextScript}.
+Extending:
+@rextend{New markup list command definition}.
+
+Internals Reference:
+@rinternals{TextScript}.
+
+Installed Files:
+@file{scm/define-markup-commands.scm}.

 
 

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

 
 @funindex \markuplines
 @funindex markuplines
 
 @funindex \markuplines
 @funindex markuplines


@@ -1345,10 +1380,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"
   }


@@ -1390,8 +1423,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 {


@@ -1435,7 +1468,7 @@ Any font that is installed on the operating system and recognized by
 FontConfig may be used in a score, using the following syntax:
 
 @lilypond[quote,verbatim,relative=2]
 FontConfig may be used in a score, using the following syntax:
 
 @lilypond[quote,verbatim,relative=2]

-\override Staff.TimeSignature #'font-name = #"Charter"
+\override Staff.TimeSignature #'font-name = #"Bitstream Charter"

 \override Staff.TimeSignature #'font-size = #2
 \time 3/4
 
 \override Staff.TimeSignature #'font-size = #2
 \time 3/4
 


@@ -1459,10 +1492,6 @@ operating system:
 lilypond -dshow-available-fonts x
 @end example
 
 lilypond -dshow-available-fonts x
 @end example
 

-@noindent
-The last argument of the command can be anything, but has to be
-present.
-

 
 @seealso
 Notation Reference:
 
 @seealso
 Notation Reference:


@@ -1472,8 +1501,9 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

-Installed files:
-@file{lily/@/font@/-config@/-scheme@/.cc}.
+@c A source file gets never installed...
+@c Installed Files:
+@c @file{lily/font-config-scheme.cc}.

 
 
 @node Entire document fonts
 
 
 @node Entire document fonts