Guide, node Updating translation committishes..
@end ignore
-@c \version "2.12.0"
+@c \version "2.14.0"
@node Text
@section Text
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
-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
Notation Reference:
@ref{Formatting text},
-@ref{Direction and placement}.
+@ref{Direction and placement},
+@ref{Articulations and ornamentations}.
Snippets:
@rlsr{Text}.
@knownissues
-
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
-\override Score.PaperColumn #'keep-inside-line = ##t
+\override Score.PaperColumn #'keep-inside-line = ##f
@end example
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."
@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) =
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
@seealso
Notation Reference:
@ref{Line styles},
-@ref{Dynamics}.
+@ref{Dynamics},
+@ref{Formatting text}.
Snippets:
@rlsr{Text},
@rlsr{Expressive marks}.
Internals Reference:
-@rinternals{TextSpanner},
-@rinternals{Dynamics}.
+@rinternals{TextSpanner}.
@node Text marks
@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
@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"
@cindex syntax, markup
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
Snippets:
@rlsr{Text}.
-Installed files:
-@file{scm/@/markup@/.scm}.
+Installed Files:
+@file{scm/markup.scm}.
@knownissues
-
Syntax errors for markup mode can be confusing.
@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 a font-switching command). But we need it here. -vv
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
@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
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
@seealso
Notation Reference:
@ref{Graphic},
-@ref{Editorial annotations}.
+@ref{Editorial annotations},
+@ref{Align}.
Snippets:
@rlsr{Text}.
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
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
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:
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
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
Internals Reference:
@rinternals{TextScript}.
-Installed files:
-@file{scm/@/define@/-markup@/-commands@/.scm}.
+Installed Files:
+@file{scm/define-markup-commands.scm}.
@funindex \markuplines
@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,
@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 {
Notation Reference:
@ref{The Feta font},
@ref{Music notation inside markup},
+@ref{Rotating objects},
@ref{Selecting font and font size},
@ref{Font}.
@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