Update from Carl.

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index 1d6cc143bb266478e516f365f6dc6213f84ad027..6912b99297ea3cf5db29cd0dd1d32ec34f02d003 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -719,26 +719,65 @@ r1 | R1*17 | R1*4 |
 R2.*2 |
 @end lilypond
 
-The @code{1} in @code{R1} is similar to the duration notation
-used for notes and is the length of a measure in 2/2 or 4/4 time.
+The duration of full-measure rests is similar to the duration notation
+used for notes.  The exception is that a measure of 2/4 time can
+be represented by either @code{R1} or @code{R2}.  FIXME: O RLY? -gp
 The duration in a multi-measure rest must always be an integral
 number of measure-lengths, so in other time signatures augmentation
 dots or fractions must be used:
 
 @lilypond[quote,ragged-right,fragment,verbatim]
 \compressFullBarRests
+\time 2/4
+R1 | R2 |
 \time 3/4
-R2. | R2.*2
+R2. | R2.*2 |
 \time 13/8
 R1*13/8 | R1*13/8*12 |
 \time 10/8
 R4*5*4 |
 @end lilypond
 
-An @code{R} spanning a single measure is printed as either a whole
-or breve rest, centered in the measure, regardless of the time
+A full-measure rest is printed as either a whole
+or breve rest, centered in the measure, depending on the time
 signature.
 
+@lilypond[quote,ragged-right,fragment,verbatim]
+\time 4/4
+R1 |
+\time 6/4
+R1*3/2 |
+\time 8/4
+R1*2 |
+@end lilypond
+
+Compressed multi-measure rests of 10 measures or less are printed as a
+combination of longa, breve, and whole rests. Rests longer than
+10 measures are indicated with a horizontal bar with
+serifs on the end.
+
+@lilypond[quote,ragged-right,fragment,verbatim]
+\time 4/4
+R1*3 |
+\time 2/4
+R2|
+\time 4/4
+R1*5 |
+\time 2/4
+R2|
+\time 4/4
+R1*7 |
+\time 2/4
+R2|
+\time 4/4
+R1*11 |
+\time 2/4
+R2|
+@end lilypond
+
+
+
+
 
 @cindex text on multi-measure rest
 @cindex multi-measure rest, attaching text
@@ -748,8 +787,8 @@ signature.
 @cindex multi-measure rest, attaching fermata
 
 Text can be added to multi-measure rests by using the
-@var{note} - @code{\markup} syntax described in
-@ref{Formatting text}.  The predefined command @code{\fermataMarkup}
+@code{\markup} syntax described in @ref{Formatting text}.
+The predefined command @code{\fermataMarkup}
 is provided for adding fermatas.
 
 @lilypond[quote,ragged-right,verbatim,fragment]
@@ -759,10 +798,12 @@ R2.*10^\markup { \italic "ad lib." }
 R2.^\fermataMarkup
 @end lilypond
 
-@warning{Text attached to a multi-measure rest is created
-by @code{MultiMeasureRestText}, not
+@warning{
+Markups attached to a multi-measure rest are
+objects of type @code{MultiMeasureRestText}, not
 @code{TextScript}.  Overrides must be directed to the correct
-object, or they will be ignored.  See the following example.}
+object, or they will be ignored.  See the following example.
+}
 
 @lilypond[quote,ragged-right,verbatim,fragment]
 % This fails, as the wrong object name is specified
@@ -776,35 +817,32 @@ R1^"right"
 Text attached to a multi-measure rest will be centered above or
 below it.  Long text attached in this way does not cause the
 measure to expand, and may collide with text in adjacent measures.
-This behavior may be changed with the predefined command
-@code{\textLengthOn}, which will cause following bars to expand
-as necessary to accommodate text.  @code{\textLengthOff} returns
-to the default behavior.  To left-align text within a bar attach
-it to a zero-length skip note preceding the rest.
 
+Markups can also be attached to zero-length spacer rests.  When coupled
+with the predefined command @code{\textLengthOn}, the multi-measure
+rest will be expanded as necessary to accommodate the markup.
+
+@c -- music is somewhat compressed vertically.  I thought it
+@c    was good because the emphasis is not on the content
+@c    of the markup, but on the place the markup was attached -cs
 @lilypond[quote,ragged-right,verbatim,fragment,relative=2]
 \compressFullBarRests
 \textLengthOn
 s1*0^\markup { [MAJOR GENERAL] }
 R1*19
-s1*0^\markup { [MABEL] }
 s1*0_\markup { \italic { Cue: ... it is yours } }
-R1*30
+s1*0^\markup { A }
+R1*30^\markup { [MABEL] }
 \textLengthOff
 c4^\markup { CHORUS } d f c
 @end lilypond
 
 @noindent
+Note that the spacer rest causes a bar to be inserted.
 Text attached to a skip note in this way is left-aligned to the
-position where the note would be placed in the measure, and placed
-above the measure count numeral, but if the measure length is
-determined by the length of the text, the text will appear to be
-centered.  If two (or more) texts are
-attached to skip notes in a measure the measure length is determined by
-the longer text, and the shorter text is then clearly
-left-aligned, as shown in the second measure above.  If the shorter
-text of two marks is short enough to fit it will be placed
-alongside and to the left of the measure count numeral.
+position where the note would be placed in the measure, but if the
+measure length is determined by the length of the text, the text will
+appear to be centered.
 
 @predefined
 @code{\textLengthOn},
@@ -866,15 +904,6 @@ into a single multi-measure rest.
 
 Multi-measure rests do not take part in rest collisions.
 
-Be careful when entering multi-measure rests followed by whole
-notes.  The following will enter two notes lasting four measures
-each:
-
-@example
-R1*4 cis cis
-@end example
-
-
 @node Displaying rhythms
 @subsection Displaying rhythms