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 159db9703d5e2ff4b87913937ce93b37b6407eb4..023b5380a7859e01ed5dc099f1e14e1b34975592 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.13.36"
+@c \version "2.15.17"

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


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


@@ -99,14 +98,14 @@ articulations, see @rlearning{Placement of objects}.
 @code{\textLengthOff}.
 @endpredefined
 
 @code{\textLengthOff}.
 @endpredefined
 

-

 @seealso
 Learning Manual:
 @rlearning{Placement of objects}.
 
 Notation Reference:
 @ref{Formatting text},
 @seealso
 Learning Manual:
 @rlearning{Placement of objects}.
 
 Notation Reference:
 @ref{Formatting text},

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

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


@@ -114,22 +113,18 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-

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

-

 @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
 
 


@@ -188,16 +183,17 @@ LilyPond is only able to handle one text spanner per voice.
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {dynamics-text-spanner-postfix.ly}
 
 {dynamics-text-spanner-postfix.ly}
 

-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]

 {dynamics-custom-text-spanner-postfix.ly}
 
 @seealso
 Notation Reference:
 @ref{Line styles},
 {dynamics-custom-text-spanner-postfix.ly}
 
 @seealso
 Notation Reference:
 @ref{Line styles},

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

 
 Snippets:
 @rlsr{Text},
 
 Snippets:
 @rlsr{Text},


@@ -224,8 +220,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


@@ -259,10 +255,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"


@@ -274,16 +271,15 @@ c  c
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]

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

-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]

 {aligning-marks-with-various-notation-objects.ly}
 
 {aligning-marks-with-various-notation-objects.ly}
 

-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]

 {printing-marks-on-every-staff.ly}
 
 {printing-marks-on-every-staff.ly}
 

-

 @seealso
 Notation Reference:
 @ref{Rehearsal marks},
 @seealso
 Notation Reference:
 @ref{Rehearsal marks},


@@ -348,21 +344,20 @@ requires, are described in @ref{Multi-page markup}.
 
 @funindex \markup
 @funindex markup
 
 @funindex \markup
 @funindex markup

-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist

 
 @predefined
 @code{\markup},
 
 @predefined
 @code{\markup},

-@code{\markuplines}.
+@code{\markuplist}.

 @endpredefined
 
 
 @snippets
 
 @endpredefined
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]

 {stand-alone-two-column-markup.ly}
 
 {stand-alone-two-column-markup.ly}
 

-

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


@@ -441,7 +436,7 @@ c
 
 A @code{\markup} block may also contain quoted text strings.  Such
 strings are treated as minimal text expressions, and therefore any
 
 A @code{\markup} block may also contain quoted text strings.  Such
 strings are treated as minimal text expressions, and therefore any

-markup command or special character (such as @code{\} and @code{#})
+markup command or special character (such as @code{\} and@tie{}@code{#})

 will be printed verbatim without affecting the formatting of the text.
 Double quotation marks themselves may be printed by preceding them
 with backslashes.
 will be printed verbatim without affecting the formatting of the text.
 Double quotation marks themselves may be printed by preceding them
 with backslashes.


@@ -482,7 +477,6 @@ allegro = \markup { \bold \large Allegro }
 An exhaustive list of @code{\markup}-specific commands can be found in
 @ref{Text markup commands}.
 
 An exhaustive list of @code{\markup}-specific commands can be found in
 @ref{Text markup commands}.
 

-

 @seealso
 Notation Reference:
 @ref{Text markup commands}.
 @seealso
 Notation Reference:
 @ref{Text markup commands}.


@@ -493,9 +487,7 @@ Snippets:
 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.
 
 


@@ -528,6 +520,7 @@ f1 d2 r
 @cindex font size
 @cindex text size
 
 @cindex font size
 @cindex text size
 

+@funindex \abs-fontsize

 @funindex \fontsize
 @funindex fontsize
 @funindex \smaller
 @funindex \fontsize
 @funindex fontsize
 @funindex \smaller


@@ -537,38 +530,41 @@ f1 d2 r
 @funindex \magnify
 @funindex magnify
 
 @funindex \magnify
 @funindex magnify
 

-The size of the characters can also be altered in different ways:
-@itemize
-@item
-the font size can be set to predefined standard sizes,
+The font size can be altered, relative to the global staff size, in a
+number of different ways

 
 

-@item
-the font size can be set to an absolute value,
+It can be set to predefined size,

 
 

-@item
-the font size can also be changed relatively to its previous value.
-@end itemize
+@lilypond[quote,verbatim,relative=2]
+b1_\markup { \huge Sinfonia }
+b1^\markup { \teeny da }
+b1-\markup { \normalsize camera }
+@end lilypond

 
 

-@noindent
-The following example demonstrates these three methods:
+It can be set relative to its previous value,

 
 

-@lilypond[quote,verbatim,relative=1]
-f1_\markup {
-  \tiny espressivo
-  \large e
-  \normalsize intenso
-}
-a^\markup {
-  \fontsize #5 Sinfonia
-  \fontsize #2 da
-  \fontsize #3 camera
-}
-bes^\markup { (con
-  \larger grande
-  \smaller emozione
-  \magnify #0.6 { e sentimento } )
-}
-d c2 r8 c bes a g1
+@lilypond[quote,verbatim,relative=2]
+b1_\markup { \larger Sinfonia }
+b1^\markup { \smaller da }
+b1-\markup { \magnify #0.6  camera }
+@end lilypond
+
+It can be increased or decreased relative to the value set by the
+global staff size,
+
+@lilypond[quote,verbatim,relative=2]
+b1_\markup { \fontsize #-2 Sinfonia }
+b1^\markup { \fontsize #1 da }
+b1-\markup { \fontsize #3 camera }
+@end lilypond
+
+It can also be set to a fixed point-size, regardless of the global staff
+size,
+
+@lilypond[quote,verbatim,relative=2]
+b1_\markup { \abs-fontsize #20 Sinfonia }
+b1^\markup { \abs-fontsize #8 da }
+b1-\markup { \abs-fontsize #14 camera }

 @end lilypond
 
 @cindex subscript
 @end lilypond
 
 @cindex subscript


@@ -578,6 +574,8 @@ d c2 r8 c bes a g1
 @funindex super
 @funindex \sub
 @funindex sub
 @funindex super
 @funindex \sub
 @funindex sub

+@funindex \normal-size-super
+@funindex normal-size-super

 
 Text may be printed as subscript or superscript.  By default these are
 printed in a smaller size, but a normal size can be used as well:
 
 Text may be printed as subscript or superscript.  By default these are
 printed in a smaller size, but a normal size can be used as well:


@@ -672,7 +670,6 @@ Defining custom font sets is also possible, as explained in
 @code{\larger}.
 @endpredefined
 
 @code{\larger}.
 @endpredefined
 

-

 @seealso
 Notation Reference:
 @ref{Font},
 @seealso
 Notation Reference:
 @ref{Font},


@@ -680,15 +677,15 @@ Notation Reference:
 @ref{Manual repeat marks},
 @ref{Fonts}.
 
 @ref{Manual repeat marks},
 @ref{Fonts}.
 

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

 Snippets:
 @rlsr{Text}.
 
 Internals Reference:
 @rinternals{TextScript}.
 
 Snippets:
 @rlsr{Text}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-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
 @knownissues
 Using the font sizing commands @code{\teeny}, @code{\tiny},
 @code{\small}, @code{\normalsize}, @code{\large}, and


@@ -934,7 +931,6 @@ as shown in the following example.
 An exhaustive list of text alignment commands can be found in
 @ref{Align}.
 
 An exhaustive list of text alignment commands can be found in
 @ref{Align}.
 

-

 @seealso
 Learning Manual:
 @rlearning{Moving objects}.
 @seealso
 Learning Manual:
 @rlearning{Moving objects}.


@@ -943,15 +939,15 @@ Notation Reference:
 @ref{Align},
 @ref{Text marks}.
 
 @ref{Align},
 @ref{Text marks}.
 

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

 Snippets:
 @rlsr{Text}.
 
 Internals Reference:
 @rinternals{TextScript}.
 
 Snippets:
 @rlsr{Text}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

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

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


@@ -1118,11 +1114,15 @@ c
 An exhaustive list of graphics-specific commands can be found in
 @ref{Graphic}.
 
 An exhaustive list of graphics-specific commands can be found in
 @ref{Graphic}.
 

-

 @seealso
 Notation Reference:
 @ref{Graphic},
 @seealso
 Notation Reference:
 @ref{Graphic},

-@ref{Editorial annotations}.
+@ref{Editorial annotations},
+@ref{Align}.
+
+Installed Files:
+@file{scm/define-markup-commands.scm},
+@file{scm/stencil.scm}.

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


@@ -1130,10 +1130,6 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

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

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


@@ -1250,24 +1246,23 @@ c d e f
 An exhaustive list of music notation related commands can be found in
 @ref{Music}.
 
 An exhaustive list of music notation related commands can be found in
 @ref{Music}.
 

-

 @seealso
 Notation Reference:
 @ref{Music},
 @ref{The Feta font},
 @ref{Fonts explained}.
 
 @seealso
 Notation Reference:
 @ref{Music},
 @ref{The Feta font},
 @ref{Fonts explained}.
 

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

 Snippets:
 @rlsr{Text}.
 
 Internals Reference:
 @rinternals{TextScript}.
 
 Snippets:
 @rlsr{Text}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

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

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


@@ -1277,8 +1272,8 @@ Installed Files:
 @cindex markup text, multi-page
 @cindex text spread over multiple pages
 
 @cindex markup text, multi-page
 @cindex text spread over multiple pages
 

-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist

 @funindex \justified-lines
 @funindex justified-lines
 @funindex \wordwrap-lines
 @funindex \justified-lines
 @funindex justified-lines
 @funindex \wordwrap-lines


@@ -1289,7 +1284,7 @@ makes it possible to enter lines of text that can spread over multiple
 pages:
 
 @lilypond[quote,verbatim]
 pages:
 
 @lilypond[quote,verbatim]

-\markuplines {
+\markuplist {

   \justified-lines {
     A very long text of justified lines.
     ...
   \justified-lines {
     A very long text of justified lines.
     ...


@@ -1315,29 +1310,27 @@ a list of markup lists.
 An exhaustive list of markup list commands can be found in
 @ref{Text markup list commands}.
 
 An exhaustive list of markup list commands can be found in
 @ref{Text markup list commands}.
 

-

 @seealso
 Notation Reference:
 @seealso
 Notation Reference:

-@ref{Text markup list commands},
-
-Snippets:
-@rlsr{Text}.
+@ref{Text markup list commands}.

 
 

-Extending:
+Extending LilyPond:

 @rextend{New markup list command definition}.
 
 @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}.
 

+Snippets:
+@rlsr{Text}.
+
+Internals Reference:
+@rinternals{TextScript}.

 
 

-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist

 
 @predefined
 
 @predefined

-@code{\markuplines}.
+@code{\markuplist}.

 @endpredefined
 
 
 @endpredefined
 
 


@@ -1450,11 +1443,11 @@ Although it is easy to switch between preconfigured fonts, it is also
 possible to use other fonts, as explained in the following sections:
 @ref{Single entry fonts} and @ref{Entire document fonts}.
 
 possible to use other fonts, as explained in the following sections:
 @ref{Single entry fonts} and @ref{Entire document fonts}.
 

-

 @seealso
 Notation Reference:
 @ref{The Feta font},
 @ref{Music notation inside markup},
 @seealso
 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}.
 


@@ -1490,7 +1483,6 @@ operating system:
 lilypond -dshow-available-fonts x
 @end example
 
 lilypond -dshow-available-fonts x
 @end example
 

-

 @seealso
 Notation Reference:
 @ref{Fonts explained},
 @seealso
 Notation Reference:
 @ref{Fonts explained},


@@ -1538,7 +1530,6 @@ explanation of fonts, see @ref{Fonts explained}.
 @c we don't do Helvetica / Courier, since GS incorrectly loads
 @c Apple TTF fonts
 
 @c we don't do Helvetica / Courier, since GS incorrectly loads
 @c Apple TTF fonts
 

-

 @seealso
 Notation Reference:
 @ref{Fonts explained},
 @seealso
 Notation Reference:
 @ref{Fonts explained},