@snippets
-@c Send these snippets to Valentin for the LSR.
+@c Once revised, add to LSR.
The shorthands are defined in @file{ly/@/script@/-init@/.ly},
where the variables @code{dashHat}, @code{dashPlus},
@seealso
-Music Glossary: @rglos{tenuto}, @rglos{accent}, @rglos{staccato},
+Music Glossary:
+@rglos{tenuto},
+@rglos{accent},
+@rglos{staccato},
@rglos{portato}.
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Notation Reference:
+@ref{Controlling direction and placement}.
+
+Installed Files:
+@file{scm/@/script@/.scm}.
-Internals Reference: @internalsref{Script},
-@internalsref{TextScript}.
+Snippets:
+@rlsr{Expressive marks}.
+
+Internals Reference:
+@rinternals{Script},
+@rinternals{TextScript}.
@knownissues
@node Dynamics
@subsubsection Dynamics
+@cindex absolute dynamics
@cindex dynamics
+@cindex dynamics, absolute
+@funindex \ppppp
@funindex \pppp
@funindex \ppp
@funindex \pp
@funindex \rfz
Absolute dynamic marks are specified using a command after a note,
-like @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{Controlling direction
-and placement}.
+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{Controlling
+direction and placement}.
@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
c2\ppp c\mp
c\rfz c^\mf
-c_\spp c_\staccato^\ff
+c_\spp c^\ff
@end lilypond
@cindex hairpin
@funindex \decr
A @notation{crescendo} mark is started with @code{\<} and
-terminated with @code{\!} or an absolute dynamic. A
-@notation{decrescendo} is started with @code{\>} and is also
-terminated with @code{\!} or an absolute dynamic. @code{\cr} and
-@code{\decr} may be used instead of @code{\<} and @code{\>}. They
-can be engraved either using a graphical sign (a
-@notation{hairpin}), or with textual signs.
-
-Because these marks are bound to notes, you must use spacer notes
-if multiple marks are needed during one note.
+terminated with @code{\!}, an absolute dynamic, or an additional
+@notation{crescendo} or @notation{decrescendo} mark. A
+@notation{decrescendo} mark is started with @code{\>} and is also
+terminated with @code{\!}, an absolute dynamic, or another
+@notation{crescendo} or @notation{decrescendo} mark. @code{\cr}
+and @code{\decr} may be used instead of @code{\<} and @code{\>}.
+@notation{Hairpins} are engraved by default using this notation.
@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-c\< c\! d\> e\!
-<< f1 { s4 s4\< s4\! \> s4\! } >>
+c2\< c\!
+d2\< d\f
+e2\< e\>
+f2\> f\!
+e2\> e\mp
+d2\> d\>
+c1\!
@end lilypond
-This may give rise to very short hairpins. To lengthen them, the
-following code can be used, for example:
-
-@example
-\override Voice.Hairpin #'minimum-length = #5
-@end example
-
-@noindent
-A @notation{hairpin} normally starts at the left edge of the
-beginning note and ends on the right edge of the ending note. If
-the ending note falls on the downbeat, the @notation{hairpin} ends
-on the immediately preceding bar line. The following example
-illustrates this behavior:
+Spacer notes are needed to engrave multiple marks on one note.
@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-e4\< e2. e1\!
-\set hairpinToBarline = ##f
-e4\< e2. e1\!
+c4\< c\! d\> e\!
+<< f1 { s4 s4\< s4\> s4\! } >>
@end lilypond
-@cindex espressivo, articulation
+@cindex espressivo articulation
In some situations the @code{\espressivo} articulation mark may be
-suitable to indicate a crescendo and decrescendo on the one note:
+the appropriate choice to indicate a @notation{crescendo} and
+@notation{decrescendo} on one note:
@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-c2 b4 a g1\espressivo
-@end lilypond
-
-@cindex al niente
-@cindex niente, al
-
-Hairpins may be printed with a circled tip (al niente notation):
-
-@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-\override Hairpin #'circled-tip = ##t
-c2\< c\!
-c4\> c\< c2\!
+c2 b4 a
+g1\espressivo
@end lilypond
@cindex crescendo
@cindex diminuendo
@funindex \setTextCresc
@funindex \setTextDim
+@funindex \setTextDecr
@funindex \setTextDecresc
@funindex \setHairpinCresc
@funindex \setHairpinDim
@funindex \setHairpinDecresc
-You can use text saying @notation{cresc.}, @notation{decr.}, or
-@notation{dim.} instead of hairpins with the commands
-@code{\setTextCresc}, @code{\setTextDim}, and
-@code{\setTextDecresc}. The corresponding
-@code{\setHairpinCresc}, @code{\setHairpinDim}, and
-@code{\setHairpinDecresc} will revert to hairpins again:
+@notation{Crescendos} and @notation{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:
@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-\setTextCresc
c\< d e f\!
-\setHairpinCresc
e\> d c b\!
+\setTextCresc
+c\< d e f\!
\setTextDecresc
-e\> d e f\!
-\setTextDecr
-c\> d e f\!
-\setTextDim
e\> d c b\!
+\setHairpinCresc
+c\< d e f\!
@end lilypond
-You can also supply your own texts and change the style of the
-spanner line with the properties @code{\crescendoText},
-@code{\crescendoSpanner}, @code{\decrescendoText}, and
-@code{\decrescendoSpanner}. Available values for the spanner
-properties are @code{hairpin}, @code{line}, @code{dashed-line},
-and @code{dotted-line}. If unset, a hairpin crescendo is used:
+The text used for @notation{crescendos} and
+@notation{decrescendos} can be changed by modifying the context
+properties @code{crescendoText} and @code{decrescendoText}. The
+style of the spanner line can be changed by modifying the context
+properties @code{crescendoSpanner} and @code{decrescendoSpanner}.
+Available values for the spanner properties are @code{'hairpin},
+@code{'line}, @code{'dashed-line}, and @code{'dotted-line}. If
+unset, a hairpin crescendo is used:
@lilypond[verbatim,quote,ragged-right,fragment,relative=1]
\set crescendoText = \markup { \italic "cresc. poco" }
\set crescendoSpanner = #'dotted-line
-a'2\< a a a a a a a\!\mf
+a'2\< a a a a a a a\mf
@end lilypond
-To create new 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}.
Vertical positioning of dynamics is handled by
-@internalsref{DynamicLineSpanner}.
+@rinternals{DynamicLineSpanner}.
@predefined
@snippets
+@c Add LilyPond examples to these snippets. -pm
+
+@c A @notation{hairpin} normally starts at the left edge of the
+@c beginning note and ends on the right edge of the ending note. If
+@c the ending note falls on the downbeat, the @notation{hairpin} ends
+@c on the immediately preceding bar line. The following example
+@c illustrates this behavior:
+@c
+@c TODO: Add link to new snippet for #'to-barline
+
+If hairpins are too short, they can be lengthened using the
+following method:
+
+@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
+c4\< c\! d\> e\!
+\override Voice.Hairpin #'minimum-length = #5
+<< f1 { s4 s4\< s4\> s4\! } >>
+@end lilypond
+
+@cindex al niente
+@cindex niente, al
+
+Hairpins may be printed with a circled tip (al niente notation):
+
+@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
+\override Hairpin #'circled-tip = ##t
+c2\< c\!
+c4\> c\< c2\!
+@end lilypond
+
Dynamics that occur at, begin on, or end on the same note will be
vertically aligned. If you want to ensure that dynamics are
aligned when they do not occur on the same note, you can increase
\override DynamicLineSpanner #'staff-padding = #4
@end example
-@noindent
-You may also use this property if the dynamics are colliding with
-other notation.
-
@notation{Crescendi} and @notation{decrescendi} that cross a line
break will be continued on the second line. If they end on the
first note of a new line, nothing will be printed on that line.
@c TODO: Add hairpin to glossary.
-Music Glossary: @rglos{crescendo}, @rglos{decrescendo}.
+Music Glossary:
+@rglos{crescendo},
+@rglos{decrescendo}.
-Learning Manual: @rlearning{Articulation and dynamics}.
+Learning Manual:
+@rlearning{Articulation and dynamics}.
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Notation Reference:
+@ref{Controlling direction and placement}.
+
+Snippets:
+@rlsr{Expressive marks}.
-Internals Reference: @internalsref{DynamicText},
-@internalsref{Hairpin}. Vertical positioning of these symbols is
-handled by @internalsref{DynamicLineSpanner}.
+Internals Reference:
+@rinternals{DynamicText},
+@rinternals{Hairpin},
+@rinternals{DynamicLineSpanner}.
@node New dynamic marks
@seealso
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@rlsr{Expressive marks}.
@node Curves
@seealso
-Music Glossary: @rglos{slur}
+Music Glossary:
+@rglos{slur}.
+
+Notation Reference:
+@ref{Controlling direction and placement}.
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@rlsr{Expressive marks}.
-Internals Reference: @internalsref{Slur}.
+Internals Reference:
+@rinternals{Slur}.
@node Phrasing slurs
@seealso
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Notation Reference:
+@ref{Controlling direction and placement}.
+
+Snippets:
+@rlsr{Expressive marks}.
-Internals Reference: @internalsref{PhrasingSlur}
+Internals Reference:
+@rinternals{PhrasingSlur}.
@node Breath marks
@seealso
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@rlsr{Expressive marks}.
@c @lsr{expressive,breathing-sign.ly}.
-Internals Reference: @internalsref{BreathingSign}
+Internals Reference:
+@rinternals{BreathingSign}.
@node Falls and doits
@seealso
@c TODO: add falls and doits to glossary.
-@c Music Glossary: @rglos{falls}, @rglos{doits}.
+@c Music Glossary:
+@c @rglos{falls},
+@c @rglos{doits}.
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@rlsr{Expressive marks}.
@node Lines
@seealso
-Music Glossary: @rglos{glissando}
+Music Glossary:
+@rglos{glissando}.
-Snippets: @lsrdir{Expressive,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: @internalsref{Glissando}
+Internals Reference:
+@rinternals{Glissando}.
@knownissues
@cindex arpeggio
@cindex broken chord
+@c Add documentation for new 'parenthesis' style arpeggio. Maybe
+@c create a new \arpeggioParen command, or something similar. -pm
+
You can specify an @notation{arpeggio} (also known as a
@notation{broken chord}) on a chord by attaching an
@code{\arpeggio} to the chord:
@c TODO: Add 'broken chord' to glossary.
-Music Glossary: @rglos{arpeggio}
+Music Glossary:
+@rglos{arpeggio}.
-Notation Reference: @ref{Ties}, for writing out arpeggios.
+Notation Reference:
+@ref{Ties}, for writing out arpeggios.
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@rlsr{Expressive marks}.
-Internals Reference: @internalsref{Arpeggio},
-@internalsref{PianoStaff}.
+Internals Reference:
+@rinternals{Arpeggio},
+@rinternals{PianoStaff}.
@knownissues
@seealso
-Music Glossary: @rglos{trill}
+Music Glossary:
+@rglos{trill}.
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@rlsr{Expressive marks}.
-Internals Reference: @internalsref{TrillSpanner}
+Internals Reference:
+@rinternals{TrillSpanner}.
projects / lilypond.git / blobdiff