lilypond-book robustness: ensure EOL at the end of @verbatim

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

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index cf1a09547c55f1a9e8d025fcccaea77389dc1bbc..56904b0067206e54fbdb1b3098d45101105e8ae7 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -107,7 +107,7 @@ c4->  c-.  c2-_
 
 The rules for the default placement of articulations are defined
 in @file{scm/@/script@/.scm}.  Articulations and ornamentations
-may be manually placed above or below the staff, see
+may be manually placed above or below the staff; see
 @ref{Direction and placement}.
 
 
@@ -194,9 +194,9 @@ such as @code{c4\ff}.  The available dynamic marks are
 @code{\ppppp}, @code{\pppp}, @code{\ppp}, @code{\pp}, @code{\p},
 @code{\mp}, @code{\mf}, @code{\f}, @code{\ff}, @code{\fff},
 @code{\ffff}, @code{\fp}, @code{\sf}, @code{\sff}, @code{\sp},
-@code{\spp}, @code{\sfz}, and @code{\rfz}.  The dynamic marks may
-be manually placed above or below the staff, see
-@ref{Direction and placement}.
+@code{\spp}, @code{\sfz}, and @code{\rfz}.  Dynamic marks may be
+manually placed above or below the staff; see @ref{Direction and
+placement}.
 
 @lilypond[verbatim,quote,relative=2]
 c2\ppp c\mp
@@ -522,17 +522,9 @@ a4 g2 f4)
 @funindex \slurNeutral
 @funindex slurNeutral
 
-Slurs may be manually placed above or below the notes, see
+Slurs may be manually placed above or below the staff; see
 @ref{Direction and placement}.
 
-@lilypond[verbatim,quote,relative=2]
-c2( d)
-\slurDown
-c2( d)
-\slurNeutral
-c2( d)
-@end lilypond
-
 @cindex phrasing slur
 @cindex multiple slurs
 @cindex simultaneous slurs
@@ -545,16 +537,13 @@ 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
 @cindex solid slur
 @cindex dotted slur
 @cindex dashed slur
-@cindex sytle, slur
+@cindex style, slur
 @funindex \slurDashed
 @funindex slurDashed
 @funindex \slurDotted
@@ -579,12 +568,14 @@ g4( e c2)
 @funindex slurHalfDashed
 @funindex \slurHalfSolid
 @funindex slurHalfSolid
+@cindex slur, half dashed and half solid
 
 Slurs can also be made half-dashed (the first half dashed, the
 second half solid) or half-solid (the first half solid, the second
 half dashed):
 
 @lilypond[verbatim,quote,relative=1]
+c4( e g2)
 \slurHalfDashed
 g4( e c2)
 \slurHalfSolid
@@ -593,9 +584,14 @@ c4( e g2)
 g4( e c2)
 @end lilypond
 
+@funindex \slurDashPattern
+@funindex slurDashPattern
+@cindex slur, defining dash patterns
+
 Custom dash patterns for slurs can be defined:
 
 @lilypond[verbatim,quote,relative=1]
+c4( e g2)
 \slurDashPattern #0.7 #0.75
 g4( e c2)
 \slurDashPattern #0.5 #2.0
@@ -681,21 +677,15 @@ e2) d\)
 Typographically, a phrasing slur behaves almost exactly like a
 normal slur.  However, they are treated as different objects; a
 @code{\slurUp} will have no effect on a phrasing slur.  Phrasing
-slurs may be manually placed above or below the notes, see
+may be manually placed above or below the staff; see
 @ref{Direction and placement}.
 
-@lilypond[verbatim,quote,relative=1]
-c4\( g' c,( b) | c1\)
-\phrasingSlurUp
-c4\( g' c,( b) | c1\)
-@end lilypond
-
 @cindex simultaneous phrasing slurs
 @cindex multiple phrasing slurs
-@cindex slurs, simultaneous phrasing
-@cindex slurs, multiple phrasing
-@cindex phrasing slurs, simultaneous
-@cindex phrasing slurs, multiple
+@cindex slur, simultaneous phrasing
+@cindex slur, multiple phrasing
+@cindex phrasing slur, simultaneous
+@cindex phrasing slur, multiple
 
 Simultaneous or overlapping phrasing slurs are not permitted.
 
@@ -705,6 +695,12 @@ Simultaneous or overlapping phrasing slurs are not permitted.
 @funindex phrasingSlurDotted
 @funindex \phrasingSlurSolid
 @funindex phrasingSlurSolid
+@cindex phrasing slur, dashed
+@cindex dashed phrasing slur
+@cindex phrasing slur, dotted
+@cindex dotted phrasing slurs
+@cindex slur, dashed phrasing
+@cindex slur, dotted phrasing
 
 Phrasing slurs can be solid, dotted, or dashed.  Solid is the default
 style for phrasing slurs:
@@ -723,33 +719,39 @@ g4\( e c2\)
 @funindex \phrasingSlurHalfDashed
 @funindex \phrasingSlurHalfSolid
 @funindex phrasingSlurHalfSolid
+@cindex phrasing slur, half solid and half dashed
+@cindex slur, half solid and half dashed phrasing
 
 Phrasing slurs can also be made half-dashed (the first half dashed, the
 second half solid) or half-solid (the first half solid, the second
 half dashed):
 
 @lilypond[verbatim,quote,relative=1]
+c4\( e g2\)
 \phrasingSlurHalfDashed
-g4( e c2)
+g4\( e c2\)
 \phrasingSlurHalfSolid
-c4( e g2)
+c4\( e g2\)
 \phrasingSlurSolid
-g4( e c2)
+g4\( e c2\)
 @end lilypond
 
 @funindex \phrasingSlurDashPattern
 @funindex phrasingSlurDashPattern
-
+@cindex phrasing slur, defining dash patterns
+@cindex slur, phrasing, defining dash patterns
+@cindex slur, definind dash patterns for phrasing
 
 Custom dash patterns for phrasing slurs can be defined:
 
 @lilypond[verbatim,quote,relative=1]
+c4\( e g2\)
 \phrasingSlurDashPattern #0.7 #0.75
-g4( e c2)
+g4\( e c2\)
 \phrasingSlurDashPattern #0.5 #2.0
-c4( e g2)
+c4\( e g2\)
 \phrasingSlurSolid
-g4( e c2)
+g4\( e c2\)
 @end lilypond
 
 Dash pattern definitions for phrasing slurs have the same structure
@@ -967,6 +969,8 @@ Different types of arpeggios may be written.
 @funindex arpeggioBracket
 @funindex \arpeggioParenthesis
 @funindex arpeggioParenthesis
+@funindex \arpeggioParenthesisDashed
+@funindex arpeggioParenthesisDashed
 
 Special @emph{bracketed} arpeggio symbols can be created:
 
@@ -976,10 +980,15 @@ Special @emph{bracketed} arpeggio symbols can be created:
 <c e g c>2\arpeggio
 \arpeggioParenthesis
 <c e g c>2\arpeggio
+\arpeggioParenthesisDashed
+<c e g c>2\arpeggio
 \arpeggioNormal
 <c e g c>2\arpeggio
 @end lilypond
 
+The dash properties of the parenthesis arpeggio are controlled
+with the @code{'dash-details} property, which is described at @ref{Slurs}.
+
 Arpeggios can be explicitly written out with ties.  For more
 information, see @ref{Ties}.
 
@@ -990,7 +999,8 @@ information, see @ref{Ties}.
 @code{\arpeggioArrowDown},
 @code{\arpeggioNormal},
 @code{\arpeggioBracket},
-@code{\arpeggioParenthesis}.
+@code{\arpeggioParenthesis}
+@code{\arpeggioParenthesisDashed}.
 @endpredefined
 
 
@@ -1011,6 +1021,7 @@ Music Glossary:
 @rglos{arpeggio}.
 
 Notation Reference:
+@ref{Slurs},
 @ref{Ties}.
 
 Snippets:
@@ -1018,6 +1029,7 @@ Snippets:
 
 Internals Reference:
 @rinternals{Arpeggio},
+@rinternals{Slur},
 @rinternals{PianoStaff}.