X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Ftext.itely;h=516fd1e996ee114cfc34356e002f35cd0d06436a;hb=d31248d7770fb5770c2caacfb3547984bf8dcdc3;hp=04b1720913aabccb4d070d7cda74cbffb3ec43fa;hpb=3a991b6913837bac6d0ea429b583295b9263e049;p=lilypond.git

diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index 04b1720913..516fd1e996 100644
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.65"
+@c \version "2.12.0"
 
 @node Text
 @section Text
@@ -53,12 +53,7 @@ information, see @ref{Text encoding}.}
 @cindex non-empty texts
 @cindex quoted text
 
-Simple @qq{quoted text} indications may be added
-to a score, as demonstrated in the following example.
-Such indications may be manually placed
-above or below the staff, using the
-syntax described in @ref{Direction and
-placement}.
+Simple @qq{quoted text} indications may be added to a score.
 
 @lilypond[quote,verbatim,relative=2]
 a8^"pizz." g f e a4-"scherz." f
@@ -73,6 +68,10 @@ a8^\markup { \italic pizz. } g f e
 a4_\markup { \tiny scherz. \bold molto } f
 @end lilypond
 
+@qq{Quoted text} and @code{\markup} commands may be manually
+placed above or below the staff; see @ref{Direction and
+placement}.
+
 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
@@ -150,6 +149,9 @@ 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}.
 
+Text spanners may be manually placed above or below the staff; see
+@ref{Direction and placement}.
+
 
 @predefined
 @funindex textSpannerUp
@@ -164,7 +166,8 @@ object property.  This syntax is described in @ref{Line styles}.
 @seealso
 Notation Reference:
 @ref{Line styles},
-@ref{Dynamics}.
+@ref{Dynamics},
+@ref{Direction and placement}.
 
 Snippets:
 @rlsr{Text}.
@@ -316,42 +319,8 @@ requires, are described in @ref{Multi-page markup}.
 
 @snippets
 
-@ignore
-@c TODO Replace following example with this snippet when available
-@c Submitted to LSR 30 Nov 08
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{stand--alone-two--column-markup.ly}
-@end ignore
-
-Stand-alone text may be arranged in several columns using @code{\markup}
-commands:
-
-@lilypond[verbatim,quote]
-\markup {
- \fill-line {
-  \hspace #1.0
-  \column {
-   \line {"O sacrum convivium" }
-   \line {"in quo Christus sumitur," }
-   \line {"recolitur memoria passionis ejus," }
-   \line {"mens impletur gratia," }
-   \line {"futurae gloriae nobis pignus datur." }
-   \line {"Amen."}
-  }
-  \hspace #2
-  \column {
-   \line { \italic {"O sacred feast"} }
-   \line { \italic {"in which Christ is received,"} }
-   \line { \italic {"the memory of His Passion is renewed,"} }
-   \line { \italic {"the mind is filled with grace," } }
-   \line { \italic {"and a pledge of future glory is given to us." }}
-   \line { \italic {"Amen."}}
-  }
-  \hspace #1.0
- }
-}
-@end lilypond
-@seealso
+{stand-alone-two-column-markup.ly}
 
 @seealso
 Notation Reference: @ref{Formatting text},
@@ -992,7 +961,7 @@ 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 explicitely specify the size of the
+may be useful to explicitly specify the size of the
 drawing, as demonstrated below:
 
 @lilypond[quote,verbatim,relative=1]
@@ -1096,14 +1065,10 @@ c16
 c2^\markup { \musicglyph #"timesig.neomensural94" }
 @end lilypond
 
-@c TODO: add \lookup here? -vv
-@c Probably better not to document \lookup, which is useful only for
-@c printing braces, and instead document \left-brace and \right-brace
-@c when these become available  -td
-
 @noindent
-Another way of printing non-text glyphs is described
-in @ref{Fonts explained}.
+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:
@@ -1238,6 +1203,7 @@ and how they may be changed in scores.
 
 @cindex Pango
 @cindex fonts, explained
+@cindex braces, various sizes
 @funindex font-interface
 
 Fonts are handled through several libraries.
@@ -1265,8 +1231,17 @@ a1^\markup {
 @end lilypond
 
 @noindent
-A simpler, but more limited syntax is also described in
-@ref{Music notation inside markup}.
+However, all these glyphs except the braces of various sizes
+contained in @code{fetaBraces} are available using the
+simpler syntax described in @ref{Music notation inside markup}.
+
+When using the glyphs contained in @code{fetaBraces}, the size of
+the brace is specified by the numerical part of the glyph name, in
+arbitrary units.  Any integer from @code{0} to @code{575} inclusive
+may be specified, @code{0} giving the smallest brace.  The optimum
+value must be determined by trial and error.  These glyphs are all
+left braces; right braces may be obtained by rotation, see
+@ref{Rotating objects}.
 
 Three families of text fonts are made available: the
 @emph{roman} (serif) font, that defaults to New Century