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

diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index d31e59d94f..897a5c3845 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -108,6 +108,7 @@ Methods to create new dynamic markings are also discussed.
 @funindex \fermata
 @funindex \longfermata
 @funindex \verylongfermata
+@funindex \fermataMarkup
 @funindex \segno
 @funindex \coda
 @funindex \varcoda
@@ -159,6 +160,19 @@ may be manually placed above or below the staff; see
 Articulations are @code{Script} objects.  Their properties are
 described more fully in @rinternals{Script}.
 
+Articulations can be attached to rests as well as notes but they
+cannot be attached to multi-measure rests.  A special predefined
+command, @code{\fermataMarkup}, is available for attaching a fermata
+to a multi-measure rest (and only a multi-measure rest).  This
+creates a @code{MultiMeasureRestText} object.
+
+@lilypond[verbatim,quote,relative=2]
+\override Script #'color = #red
+\override MultiMeasureRestText #'color = #blue
+a2\fermata r\fermata
+R1\fermataMarkup
+@end lilypond
+
 In addition to articulations, text and markups can be attached to
 notes.  See @ref{Text scripts}.
 
@@ -186,7 +200,6 @@ Music Glossary:
 Learning Manual:
 @rlearning{Placement of objects}.
 
-
 Notation Reference:
 @ref{Text scripts},
 @ref{Direction and placement},
@@ -297,10 +310,33 @@ d2\> d\>
 c1\!
 @end lilypond
 
-Spacer rests are needed to engrave multiple marks on one note.
+A hairpin that is terminated with @code{\!} will end at the
+right edge of the note that has the @code{\!} assigned to it.  In the
+case where it is terminated with the start of another @notation{crescendo}
+or @notation{decrescendo} mark, it will end at the centre of the note
+that has the next @code{\<} or @code{\>} assigned to it.  The next
+hairpin will then start at the right edge of the same note
+instead of the usual left edge had it been terminated with @code{\!}
+before.
+
+@lilypond[verbatim,quote,relative=2]
+c1\< | c4 a c\< a | c4 a c\! a\< | c4 a c a\!
+@end lilypond
+
+Hairpins that are terminated with absolute dynamic marks instead of
+@code{\!} will also be engraved in a similar way.  However, the length
+of the absolute dynamic itself can alter where the preceding hairpin
+ends.
+
+@lilypond[verbatim,quote,relative=2]
+c1\< | c4 a c\mf a | c1\< | c4 a c\ffff a
+@end lilypond
 
 @cindex multiple dynamic marks on one note
 @cindex dynamic marks, multiple on one note
+Spacer rests are needed to engrave multiple marks on one note.
+This is particularly useful when adding a @notation{crescendo} and
+@notation{decrescendo} to the same note:
 
 @lilypond[verbatim,quote,relative=2]
 c4\< c\! d\> e\!
@@ -312,9 +348,9 @@ c4\< c\! d\> e\!
 @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:
+The @code{\espressivo} command can be used to indicate a crescendo
+and decrescendo on the same note.  However, be warned that this is
+implemented as an articulation, not a dynamic.
 
 @lilypond[verbatim,quote,relative=2]
 c2 b4 a
@@ -810,7 +846,7 @@ g4\( e c2\)
 @funindex phrasingSlurDashPattern
 @cindex phrasing slur, defining dash patterns
 @cindex slur, phrasing, defining dash patterns
-@cindex slur, definind dash patterns for phrasing
+@cindex slur, defining dash patterns for phrasing
 
 Custom dash patterns for phrasing slurs can be defined: