Merge branch 'fixedmerge' into HEAD

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

diff --git a/Documentation/notation/editorial.itely b/Documentation/notation/editorial.itely
index c83383359c698b30c5fdbc64a49967a88208340e..56c05e8335c1a701f4d785435107fe78382b0b7d 100644 (file)
--- a/Documentation/notation/editorial.itely
+++ b/Documentation/notation/editorial.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.14.0"
 
 @node Editorial annotations
 @section Editorial annotations
@@ -166,7 +166,7 @@ c4-1 d-2 f-4 c^\markup { \finger "2 - 3" }
 @funindex \thumb
 @funindex thumb
 
-A thumb-script can be added (e.g., in cello music) to indicate
+A thumb-script can be added (e.g. cello music) to indicate
 that a note should be played with the thumb.
 
 @lilypond[verbatim,quote,relative=2]
@@ -177,8 +177,8 @@ that a note should be played with the thumb.
 @cindex fingering instructions for chords
 @cindex chords, fingering
 
-Fingerings for chords can also be added to individual notes of the
-chord by adding them after the pitches.
+Fingerings for chords can also be added to individual notes by
+adding them after the pitches.
 
 @lilypond[verbatim,quote,relative=2]
 <c-1 e-2 g-3 b-5>2 <d-1 f-2 a-3 c-5>
@@ -189,19 +189,19 @@ staff, see @ref{Direction and placement}.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {controlling-the-placement-of-chord-fingerings.ly}
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {avoiding-collisions-with-chord-fingerings.ly}
 
 
 @seealso
 Notation Reference:
-@ref{Direction and placement}
+@ref{Direction and placement}.
 
 Snippets:
 @rlsr{Editorial annotations}.
@@ -213,6 +213,10 @@ Internals Reference:
 @rinternals{New_fingering_engraver},
 @rinternals{Fingering}.
 
+@knownissues
+By default, numbers greater than 9 are not supported using
+@samp{@var{note}-@var{digit}}.
+
 
 @node Hidden notes
 @unnumberedsubsubsec Hidden notes
@@ -383,9 +387,9 @@ An X11 color is not necessarily exactly the same shade as a
 similarly named normal color.
 
 Not all X11 colors are distinguishable in a web browser, i.e.,
-a web browser might not display a difference between @code{'LimeGreen}
-and @code{'ForestGreen}.  For web use normal colors are recommended
-(i.e., @code{#blue}, @code{#green}, @code{#red}).
+a web browser might not display a difference between @code{LimeGreen}
+and @code{ForestGreen}.  For web use normal colors are recommended
+(i.e., @code{blue}, @code{green}, @code{red}).
 
 
 Notes in a chord cannot be colored with @code{\override}; use
@@ -474,7 +478,7 @@ Stems may be manually placed to point up or down; see
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {default-direction-of-stems-on-the-center-line-of-the-staff.ly}
 
 
@@ -629,7 +633,7 @@ lines.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {grid-lines--changing-their-appearance.ly}