Update expressive marks from Eyolf, thanks!

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index 06e483a482cc5c156e86ae8bb6c8fe0e627432ad..35eaeb3ce1c1b412af2c213899e7177a5fe73c34 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -40,9 +40,9 @@ the affected graphical objects can be accommodated for a specific
 notation flavor without the need for introducing any new notational
 concept.
 
-In addition to the standard articulation signs described in section
-@ref{Articulations}, specific articulation signs for ancient notation
-are provided.
+In addition to the standard articulation signs described in
+section @ref{Articulations and ornamentations}, specific
+articulation signs for ancient notation are provided.
 
 @itemize
 @item
@@ -656,10 +656,10 @@ addressable with @code{\time}.  Use a @code{\markup} instead
 
 @cindex articulations
 
-In addition to the standard articulation signs described in section
-@ref{Articulations}, articulation signs for ancient notation are
-provided.  These are specifically designed for use with notation in
-Editio Vaticana style.
+In addition to the standard articulation signs described in
+section @ref{Articulations and ornamentations}, articulation signs
+for ancient notation are provided.  These are specifically
+designed for use with notation in Editio Vaticana style.
 
 @lilypond[quote,ragged-right,verbatim]
 \include "gregorian-init.ly"

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 96caa7c8915f731222cd2da85384853aba938559..d6b4d7bf93bf9cf520a1ce8c6a5f55987fcd12d2 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -21,7 +21,7 @@
 
 
 @menu
-* Articulations::               
+* Articulations and ornamentations::  
 * Dynamics::                    
 @end menu
 
@@ -45,9 +45,9 @@ the articulation to the note name.  The available shorthands and
 their output are:
 
 @example
-\relative c'' {
+\relative c'' @{
 c-.  c-- c-+ c-|
-c-> c-^ c-_ } 
+c-> c-^ c-_ @} 
 @end example 
 
 @lilypond[quote,ragged-right,fragment]
@@ -116,7 +116,7 @@ are associated with the default articulation marks.  If you want,
 e.g., @code{-+} to produce a trill instead of a "+", you can
 redefine the variable in your document:
 
-@lilypond[quote,ragged-right,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim]
 \relative c'' { c-+ }       
 dashPlus = "trill"
 \relative c'' { c-+ }       
@@ -222,7 +222,7 @@ and ends on the right edge of the ending note.  If the ending note
 falls on the downbeat, the hairpin ends on the immediately
 preceding barline.  This may be modified by setting the
 @code{hairpinToBarline} property,
-@cindex{Hairpin}
+@cindex Hairpin
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 e4\< e2. e1\!
@@ -230,9 +230,9 @@ e4\< e2. e1\!
 e4\< e2. e1\!
 @end lilypond
 
+@cindex espressivo, articulation
 In some situations the @code{\espressivo} articulation mark may be
 suitable to indicate a crescendo and decrescendo on the one note:
-@cindex{espressivo, articulation} 
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c2 b4 a g1\espressivo
@@ -778,7 +778,7 @@ time.
 @unnumberedsubsubsec Trills
 
 Short trills are printed like normal articulation; see
-@ref{Articulations}.
+@ref{Articulations and ornamentations}.
 
 Long running trills are made with @code{\startTrillSpan} and
 @code{\stopTrillSpan},