X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Ftext.itely;h=cdef0fd8413e8ed7f91416fa9937700c3c31c480;hb=08666d43e1dd61b654c40a77d5785544065af423;hp=41b8fb34a432f6dfc0626f038c8f0ec8330ef2d7;hpb=1c859650b6ff11a7dbe829328fd5cae3816b9231;p=lilypond.git diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely index 41b8fb34a4..cdef0fd841 100644 --- a/Documentation/notation/text.itely +++ b/Documentation/notation/text.itely @@ -3,7 +3,8 @@ 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" @@ -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}. @@ -105,6 +114,7 @@ Snippets: Internals Reference: @rinternals{TextScript}. + @cindex text outside margin @cindex margin, text running over @cindex text, keeping inside margin @@ -173,6 +183,8 @@ 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. @seealso Notation Reference: @@ -254,7 +266,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} @@ -274,16 +286,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 @@ -298,8 +305,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 { @@ -346,8 +353,10 @@ requires, are described in @ref{Multi-page markup}. @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] {stand-alone-two-column-markup.ly} + @seealso -Notation Reference: @ref{Formatting text}, +Notation Reference: +@ref{Formatting text}, @ref{File structure}, @ref{Multiple scores in a book}, @ref{Multi-page markup}. @@ -355,7 +364,8 @@ Notation Reference: @ref{Formatting text}, Snippets: @rlsr{Text}. -Internals Reference: @rinternals{TextScript}. +Internals Reference: +@rinternals{TextScript}. @node Formatting text @@ -390,7 +400,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{@{ @@ -920,7 +930,8 @@ Notation Reference: Snippets: @rlsr{Text}. -Internals Reference: @rinternals{TextScript}. +Internals Reference: +@rinternals{TextScript}. Installed files: @file{scm/@/define@/-markup@/-commands@/.scm}. @@ -1066,7 +1077,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 { @@ -1100,7 +1111,8 @@ Notation Reference: Snippets: @rlsr{Text}. -Internals Reference: @rinternals{TextScript}. +Internals Reference: +@rinternals{TextScript}. Installed files: @file{scm/@/define@/-markup@/-commands@/.scm}, @@ -1172,7 +1184,6 @@ c16 c2^\markup { \musicglyph #"timesig.neomensural94" } @end lilypond -@noindent Another way of printing non-text glyphs is described in @ref{Fonts explained}. This is useful for printing braces of various sizes. @@ -1232,7 +1243,8 @@ Notation Reference: Snippets: @rlsr{Text}. -Internals Reference: @rinternals{TextScript}. +Internals Reference: +@rinternals{TextScript}. Installed files: @file{scm/@/define@/-markup@/-commands@/.scm}, @@ -1290,16 +1302,20 @@ An exhaustive list of markup list commands can be found in @seealso Notation Reference: @ref{Text markup list commands}, -@ref{New markup list command definition}. Snippets: @rlsr{Text}. -Internals Reference: @rinternals{TextScript}. +Extending: +@rextend{New markup list command definition}. + +Internals Reference: +@rinternals{TextScript}. Installed files: @file{scm/@/define@/-markup@/-commands@/.scm}. + @funindex \markuplines @funindex markuplines @@ -1345,10 +1361,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" } @@ -1435,7 +1449,7 @@ Any font that is installed on the operating system and recognized by FontConfig may be used in a score, using the following syntax: @lilypond[quote,verbatim,relative=2] -\override Staff.TimeSignature #'font-name = #"Charter" +\override Staff.TimeSignature #'font-name = #"Bitstream Charter" \override Staff.TimeSignature #'font-size = #2 \time 3/4 @@ -1459,10 +1473,6 @@ operating system: lilypond -dshow-available-fonts x @end example -@noindent -The last argument of the command can be anything, but has to be -present. - @seealso Notation Reference: @@ -1472,8 +1482,9 @@ Notation Reference: Snippets: @rlsr{Text}. -Installed files: -@file{lily/@/font@/-config@/-scheme@/.cc}. +@c A source file gets never installed... +@c Installed files: +@c @file{lily/@/font@/-config@/-scheme@/.cc}. @node Entire document fonts