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 8fdc7bacd9467d1dd59a00cba562f35896364608..56904b0067206e54fbdb1b3098d45101105e8ae7 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
 
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 

-@c \version "2.11.51"
+@c \version "2.12.0"

 
 @node Expressive marks
 @section Expressive marks
 
 @node Expressive marks
 @section Expressive marks


@@ -17,9 +17,9 @@ This section lists various expressive marks that can be
 created in a score.
 
 @menu
 created in a score.
 
 @menu

-* Attached to notes::           
-* Curves::                      
-* Lines::                       
+* Attached to notes::
+* Curves::
+* Lines::

 @end menu
 
 
 @end menu
 
 


@@ -31,15 +31,16 @@ attached to notes: articulations, ornamentations, and dynamics.
 Methods to create new dynamic markings are also discussed.
 
 @menu
 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
 @unnumberedsubsubsec Articulations and ornamentations
 
 @cindex articulations
 @end menu
 
 @node Articulations and ornamentations
 @unnumberedsubsubsec Articulations and ornamentations
 
 @cindex articulations

+@cindex ornamentation

 @cindex scripts
 @cindex ornaments
 @cindex espressivo
 @cindex scripts
 @cindex ornaments
 @cindex espressivo


@@ -48,6 +49,7 @@ Methods to create new dynamic markings are also discussed.
 @cindex downbow
 @cindex foot marks
 @cindex organ pedal marks
 @cindex downbow
 @cindex foot marks
 @cindex organ pedal marks

+@cindex pedal marks, organ

 @cindex turn
 @cindex open
 @cindex stopped
 @cindex turn
 @cindex open
 @cindex stopped


@@ -65,6 +67,8 @@ Methods to create new dynamic markings are also discussed.
 @cindex coda
 @cindex varcoda
 
 @cindex coda
 @cindex varcoda
 

+@funindex -
+

 A variety of symbols that denote articulations, ornamentations,
 and other performance indications can be attached to a note using
 this syntax:
 A variety of symbols that denote articulations, ornamentations,
 and other performance indications can be attached to a note using
 this syntax:


@@ -82,7 +86,6 @@ c1\fermata
 @end lilypond
 
 @cindex marcato
 @end lilypond
 
 @cindex marcato

-@cindex stopped

 @cindex tenuto
 @cindex staccatissimo
 @cindex accent
 @cindex tenuto
 @cindex staccatissimo
 @cindex accent


@@ -91,21 +94,20 @@ c1\fermata
 
 Some of these articulations have shorthands for easier entry.
 Shorthands are appended to the note name, and their syntax
 
 Some of these articulations have shorthands for easier entry.
 Shorthands are appended to the note name, and their syntax

-consists of a dash (@tie{}@code{-}) followed by a symbol
-signifying the articulation.  Predefined shorthands exist for
-@notation{marcato}, @notation{stopped}, @notation{tenuto},
-@notation{staccatissimo}, @notation{accent}, @notation{staccato},
-and @notation{portato}.  Their corresponding output appears as
-follows:
+consists of a dash @code{-} followed by a symbol signifying the
+articulation.  Predefined shorthands exist for @notation{marcato},
+@notation{stopped}, @notation{tenuto}, @notation{staccatissimo},
+@notation{accent}, @notation{staccato}, and @notation{portato}.
+Their corresponding output appears as follows:

 
 @lilypond[verbatim,quote,relative=2]
 c4-^  c-+  c--  c-|
 
 @lilypond[verbatim,quote,relative=2]
 c4-^  c-+  c--  c-|

-c4->  c-.  c-_
+c4->  c-.  c2-_

 @end lilypond
 
 The rules for the default placement of articulations are defined
 in @file{scm/@/script@/.scm}.  Articulations and ornamentations
 @end lilypond
 
 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}.
 
 
 @ref{Direction and placement}.
 
 


@@ -117,9 +119,10 @@ may be manually placed above or below the staff, see
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {controlling-the-vertical-ordering-of-scripts.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {controlling-the-vertical-ordering-of-scripts.ly}
 

+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{creating-a-delayed-turn.ly}

 
 @seealso
 
 @seealso

-

 Music Glossary:
 @rglos{tenuto},
 @rglos{accent},
 Music Glossary:
 @rglos{tenuto},
 @rglos{accent},


@@ -128,7 +131,8 @@ Music Glossary:
 
 Notation Reference:
 @ref{Direction and placement},
 
 Notation Reference:
 @ref{Direction and placement},

-@ref{List of articulations}.
+@ref{List of articulations},
+@ref{Trills}.

 
 Installed Files:
 @file{scm/@/script@/.scm}.
 
 Installed Files:
 @file{scm/@/script@/.scm}.


@@ -141,45 +145,58 @@ Internals Reference:
 @rinternals{TextScript}.
 
 
 @rinternals{TextScript}.
 
 

-@knownissues
-
-These signs appear in the printed output but have no effect on the
-MIDI rendering of the music.
-
-

 @node Dynamics
 @unnumberedsubsubsec Dynamics
 
 @cindex absolute dynamics
 @cindex dynamics
 @cindex dynamics, absolute
 @node Dynamics
 @unnumberedsubsubsec Dynamics
 
 @cindex absolute dynamics
 @cindex dynamics
 @cindex dynamics, absolute

+

 @funindex \ppppp
 @funindex \ppppp

+@funindex ppppp

 @funindex \pppp
 @funindex \pppp

+@funindex pppp

 @funindex \ppp
 @funindex \ppp

+@funindex ppp

 @funindex \pp
 @funindex \pp

+@funindex pp

 @funindex \p
 @funindex \p

+@funindex p

 @funindex \mp
 @funindex \mp

+@funindex mp

 @funindex \mf
 @funindex \mf

+@funindex mf

 @funindex \f
 @funindex \f

+@funindex f

 @funindex \ff
 @funindex \ff

+@funindex ff

 @funindex \fff
 @funindex \fff

+@funindex fff

 @funindex \ffff
 @funindex \ffff

+@funindex ffff

 @funindex \fp
 @funindex \fp

+@funindex fp

 @funindex \sf
 @funindex \sf

+@funindex sf

 @funindex \sff
 @funindex \sff

+@funindex sff

 @funindex \sp
 @funindex \sp

+@funindex sp

 @funindex \spp
 @funindex \spp

+@funindex spp

 @funindex \sfz
 @funindex \sfz

+@funindex sfz

 @funindex \rfz
 @funindex \rfz

+@funindex rfz

 
 Absolute dynamic marks are specified using a command after a note,
 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},
 
 Absolute dynamic marks are specified using a command after a note,
 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
 
 @lilypond[verbatim,quote,relative=2]
 c2\ppp c\mp


@@ -188,11 +205,17 @@ c2_\spp c^\ff
 @end lilypond
 
 @cindex hairpin
 @end lilypond
 
 @cindex hairpin

+@cindex crescendo
+@cindex decrescendo
+@cindex diminuendo
+

 @funindex \<
 @funindex \>
 @funindex \!
 @funindex \cr
 @funindex \<
 @funindex \>
 @funindex \!
 @funindex \cr

+@funindex cr

 @funindex \decr
 @funindex \decr

+@funindex decr

 
 A @notation{crescendo} mark is started with @code{\<} and
 terminated with @code{\!}, an absolute dynamic, or an additional
 
 A @notation{crescendo} mark is started with @code{\<} and
 terminated with @code{\!}, an absolute dynamic, or an additional


@@ -215,6 +238,9 @@ c1\!
 
 Spacer rests are needed to engrave multiple marks on one note.
 
 
 Spacer rests are needed to engrave multiple marks on one note.
 

+@cindex multiple dynamic marks on one note
+@cindex dynamic marks, multiple on one note
+

 @lilypond[verbatim,quote,relative=2]
 c4\< c\! d\> e\!
 << f1 { s4 s4\< s4\> s4\! } >>
 @lilypond[verbatim,quote,relative=2]
 c4\< c\! d\> e\!
 << f1 { s4 s4\< s4\> s4\! } >>


@@ -222,6 +248,9 @@ c4\< c\! d\> e\!
 
 @cindex espressivo articulation
 
 
 @cindex espressivo articulation
 

+@funindex \espressivo
+@funindex espressivo
+

 In some situations the @code{\espressivo} articulation mark may be
 the appropriate choice to indicate a crescendo and decrescendo on
 one note:
 In some situations the @code{\espressivo} articulation mark may be
 the appropriate choice to indicate a crescendo and decrescendo on
 one note:


@@ -231,57 +260,70 @@ c2 b4 a
 g1\espressivo
 @end lilypond
 
 g1\espressivo
 @end lilypond
 

-@cindex crescendo
-@cindex decrescendo
-@cindex diminuendo
+
+@funindex \crescTextCresc
+@funindex crescTextCresc
+@funindex \dimTextDecresc
+@funindex dimTextDecresc
+@funindex \dimTextDecr
+@funindex dimTextDecr
+@funindex \dimTextDim
+@funindex dimTextDim
+@funindex \crescHairpin
+@funindex crescHairpin
+@funindex \dimHairpin
+@funindex dimHairpin

 
 Crescendos and decrescendos can be engraved as textual markings
 
 Crescendos and decrescendos can be engraved as textual markings

-instead of hairpins.  The built-in commands that enable these text
-modes are @code{\setTextCresc}, @code{\setTextDecresc},
-@code{\setTextDecr}, and @code{\setTextDim}.  The corresponding
-@code{\setHairpinCresc}, @code{\setHairpinDim}, and
-@code{\setHairpinDecresc} commands will revert to hairpins again:
+instead of hairpins.  Dashed lines are printed to indicate their
+extent.  The built-in commands that enable these text modes are
+@code{\crescTextCresc}, @code{\dimTextDecresc},
+@code{\dimTextDecr}, and @code{\dimTextDim}.  The corresponding
+@code{\crescHairpin} and @code{\dimHairpin} commands will revert
+to hairpins again:

 
 @lilypond[verbatim,quote,relative=2]
 
 @lilypond[verbatim,quote,relative=2]

-c4\< d e f\!
-e4\> d c b\!
-\setTextCresc
-c4\< d e f\!
-\setTextDecresc
-e4\> d c b\!
-\setHairpinCresc
-c4\< d e f\!
+\crescTextCresc
+c2\< d | e f\!
+\dimTextDecresc
+e2\> d | c b\!
+\crescHairpin
+c2\< d | e f\!
+\dimHairpin
+e2\> d\!

 @end lilypond
 
 @end lilypond
 

+

 To create new absolute dynamic marks or text that should be
 aligned with dynamics, see @ref{New dynamic marks}.
 
 To create new absolute dynamic marks or text that should be
 aligned with dynamics, see @ref{New dynamic marks}.
 

+@cindex dynamics, vertical positioning
+@cindex vertical positioning of dynamics
+
+@funindex DynamicLineSpanner
+
+

 Vertical positioning of dynamics is handled by
 @rinternals{DynamicLineSpanner}.
 Vertical positioning of dynamics is handled by
 @rinternals{DynamicLineSpanner}.

+@funindex \dynamicUp
+@funindex dynamicUp
+@funindex \dynamicDown
+@funindex dynamicDown
+@funindex \dynamicNeutral
+@funindex dynamicNeutral

 
 
 @predefined
 
 
 @predefined

-
-@funindex \dynamicUp

 @code{\dynamicUp},
 @code{\dynamicUp},

-@funindex \dynamicDown

 @code{\dynamicDown},
 @code{\dynamicDown},

-@funindex \dynamicNeutral

 @code{\dynamicNeutral},
 @code{\dynamicNeutral},

-@funindex \setTextCresc
-@code{\setTextCresc},
-@funindex \setTextDim
-@code{\setTextDim},
-@funindex \setTextDecr
-@code{\setTextDecr},
-@funindex \setTextDecresc
-@code{\setTextDecresc},
-@funindex \setHairpinCresc
-@code{\setHairpinCresc},
-@funindex \setHairpinDim
-@code{\setHairpinDim},
-@funindex \setHairpinDecresc
-@code{\setHairpinDecresc}.
+@code{\crescTextCresc},
+@code{\dimTextDim},
+@code{\dimTextDecr},
+@code{\dimTextDecresc},
+@code{\crescHairpin},
+@code{\dimHairpin}.
+@endpredefined

 
 
 @snippets
 
 
 @snippets


@@ -299,7 +341,7 @@ Vertical positioning of dynamics is handled by
 {printing-hairpins-using-al-niente-notation.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {printing-hairpins-using-al-niente-notation.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]

-{vertically-aligning-dynamics-across-multiple-notes.ly}
+{vertically-aligned-dynamics-and-textscripts.ly}

 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {hiding-the-extender-line-for-text-dynamics.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {hiding-the-extender-line-for-text-dynamics.ly}


@@ -309,19 +351,20 @@ Vertical positioning of dynamics is handled by
 
 
 @seealso
 
 
 @seealso

-
-@c TODO: Add hairpin to glossary.
-

 Music Glossary:
 Music Glossary:

+@rglos{al niente},

 @rglos{crescendo},
 @rglos{crescendo},

-@rglos{decrescendo}.
+@rglos{decrescendo},
+@rglos{hairpin}.

 
 Learning Manual:
 @rlearning{Articulation and dynamics}.
 
 Notation Reference:
 @ref{Direction and placement},
 
 Learning Manual:
 @rlearning{Articulation and dynamics}.
 
 Notation Reference:
 @ref{Direction and placement},

-@ref{New dynamic marks}.
+@ref{New dynamic marks},
+@ref{What goes into the MIDI output?},
+@ref{Controlling MIDI dynamics}.

 
 Snippets:
 @rlsr{Expressive marks}.
 
 Snippets:
 @rlsr{Expressive marks}.


@@ -345,33 +388,38 @@ The easiest way to create dynamic indications is to use
 moltoF = \markup { molto \dynamic f }
 
 \relative c' {
 moltoF = \markup { molto \dynamic f }
 
 \relative c' {

-  <d e>16 <d e>
-  <d e>2.._\moltoF
+  <d e>16_\moltoF <d e>
+  <d e>2..

 }
 @end lilypond
 
 @cindex dynamics, editorial
 @cindex dynamics, parenthesis
 }
 @end lilypond
 
 @cindex dynamics, editorial
 @cindex dynamics, parenthesis

+@cindex editorial dynamics
+@funindex \bracket
+@funindex bracket
+@funindex \dynamic
+@funindex dynamic

 
 

-Markup mode makes possible, for instance, to add
-editorial dynamics, printed in round parenthesis or square
-brackets.  Its syntax is described in @ref{Formatting text}.
+In markup mode, editorial dynamics (within parentheses or square
+brackets) can be created.  The syntax for markup mode is described
+in @ref{Formatting text}.

 
 @lilypond[verbatim,quote]
 
 @lilypond[verbatim,quote]

-roundf = \markup { \center-align { \line { \bold { \italic ( }
-         \dynamic f \bold { \italic ) } } } }
-boxf = \markup { \bracket { \dynamic f } }
+roundF = \markup { \center-align \concat { \bold { \italic ( }
+           \dynamic f \bold { \italic ) } } }
+boxF = \markup { \bracket { \dynamic f } }

 \relative c' {
 \relative c' {

-  c1_\roundf
-  c1_\boxf
+  c1_\roundF
+  c1_\boxF

 }
 @end lilypond
 
 }
 @end lilypond
 

-Markup objects are treated differently from authentic dynamic marks.
-Defining dynamic objects that will be entered and printed exactly like
-standard dynamic marks is also possible, using the following function:
-

 @cindex make-dynamic-script
 @cindex make-dynamic-script

+@funindex make-dynamic-script
+
+Simple, centered dynamic marks are easily created with the
+@code{make-dynamic-script} function.

 
 @lilypond[verbatim,quote]
 sfzp = #(make-dynamic-script "sfzp")
 
 @lilypond[verbatim,quote]
 sfzp = #(make-dynamic-script "sfzp")


@@ -380,33 +428,60 @@ sfzp = #(make-dynamic-script "sfzp")
 }
 @end lilypond
 
 }
 @end lilypond
 

-@noindent
-Note that the dynamic font only contains the characters 
-@code{f,m,p,r,s} and @code{z}.  To switch to other font families,
-it is necessary to use markup mode in its Scheme form, as
+In general, @code{make-dynamic-script} takes any markup object as its
+argument.  The dynamic font only contains the characters
+@code{f,m,p,r,s} and @code{z}, so if a dynamic mark that includes
+plain text or punctuation symbols is desired, markup commands that
+reverts font family and font encoding to normal text should be used,
+for example @code{\normal-text}.  The interest of using
+@code{make-dynamic-script} instead of an ordinary markup is ensuring
+the vertical alignment of markup objects and hairpins that are
+attached to the same note head.
+
+@lilypond[verbatim,quote]
+roundF = \markup { \center-align \concat {
+           \normal-text { \bold { \italic ( } }
+           \dynamic f
+           \normal-text { \bold { \italic ) } } } }
+boxF = \markup { \bracket { \dynamic f } }
+mfEspress = \markup { \center-align \line {
+              \hspace #3.7 mf \normal-text \italic espress. } }
+roundFdynamic = #(make-dynamic-script roundF)
+boxFdynamic = #(make-dynamic-script boxF)
+mfEspressDynamic = #(make-dynamic-script mfEspress)
+\relative c' {
+  c4_\roundFdynamic\< d e f
+  g,1~_\boxFdynamic\>
+  g
+  g'~\mfEspressDynamic
+  g
+}
+@end lilypond
+
+The Scheme form of markup mode may be used instead.  Its syntax is

 explained in @ref{Markup construction in Scheme}.
 
 @lilypond[verbatim,quote]
 explained in @ref{Markup construction in Scheme}.
 
 @lilypond[verbatim,quote]

-moltoF = #(make-dynamic-script (markup 
-                      #:normal-text "molto"
-                      #:dynamic "f"))
+moltoF = #(make-dynamic-script
+            (markup #:normal-text "molto"
+                    #:dynamic "f"))

 \relative c' {
   <d e>16 <d e>
   <d e>2..\moltoF
 }
 @end lilypond
 
 \relative c' {
   <d e>16 <d e>
   <d e>2..\moltoF
 }
 @end lilypond
 

-@noindent

 Font settings in markup mode are described in
 Font settings in markup mode are described in

-@ref{Common markup commands}.
+@ref{Selecting font and font size}.

 
 
 @seealso
 
 
 @seealso

-

 Notation Reference:
 @ref{Formatting text},
 Notation Reference:
 @ref{Formatting text},

-@ref{Common markup commands},
-@ref{Markup construction in Scheme}.
+@ref{Selecting font and font size},
+@ref{Markup construction in Scheme},
+@ref{What goes into the MIDI output?},
+@ref{Controlling MIDI dynamics}.

 
 Snippets:
 @rlsr{Expressive marks}.
 
 Snippets:
 @rlsr{Expressive marks}.


@@ -420,10 +495,10 @@ are curved: normal slurs, phrasing slurs, breath marks, falls, and
 doits.
 
 @menu
 doits.
 
 @menu

-* Slurs::                       
-* Phrasing slurs::              
-* Breath marks::                
-* Falls and doits::             
+* Slurs::
+* Phrasing slurs::
+* Breath marks::
+* Falls and doits::

 @end menu
 
 @node Slurs
 @end menu
 
 @node Slurs


@@ -439,19 +514,42 @@ a4 g2 f4)
 <c e>2( <b d>2)
 @end lilypond
 
 <c e>2( <b d>2)
 @end lilypond
 

-Slurs may be manually placed above or below the notes, see
-@ref{Direction and placement}.
+@cindex slurs, manual placement
+@cindex slurs, below notes
+@cindex slurs, above notes
+@funindex \slurDown
+@funindex slurDown
+@funindex \slurNeutral
+@funindex slurNeutral

 
 

-@lilypond[verbatim,quote,relative=2]
-c2( d)
-\slurDown
-c2( d)
-\slurNeutral
-c2( d)
-@end lilypond
+Slurs may be manually placed above or below the staff; see
+@ref{Direction and placement}.

 
 

-Phrasing slurs must be used to print more than one slur at once.
-For details, see @ref{Phrasing slurs}.
+@cindex phrasing slur
+@cindex multiple slurs
+@cindex simultaneous slurs
+@cindex slur, phrasing
+@cindex slurs, multiple
+@cindex slurs, simultaneous
+
+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 slur, solid
+@cindex slur, dotted
+@cindex slur, dashed
+@cindex solid slur
+@cindex dotted slur
+@cindex dashed slur
+@cindex style, slur
+@funindex \slurDashed
+@funindex slurDashed
+@funindex \slurDotted
+@funindex slurDotted
+@funindex \slurSolid
+@funindex slurSolid

 
 Slurs can be solid, dotted, or dashed.  Solid is the default slur
 style:
 
 Slurs can be solid, dotted, or dashed.  Solid is the default slur
 style:


@@ -466,21 +564,59 @@ c4( e g2)
 g4( e c2)
 @end lilypond
 
 g4( e c2)
 @end lilypond
 

+@funindex \slurHalfDashed
+@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
+c4( e g2)
+\slurSolid
+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
+c4( e g2)
+\slurSolid
+g4( e c2)
+@end lilypond
+

 
 

-@predefined

 
 @funindex \slurUp
 
 @funindex \slurUp

+@funindex slurUp
+
+
+@predefined

 @code{\slurUp},
 @code{\slurUp},

-@funindex \slurDown

 @code{\slurDown},
 @code{\slurDown},

-@funindex \slurNeutral

 @code{\slurNeutral},
 @code{\slurNeutral},

-@funindex \slurDashed

 @code{\slurDashed},
 @code{\slurDashed},

-@funindex \slurDotted

 @code{\slurDotted},
 @code{\slurDotted},

-@funindex \slurSolid
+@code{\slurHalfDashed},
+@code{\slurHalfSolid},
+@code{\slurDashPattern},

 @code{\slurSolid}.
 @code{\slurSolid}.

+@endpredefined

 
 
 @snippets
 
 
 @snippets


@@ -488,12 +624,19 @@ g4( e c2)
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {using-double-slurs-for-legato-chords.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {using-double-slurs-for-legato-chords.ly}
 

+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{positioning-text-markups-inside-slurs.ly}

 
 

-@seealso
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{making-slurs-with-complex-dash-structure.ly}

 
 

+@seealso

 Music Glossary:
 @rglos{slur}.
 
 Music Glossary:
 @rglos{slur}.
 

+Learning Manual:
+@rlearning{On the un-nestedness of brackets and ties}.
+

 Notation Reference:
 @ref{Direction and placement},
 @ref{Phrasing slurs}.
 Notation Reference:
 @ref{Direction and placement},
 @ref{Phrasing slurs}.


@@ -510,6 +653,8 @@ Internals Reference:
 
 @cindex phrasing slurs
 @cindex phrasing marks
 
 @cindex phrasing slurs
 @cindex phrasing marks

+@cindex slur, phrasing
+@cindex mark, phrasing

 @funindex \(
 @funindex \)
 
 @funindex \(
 @funindex \)
 


@@ -522,35 +667,117 @@ c4\( d( e) f(
 e2) d\)
 @end lilypond
 
 e2) d\)
 @end lilypond
 

+@funindex \phrasingSlurUp
+@funindex phrasingSlurUp
+@funindex \phrasingSlurDown
+@funindex phrasingSlurDown
+@funindex \phrasingSlurNeutral
+@funindex phrasingSlurNeutral
+

 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
 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}.
 
 @ref{Direction and placement}.
 

+@cindex simultaneous phrasing slurs
+@cindex multiple phrasing slurs
+@cindex slur, simultaneous phrasing
+@cindex slur, multiple phrasing
+@cindex phrasing slur, simultaneous
+@cindex phrasing slur, multiple
+
+Simultaneous or overlapping phrasing slurs are not permitted.
+
+@funindex phrasingSlurDashed
+@funindex \phrasingSlurDashed
+@funindex \phrasingSlurDotted
+@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:
+

 @lilypond[verbatim,quote,relative=1]
 @lilypond[verbatim,quote,relative=1]

-c4\( g' c,( b) | c1\)
-\phrasingSlurUp
-c4\( g' c,( b) | c1\)
+c4\( e g2\)
+\phrasingSlurDashed
+g4\( e c2\)
+\phrasingSlurDotted
+c4\( e g2\)
+\phrasingSlurSolid
+g4\( e c2\)

 @end lilypond
 
 @end lilypond
 

-Simultaneous phrasing slurs are not permitted.
+@funindex phrasingSlurHalfDashed
+@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):

 
 

-@predefined
+@lilypond[verbatim,quote,relative=1]
+c4\( e g2\)
+\phrasingSlurHalfDashed
+g4\( e c2\)
+\phrasingSlurHalfSolid
+c4\( e g2\)
+\phrasingSlurSolid
+g4\( e c2\)
+@end lilypond

 
 

-@funindex \phrasingSlurUp
+@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\)
+\phrasingSlurDashPattern #0.5 #2.0
+c4\( e g2\)
+\phrasingSlurSolid
+g4\( e c2\)
+@end lilypond
+
+Dash pattern definitions for phrasing slurs have the same structure
+as dash pattern definitions for slurs.  For more information about
+complex dash patterns, see the snippets under @ref{Slurs}.
+
+@predefined

 @code{\phrasingSlurUp},
 @code{\phrasingSlurUp},

-@funindex \phrasingSlurDown

 @code{\phrasingSlurDown},
 @code{\phrasingSlurDown},

-@funindex \phrasingSlurNeutral
-@code{\phrasingSlurNeutral}.
+@code{\phrasingSlurNeutral},
+@code{\phrasingSlurDashed},
+@code{\phrasingSlurDotted},
+@code{\phrasingSlurHalfDashed},
+@code{\phrasingSlurHalfSolid},
+@code{\phrasingSlurDashPattern},
+@code{\phrasingSlurSolid}.
+@endpredefined

 
 
 @seealso
 
 
 @seealso

+Learning Manual:
+@rlearning{On the un-nestedness of brackets and ties}.

 
 Notation Reference:
 
 Notation Reference:

-@ref{Direction and placement}.
+@ref{Direction and placement},
+@ref{Slurs}.

 
 Snippets:
 @rlsr{Expressive marks}.
 
 Snippets:
 @rlsr{Expressive marks}.


@@ -563,7 +790,9 @@ Internals Reference:
 @unnumberedsubsubsec Breath marks
 
 @cindex breath marks
 @unnumberedsubsubsec Breath marks
 
 @cindex breath marks

+@cindex pause mark

 @funindex \breathe
 @funindex \breathe

+@funindex breathe

 
 Breath marks are entered using @code{\breathe}:
 
 
 Breath marks are entered using @code{\breathe}:
 


@@ -583,33 +812,19 @@ divisiones, are supported.  For details, see @ref{Divisiones}.
 @cindex caesura
 @cindex railroad tracks
 
 @cindex caesura
 @cindex railroad tracks
 

-@c input/new snippet
-@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-@c {inserting-a-caesura.ly}
-
-Caesura marks can be created by overriding the @code{'text}
-property of the @code{BreathingSign} object.  A curved caesura
-mark is also available.
-
-@lilypond[verbatim,quote,relative=2]
-\override BreathingSign #'text =
-  #(make-musicglyph-markup "scripts.caesura.straight")
-c8 e4. \breathe g8. e16 c4
-
-\override BreathingSign #'text =
-  #(make-musicglyph-markup "scripts.caesura.curved")
-g8 e'4. \breathe g8. e16 c4
-@end lilypond
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{inserting-a-caesura.ly}

 
 
 @seealso
 
 
 @seealso

+Music Glossary:
+@rglos{caesura}.

 
 Notation Reference:
 @ref{Divisiones}.
 
 Snippets:
 @rlsr{Expressive marks}.
 
 Notation Reference:
 @ref{Divisiones}.
 
 Snippets:
 @rlsr{Expressive marks}.

-@c @lsr{expressive,breathing-sign.ly}.

 
 Internals Reference:
 @rinternals{BreathingSign}.
 
 Internals Reference:
 @rinternals{BreathingSign}.


@@ -621,6 +836,7 @@ Internals Reference:
 @cindex falls
 @cindex doits
 @funindex \bendAfter
 @cindex falls
 @cindex doits
 @funindex \bendAfter

+@funindex bendAfter

 
 @notation{Falls} and @notation{doits} can be added to notes using
 the @code{\bendAfter} command.  The direction of the fall or doit
 
 @notation{Falls} and @notation{doits} can be added to notes using
 the @code{\bendAfter} command.  The direction of the fall or doit


@@ -635,7 +851,7 @@ c2-\bendAfter #+8
 c2-\bendAfter #-8
 @end lilypond
 
 c2-\bendAfter #-8
 @end lilypond
 

-The dash (@tie{-}) immediately preceding the @code{\bendAfter}
+The dash @code{-} immediately preceding the @code{\bendAfter}

 command is @emph{required} when writing falls and doits.
 
 
 command is @emph{required} when writing falls and doits.
 
 


@@ -646,11 +862,9 @@ command is @emph{required} when writing falls and doits.
 
 
 @seealso
 
 
 @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}.
 
 Snippets:
 @rlsr{Expressive marks}.


@@ -663,9 +877,9 @@ This section explains how to create various expressive marks that
 follow a linear path: glissandos, arpeggios, and trills.
 
 @menu
 follow a linear path: glissandos, arpeggios, and trills.
 
 @menu

-* Glissando::                   
-* Arpeggio::                    
-* Trills::                      
+* Glissando::
+* Arpeggio::
+* Trills::

 @end menu
 
 @node Glissando
 @end menu
 
 @node Glissando


@@ -673,6 +887,7 @@ follow a linear path: glissandos, arpeggios, and trills.
 
 @cindex glissando
 @funindex \glissando
 
 @cindex glissando
 @funindex \glissando

+@funindex glissando

 
 A @notation{glissando} is created by attaching @code{\glissando}
 to a note:
 
 A @notation{glissando} is created by attaching @code{\glissando}
 to a note:


@@ -692,7 +907,6 @@ Different styles of glissandi can be created.  For details, see
 
 
 @seealso
 
 
 @seealso

-

 Music Glossary:
 @rglos{glissando}.
 
 Music Glossary:
 @rglos{glissando}.
 


@@ -702,17 +916,13 @@ Notation Reference:
 Snippets:
 @rlsr{Expressive marks}.
 
 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
 
 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.
 
 
 supported.
 
 


@@ -723,6 +933,15 @@ supported.
 @cindex broken chord
 @cindex chord, broken
 
 @cindex broken chord
 @cindex chord, broken
 

+@funindex \arpeggio
+@funindex arpeggio
+@funindex \arpeggioArrowUp
+@funindex arpeggioArrowUp
+@funindex \arpeggioArrowDown
+@funindex arpeggioArrowDown
+@funindex \arpeggioNormal
+@funindex arpeggioNormal
+

 An @notation{arpeggio} on a chord (also known as a broken chord)
 is denoted by appending @code{\arpeggio} to the chord construct:
 
 An @notation{arpeggio} on a chord (also known as a broken chord)
 is denoted by appending @code{\arpeggio} to the chord construct:
 


@@ -730,63 +949,59 @@ is denoted by appending @code{\arpeggio} to the chord construct:
 <c e g c>1\arpeggio
 @end lilypond
 
 <c e g c>1\arpeggio
 @end lilypond
 

-The direction of an arpeggio is indicated by adding an arrowhead
-to the wiggly line.  The commands @code{\arpeggioUp} and
-@code{\arpeggioDown} are used for this task.
-@code{\arpeggioNeutral} reverts back to an arrow-less arpeggio:
+Different types of arpeggios may be written.
+@code{\arpeggioNormal} reverts to a normal arpeggio:

 
 @lilypond[verbatim,quote,relative=1]
 
 @lilypond[verbatim,quote,relative=1]

-\arpeggioUp

 <c e g c>2\arpeggio
 <c e g c>2\arpeggio

-\arpeggioDown
+\arpeggioArrowUp

 <c e g c>2\arpeggio
 <c e g c>2\arpeggio

-\arpeggioNeutral
-<c e g c>1\arpeggio
-@end lilypond
-
-The command @code{\arpeggioBracket} can be used to create a square
-bracket on the left of a chord, indicating that the chord should
-@emph{not} be arpeggiated.  @code{\arpeggioNeutral} reverts back
-to a regular arpeggio:
-
-@lilypond[verbatim,quote,relative=1]
-<c e g c>2
-\arpeggioBracket
+\arpeggioArrowDown
+<c e g c>2\arpeggio
+\arpeggioNormal

 <c e g c>2\arpeggio
 <c e g c>2\arpeggio

-\arpeggioNeutral
-<c e g c>1\arpeggio

 @end lilypond
 
 @end lilypond
 

-A @emph{parenthesis} style bracket may be attached to a chord
-construct instead of a square bracket.
+@cindex arpeggio symbols, special
+@cindex special arpeggio symbols

 
 

-@c Maybe create a new \arpeggioParen command, or something
-@c like that. -pm
+@funindex \arpeggioBracket
+@funindex arpeggioBracket
+@funindex \arpeggioParenthesis
+@funindex arpeggioParenthesis
+@funindex \arpeggioParenthesisDashed
+@funindex arpeggioParenthesisDashed
+
+Special @emph{bracketed} arpeggio symbols can be created:

 
 @lilypond[verbatim,quote,relative=1]
 <c e g c>2
 
 @lilypond[verbatim,quote,relative=1]
 <c e g c>2

-\override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur
-\override Arpeggio #'X-extent = #ly:grob::stencil-width
+\arpeggioBracket
+<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
 <c e g c>2\arpeggio

-\arpeggioNeutral
-<c e g c>1\arpeggio

 @end lilypond
 
 @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}.
 
 Arpeggios can be explicitly written out with ties.  For more
 information, see @ref{Ties}.
 

-@predefined

 
 

-@funindex \arpeggio
+@predefined

 @code{\arpeggio},
 @code{\arpeggio},

-@funindex \arpeggioUp
-@code{\arpeggioUp},
-@funindex \arpeggioDown
-@code{\arpeggioDown},
-@funindex \arpeggioNeutral
-@code{\arpeggioNeutral},
-@funindex \arpeggioBracket
-@code{\arpeggioBracket}.
+@code{\arpeggioArrowUp},
+@code{\arpeggioArrowDown},
+@code{\arpeggioNormal},
+@code{\arpeggioBracket},
+@code{\arpeggioParenthesis}
+@code{\arpeggioParenthesisDashed}.
+@endpredefined

 
 
 @snippets
 
 
 @snippets


@@ -802,11 +1017,11 @@ information, see @ref{Ties}.
 
 
 @seealso
 
 
 @seealso

-

 Music Glossary:
 @rglos{arpeggio}.
 
 Notation Reference:
 Music Glossary:
 @rglos{arpeggio}.
 
 Notation Reference:

+@ref{Slurs},

 @ref{Ties}.
 
 Snippets:
 @ref{Ties}.
 
 Snippets:


@@ -814,11 +1029,16 @@ Snippets:
 
 Internals Reference:
 @rinternals{Arpeggio},
 
 Internals Reference:
 @rinternals{Arpeggio},

+@rinternals{Slur},

 @rinternals{PianoStaff}.
 
 
 @knownissues
 
 @rinternals{PianoStaff}.
 
 
 @knownissues
 

+@cindex cross-staff parenthesis-style arpeggio
+@cindex arpeggio, parenthesis-style, cross-staff
+@cindex arpeggio, cross-staff parenthesis-style
+

 It is not possible to mix connected arpeggios and unconnected
 arpeggios in one @code{PianoStaff} at the same point in
 time.
 It is not possible to mix connected arpeggios and unconnected
 arpeggios in one @code{PianoStaff} at the same point in
 time.


@@ -831,55 +1051,79 @@ cross-staff arpeggios.
 @unnumberedsubsubsec Trills
 
 @cindex trills
 @unnumberedsubsubsec Trills
 
 @cindex trills

+

 @funindex \trill
 @funindex \trill

+@funindex trill
+@funindex \startTrillSpan
+@funindex startTrillSpan
+@funindex \stopTrillSpan
+@funindex stopTrillSpan

 
 Short @notation{trills} without an extender line are printed with
 @code{\trill}; see @ref{Articulations and ornamentations}.
 
 
 Short @notation{trills} without an extender line are printed with
 @code{\trill}; see @ref{Articulations and ornamentations}.
 

-Long running trills are made with @code{\startTrillSpan} and
-@code{\stopTrillSpan}.  In the following example, a long running
-trill is shown combined with grace notes.  To achieve precise
-control of the placement of the grace notes, see @ref{Grace
-notes}.
+Longer trills with an extender line are made with
+@code{\startTrillSpan} and @code{\stopTrillSpan}:
+
+@lilypond[verbatim,quote,relative=2]
+d1~\startTrillSpan
+d1
+c2\stopTrillSpan r2
+@end lilypond
+
+In the following example, a trill is combined with grace notes.
+The syntax of this construct and the method to precisely position
+the grace notes are described in @ref{Grace notes}.

 
 @lilypond[verbatim,quote,relative=2]
 c1 \afterGrace
 
 @lilypond[verbatim,quote,relative=2]
 c1 \afterGrace

-d1\startTrillSpan { c16[\stopTrillSpan d] }
-c4
+d1\startTrillSpan { c32[ d]\stopTrillSpan }
+e2 r2

 @end lilypond
 
 @cindex pitched trills
 @cindex trills, pitched
 @end lilypond
 
 @cindex pitched trills
 @cindex trills, pitched

+@funindex \pitchedTrill
+@funindex pitchedTrill

 
 

-Trills that should be executed on an explicitly specified pitch
-can be typeset with the command @code{\pitchedTrill} using the
-following syntax:
-
-@example
-@code{\pitchedTrill} @var{mainnote} @code{\startTrillSpan}
-@var{trillnote} @var{endnote} @code{\stopTrillSpan}
-@end example
+Trills that require an auxiliary note with an explicit pitch can
+be typeset with the @code{\pitchedTrill} command.  The first
+argument is the main note, and the second is the @emph{trilled}
+note, printed as a stemless note head in parentheses.

 
 @lilypond[verbatim,quote,relative=1]
 
 @lilypond[verbatim,quote,relative=1]

-\pitchedTrill e2 \startTrillSpan fis
+\pitchedTrill e2\startTrillSpan fis

 d\stopTrillSpan
 @end lilypond
 
 d\stopTrillSpan
 @end lilypond
 

-@noindent
-The first argument is the main note.  The pitch of the second is
-printed as a stemless note head in parentheses.
+@cindex pitched trill with forced accidental
+@cindex trill, pitched with forced accidental
+@cindex accidental, forced for pitched trill

 
 

+In the following example, the second pitched trill is ambiguous;
+the accidental of the trilled note is not printed.  As a
+workaround, the accidentals of the trilled notes can be forced.
+The second measure illustrates this method:
+
+@lilypond[verbatim,quote,relative=2]
+\pitchedTrill eis4\startTrillSpan fis
+g\stopTrillSpan
+\pitchedTrill eis4\startTrillSpan fis
+g\stopTrillSpan
+\pitchedTrill eis4\startTrillSpan fis
+g\stopTrillSpan
+\pitchedTrill eis4\startTrillSpan fis!
+g\stopTrillSpan
+@end lilypond

 
 

-@predefined

 
 

+@predefined

 @code{\startTrillSpan},
 @code{\startTrillSpan},

-@funindex \startTrillSpan

 @code{\stopTrillSpan}.
 @code{\stopTrillSpan}.

-@funindex \stopTrillSpan
+@endpredefined

 
 
 @seealso
 
 
 @seealso

-

 Music Glossary:
 @rglos{trill}.
 
 Music Glossary:
 @rglos{trill}.
 


@@ -892,3 +1136,4 @@ Snippets:
 
 Internals Reference:
 @rinternals{TrillSpanner}.
 
 Internals Reference:
 @rinternals{TrillSpanner}.

+