X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Ftext.itely;h=2e6e32a569832911f4893160b9a6259f5993ec47;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=dc8c011519e5dea36e4c09fcd389cb2bc3a98513;hpb=33da8a7ea4971d226b13337de0e7ba2f3d539474;p=lilypond.git

diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index dc8c011519..2e6e32a569 100644
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -217,9 +217,8 @@ or fermata, by specifying the appropriate symbol name as explained in
 @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 the
-beginning of a score or at a line break, marks will be printed at
-the beginning of the line (the next line, in case of a line break).
+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[fragment,quote,ragged-right,verbatim,relative=2]
 \mark "Allegro"
@@ -299,11 +298,10 @@ several music pieces, as described in
 }
 @end lilypond
 
-Using a specific syntax, text blocks can be spread
-over multiple pages, making it possible to print
-text documents or books (and therefore to
-use LilyPond as a word processor).  This syntax is described in
-@ref{Multi-page markup}.
+Separate text blocks can be spread over multiple pages,
+making it possible to print text documents or books entirely
+within LilyPond.  This feature, and the specific syntax it
+requires, are described in @ref{Multi-page markup}.
 
 @predefined
 
@@ -355,7 +353,7 @@ using the @code{\markup} mode specific syntax.
 @funindex \markup
 
 A @code{\markup} block is used to typeset text with an extensible
-specific syntax called @qq{markup mode}.
+syntax called @qq{markup mode}.
 
 @cindex markup expressions
 @cindex markup syntax
@@ -366,7 +364,7 @@ The markup syntax is similar to LilyPond's usual syntax: a
 and therefore does not need to be enclosed with braces.
 
 Unlike simple @qq{quoted text} indications, @code{\markup} blocks
-may contain nested expressions or specific commands,
+may contain nested expressions or markup commands,
 entered using the backslash @code{\} character.
 Such commands only affect the first following expression.
 
@@ -390,37 +388,29 @@ 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{#}) will be printed verbatim without affecting
-the formatting of the text.  This syntax even allows to print
-double quotation marks, by preceding them with backslashes
+the formatting of the text.  Double quotation marks themselves
+may be printed by preceding them with backslashes.
 
 @lilypond[quote,verbatim,fragment,relative=1]
 d1^"\italic markup..."
-d_\markup \italic "... prints \"italic\" letters!"
+d_\markup { \italic "... prints \"italic\" letters!" }
 d d
 @end lilypond
 
-The way markup expressions are defined affects 
-how these expressions will be stacked, centered and aligned
-when using the commands explained in @ref{Text alignment}.
-
-@lilypond[quote,verbatim,fragment,relative=1]
-c1^\markup { \column { a bbbb \line { c d } } }
-c1^\markup { \center-column { a bbbb c } }
-c1^\markup { \line { a b c } }
-@end lilypond
-
-Lists of words that are not enclosed with double quotes
-or preceded by a command are not treated as a distinct
-expression.  In the following example, the first two
-@code{\markup} expressions are equivalent:
+To be treated as a distinct expression, a list of words needs
+to be enclosed with double quotes or preceded by a command.
+The way markup expressions are defined affects how these
+expressions will be stacked, centered and aligned; in the
+following example, the second @code{\markup} expression is
+treated the same as the first one:
 
 @lilypond[quote,verbatim,fragment,relative=1]
 c1^\markup { \center-column { a bbb c } }
 c1^\markup { \center-column { a { bbb c } } }
 c1^\markup { \center-column { a \line { bbb c } } }
+c1^\markup { \center-column { a "bbb c" } }
 @end lilypond
 
-
 Markups can be stored in variables.  Such variables may be
 directly attached to notes:
 
@@ -447,9 +437,6 @@ Notation Reference:
 Snippets:
 @rlsr{Text}.
 
-Internals Reference:
-@rinternals{TextScript}.
-
 Installed files:
 @file{scm/@/markup@/.scm}.
 
@@ -470,15 +457,13 @@ Syntax errors for markup mode can be confusing.
 Basic font switching is supported in markup mode:
 
 @lilypond[quote,verbatim,relative=2]
-{
-  d1^\markup { 
-    \bold { Più mosso } 
-    \italic { non troppo \underline Vivo } 
-  }
-  r2 r4 r8
-  d,_\markup { \italic quasi \smallCaps Tromba }
-  f1 d2 r
+d1^\markup { 
+  \bold { Più mosso } 
+  \italic { non troppo \underline Vivo } 
 }
+r2 r4 r8
+d,_\markup { \italic quasi \smallCaps Tromba }
+f1 d2 r
 @end lilypond
 
 @cindex font size
@@ -486,16 +471,15 @@ Basic font switching is supported in markup mode:
 @funindex \fontsize
 @funindex \smaller
 @funindex \larger
-@funindex \bigger
 @funindex \magnify
 
 The size of the characters can also be altered in different ways:
 @itemize
 @item
-the font size can be defined to an absolute value,
+the font size can be set to predefined standard sizes,
 
 @item
-predefined commands allow to easily select standard sizes,
+the font size can be set to an absolute value,
 
 @item
 the font size can also be changed relatively to its previous value.
@@ -504,21 +488,23 @@ the font size can also be changed relatively to its previous value.
 @noindent
 The following example demonstrates these three methods:
 
-@lilypond[quote,verbatim,relative=2]
-{
-  f1^\markup { \fontsize #5 Sinfonia } 
-  a,_\markup { 
-    \tiny espressivo
-    \large e
-    \normalsize intenso 
-  }
-  bes^\markup { (con 
-    \larger grande 
-    \smaller emozione 
-    \magnify #0.6 { e sentimento } )
-  }
-  d c2 r8 c bes a g1
+@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
 @end lilypond
 
 @cindex subscript
@@ -543,7 +529,7 @@ these are printed in a smaller size, but a normal size can be used as well:
 
 The markup mode provides an easy way to select alternate
 font families.  The default serif font, of roman type, is
-automatically selected unless specified otherwise: on the
+automatically selected unless specified otherwise; on the
 last line of the following example, there is no difference
 between the first and the second word.
 
@@ -586,8 +572,8 @@ easily be solved by concatenating the text elements together:
 }
 @end lilypond
 
-An exhaustive list of font-switching, font-size
-and font-families related commands can be found in @ref{Font}.
+An exhaustive list of font switching, and custom font usage
+commands can be found in @ref{Font}.
 
 Defining custom font sets is also possible, as explained in
 @ref{Fonts}.
@@ -600,12 +586,16 @@ Defining custom font sets is also possible, as explained in
 @funindex \normalsize
 @funindex \large
 @funindex \huge
+@funindex \smaller
+@funindex \larger
 @code{\teeny},
 @code{\tiny},
 @code{\small},
 @code{\normalsize},
 @code{\large},
-@code{\huge}.
+@code{\huge},
+@code{\smaller},
+@code{\larger}.
 
 @seealso
 Notation Reference:
@@ -630,10 +620,9 @@ Installed files:
 @cindex text, aligning
 @cindex aligning text
 
-This subsection discusses how to place text in markup mode,
-inside a @code{\markup} block.  Markup objects can also
-be moved as a whole, using the syntax described in
-@rlearning{Moving objects}.
+This subsection discusses how to place text in markup mode.
+Markup objects can also be moved as a whole, using the syntax
+described in @rlearning{Moving objects}.
 
 @c Padding commands should be mentioned on this page, but
 @c most of these require \box to be more clearly illustrated. -vv
@@ -650,13 +639,13 @@ example, there is no difference
 between the first and the second markup.
 
 @lilypond[quote,verbatim,fragment,relative=1]
-a1-\markup { poco }
-e'
-a,-\markup { \left-align poco }
-e'
-a,-\markup { \center-align { poco } }
-e'
-a,-\markup { \right-align poco }
+d1-\markup { poco }
+f
+d-\markup { \left-align poco }
+f
+d-\markup { \center-align { poco } }
+f
+d-\markup { \right-align poco }
 @end lilypond
 
 @funindex \halign
@@ -678,7 +667,7 @@ a,-\markup { \halign #2 poco }
 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},
+for instance in @ref{Text marks}.
 
 @cindex text, vertical alignment
 @cindex vertical text alignment
@@ -811,7 +800,7 @@ the following example.
     \wordwrap \italic {
       (La escena representa el corral de una casa de
       gitanos en el Albaicín de Granada. Al fondo una
-      puerta por la que se vé el negro interior de
+      puerta por la que se ve el negro interior de
       una Fragua, iluminado por los rojos resplandores
       del fuego.) 
     }
@@ -856,7 +845,7 @@ Installed files:
 @cindex drawing graphic objects
 
 Various graphic objects may be added to a score,
-using specific markup commands.
+using markup commands.
 
 @funindex \box
 @funindex \circle
@@ -867,7 +856,7 @@ using specific markup commands.
 @cindex decorating text
 @cindex framing text
 
-Some markup commands allow to decorate text elements
+Some markup commands allow decoration of text elements
 with graphics, as demonstrated in the following example.
 
 @lilypond[quote,verbatim]
@@ -895,8 +884,8 @@ with graphics, as demonstrated in the following example.
 @cindex padding around text
 @cindex text padding
 
-Some commands may require to increase the padding around
-the text: this is achieved with some specific commands
+Some commands may require an increase in the padding around
+the text; this is achieved with some markup commands
 exhaustively described in @ref{Align}.
 
 @lilypond[quote,verbatim]
@@ -933,7 +922,7 @@ Flute quartet keeps very uneven time."
 
 Other graphic elements or symbols may be printed
 without requiring any text.  As with any markup
-expression, such objects can be combined together:
+expression, such objects can be combined.
 
 @lilypond[quote,verbatim]
 \markup {
@@ -1010,7 +999,7 @@ Installed files:
 Various musical notation elements may be added
 to a score, inside a markup object.
 
-Notes and accidentals can be entered using specific
+Notes and accidentals can be entered using markup
 commands:
 
 @lilypond[quote,verbatim,fragment,relative=2]
@@ -1134,7 +1123,7 @@ Installed files:
 @unnumberedsubsubsec Multi-page markup
 
 Although standard markup objects are not breakable, a
-specific syntax allows to enter lines of text that can
+specific syntax makes it possible to enter lines of text that can
 spread over multiple pages:
 
 @lilypond[quote,verbatim]
@@ -1151,7 +1140,7 @@ spread over multiple pages:
 }
 @end lilypond
 
-This specific syntax accepts a list of markups, that can be
+This syntax accepts a list of markups, that can be
 @itemize
 @item
 the result of a markup list command,
@@ -1245,7 +1234,7 @@ alternate families, shapes, series and sizes:
   \key d \major
   \override  Voice.TextScript #'font-shape = #'italic
   \override  Voice.TextScript #'font-series = #'bold
-  d''2.^\markup "Allegro"
+  d'2.^\markup "Allegro"
   r4
 @end lilypond