Update from Ralph.

1 files changed, 97 insertions, 163 deletions

diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely
index 079016241f..1c62bef643 100644
--- a/Documentation/user/repeats.itely
+++ b/Documentation/user/repeats.itely
@@ -12,52 +12,9 @@
 @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.  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.
+Repetition is a central concept in music, and multiple notations
+exist for repetitions. LilyPond supports the following kinds of repeats:
 
-@menu
-* Types of repeats::            
-* Normal repeats::              
-@end menu
-
-@node Types of repeats
-@subsection Kinds of repeats
-
-@menu
-* Repeat syntax::               
-* Repeats supported::           
-@end menu
-
-@node Repeat syntax
-@subsubsection Repeat syntax
-
-@cindex repeats
-@cindex repeat syntax
-@cindex syntax, repeat
-
-In LilyPond, repeats are formed using the following construction:
-
-@example
-\repeat @var{variant} @var{repeatcount} @var{repeatbody}
-@end example
-
-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
-
-@cindex repeat volta
-@cindex volta
 
 @table @code
 @item volta
@@ -67,34 +24,32 @@ line is only printed at the end. Alternative endings (volte) are
 printed, left to right with brackets.  This is the standard
 notation for repeats with alternatives.
 
-@cindex repetitious music
-
 @item unfold
 The repeated music is fully written out, as many times as
 specified by @var{repeatcount}.  This is useful when
 entering repetitious music. 
 
-@cindex beat repeat
-@cindex measure repeat
-@cindex percent sign, for repeat
-
 @item percent
 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
- 
-@funindex \alternative
+LilyPond has one syntactic construct for specifying different
+types of repeats.  The syntax is
+
+@example
+\repeat @var{variant} @var{repeatcount} @var{repeatbody}
+@end example
+
+where @var{repeabody} is a music expression.
+
 
+Alternative endings are entered with 
+@funindex \alternative
 @example
 \alternative @{
   @var{alternative1}
@@ -106,19 +61,23 @@ Alternative endings are entered with
 
 @noindent
 after a @code{\repeat volta} or @code{unfold} block, where each
-@var{alternative} is a music expression.  If you give
-less alternatives than @var{repeatcount}, the first alternative
-is assumed to be played more than once.
-
+@var{alternative} is a music expression.  If you give fewer
+alternatives than @var{repeatcount}, the first alternative is assumed
+to be played more than once.
 
-@seealso
 
-Music Glossary: @rglos{volta}, @rglos{tremolo}.
+@menu
+* Writing long repeats::        
+* Short repeats::               
+@end menu
 
-Snippets: @lsrdir{Repeats,Repeats}.
+@node Writing long repeats
+@subsection Writing long repeats
 
-@node Normal repeats
-@subsection Normal repeats
+@menu
+* Normal repeats::              
+* Manual repeat marks::         
+@end menu
 
 @cindex volta
 @cindex prima volta
@@ -127,46 +86,24 @@ Snippets: @lsrdir{Repeats,Repeats}.
 @cindex volta, seconda
 @funindex \repeat
 
-@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:
+@node Normal repeats
+@subsubsection Normal repeats
 
-@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
+FIXME: this example needs to go by itself.
+@verbatim
 \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
+@end verbatim
 
-
-Repeats with alternate endings:
+Normal repeats, with or without alternate repeats:
 
 @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]
@@ -245,8 +182,6 @@ 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},
@@ -255,7 +190,7 @@ Internals Reference: @internalsref{VoltaBracket},
 @internalsref{UnfoldedRepeatedMusic}.
 
 @c Examples:
-@c FIXME: ?
+
 
 @knownissues
 
@@ -283,8 +218,8 @@ repeated.
 
 
 
-@node Manual repeat commands
-@subsubsection Manual repeat commands
+@node Manual repeat marks
+@subsubsection Manual repeat marks
 
 @funindex repeatCommands
 
@@ -304,10 +239,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)}
@@ -326,23 +261,73 @@ c4 c4
 
 @seealso
 
-Notation Reference: @ref{Bar lines}, @ref{Text markup}.
+Notation Reference: @ref{Bar lines}.
 
 Snippets: @lsrdir{Repeats,Repeats}
 
 Internals Reference: @internalsref{VoltaBracket},
-@internalsref{RepeatedMusic}, @internalsref{VoltaRepeatedMusic}, and
-@internalsref{UnfoldedRepeatedMusic}.
+@internalsref{RepeatedMusic}, @internalsref{VoltaRepeatedMusic},
+and @internalsref{UnfoldedRepeatedMusic}.
+
+
+@node Short repeats
+@subsection Short repeats
+
+@menu
+* Percent repeats::             
+* Tremolo repeats::             
+@end menu
+
+@node Percent repeats
+@subsubsection Percent repeats
+
+@cindex percent repeats
+@cindex measure repeats
+
+A note pattern can be repeated with the @code{\repeat percent
+@var{number}} syntax.  The music is printed once, and the pattern
+is replaced with a special sign.  Patterns of one and two measures
+are replaced by percent-like signs, patterns that divide the
+measure length are replaced by slashes.  Percent repeats must be
+declared within a @code{Voice} context.
+
+@lilypond[quote,verbatim,ragged-right]
+\new Voice \relative c' {
+  \repeat percent 4 { c4 }
+  \repeat percent 2 { c2 es2 f4 fis4 g4 c4 }
+}
+@end lilypond
+
+Measure repeats of more than two measures get a counter if you
+switch on the @code{countPercentRepeats} property:
+
+@lilypond[relative=2,fragment,quote,verbatim,ragged-right]
+\new Voice {
+  \set countPercentRepeats = ##t
+  \repeat percent 4 { c1 }
+}
+@end lilypond
 
 
-@node Repetitious Music
-@subsubsection Repetitous music
+Isolated percents can also be printed.  This is done by entering a
+multi-measure rest with a different print function:
+
+@lilypond[fragment,verbatim,quote]
+\override MultiMeasureRest #'stencil
+  = #ly:multi-measure-rest::percent
+R1
+@end lilypond
 
-@c FIXME: rewrite unfold section
 
 @seealso
 
-Snippets: @lsrdir{Repeats,Repeats}.
+Snippets: @lsrdir{Repeats,Repeats}
+
+Internals Reference: @internalsref{RepeatSlash},
+@internalsref{PercentRepeat}, @internalsref{DoublePercentRepeat},
+@internalsref{DoublePercentRepeatCounter},
+@internalsref{PercentRepeatCounter},
+@internalsref{PercentRepeatedMusic}.
 
 @node Tremolo repeats
 @subsubsection Tremolo repeats
@@ -413,57 +398,6 @@ Snippets: @lsrdir{Repeats,Repeats}
 Elsewhere: @internalsref{StemTremolo}.
 
 
-@node Measure repeats
-@subsubsection Measure repeats
-
-@cindex percent repeats
-@cindex measure repeats
-
-A note pattern can be repeated with the @code{\repeat percent
-@var{number}} syntax.  The music is printed once, and the pattern
-is replaced with a special sign.  Patterns of one and two measures
-are replaced by percent-like signs, patterns that divide the
-measure length are replaced by slashes.  Percent repeats must be
-declared within a @code{Voice} context.
-
-@lilypond[quote,verbatim,ragged-right]
-\new Voice \relative c' {
-  \repeat percent 4 { c4 }
-  \repeat percent 2 { c2 es2 f4 fis4 g4 c4 }
-}
-@end lilypond
-
-Measure repeats of more than two measures get a counter if you
-switch on the @code{countPercentRepeats} property:
-
-@lilypond[relative=2,fragment,quote,verbatim,ragged-right]
-\new Voice {
-  \set countPercentRepeats = ##t
-  \repeat percent 4 { c1 }
-}
-@end lilypond
-
-
-Isolated percents can also be printed.  This is done by entering a
-multi-measure rest with a different print function:
-
-@lilypond[fragment,verbatim,quote]
-\override MultiMeasureRest #'stencil
-  = #ly:multi-measure-rest::percent
-R1
-@end lilypond
-
-
-@seealso
-
-Snippets: @lsrdir{Repeats,Repeats}
-
-Internals Reference: @internalsref{RepeatSlash},
-@internalsref{PercentRepeat}, @internalsref{DoublePercentRepeat},
-@internalsref{DoublePercentRepeatCounter},
-@internalsref{PercentRepeatCounter},
-@internalsref{PercentRepeatedMusic}.
-