From: Graham Percival Date: Tue, 4 Mar 2008 01:57:15 +0000 (-0800) Subject: Update from Ralph. X-Git-Tag: release/2.11.42-1~7^2~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6c2a746ae9b6f2dc9dbaf25219b58edc2fb4e573;p=lilypond.git Update from Ralph. --- diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely index 724a7a262a..079016241f 100644 --- a/Documentation/user/repeats.itely +++ b/Documentation/user/repeats.itely @@ -9,30 +9,29 @@ @node Repeats @section Repeats -@lilypondfile[quote]{repeats-headword.ly} +@lilypondfile[ragged-right,line-width=16\cm,staffsize=16,quote] +{repeats-headword.ly} -Repetition is a central concept in music, and multiple notations -exist for repetitions. +Repetition is a central concept in music, and multiple notations exist +for repetitions. This section discusses how to write repeats, +including repeated sections of music enclosed within repeat bars, +alternate repeat endings, a shortcut to writing repeated music that is +not enclosed within repeat bars, repeated music one measure or less in +length, and tremolos. @menu -* Writing repeats:: -* Other repeats:: +* Types of repeats:: +* Normal repeats:: @end menu -@node Writing repeats -@subsection Writing repeats - -This section discusses how to write repeats, including repeated -sections of music enclosed within repeat bars, alternate repeat -endings, tremolos, and beat or measure repeats. +@node Types of repeats +@subsection Kinds of repeats @menu * Repeat syntax:: -* Normal repeats:: -* Manual repeat commands:: +* Repeats supported:: @end menu - @node Repeat syntax @subsubsection Repeat syntax @@ -40,14 +39,20 @@ endings, tremolos, and beat or measure repeats. @cindex repeat syntax @cindex syntax, repeat -LilyPond has one syntactic construct for specifying different -types of repeats. The syntax is +In LilyPond, repeats are formed using the following construction: @example \repeat @var{variant} @var{repeatcount} @var{repeatbody} @end example -where @var{repeabody} is a music expression. +where @var{repeatbody} is a music expression. + +@seealso + +Snippets: @lsrdir{Repeats,Repeats}. + +@node Repeats supported +@subsubsection Repeats supported The following types of repetition are supported @@ -69,13 +74,6 @@ The repeated music is fully written out, as many times as specified by @var{repeatcount}. This is useful when entering repetitious music. -@cindex tremolo -@cindex tremolo beams -@cindex beams, tremolo - -@item tremolo -Make tremolo beams. - @cindex beat repeat @cindex measure repeat @cindex percent sign, for repeat @@ -84,10 +82,19 @@ Make tremolo beams. Make beat or measure repeats. These look like percent signs. Percent repeats must be declared within a @code{Voice} context. +@cindex tremolo +@cindex tremolo beams +@cindex beams, tremolo + +@item tremolo +Make tremolo beams. + @end table -Alternative endings are entered with +Alternative endings are entered with + @funindex \alternative + @example \alternative @{ @var{alternative1} @@ -104,8 +111,14 @@ less alternatives than @var{repeatcount}, the first alternative is assumed to be played more than once. +@seealso + +Music Glossary: @rglos{volta}, @rglos{tremolo}. + +Snippets: @lsrdir{Repeats,Repeats}. + @node Normal repeats -@subsubsection Normal repeats +@subsection Normal repeats @cindex volta @cindex prima volta @@ -114,17 +127,46 @@ is assumed to be played more than once. @cindex volta, seconda @funindex \repeat -Normal repeats, with or without alternate repeats: +@menu +* Simple repeats:: +* Complex repeats:: +* Manual repeat commands:: +* Repetitious Music:: +* Tremolo repeats:: +* Measure repeats:: +@end menu + +@node Simple repeats +@subsubsection Simple repeats + +Normal repeats, without alternate endings: + +@lilypond[quote,ragged-right,fragment,verbatim,relative=2] +\repeat volta 2 { c4 d e f } +\repeat volta 4 { g f e d } +c1 +@end lilypond + +@seealso + +Snippets: @lsrdir{Repeats,Repeats}. + +@node Complex repeats +@subsubsection Complex repeats + + +Repeats with alternate endings: @lilypond[quote,ragged-right,fragment,verbatim,relative=2] \repeat volta 2 { c4 d e f } -\repeat volta 2 { g f e d } \alternative { { cis2 g' } { cis,2 b } } c1 @end lilypond + +@noindent Repeats with upbeats: @lilypond[quote,ragged-right,fragment,verbatim,relative=2] @@ -203,6 +245,8 @@ see @ref{Bar lines} for more information. @seealso +Notation Reference: @ref{Bar lines}, @ref{Modifying context plug-ins}. + Snippets: @lsrdir{Repeats,Repeats} Internals Reference: @internalsref{VoltaBracket}, @@ -211,7 +255,7 @@ Internals Reference: @internalsref{VoltaBracket}, @internalsref{UnfoldedRepeatedMusic}. @c Examples: - +@c FIXME: ? @knownissues @@ -260,10 +304,10 @@ Print a @code{|:} bar line. Print a @code{:|} bar line. @item @code{(volta @var{text})} -Print a volta bracket saying @var{text}. The text can be -specified as a text string or as a markup text, see @ref{Text -markup}. Do not forget to change the font, as the default number -font does not contain alphabetic characters; +Print a volta bracket saying @var{text}. The text can be specified as +a text string or as a markup text, see @ref{Text markup}. Do not +forget to change the font, as the default number font does not contain +alphabetic characters; @item @code{(volta #f)} @@ -282,22 +326,23 @@ c4 c4 @seealso -Notation Reference: @ref{Bar lines}. +Notation Reference: @ref{Bar lines}, @ref{Text markup}. Snippets: @lsrdir{Repeats,Repeats} Internals Reference: @internalsref{VoltaBracket}, -@internalsref{RepeatedMusic}, @internalsref{VoltaRepeatedMusic}, -and @internalsref{UnfoldedRepeatedMusic}. +@internalsref{RepeatedMusic}, @internalsref{VoltaRepeatedMusic}, and +@internalsref{UnfoldedRepeatedMusic}. -@node Other repeats -@subsection Other repeats +@node Repetitious Music +@subsubsection Repetitous music -@menu -* Tremolo repeats:: -* Measure repeats:: -@end menu +@c FIXME: rewrite unfold section + +@seealso + +Snippets: @lsrdir{Repeats,Repeats}. @node Tremolo repeats @subsubsection Tremolo repeats @@ -409,8 +454,6 @@ R1 @end lilypond - - @seealso Snippets: @lsrdir{Repeats,Repeats}