X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fexpressive.itely;h=295cf49ad0c48ff2a0c645a5b4a95e0dc97df968;hb=e69b5973fcee6e8f8523de45ccdbd7ec6111b66d;hp=897a5c38459363ee479473f3c2c10f9dfd570c5a;hpb=e1a149d0cc60b02e86209387958f4028567dd366;p=lilypond.git

diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index 897a5c3845..295cf49ad0 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.12.0"
+@c \version "2.13.36"
 
 @node Expressive marks
 @section Expressive marks
@@ -18,14 +18,14 @@ This section lists various expressive marks that can be
 created in a score.
 
 @menu
-* Attached to notes::
-* Curves::
-* Lines::
+* Expressive marks attached to notes::
+* Expressive marks as curves::
+* Expressive marks as lines::
 @end menu
 
 
-@node Attached to notes
-@subsection Attached to notes
+@node Expressive marks attached to notes
+@subsection Expressive marks attached to notes
 
 This section explains how to create expressive marks that are
 attached to notes: articulations, ornamentations, and dynamics.
@@ -124,8 +124,8 @@ this syntax:
 @var{note}\@var{name}
 @end example
 
-The possible values for @var{name} are listed in @ref{List of
-articulations}.  For example:
+The possible values for @code{@var{name}} are listed in
+@ref{List of articulations}.  For example:
 
 @lilypond[verbatim,quote,relative=2]
 c4\staccato c\mordent b2\turn
@@ -153,7 +153,7 @@ c4-> c-. c2-_
 @end lilypond
 
 The rules for the default placement of articulations are defined
-in @file{scm/@/script@/.scm}.  Articulations and ornamentations
+in @file{scm/script.scm}.  Articulations and ornamentations
 may be manually placed above or below the staff; see
 @ref{Direction and placement}.
 
@@ -207,7 +207,7 @@ Notation Reference:
 @ref{Trills}.
 
 Installed Files:
-@file{scm/@/script@/.scm}.
+@file{scm/script.scm}.
 
 Snippets:
 @rlsr{Expressive marks}.
@@ -357,6 +357,22 @@ c2 b4 a
 g1\espressivo
 @end lilypond
 
+@funindex \cresc
+@funindex cresc
+@funindex \decresc
+@funindex decresc
+@funindex \dim
+@funindex dim
+Textual crescendo marks begin with @code{\cresc}.
+Textual decrescendos begin with @code{\decresc} or @code{\dim}.
+Extender lines are engraved as required.
+
+@lilypond[verbatim,quote,relative=2]
+g8\cresc a b c b c d e\mf |
+f8\decresc e d c e\> d c b |
+a1\dim ~ |
+a2. r4\! |
+@end lilypond
 
 @funindex \crescTextCresc
 @funindex crescTextCresc
@@ -371,24 +387,19 @@ g1\espressivo
 @funindex \dimHairpin
 @funindex dimHairpin
 
-Crescendos and decrescendos can be engraved as textual markings
-instead of hairpins.  Dashed lines are printed to indicate their
-extent.  The built-in commands @code{\crescTextCresc},
-@code{\dimTextDecresc}, @code{\dimTextDecr}, and @code{\dimTextDim}
-will tell LilyPond to use such textual marks instead of hairpins
-for all subsequent @code{\<} and @code{\>} commands.  The corresponding
-@code{\crescHairpin} and @code{\dimHairpin} commands will revert
-to hairpins again:
-
+Textual marks for dynamic changes can also replace hairpins:
 @lilypond[verbatim,quote,relative=2]
 \crescTextCresc
-c2\< d | e f\!
+c4\< d e f\! |
 \dimTextDecresc
-e2\> d | c b\!
+g4\> e d c\! |
+\dimTextDecr
+e4\> d c b\! |
+\dimTextDim
+d4\> c b a\! |
 \crescHairpin
-c2\< d | e f\!
 \dimHairpin
-e2\> d\!
+c4\< d\! e\> d\! |
 @end lilypond
 
 
@@ -410,6 +421,29 @@ Vertical positioning of dynamics is handled by
 @funindex \dynamicNeutral
 @funindex dynamicNeutral
 
+A @code{Dynamics} context is available to engrave dynamics on
+their own horizontal line.  Use spacer rests to indicate timing.
+(Notes in a @code{Dynamics} context will also take up
+musical time, but will not be engraved.)
+The @code{Dynamics} context can usefully contain some other
+items such as text scripts, text spanners, and piano pedal marks.
+
+@lilypond[verbatim,quote]
+<<
+  \new Staff \relative c' {
+    c2 d4 e |
+    c4 e e,2 |
+    g'4 a g a |
+    c1 |
+  }
+  \new Dynamics {
+    s1\< |
+    s1\f |
+    s2\dim s2-"rit." |
+    s1\p |
+  }
+>>
+@end lilypond
 
 @predefined
 @code{\dynamicUp},
@@ -470,7 +504,8 @@ Snippets:
 Internals Reference:
 @rinternals{DynamicText},
 @rinternals{Hairpin},
-@rinternals{DynamicLineSpanner}.
+@rinternals{DynamicLineSpanner},
+@rinternals{Dynamics}.
 
 
 @node New dynamic marks
@@ -589,8 +624,8 @@ Extend:
 
 
 
-@node Curves
-@subsection Curves
+@node Expressive marks as curves
+@subsection Expressive marks as curves
 
 This section explains how to create various expressive marks that
 are curved: normal slurs, phrasing slurs, breath marks, falls, and
@@ -987,8 +1022,8 @@ Snippets:
 @rlsr{Expressive marks}.
 
 
-@node Lines
-@subsection Lines
+@node Expressive marks as lines
+@subsection Expressive marks as lines
 
 This section explains how to create various expressive marks that
 follow a linear path: glissandos, arpeggios, and trills.