X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fexpressive.itely;h=56904b0067206e54fbdb1b3098d45101105e8ae7;hb=1423508c355989fa26a8cfe5985b0d6e1ab0a538;hp=70e896321aa72c316e9fc3f328ad6c24e022adf9;hpb=9e338fb9a890089a44a3c36ae3c95653027718d5;p=lilypond.git

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 70e896321a..56904b0067 100644
--- 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.12.0"
 
 @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
@@ -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}.
 
 
@@ -119,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]
+{creating-a-delayed-turn.ly}
 
 @seealso
-
 Music Glossary:
 @rglos{tenuto},
 @rglos{accent},
@@ -130,7 +131,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}.
@@ -192,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
@@ -300,20 +302,20 @@ 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},
@@ -321,6 +323,7 @@ Vertical positioning of dynamics is handled by
 @code{\dimTextDecresc},
 @code{\crescHairpin},
 @code{\dimHairpin}.
+@endpredefined
 
 
 @snippets
@@ -348,12 +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}.
@@ -417,8 +419,7 @@ boxF = \markup { \bracket { \dynamic f } }
 @funindex make-dynamic-script
 
 Simple, centered dynamic marks are easily created with the
-@code{make-dynamic-script} function.  The dynamic font only
-contains the characters @code{f,m,p,r,s} and @code{z}.
+@code{make-dynamic-script} function.
 
 @lilypond[verbatim,quote]
 sfzp = #(make-dynamic-script "sfzp")
@@ -427,11 +428,15 @@ sfzp = #(make-dynamic-script "sfzp")
 }
 @end lilypond
 
-In general, @code{make-dynamic-script} takes any markup object as
-its argument.  In the following example, using
-@code{make-dynamic-script} ensures the vertical alignment of
-markup objects and hairpins that are attached to the same note
-head.
+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 {
@@ -439,11 +444,17 @@ roundF = \markup { \center-align \concat {
            \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,1~_\boxFdynamic\>
+  g
+  g'~\mfEspressDynamic
+  g
 }
 @end lilypond
 
@@ -465,7 +476,6 @@ Font settings in markup mode are described in
 
 
 @seealso
-
 Notation Reference:
 @ref{Formatting text},
 @ref{Selecting font and font size},
@@ -485,10 +495,10 @@ are curved: normal slurs, phrasing slurs, breath marks, falls, and
 doits.
 
 @menu
-* Slurs::                       
-* Phrasing slurs::              
-* Breath marks::                
-* Falls and doits::             
+* Slurs::
+* Phrasing slurs::
+* Breath marks::
+* Falls and doits::
 @end menu
 
 @node Slurs
@@ -512,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
@@ -530,8 +532,9 @@ 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 slur, solid
@@ -540,7 +543,7 @@ For details, see @ref{Phrasing slurs}.
 @cindex solid slur
 @cindex dotted slur
 @cindex dashed slur
-@cindex sytle, slur
+@cindex style, slur
 @funindex \slurDashed
 @funindex slurDashed
 @funindex \slurDotted
@@ -561,21 +564,59 @@ c4( e g2)
 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
+
+
+@predefined
 @code{\slurUp},
-@funindex \slurDown
 @code{\slurDown},
-@funindex \slurNeutral
 @code{\slurNeutral},
-@funindex \slurDashed
 @code{\slurDashed},
-@funindex \slurDotted
 @code{\slurDotted},
-@funindex \slurSolid
+@code{\slurHalfDashed},
+@code{\slurHalfSolid},
+@code{\slurDashPattern},
 @code{\slurSolid}.
+@endpredefined
 
 
 @snippets
@@ -583,9 +624,13 @@ g4( e c2)
 @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}.
 
@@ -632,39 +677,107 @@ 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}.
 
+@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]
-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
 
-@cindex simultaneous phrasing slurs
-@cindex multiple phrasing slurs
-@cindex slurs, simultaneous phrasing
-@cindex slurs, multiple phrasing
-@cindex phrasing slurs, simultaneous
-@cindex phrasing slurs, multiple
+@funindex phrasingSlurHalfDashed
+@funindex \phrasingSlurHalfDashed
+@funindex \phrasingSlurHalfSolid
+@funindex phrasingSlurHalfSolid
+@cindex phrasing slur, half solid and half dashed
+@cindex slur, half solid and half dashed phrasing
 
-Simultaneous phrasing slurs are not permitted.
+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\)
+\phrasingSlurHalfSolid
+c4\( e g2\)
+\phrasingSlurSolid
+g4\( e c2\)
+@end lilypond
 
-@predefined
+@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{\phrasingSlurDown},
-@code{\phrasingSlurNeutral}.
+@code{\phrasingSlurNeutral},
+@code{\phrasingSlurDashed},
+@code{\phrasingSlurDotted},
+@code{\phrasingSlurHalfDashed},
+@code{\phrasingSlurHalfSolid},
+@code{\phrasingSlurDashPattern},
+@code{\phrasingSlurSolid}.
+@endpredefined
 
 
 @seealso
-
 Learning Manual:
 @rlearning{On the un-nestedness of brackets and ties}.
 
 Notation Reference:
-@ref{Direction and placement}.
+@ref{Direction and placement},
+@ref{Slurs}.
 
 Snippets:
 @rlsr{Expressive marks}.
@@ -677,6 +790,7 @@ Internals Reference:
 @unnumberedsubsubsec Breath marks
 
 @cindex breath marks
+@cindex pause mark
 @funindex \breathe
 @funindex breathe
 
@@ -703,13 +817,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}.
@@ -747,11 +862,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 +877,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
@@ -794,7 +907,6 @@ Different styles of glissandi can be created.  For details, see
 
 
 @seealso
-
 Music Glossary:
 @rglos{glissando}.
 
@@ -804,17 +916,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 +932,7 @@ supported.
 @cindex arpeggio
 @cindex broken chord
 @cindex chord, broken
+
 @funindex \arpeggio
 @funindex arpeggio
 @funindex \arpeggioArrowUp
@@ -855,10 +964,13 @@ Different types of arpeggios may be written.
 
 @cindex arpeggio symbols, special
 @cindex special arpeggio symbols
+
 @funindex \arpeggioBracket
 @funindex arpeggioBracket
 @funindex \arpeggioParenthesis
 @funindex arpeggioParenthesis
+@funindex \arpeggioParenthesisDashed
+@funindex arpeggioParenthesisDashed
 
 Special @emph{bracketed} arpeggio symbols can be created:
 
@@ -868,21 +980,28 @@ 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}.
 
-@predefined
 
+@predefined
 @code{\arpeggio},
 @code{\arpeggioArrowUp},
 @code{\arpeggioArrowDown},
 @code{\arpeggioNormal},
 @code{\arpeggioBracket},
-@code{\arpeggioParenthesis}.
+@code{\arpeggioParenthesis}
+@code{\arpeggioParenthesisDashed}.
+@endpredefined
 
 
 @snippets
@@ -898,11 +1017,11 @@ information, see @ref{Ties}.
 
 
 @seealso
-
 Music Glossary:
 @rglos{arpeggio}.
 
 Notation Reference:
+@ref{Slurs},
 @ref{Ties}.
 
 Snippets:
@@ -910,6 +1029,7 @@ Snippets:
 
 Internals Reference:
 @rinternals{Arpeggio},
+@rinternals{Slur},
 @rinternals{PianoStaff}.
 
 
@@ -931,6 +1051,7 @@ cross-staff arpeggios.
 @unnumberedsubsubsec Trills
 
 @cindex trills
+
 @funindex \trill
 @funindex trill
 @funindex \startTrillSpan
@@ -997,13 +1118,12 @@ g\stopTrillSpan
 
 
 @predefined
-
 @code{\startTrillSpan},
 @code{\stopTrillSpan}.
+@endpredefined
 
 
 @seealso
-
 Music Glossary:
 @rglos{trill}.