From a3053464dbe2295f66decd9d328b1c20ad6f6678 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Fri, 3 Oct 2008 22:47:04 +0200 Subject: [PATCH] Corrections in NR 1.8 Text (thanks to Graham) --- Documentation/user/text.itely | 90 ++++++++++++++++------------------- 1 file changed, 41 insertions(+), 49 deletions(-) diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely index 167e9acb4c..39b10e2fc4 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" @@ -390,37 +389,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 +not treated differently from 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 +438,6 @@ Notation Reference: Snippets: @rlsr{Text}. -Internals Reference: -@rinternals{TextScript}. - Installed files: @file{scm/@/markup@/.scm}. @@ -470,15 +458,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 @@ -492,10 +478,10 @@ Basic font switching is supported in markup mode: 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 an absolute value, @item -predefined commands allow to easily select standard sizes, +the font size can be set to predefined standard sizes, @item the font size can also be changed relatively to its previous value. @@ -505,20 +491,22 @@ the font size can also be changed relatively to its previous value. 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 +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 +531,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. @@ -600,12 +588,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: -- 2.39.5