Merge master into nested-bookparts

[lilypond.git] / Documentation / user / expressive.itely

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 70e896321aa72c316e9fc3f328ad6c24e022adf9..65e197b242aa91151223e57abb549d794d9742ff 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Expressive marks
 @section Expressive marks
@@ -17,9 +17,9 @@ This section lists various expressive marks that can be
 created in a score.
 
 @menu
-* Attached to notes::           
-* Curves::                      
-* Lines::                       
+* Attached to notes::
+* Curves::
+* Lines::
 @end menu
 
 
@@ -31,9 +31,9 @@ attached to notes: articulations, ornamentations, and dynamics.
 Methods to create new dynamic markings are also discussed.
 
 @menu
-* Articulations and ornamentations::  
-* Dynamics::                    
-* New dynamic marks::           
+* Articulations and ornamentations::
+* Dynamics::
+* New dynamic marks::
 @end menu
 
 @node Articulations and ornamentations
@@ -130,7 +130,8 @@ Music Glossary:
 
 Notation Reference:
 @ref{Direction and placement},
-@ref{List of articulations}.
+@ref{List of articulations},
+@ref{Trills}.
 
 Installed Files:
 @file{scm/@/script@/.scm}.
@@ -300,20 +301,21 @@ aligned with dynamics, see @ref{New dynamic marks}.
 
 @funindex DynamicLineSpanner
 
+
 Vertical positioning of dynamics is handled by
 @rinternals{DynamicLineSpanner}.
-
-
-@predefined
-
 @funindex \dynamicUp
 @funindex dynamicUp
-@code{\dynamicUp},
 @funindex \dynamicDown
 @funindex dynamicDown
-@code{\dynamicDown},
 @funindex \dynamicNeutral
 @funindex dynamicNeutral
+
+
+@predefined
+
+@code{\dynamicUp},
+@code{\dynamicDown},
 @code{\dynamicNeutral},
 @code{\crescTextCresc},
 @code{\dimTextDim},
@@ -349,11 +351,11 @@ Vertical positioning of dynamics is handled by
 
 @seealso
 
-@c TODO: Add hairpin to glossary.
-
 Music Glossary:
+@rglos{al niente},
 @rglos{crescendo},
-@rglos{decrescendo}.
+@rglos{decrescendo},
+@rglos{hairpin}.
 
 Learning Manual:
 @rlearning{Articulation and dynamics}.
@@ -530,10 +532,14 @@ c2( d)
 @cindex slurs, multiple
 @cindex slurs, simultaneous
 
-Phrasing slurs must be used to print more than one slur at once.
-For details, see @ref{Phrasing slurs}.
+Simultaneous or overlapping slurs are not permitted, but a phrasing
+slur can overlap a slur.  This permits two slurs to be printed at
+once.  For details, see @ref{Phrasing slurs}.
 
 @cindex slur style
+@cindex solid slur
+@cindex dotted slur
+@cindex dashed slur
 @cindex slur, solid
 @cindex slur, dotted
 @cindex slur, dashed
@@ -561,20 +567,16 @@ c4( e g2)
 g4( e c2)
 @end lilypond
 
+@funindex \slurUp
+@funindex slurUp
 
 @predefined
 
-@funindex \slurUp
 @code{\slurUp},
-@funindex \slurDown
 @code{\slurDown},
-@funindex \slurNeutral
 @code{\slurNeutral},
-@funindex \slurDashed
 @code{\slurDashed},
-@funindex \slurDotted
 @code{\slurDotted},
-@funindex \slurSolid
 @code{\slurSolid}.
 
 
@@ -648,7 +650,7 @@ c4\( g' c,( b) | c1\)
 @cindex phrasing slurs, simultaneous
 @cindex phrasing slurs, multiple
 
-Simultaneous phrasing slurs are not permitted.
+Simultaneous or overlapping phrasing slurs are not permitted.
 
 
 @predefined
@@ -677,6 +679,7 @@ Internals Reference:
 @unnumberedsubsubsec Breath marks
 
 @cindex breath marks
+@cindex pause mark
 @funindex \breathe
 @funindex breathe
 
@@ -704,12 +707,14 @@ divisiones, are supported.  For details, see @ref{Divisiones}.
 
 @seealso
 
+Music Glossary: 
+@rglos{caesura}.
+
 Notation Reference:
 @ref{Divisiones}.
 
 Snippets:
 @rlsr{Expressive marks}.
-@c @lsr{expressive,breathing-sign.ly}.
 
 Internals Reference:
 @rinternals{BreathingSign}.
@@ -748,10 +753,9 @@ command is @emph{required} when writing falls and doits.
 
 @seealso
 
-@c TODO: add falls and doits to glossary.
-@c Music Glossary:
-@c @rglos{falls},
-@c @rglos{doits}.
+Music Glossary:
+@rglos{fall},
+@rglos{doit}.
 
 Snippets:
 @rlsr{Expressive marks}.
@@ -764,9 +768,9 @@ This section explains how to create various expressive marks that
 follow a linear path: glissandos, arpeggios, and trills.
 
 @menu
-* Glissando::                   
-* Arpeggio::                    
-* Trills::                      
+* Glissando::
+* Arpeggio::
+* Trills::
 @end menu
 
 @node Glissando
@@ -804,17 +808,13 @@ Notation Reference:
 Snippets:
 @rlsr{Expressive marks}.
 
-@c FIXME: I need to figure out what's up with these.  -gp
-@c @lsr{expressive,glissando.ly},
-@c @lsr{expressive,line-styles.ly}
-
 Internals Reference:
 @rinternals{Glissando}.
 
 
 @knownissues
 
-Printing text over the line (such as @emph{gliss.}) is not
+Printing text over the line (such as @notation{gliss.}) is not
 supported.
 
 
@@ -824,6 +824,7 @@ supported.
 @cindex arpeggio
 @cindex broken chord
 @cindex chord, broken
+
 @funindex \arpeggio
 @funindex arpeggio
 @funindex \arpeggioArrowUp
@@ -855,6 +856,7 @@ Different types of arpeggios may be written.
 
 @cindex arpeggio symbols, special
 @cindex special arpeggio symbols
+
 @funindex \arpeggioBracket
 @funindex arpeggioBracket
 @funindex \arpeggioParenthesis
@@ -931,6 +933,7 @@ cross-staff arpeggios.
 @unnumberedsubsubsec Trills
 
 @cindex trills
+
 @funindex \trill
 @funindex trill
 @funindex \startTrillSpan