X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fexpressive.itely;h=e0003fc452866dbd7a4c957083ff0cdf0448d11c;hb=5b2bdf8c532aa1b4aa8626f6847938f2ef4ba1be;hp=35a023aa709f720303ef93aca8ec4d7247586f45;hpb=222b0bff12be16c385df77f4cfa89101aafeece7;p=lilypond.git diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely index 35a023aa70..e0003fc452 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,15 +31,16 @@ 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 @unnumberedsubsubsec Articulations and ornamentations @cindex articulations +@cindex ornamentation @cindex scripts @cindex ornaments @cindex espressivo @@ -48,6 +49,7 @@ Methods to create new dynamic markings are also discussed. @cindex downbow @cindex foot marks @cindex organ pedal marks +@cindex pedal marks, organ @cindex turn @cindex open @cindex stopped @@ -65,6 +67,8 @@ Methods to create new dynamic markings are also discussed. @cindex coda @cindex varcoda +@funindex - + A variety of symbols that denote articulations, ornamentations, and other performance indications can be attached to a note using this syntax: @@ -82,7 +86,6 @@ c1\fermata @end lilypond @cindex marcato -@cindex stopped @cindex tenuto @cindex staccatissimo @cindex accent @@ -116,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}, @@ -127,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}. @@ -146,6 +151,7 @@ Internals Reference: @cindex absolute dynamics @cindex dynamics @cindex dynamics, absolute + @funindex \ppppp @funindex ppppp @funindex \pppp @@ -201,11 +207,15 @@ c2_\spp c^\ff @cindex hairpin @cindex crescendo @cindex decrescendo +@cindex diminuendo + @funindex \< @funindex \> @funindex \! @funindex \cr +@funindex cr @funindex \decr +@funindex decr A @notation{crescendo} mark is started with @code{\<} and terminated with @code{\!}, an absolute dynamic, or an additional @@ -237,6 +247,7 @@ c4\< c\! d\> e\! @end lilypond @cindex espressivo articulation + @funindex \espressivo @funindex espressivo @@ -249,9 +260,7 @@ c2 b4 a g1\espressivo @end lilypond -@cindex crescendo -@cindex decrescendo -@cindex diminuendo + @funindex \crescTextCresc @funindex crescTextCresc @funindex \dimTextDecresc @@ -290,41 +299,31 @@ aligned with dynamics, see @ref{New dynamic marks}. @cindex dynamics, vertical positioning @cindex vertical positioning of dynamics + @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}, -@funindex \crescTextCresc -@funindex crescTextCresc @code{\crescTextCresc}, -@funindex \dimTextDim -@funindex dimTextDim @code{\dimTextDim}, -@funindex \dimTextDecr -@funindex dimTextDecr @code{\dimTextDecr}, -@funindex \dimTextDecresc -@funindex dimTextDecresc @code{\dimTextDecresc}, -@funindex \crescHairpin -@funindex crescHairpin @code{\crescHairpin}, -@funindex \dimHairpin -@funindex dimHairpin @code{\dimHairpin}. +@endpredefined @snippets @@ -352,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}. @@ -469,7 +467,6 @@ Font settings in markup mode are described in @seealso - Notation Reference: @ref{Formatting text}, @ref{Selecting font and font size}, @@ -489,10 +486,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 @@ -534,10 +531,14 @@ 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 solid slur +@cindex dotted slur +@cindex dashed slur @cindex slur, solid @cindex slur, dotted @cindex slur, dashed @@ -565,21 +566,18 @@ c4( e g2) g4( e c2) @end lilypond +@funindex \slurUp +@funindex slurUp -@predefined -@funindex \slurUp +@predefined @code{\slurUp}, -@funindex \slurDown @code{\slurDown}, -@funindex \slurNeutral @code{\slurNeutral}, -@funindex \slurDashed @code{\slurDashed}, -@funindex \slurDotted @code{\slurDotted}, -@funindex \slurSolid @code{\slurSolid}. +@endpredefined @snippets @@ -587,9 +585,10 @@ 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 - Music Glossary: @rglos{slur}. @@ -632,6 +631,12 @@ e2) d\) @funindex phrasingSlurDown @funindex \phrasingSlurNeutral @funindex phrasingSlurNeutral +@funindex phrasingSlurDashed +@funindex \phrasingSlurDashed +@funindex \phrasingSlurDotted +@funindex phrasingSlurDotted +@funindex \phrasingSlurSolid +@funindex phrasingSlurSolid Typographically, a phrasing slur behaves almost exactly like a normal slur. However, they are treated as different objects; a @@ -652,18 +657,33 @@ c4\( g' c,( b) | c1\) @cindex phrasing slurs, simultaneous @cindex phrasing slurs, multiple -Simultaneous phrasing slurs are not permitted. +Simultaneous or overlapping phrasing slurs are not permitted. +Phrasing slurs can be solid, dotted, or dashed. Solid is the default +style for phrasing slurs: + +@lilypond[verbatim,quote,relative=1] +c4\( e g2\) +\phrasingSlurDashed +g4\( e c2\) +\phrasingSlurDotted +c4\( e g2\) +\phrasingSlurSolid +g4\( e c2\) +@end lilypond -@predefined +@predefined @code{\phrasingSlurUp}, @code{\phrasingSlurDown}, -@code{\phrasingSlurNeutral}. +@code{\phrasingSlurNeutral}, +@code{\phrasingSlurDashed}, +@code{\phrasingSlurDotted}, +@code{\phrasingSlurSolid}. +@endpredefined @seealso - Learning Manual: @rlearning{On the un-nestedness of brackets and ties}. @@ -681,6 +701,7 @@ Internals Reference: @unnumberedsubsubsec Breath marks @cindex breath marks +@cindex pause mark @funindex \breathe @funindex breathe @@ -707,13 +728,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}. @@ -751,11 +773,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}. @@ -768,9 +788,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 @@ -798,7 +818,6 @@ Different styles of glissandi can be created. For details, see @seealso - Music Glossary: @rglos{glissando}. @@ -808,17 +827,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. @@ -828,6 +843,7 @@ supported. @cindex arpeggio @cindex broken chord @cindex chord, broken + @funindex \arpeggio @funindex arpeggio @funindex \arpeggioArrowUp @@ -859,6 +875,7 @@ Different types of arpeggios may be written. @cindex arpeggio symbols, special @cindex special arpeggio symbols + @funindex \arpeggioBracket @funindex arpeggioBracket @funindex \arpeggioParenthesis @@ -879,14 +896,15 @@ Special @emph{bracketed} arpeggio symbols can be created: 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}. +@endpredefined @snippets @@ -902,7 +920,6 @@ information, see @ref{Ties}. @seealso - Music Glossary: @rglos{arpeggio}. @@ -935,6 +952,7 @@ cross-staff arpeggios. @unnumberedsubsubsec Trills @cindex trills + @funindex \trill @funindex trill @funindex \startTrillSpan @@ -1001,13 +1019,12 @@ g\stopTrillSpan @predefined - @code{\startTrillSpan}, @code{\stopTrillSpan}. +@endpredefined @seealso - Music Glossary: @rglos{trill}.