Index: Documentation/notation/expressive.itely |
diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely |
index f2fee1c5de8ffee95ee838aaa25932784c948691..3572dd9962e69fade4c976f379b0264499038141 100644 |
--- a/Documentation/notation/expressive.itely |
+++ b/Documentation/notation/expressive.itely |
@@ -290,6 +290,12 @@ c2_\spp c^\ff |
@funindex cr |
@funindex \decr |
@funindex decr |
+@funindex \cresc |
+@funindex cresc |
+@funindex \decresc |
+@funindex decresc |
+@funindex \dim |
+@funindex dim |
A @notation{crescendo} mark is started with @code{\<} and |
terminated with @code{\!}, an absolute dynamic, or an additional |
@@ -304,43 +310,57 @@ notation. |
c2\< c\! |
d2\< d\f |
e2\< e\> |
-f2\> f\! |
-e2\> e\mp |
-d2\> d\> |
-c1\! |
+\bar "||" e2\p\< f | e2\> d\! | a2\< b | c1\decr s1*0\! \bar "|." |
Carl
2010/12/20 05:59:46
I don't like having all this on one line. Is ther
Keith
2010/12/20 06:44:18
So that the reader can keep his place when shiftin
Trevor Daniels
2010/12/20 10:57:44
Although it looks prettier with inserted \bar comm
Carl
2010/12/20 15:22:30
I think it's far easier to keep place when the lin
Graham Percival (old account)
2010/12/20 18:53:19
Yes.
That said, we have sometimes used
\break
t
Keith
2010/12/21 01:37:02
I have difficulty keeping my place in the input wh
|
@end lilypond |
-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. |
+Textual crescendo marks begin with @code{\cresc} |
+and continue, with dashed extender lines as required, |
+until the next dynamic mark, |
+or @code{\!} or its synonym @{\endcresc}. |
Trevor Daniels
2010/12/20 10:57:44
@code{\endcresc}
Graham Percival (old account)
2010/12/20 18:53:19
Yes. I'm surprised that the code compiled with th
|
+Text decrescendos begin with @code{\decresc} or @code{\dim}. |
@lilypond[verbatim,quote,relative=2] |
-c1\< | c4 a c\< a | c4 a c\! a\< | c4 a c a\! |
+c2\cresc e | d2 d\mf | e2\decresc f | e\> d | |
+\bar "||" |
Trevor Daniels
2010/12/20 10:57:44
drop \bar
Graham Percival (old account)
2010/12/20 18:53:19
I'll accept a \break instead, if Keith insists.
Keith
2010/12/21 01:37:02
I'll put this in standard style
|
+a2.\p\< b4 | c1\dim ~ | c2. r4\! | |
@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. |
+@funindex \crescTextCresc |
+@funindex crescTextCresc |
+@funindex \dimTextDecresc |
+@funindex dimTextDecresc |
+@funindex \dimTextDecr |
+@funindex dimTextDecr |
+@funindex \dimTextDim |
+@funindex dimTextDim |
+@funindex \crescHairpin |
+@funindex crescHairpin |
+@funindex \dimHairpin |
+@funindex dimHairpin |
+ |
+The commands @code{\crescTextCresc}, @code{\dimTextDecresc}, |
Graham Percival (old account)
2010/12/20 18:53:19
Holy talking through the code, batman!
Delete thi
Keith
2010/12/21 01:37:02
Amen, brother! This was a moved block, and I was
|
+@code{\dimTextDecr}, and @code{\dimTextDim} |
+cause subsequent @code{\<} and @code{\>} commands |
+to produce textual marks instead of hairpins. |
+The corresponding @code{\crescHairpin} and @code{\dimHairpin} |
+commands will revert @code{\<} and @code{\>} to hairpins: |
@lilypond[verbatim,quote,relative=2] |
-c1\< | c4 a c\mf a | c1\< | c4 a c\ffff a |
+\crescTextCresc c2\< d\! | e\> d\! \bar "||" |
+\dimTextDecr c2\< d\! | e\> d\! \bar "||" |
+\crescHairpin c2\< d\! | e\> d\! \bar "||" |
+\dimHairpin c2\< d\! | e\> d\! \bar "||" |
Trevor Daniels
2010/12/20 10:57:44
drop \bar's
start music on newlines
I'd also prefe
Keith
2010/12/21 01:37:02
Okay. Starting again from the old example, Graham
|
@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 |
+Spacer rests can be used to add a @notation{crescendo} and |
@notation{decrescendo} to the same note: |
@lilypond[verbatim,quote,relative=2] |
-c4\< c\! d\> e\! |
-<< f1 { s4 s4\< s4\> s4\! } >> |
+c4\> << b2. {s2 s4\p} >> | |
+<< { g1 } { s4 s4\< s4\> s4\! } >> |
@end lilypond |
@cindex espressivo articulation |
@@ -357,59 +377,44 @@ c2 b4 a |
g1\espressivo |
@end lilypond |
- |
-@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 |
-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: |
- |
-@lilypond[verbatim,quote,relative=2] |
-\crescTextCresc |
-c2\< d | e f\! |
-\dimTextDecresc |
-e2\> d | c b\! |
-\crescHairpin |
-c2\< d | e f\! |
-\dimHairpin |
-e2\> d\! |
-@end lilypond |
- |
- |
-To create new absolute dynamic marks or text that should be |
+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 |
+Dynamics can by moved from their default placement |
+with the commands @code{\dynamicUp}, |
+@code{\dynamicDown} and @code{\dynamicNeutral}. |
+Adjusting the @code{staff-padding} of dynamics is demonstrated |
+in @rlearning{Moving-objects}. |
Trevor Daniels
2010/12/20 12:54:37
Broken ref
Keith
2010/12/21 01:37:02
Working on it. Also fixing "can by" -> "can be"
|
- |
-Vertical positioning of dynamics is handled by |
-@rinternals{DynamicLineSpanner}. |
@funindex \dynamicUp |
@funindex dynamicUp |
@funindex \dynamicDown |
@funindex dynamicDown |
@funindex \dynamicNeutral |
@funindex dynamicNeutral |
+@funindex \dynamicUp |
+ |
+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, piano pedal marks, |
+and bar indications. |
+@lilypond[verbatim,quote] |
+<< |
+ \new Staff \relative c' { |
+ c2 d4 e | b4 e e,2 | g'4 a g a | c1 |
+ } |
+ \new Dynamics { |
+ s1\< | s1\f | s2\dim s2-"rit." | s1\p \bar"|." |
+ } |
+>> |
+@end lilypond |
@predefined |
@code{\dynamicUp}, |