Doc: Perform fold on itely files for linelength

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

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 3f1d612441ce7d9d6f9f8a63b44edd6812b8196c..6841e44dcb5e4bafc0d7fe99cfa7e69562c0e274 100644 (file)
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -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


@@ -106,7 +105,8 @@ Learning Manual:
 
 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}.


@@ -122,7 +122,6 @@ Internals Reference:
 
 
 @knownissues
 
 
 @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
 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


@@ -140,8 +139,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."


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


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

-Text spanners are part of the @code{Dynamics} context; see
-@rinternals{Dynamics}.
-

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


@@ -199,15 +196,15 @@ LilyPond is only able to handle one text spanner per voice.
 @seealso
 Notation Reference:
 @ref{Line styles},
 @seealso
 Notation Reference:
 @ref{Line styles},

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

 
 Snippets:
 @rlsr{Text},
 @rlsr{Expressive marks}.
 
 Internals Reference:
 
 Snippets:
 @rlsr{Text},
 @rlsr{Expressive marks}.
 
 Internals Reference:

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

 
 
 @node Text marks
 
 
 @node Text marks


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


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


@@ -415,8 +413,8 @@ syntax called @qq{markup mode}.
 @cindex syntax, markup
 
 The markup syntax is similar to LilyPond's usual syntax: a
 @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
 and therefore does not need to be enclosed with braces.
 
 Unlike simple @qq{quoted text} indications, @code{\markup} blocks may


@@ -493,12 +491,11 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
 Snippets:
 @rlsr{Text}.
 

-Installed files:
+Installed Files:

 @file{scm/markup.scm}.
 
 
 @knownissues
 @file{scm/markup.scm}.
 
 
 @knownissues

-

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


@@ -615,8 +612,8 @@ 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 a font-switching command).  But we need it here. -vv
 
 @c \concat is actually documented in Align (it is not
 @c a font-switching command).  But we need it here. -vv


@@ -689,9 +686,15 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
+Installed Files:

 @file{scm/define-markup-commands.scm}.
 
 @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
 @unnumberedsubsubsec Text alignment
 
 @node Text alignment
 @unnumberedsubsubsec Text alignment


@@ -752,7 +755,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


@@ -945,7 +949,7 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
+Installed Files:

 @file{scm/define-markup-commands.scm}.
 
 
 @file{scm/define-markup-commands.scm}.
 
 


@@ -1118,7 +1122,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}.


@@ -1126,7 +1131,7 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
+Installed Files:

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


@@ -1184,8 +1189,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


@@ -1196,8 +1201,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:


@@ -1258,7 +1264,7 @@ Snippets:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
+Installed Files:

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


@@ -1324,7 +1330,7 @@ Extending:
 Internals Reference:
 @rinternals{TextScript}.
 
 Internals Reference:
 @rinternals{TextScript}.
 

-Installed files:
+Installed Files:

 @file{scm/define-markup-commands.scm}.
 
 
 @file{scm/define-markup-commands.scm}.
 
 


@@ -1395,9 +1401,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,


@@ -1416,8 +1422,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 {


@@ -1450,6 +1456,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}.
 


@@ -1495,7 +1502,7 @@ Snippets:
 @rlsr{Text}.
 
 @c A source file gets never installed...
 @rlsr{Text}.
 
 @c A source file gets never installed...

-@c Installed files:
+@c Installed Files:

 @c @file{lily/font-config-scheme.cc}.
 
 
 @c @file{lily/font-config-scheme.cc}.