X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Ftext.itely;h=09b3d56ef15bdca32692a61361a3676277dff534;hb=ff5b756b319b1a577e0ebcbe90b77feeef3eb1da;hp=81e6ed5d16323c2b3354756cdc692c97cf0f964d;hpb=aa8523e4fa16352a1708065e447aac65426d82a4;p=lilypond.git diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely index 81e6ed5d16..09b3d56ef1 100644 --- a/Documentation/notation/text.itely +++ b/Documentation/notation/text.itely @@ -3,10 +3,11 @@ Translation of GIT committish: FILL-IN-HEAD-COMMITTISH When revising a translation, copy the HEAD committish of the - version that you are working on. See TRANSLATION for details. + version that you are working on. For details, see the Contributors' + Guide, node Updating translation committishes.. @end ignore -@c \version "2.12.0" +@c \version "2.13.36" @node Text @section Text @@ -82,6 +83,11 @@ a8^"pizz." g f e a4_"scherzando" f @end lilypond +In addition to text scripts, articulations can be attached to notes. +For more information, see @ref{Articulations and ornamentations}. + +For more information about the relative ordering of text scripts and +articulations, see @rlearning{Placement of objects}. @funindex \textLengthOn @funindex textLengthOn @@ -95,6 +101,9 @@ a4_"scherzando" f @seealso +Learning Manual: +@rlearning{Placement of objects}. + Notation Reference: @ref{Formatting text}, @ref{Direction and placement}. @@ -158,6 +167,8 @@ 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 are part of the @code{Dynamics} context; see +@rinternals{Dynamics}. @funindex \textSpannerUp @@ -174,6 +185,16 @@ object property. This syntax is described in @ref{Line styles}. @code{\textSpannerNeutral}. @endpredefined +@knownissues +LilyPond is only able to handle one text spanner per voice. + +@snippets + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{dynamics-text-spanner-postfix.ly} + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{dynamics-custom-text-spanner-postfix.ly} @seealso Notation Reference: @@ -181,10 +202,12 @@ Notation Reference: @ref{Dynamics}. Snippets: -@rlsr{Text}. +@rlsr{Text}, +@rlsr{Expressive marks}. Internals Reference: -@rinternals{TextSpanner}. +@rinternals{TextSpanner}, +@rinternals{Dynamics}. @node Text marks @@ -255,7 +278,7 @@ c c @snippets @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{printing-marks-at-the-end-of-a-line-or-a-score.ly} +{printing-marks-at-the-end-of-a-line.ly} @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] {aligning-marks-with-various-notation-objects.ly} @@ -275,16 +298,11 @@ Snippets: @rlsr{Text}. Internals Reference: +@rinternals{MarkEvent}, +@rinternals{Mark_engraver}, @rinternals{RehearsalMark}. -@knownissues -@c To be removed when Issue 69 in the tracker gets fixed. -vv - -If a mark is entered at the end of the last bar of the score (where -there is no next line), then the mark will not be printed at -all. - @node Separate text @unnumberedsubsubsec Separate text @@ -299,8 +317,8 @@ all. @funindex markup A @code{\markup} block can exist by itself, outside of any -any @code{\score} block, as a @qq{top-level -expression}. This syntax is described in @ref{File structure}. +@code{\score} block, as a @qq{top-level expression}. This syntax +is described in @ref{File structure}. @lilypond[verbatim,quote] \markup { @@ -394,7 +412,7 @@ syntax called @qq{markup mode}. @cindex markup expressions @cindex expressions, markup @cindex markup syntax -@cindex synatax, markup +@cindex syntax, markup The markup syntax is similar to LilyPond's usual syntax: a @code{\markup} expression is enclosed in curly braces @code{@{ @@ -601,7 +619,7 @@ 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 a font-switching command). But we need it here. -vv When used inside a word, some font-switching or formatting commands may produce an unwanted blank space. This can easily be solved by @@ -886,7 +904,7 @@ as shown in the following example. \line \bold { Acto I } \wordwrap \italic { (La escena representa el corral de una casa de - gitanos en el Albaicín de Granada. Al fondo una + gitanos en el Albaicín de Granada. Al fondo una puerta por la que se ve el negro interior de una Fragua, iluminado por los rojos resplandores del fuego.) @@ -896,7 +914,7 @@ as shown in the following example. \line \bold { Acto II } \override #'(line-width . 50) \justify \italic { - (Calle de Granada. Fachada de la casa de Carmela + (Calle de Granada. Fachada de la casa de Carmela y su hermano Manuel con grandes ventanas abiertas a través de las que se ve el patio donde se celebra una alegre fiesta) @@ -1071,7 +1089,7 @@ Advanced graphic features include the ability to 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 drawing, as demonstrated below: +explicitly specify the size of the drawing, as demonstrated below: @lilypond[quote,verbatim,relative=1] c1^\markup { @@ -1194,10 +1212,10 @@ c^\markup { 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 @@ -1355,10 +1373,8 @@ a1^\markup { \vcenter { \override #'(font-encoding . fetaBraces) \lookup #"brace120" - \override #'(font-encoding . fetaNumber) - \column { 1 3 } - \override #'(font-encoding . fetaDynamic) - sf + \override #'(font-encoding . fetaText) + \column { 1 3 sf } \override #'(font-encoding . fetaMusic) \lookup #"noteheads.s0petrucci" }