X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Frhythms.itely;h=c97d7140621b097853f48c9e256aa23131f22023;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=1b0d580bf5ef24b4d22bf6da5e3ac5ee63aa73a2;hpb=b021329ee1e72a5f7cf92a9228e03877238883a7;p=lilypond.git

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index 1b0d580bf5..c97d714062 100644
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ignore
 GDP TODO list
@@ -59,7 +59,7 @@ This section discusses rhythms, rests, durations, beaming and bars.
 @end menu
 
 @node Durations
-@subsubsection Durations
+@unnumberedsubsubsec Durations
 
 @cindex durations, of notes
 @cindex note durations
@@ -183,7 +183,7 @@ rests from 128th to maxima (8 x whole) may be printed.
 
 
 @node Tuplets
-@subsubsection Tuplets
+@unnumberedsubsubsec Tuplets
 
 @cindex tuplets
 @cindex triplets
@@ -287,7 +287,7 @@ placed within tuplet brackets.
 
 
 @node Scaling durations
-@subsubsection Scaling durations
+@unnumberedsubsubsec Scaling durations
 
 @cindex scaling durations
 @cindex durations, scaling
@@ -361,7 +361,7 @@ Snippets:
 
 
 @node Ties
-@subsubsection Ties
+@unnumberedsubsubsec Ties
 
 @cindex tie
 @funindex ~
@@ -521,7 +521,7 @@ Rests are entered as part of the music in music expressions.
 @end menu
 
 @node Rests
-@subsubsection Rests
+@unnumberedsubsubsec Rests
 @cindex rest
 @cindex rest, entering durations
 @cindex maxima
@@ -602,7 +602,7 @@ are rests from 128th to maxima (8 x whole).
 
 
 @node Invisible rests
-@subsubsection Invisible rests
+@unnumberedsubsubsec Invisible rests
 
 @cindex skip
 @cindex invisible rest
@@ -664,7 +664,7 @@ Internals Reference: @rinternals{SkipMusic}
 
 
 @node Full measure rests
-@subsubsection Full measure rests
+@unnumberedsubsubsec Full measure rests
 
 @cindex multi-measure rests
 @cindex full-measure rests
@@ -799,30 +799,8 @@ setting, resulting bar-check warnings may not be displayed.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {positioning-multi--measure-rests.ly}
 
-@c TODO -- convert to snippet -- submitted to Neil
-Markups attached to a multi-measure rest will be centered above or
-below it.  Long markups attached to multi-measure rests do not cause
-the measure to expand. To expand a multi-measure rest to fit the markup,
-use a spacer rest with an attached markup before the multi-measure rest:
-
-@lilypond[quote,ragged-right,verbatim,fragment,relative=2]
-\compressFullBarRests
-\textLengthOn
-s1*0^\markup { [MAJOR GENERAL] }
-R1*19
-s1*0_\markup { \italic { Cue: ... it is yours } }
-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 spacer rest in this way is left-aligned to the
-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.
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{multi--measure-rest-markup.ly}
 
 @seealso
 
@@ -874,7 +852,7 @@ Multi-measure rests do not take part in rest collisions.
 @end menu
 
 @node Time signature
-@subsubsection Time signature
+@unnumberedsubsubsec Time signature
 
 @cindex time signature
 @cindex meter
@@ -893,7 +871,7 @@ Time signatures are printed at the beginning of a piece
 and whenever the time signature changes.  If a change takes place
 at the end of a line a warning time signature sign is printed
 there.  This default behavior may be changed, see
-@ref{Controlling visibility of objects}.
+@c ref{Controlling visibility of objects}.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \time 2/4
@@ -927,8 +905,8 @@ changed to a numeric style:
 @end lilypond
 
 
-Ancient time signatures are covered in
-@ref{Ancient time signatures}.
+Mensural time signatures are covered in
+@ref{Mensural time signatures}.
 
 @predefined
 
@@ -945,11 +923,27 @@ context, which is normally aliased to @code{Score}.  Changing the
 value of @code{timeSignatureFraction} causes the new time
 signature symbol to be printed without changing the other
 properties.  The property @code{measureLength} determines where
-bar lines should be inserted and, with @code{beatLength}, how
+bar lines should be inserted and, with @code{beatLength}
+and @code{beatGrouping}, how
 automatic beams should be generated.
 
-TODO Add example of using beatLength.
-@c beatLength is broken - see bug 511
+@lilypond[quote,verbatim,relative=2]
+\time 3/4 % auto beam on 1/4 note groups	
+a16 a a a a a a a a a a a a a a a
+\time 12/16 % no defined auto-beaming for this time sig
+a16 a a a a a a a a a a a a a a a
+\time 3/4
+a16 a a a a a a a a a a a a a a a
+\set Score.timeSignatureFraction = #'(12 16) %keep 3/4 beaming 
+                                             % due to beatLength
+a16 a a a a a a a a a a a a a a a
+\set Score.beatLength = #(ly:make-moment 1 8) %beam on 1/8 notes
+a16 a a a a a a a a a a a a a a a
+\set Score.beatLength = #(ly:make-moment 1 16)
+\set Score.beatGrouping = #'(3 4 2 3) %beam on 3/16, 7/16, 9/16, 12/16
+a16 a a a a a a a a a a a a a a a
+@end lilypond
+
 
 @c End of snippet
 
@@ -1000,7 +994,7 @@ Music Glossary:
 @rglos{time signature}
 
 Notation Reference:
-@ref{Ancient time signatures},
+@ref{Mensural time signatures},
 @ref{Time administration}.
 
 Snippets:
@@ -1011,14 +1005,8 @@ Internals Reference:
 @rinternals{Timing_translator}.
 
 
-@knownissues
-
-Automatic beaming does not use the measure grouping specified with
-@code{set-time-signature}.
-
-
 @node Upbeats
-@subsubsection Upbeats
+@unnumberedsubsubsec Upbeats
 
 @cindex anacrusis
 @cindex upbeat
@@ -1065,26 +1053,26 @@ command: i.e., @code{\partial 4} is internally translated to
 
 @seealso
 
-Music Glossary: @rglos{anacrusis}
+Music Glossary: 
+@rglos{anacrusis}.
 
-Notation Reference: @ref{Grace notes}
+Notation Reference: 
+@ref{Grace notes}.
 
 Snippets:
 @rlsr{Rhythms}.
 
 Internal Reference:
-@rinternals{Timing_translator}
+@rinternals{Timing_translator}.
 
 @knownissues
 
-@cindex grace notes, in anacruses
-
 The @code{\partial} command is intended to be used only at the
 beginning of a piece.  If you use it after the beginning, some
 odd warnings may occur.
 
 @node Unmetered music
-@subsubsection Unmetered music
+@unnumberedsubsubsec Unmetered music
 
 @funindex \cadenzaOn
 @funindex \cadenzaOff
@@ -1094,7 +1082,7 @@ odd warnings may occur.
 @cindex unmetered music
 
 Bar lines and bar numbers are calculated automatically.  For
-unmetered music (cadenzas, for example), this is not desirable.
+unmetered music (some cadenzas, for example), this is not desirable.
 To turn off automatic calculation of bar lines and bar numbers,
 use the command @code{\cadenzaOn}, and use @code{\cadenzaOff} 
 to turn them on again.
@@ -1130,10 +1118,10 @@ d4 e d c
 @seealso
 
 Music Glossary:
-@rglos{cadenza}
+@rglos{cadenza}.
 
 Notation Reference:
-@ref{Controlling visibility of objects}
+@c ref{Controlling visibility of objects}.
 
 Snippets:
 @rlsr{Rhythms}.
@@ -1153,7 +1141,7 @@ to indicate where breaks can occur.
 
 
 @node Polymetric notation
-@subsubsection Polymetric notation
+@unnumberedsubsubsec Polymetric notation
 
 @cindex double time signatures
 @cindex signatures, polymetric
@@ -1248,34 +1236,8 @@ moving the @code{Timing_translator} to the @code{Staff} context.
 
 @snippets
 
-@c TODO -- Convert to snippet. -- Sent to Neil 8/14/08
-
-@strong{Alternating time signatures}
-
-Regularly alternating double time signatures are not supported
-explicitly, but they can be faked.  In the next example, the
-double time signature is created with markup text, while the
-real time signature is set in the usual way with @code{\time}.
-
-@lilypond[verbatim,ragged-right]
-% Create 9/8 split into 2/4 + 5/8
-tsMarkup = \markup {
-  \override #'(baseline-skip . 2) \number {
-    \column { "2" "4" }
-    \vcenter "+"
-    \bracket \column { "5" "8" }
-  }
-}
-
-{
-  \override Staff.TimeSignature #'stencil =
-    #ly:text-interface::print
-  \override Staff.TimeSignature #'text = #tsMarkup
-  \time 9/8
-  c'2 \bar ":" c'4 c'4.
-  c'2 \bar ":" c'4 c'4.
-}
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{compound-time-signatures.ly}
 
 
 @seealso
@@ -1289,8 +1251,6 @@ Notation Reference: @ref{Scaling durations}
 
 Snippets:
 @rlsr{Rhythms}.
-@c Is this still permitted?
-@c @lsr{contemporary,compound-time-signature}
 
 Internals Reference:
 @rinternals{TimeSignature},
@@ -1307,7 +1267,7 @@ individual staves than would be normal without the different
 time signatures.
 
 @node Automatic note splitting
-@subsubsection Automatic note splitting
+@unnumberedsubsubsec Automatic note splitting
 
 @cindex notes, splitting
 @cindex splitting notes
@@ -1360,7 +1320,7 @@ split rests.
 
 
 @node Showing melody rhythms
-@subsubsection Showing melody rhythms
+@unnumberedsubsubsec Showing melody rhythms
 
 Sometimes you might want to show only the rhythm of a melody.  This
 can be done with the rhythmic staff.  All pitches of notes on such a
@@ -1488,7 +1448,7 @@ Internals Reference:
 @end menu
 
 @node Automatic beams
-@subsubsection Automatic beams
+@unnumberedsubsubsec Automatic beams
 
 By default, beams are inserted automatically:
 
@@ -1627,7 +1587,7 @@ Beams can collide with note heads and accidentals in other voices
 
 
 @node Setting automatic beam behavior
-@subsubsection Setting automatic beam behavior
+@unnumberedsubsubsec Setting automatic beam behavior
 
 @funindex autoBeamSettings
 @funindex (end * * * *)
@@ -1835,7 +1795,7 @@ Snippets:
 
 
 @node Manual beams
-@subsubsection Manual beams
+@unnumberedsubsubsec Manual beams
 
 @cindex beams, manual
 @funindex ]
@@ -1888,7 +1848,7 @@ TODO -- no difference based on stemLeftBeamCount in this example
 @snippets
 
 @node Feathered beams
-@subsubsection Feathered beams
+@unnumberedsubsubsec Feathered beams
 
 @cindex beams, feathered
 @funindex \featherDurations
@@ -1968,7 +1928,7 @@ Snippets:
 @end menu
 
 @node Bar lines
-@subsubsection Bar lines
+@unnumberedsubsubsec Bar lines
 
 @cindex bar lines
 @funindex \bar
@@ -2030,11 +1990,11 @@ with the end of a measure the specified bar line is inserted at that
 point in the printed output.  Such insertions do not affect
 the calculation and placement of subsequent automatic bar lines.
 
-The simple bar line and four types of double bar line are available
+The simple bar line and five types of double bar line are available
 for manual insertion:
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-f1 \bar "|" g \bar "||" a \bar ".|" b \bar ".|." c \bar "|." d
+f1 \bar "|" g \bar "||" a \bar ".|" b \bar ".|." c \bar "|.|" d \bar "|." e
 @end lilypond
 
 @noindent
@@ -2045,10 +2005,10 @@ f1 \bar ":" g \bar "dashed" a
 @end lilypond
 
 @noindent
-and three types of repeat bar line:
+and five types of repeat bar line:
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-f1 \bar "|:" g \bar ":|:" a \bar ":|" b
+f1 \bar "|:" g \bar ":|:" a \bar ":|.|:" b \bar ":|.:" c \bar ":|" d
 @end lilypond
 
 @cindex repeats
@@ -2109,9 +2069,10 @@ with @code{\set Timing.defaultBarType = }@var{bartype}.
 
 @seealso
 
-Notation Reference: @ref{Line breaking}, @ref{Repeats},
-@c FIXME: node name changed, but is subject to further changes.
-@c @ref{System start delimiters}.
+Notation Reference: 
+@ref{Line breaking}, 
+@ref{Repeats},
+@ref{Grouping staves}.
 
 Snippets:
 @rlsr{Rhythms}.
@@ -2123,7 +2084,7 @@ properties).
 
 
 @node Bar numbers
-@subsubsection Bar numbers
+@unnumberedsubsubsec Bar numbers
 
 @cindex bar numbers
 @cindex measure numbers
@@ -2285,7 +2246,7 @@ c1 c c c
 
 
 @node Bar and bar number checks
-@subsubsection Bar and bar number checks
+@unnumberedsubsubsec Bar and bar number checks
 
 @cindex bar check
 @funindex barCheckSynchronize
@@ -2364,7 +2325,7 @@ Snippets:
 
 
 @node Rehearsal marks
-@subsubsection Rehearsal marks
+@unnumberedsubsubsec Rehearsal marks
 
 @cindex rehearsal marks
 @cindex mark, rehearsal
@@ -2494,7 +2455,7 @@ Examples: @c @lsr{parts,rehearsal-mark-numbers.ly}
 @end menu
 
 @node Grace notes
-@subsubsection Grace notes
+@unnumberedsubsubsec Grace notes
 
 @funindex \grace
 @cindex ornaments
@@ -2705,32 +2666,37 @@ expressions.  Nesting or juxtaposing grace sections is not
 supported, and might produce crashes or other errors.
 
 @node Aligning to cadenzas
-@subsubsection Aligning to cadenzas
+@unnumberedsubsubsec Aligning to cadenzas
 
 @cindex cadenza
 @cindex cadenza, aligning to
 @cindex aligning to cadenza
 
 In an orchestral context, cadenzas present a special problem: when
-constructing a score that includes a cadenza, all other
-instruments should skip just as many notes as the length of the
-cadenza, otherwise they will start too soon or too late.
+constructing a score that includes a measured cadenza or other solo
+passage, all other instruments should skip just as many notes as the 
+length of the cadenza, otherwise they will start too soon or too late. 
 
-A solution to this problem is to use the functions
+One solution to this problem is to use the functions
 @code{mmrest-of-length} and @code{skip-of-length}.  These Scheme
-functions take a piece of music as argument, and generate a multi-measure
-rest or @code{\skip}, exactly as long as the piece.  
+functions take a defined piece of music as an argument and generate a 
+multi-measure rest or @code{\skip} exactly as long as the piece.  
 
 @lilypond[verbatim,ragged-right,quote]
-cadenza = \relative c' {
+MyCadenza = \relative c' {
   c4 d8 e f g g4 
   f2 g4 g
 }
 
 \new GrandStaff <<
-  \new Staff { \cadenza c'1 }
+  \new Staff { 
+    \MyCadenza c'1 
+    \MyCadenza c'1
+  }
   \new Staff {
-    #(ly:export (mmrest-of-length cadenza))
+    #(ly:export (mmrest-of-length MyCadenza))
+    c'1
+    #(ly:export (skip-of-length MyCadenza))
     c'1
   }
 >>
@@ -2738,12 +2704,15 @@ cadenza = \relative c' {
 
 @seealso
 
+Music Glossary:
+@rglos{cadenza}.
+
 Snippets:
 @rlsr{Rhythms}.
 
 
 @node Time administration
-@subsubsection Time administration
+@unnumberedsubsubsec Time administration
 
 @cindex time administration
 @cindex timing (within the score)