Merge branch 'lilypond/translation' of ssh://git.savannah.gnu.org/srv/git/lilypond...

[lilypond.git] / Documentation / notation / text.itely

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 81e6ed5d16323c2b3354756cdc692c97cf0f964d..cdef0fd8413e8ed7f91416fa9937700c3c31c480 100644 (file)
--- 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}.
@@ -174,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:
@@ -255,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}
@@ -275,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
 
@@ -299,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 {
@@ -394,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{@{
@@ -1071,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 {
@@ -1355,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"
   }