Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

[lilypond.git] / Documentation / user / rhythms.itely

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index c5eeb57a23538b203064aebefd555172e613e666..11b06392341981571c0d08ee723ca25b70e88c49 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -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}
 
 @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
 
 
 @seealso
 


@@ -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
 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{Visibility of objects}.
+@c ref{Controlling visibility of objects}.

 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \time 2/4
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \time 2/4


@@ -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
 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.
 
 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
 
 
 @c End of snippet
 


@@ -1011,12 +1005,6 @@ Internals Reference:
 @rinternals{Timing_translator}.
 
 
 @rinternals{Timing_translator}.
 
 

-@knownissues
-
-Automatic beaming does not use the measure grouping specified with
-@code{set-time-signature}.
-
-

 @node Upbeats
 @unnumberedsubsubsec Upbeats
 
 @node Upbeats
 @unnumberedsubsubsec Upbeats
 


@@ -1065,20 +1053,20 @@ command: i.e., @code{\partial 4} is internally translated to
 
 @seealso
 
 
 @seealso
 

-Music Glossary: @rglos{anacrusis}
+Music Glossary: 
+@rglos{anacrusis}.

 
 

-Notation Reference: @ref{Grace notes}
+Notation Reference: 
+@ref{Grace notes}.

 
 Snippets:
 @rlsr{Rhythms}.
 
 Internal Reference:
 
 Snippets:
 @rlsr{Rhythms}.
 
 Internal Reference:

-@rinternals{Timing_translator}
+@rinternals{Timing_translator}.

 
 @knownissues
 
 
 @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.
 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.


@@ -1130,10 +1118,10 @@ d4 e d c
 @seealso
 
 Music Glossary:
 @seealso
 
 Music Glossary:

-@rglos{cadenza}
+@rglos{cadenza}.

 
 Notation Reference:
 
 Notation Reference:

-@ref{Visibility of objects}
+@c ref{Controlling visibility of objects}.

 
 Snippets:
 @rlsr{Rhythms}.
 
 Snippets:
 @rlsr{Rhythms}.


@@ -1248,34 +1236,8 @@ moving the @code{Timing_translator} to the @code{Staff} context.
 
 @snippets
 
 
 @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
 
 
 @seealso


@@ -1289,8 +1251,6 @@ Notation Reference: @ref{Scaling durations}
 
 Snippets:
 @rlsr{Rhythms}.
 
 Snippets:
 @rlsr{Rhythms}.

-@c Is this still permitted?
-@c @lsr{contemporary,compound-time-signature}

 
 Internals Reference:
 @rinternals{TimeSignature},
 
 Internals Reference:
 @rinternals{TimeSignature},


@@ -1854,7 +1814,6 @@ marking the begin and end point with @code{[} and @code{]}
 }
 @end lilypond
 
 }
 @end lilypond
 

-@funindex \noBeam

 
 Individual notes may be marked with @code{\noBeam} to prevent them
 from being beamed:
 
 Individual notes may be marked with @code{\noBeam} to prevent them
 from being beamed:


@@ -2701,11 +2660,6 @@ durations in the other staves.  For the above example
    \new Staff { c4 \bar "|:" \grace s16 d2. } >>
 @end lilypond
 
    \new Staff { c4 \bar "|:" \grace s16 d2. } >>
 @end lilypond
 

-Predefined commands, like @code{\voiceOne}, which are intended to
-change the behaviour of the notation after a grace note, may not
-be effective if placed immediately before the grace note -- they
-should be placed after it.
-

 Grace sections should only be used within sequential music
 expressions.  Nesting or juxtaposing grace sections is not
 supported, and might produce crashes or other errors.
 Grace sections should only be used within sequential music
 expressions.  Nesting or juxtaposing grace sections is not
 supported, and might produce crashes or other errors.