From dbc8aaa7468900013eb45185a7641b62d68cfda7 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 8 Jul 2010 22:13:54 +0100 Subject: [PATCH] Doc: Issue 989 - plus various additions trill-spanner-chained.ly Added a custom example (not snippet) to show this in the NR. Also standardized existing examples for consistency ambitus-gap-ly Added as a snippet to NR double-repeat-double-vota Added as a snippet to the NR also added some more examples in the repeats section to build on previous examples --- Documentation/notation/expressive.itely | 82 +++++++++++++------ Documentation/notation/pitches.itely | 3 + Documentation/notation/repeats.itely | 53 ++++++++++-- Documentation/snippets/change-ambitus-gap.ly | 45 ++++++++++ .../snippets/new/change-ambitus-gap.ly | 40 +++++++++ .../new/set-double-repeat-default-volta.ly | 19 +++++ Documentation/snippets/pitches.snippet-list | 1 + Documentation/snippets/repeats.snippet-list | 1 + .../set-double-repeat-default-volta.ly | 29 +++++++ 9 files changed, 238 insertions(+), 35 deletions(-) create mode 100644 Documentation/snippets/change-ambitus-gap.ly create mode 100644 Documentation/snippets/new/change-ambitus-gap.ly create mode 100644 Documentation/snippets/new/set-double-repeat-default-volta.ly create mode 100644 Documentation/snippets/set-double-repeat-default-volta.ly diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely index c1a41341a4..d31e59d94f 100644 --- a/Documentation/notation/expressive.itely +++ b/Documentation/notation/expressive.itely @@ -1147,26 +1147,50 @@ cross-staff arpeggios. @funindex \stopTrillSpan @funindex stopTrillSpan -Short @notation{trills} without an extender line are printed with +Short trills without an extender line are printed with @code{\trill}; see @ref{Articulations and ornamentations}. Longer trills with an extender line are made with @code{\startTrillSpan} and @code{\stopTrillSpan}: @lilypond[verbatim,quote,relative=2] -d1~\startTrillSpan +d1\startTrillSpan d1 -c2\stopTrillSpan r2 +c2\stopTrillSpan +r2 @end lilypond -In the following example, a trill is combined with grace notes. -The syntax of this construct and the method to precisely position -the grace notes are described in @ref{Grace notes}. +A trill spanner crossing a line break will restart exactly above +the first note on the new line. + +@lilypond[ragged-right,verbatim,quote,relative=2] +d1\startTrillSpan +\break +d1 +c2\stopTrillSpan +r2 +@end lilypond + +Consecutive trill spans will work without explicit +@code{\stopTrillSpan} commands, since successive trill spanners will +automatically become the right bound of the previous trill. + +@lilypond[verbatim,quote,relative=2] +d1\startTrillSpan +d1 +b1\startTrillSpan +d2\stopTrillSpan +r2 +@end lilypond + +Trills can also be combined with grace notes. The syntax of this +construct and the method to precisely position the grace notes are +described in @ref{Grace notes}. @lilypond[verbatim,quote,relative=2] -c1 \afterGrace +d1~\afterGrace d1\startTrillSpan { c32[ d]\stopTrillSpan } -e2 r2 +c2 r2 @end lilypond @cindex pitched trills @@ -1179,29 +1203,34 @@ be typeset with the @code{\pitchedTrill} command. The first argument is the main note, and the second is the @emph{trilled} note, printed as a stemless note head in parentheses. -@lilypond[verbatim,quote,relative=1] -\pitchedTrill e2\startTrillSpan fis -d\stopTrillSpan +@lilypond[verbatim,quote,relative=2] +\pitchedTrill +d2\startTrillSpan fis +d2 +c2\stopTrillSpan +r2 @end lilypond -@cindex pitched trill with forced accidental -@cindex trill, pitched with forced accidental -@cindex accidental, forced for pitched trill +@cindex pitched trill with accidental +@cindex trill with accidental -In the following example, the second pitched trill is ambiguous; -the accidental of the trilled note is not printed. As a -workaround, the accidentals of the trilled notes can be forced. -The second measure illustrates this method: +Subsequent accidentals of the same note in the same measure will need +to be added manually. Only the accidental of the first pitched trill +in a measure is printed. @lilypond[verbatim,quote,relative=2] -\pitchedTrill eis4\startTrillSpan fis -g\stopTrillSpan -\pitchedTrill eis4\startTrillSpan fis -g\stopTrillSpan -\pitchedTrill eis4\startTrillSpan fis -g\stopTrillSpan -\pitchedTrill eis4\startTrillSpan fis! -g\stopTrillSpan +\pitchedTrill +eis4\startTrillSpan fis +eis4\stopTrillSpan +\pitchedTrill +eis4\startTrillSpan cis +eis4\stopTrillSpan +\pitchedTrill +eis4\startTrillSpan fis +eis4\stopTrillSpan +\pitchedTrill +eis4\startTrillSpan fis! +eis4\stopTrillSpan @end lilypond @@ -1210,7 +1239,6 @@ g\stopTrillSpan @code{\stopTrillSpan}. @endpredefined - @seealso Music Glossary: @rglos{trill}. diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index 7fb1f89e48..4895e18a23 100644 --- a/Documentation/notation/pitches.itely +++ b/Documentation/notation/pitches.itely @@ -2482,6 +2482,9 @@ printed if they are not part of the key signature. @lilypondfile[verbatim,lilyquote,texidoc,doctitle] {ambitus-with-multiple-voices.ly} +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{change-ambitus-gap.ly} + @seealso Music Glossary: diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely index 3491d200b5..f0dc624908 100644 --- a/Documentation/notation/repeats.itely +++ b/Documentation/notation/repeats.itely @@ -84,13 +84,9 @@ The syntax for a normal repeat is @end example @noindent -where @var{musicexpr} is a music expression. Alternate endings can be -produced using @code{\alternative}. In order to delimit the alternate -endings, the group of alternatives must be enclosed in a set of -braces. If there are more repeats than there are alternate endings, -the earliest repeats are given the first alternative. +where @var{musicexpr} is a music expression. -Normal repeats without alternate endings: +A single repeat without an alternate ending: @lilypond[verbatim,quote,relative=2] \repeat volta 2 { c4 d e f } @@ -98,13 +94,52 @@ c2 d \repeat volta 2 { d4 e f g } @end lilypond -Normal repeats with alternate endings: +Alternative endings can be produced using @code{\alternative}. Each +group of alternatives must be themselves, enclosed in a set of braces. + +@example +\repeat volta @var{repeatcount} @var{musicexpr} +\alternative @{ + @{ @var{musicexpr} @} +@} +@end example + +@noindent +where @var{musicexpr} is a music expression. + +If there are more repeats than there are alternate endings, the earliest +repeats are given the first alternative. + +A single repeat with one alternate ending: + +@lilypond[verbatim,quote,relative=2] +\repeat volta 2 { c4 d e f } +\alternative { + { c2 e } + { f2 g } +} +c1 +@end lilypond + +A single repeat with more than one alternate ending: @lilypond[verbatim,quote,relative=2] \repeat volta 4 { c4 d e f } \alternative { - { d2 e } + { c2 e } + { f2 g } +} +c1 +@end lilypond + +Multiple repeats with more than one alternate ending: + +@lilypond[verbatim,quote,relative=2] +\repeat volta 3 { c4 d e f } +\alternative { + { c2 e } { f2 g } + { a2 g } } c1 @end lilypond @@ -225,6 +260,8 @@ c1 @lilypondfile[verbatim,lilyquote,texidoc,doctitle] {adding-volta-brackets-to-additional-staves.ly} +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{set-double-repeat-default-volta.ly} @seealso Music Glossary: diff --git a/Documentation/snippets/change-ambitus-gap.ly b/Documentation/snippets/change-ambitus-gap.ly new file mode 100644 index 0000000000..a70ad474c8 --- /dev/null +++ b/Documentation/snippets/change-ambitus-gap.ly @@ -0,0 +1,45 @@ +% Do not edit this file; it is automatically +% generated from Documentation/snippets/new +% This file is in the public domain. +%% Note: this file works from version 2.13.26 +\version "2.13.26" +\header { + lsrtags = "pitches" + texidoc = "It is possible to change the default gap setting for +Ambitus." + + doctitle = "change-ambitus-gap.ly" +} % begin verbatim + + +\layout { + \context { + \Voice + \consists "Ambitus_engraver" + } % begin verbatim + +} + +\new Staff { + \time 2/4 + % Default setting + c'4 g'' +} + +\new Staff { + \time 2/4 + \override AmbitusLine #'gap = #0 + c'4 g'' +} + +\new Staff { + \time 2/4 + \override AmbitusLine #'gap = #1 + c'4 g'' +} + +\new Staff { + \time 2/4 + \override AmbitusLine #'gap = #1.5 + c'4 g'' +} diff --git a/Documentation/snippets/new/change-ambitus-gap.ly b/Documentation/snippets/new/change-ambitus-gap.ly new file mode 100644 index 0000000000..b923658328 --- /dev/null +++ b/Documentation/snippets/new/change-ambitus-gap.ly @@ -0,0 +1,40 @@ +\version "2.13.26" +\header { + lsrtags = "pitches" + texidoc = "It is possible to change the default gap setting for +ambitus." + + doctitle = "Changing the ambitus gap" +} + + +\layout { + \context { + \Voice + \consists "Ambitus_engraver" + } +} + +\new Staff { + \time 2/4 + % Default setting + c'4 g'' +} + +\new Staff { + \time 2/4 + \override AmbitusLine #'gap = #0 + c'4 g'' +} + +\new Staff { + \time 2/4 + \override AmbitusLine #'gap = #1 + c'4 g'' +} + +\new Staff { + \time 2/4 + \override AmbitusLine #'gap = #1.5 + c'4 g'' +} diff --git a/Documentation/snippets/new/set-double-repeat-default-volta.ly b/Documentation/snippets/new/set-double-repeat-default-volta.ly new file mode 100644 index 0000000000..70d10fbb48 --- /dev/null +++ b/Documentation/snippets/new/set-double-repeat-default-volta.ly @@ -0,0 +1,19 @@ +\version "2.13.26" +\header { + lsrtags = "repeats" + texidoc = "There are three different styles of double repeats for +volte, that can be set using @code{doubleRepeatType}." + + doctitle = "Setting the double repeat default for volte" +} + + +\relative c'' { + \repeat volta 1 { c1 } + \set Score.doubleRepeatType = #":|:" + \repeat volta 1 { c1 } + \set Score.doubleRepeatType = #":|.|:" + \repeat volta 1 { c1 } + \set Score.doubleRepeatType = #":|.:" + \repeat volta 1 { c1 } +} diff --git a/Documentation/snippets/pitches.snippet-list b/Documentation/snippets/pitches.snippet-list index 101d0dc519..41f2b095a0 100644 --- a/Documentation/snippets/pitches.snippet-list +++ b/Documentation/snippets/pitches.snippet-list @@ -3,6 +3,7 @@ altering-the-length-of-beamed-stems.ly ambitus-with-multiple-voices.ly ambitus.ly applying-note-head-styles-depending-on-the-step-of-the-scale.ly +change-ambitus-gap.ly changing-the-interval-of-lines-on-the-stave.ly clefs-can-be-transposed-by-arbitrary-amounts.ly coloring-notes-depending-on-their-pitch.ly diff --git a/Documentation/snippets/repeats.snippet-list b/Documentation/snippets/repeats.snippet-list index 676a863561..d26b378a1b 100644 --- a/Documentation/snippets/repeats.snippet-list +++ b/Documentation/snippets/repeats.snippet-list @@ -7,6 +7,7 @@ percent-repeat-count-visibility.ly percent-repeat-counter.ly positioning-segno-and-coda-with-line-break.ly printing-a-repeat-sign-at-the-beginning-of-a-piece.ly +set-double-repeat-default-volta.ly shortening-volta-brackets.ly volta-below-chords.ly volta-multi-staff.ly diff --git a/Documentation/snippets/set-double-repeat-default-volta.ly b/Documentation/snippets/set-double-repeat-default-volta.ly new file mode 100644 index 0000000000..2a417f488c --- /dev/null +++ b/Documentation/snippets/set-double-repeat-default-volta.ly @@ -0,0 +1,29 @@ +% Do not edit this file; it is automatically +% generated from Documentation/snippets/new +% This file is in the public domain. +%% Note: this file works from version 2.13.26 +% Do not edit this file; it is automatically +% generated from Documentation/snippets/new +% This file is in the public domain. +%% Note: this file works from version 2.13.26 +\version "2.13.26" +\header { + lsrtags = "repeats" + texidoc = "There are three different styles of double repeats for +volte, that can be set using @code{doubleRepeatType}." + + doctitle = "set-double-repeat-volta.ly" +} % begin verbatim + + +\relative c'' { + \repeat volta 1 { c1 } % begin verbatim + + \set Score.doubleRepeatType = #":|:" + \repeat volta 1 { c1 } % begin verbatim + + \set Score.doubleRepeatType = #":|.|:" + \repeat volta 1 { c1 } + \set Score.doubleRepeatType = #":|.:" + \repeat volta 1 { c1 } +} -- 2.39.5