Imported Upstream version 2.16.1

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

diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 8ff7c078589b79fb40c61fefffdb82eeb524db3f..c2a06b42029b9649b5a2348e4cc5bb9809d5ace3 100644 (file)
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -1051,11 +1051,34 @@ Mensural time signatures are covered in
 @funindex \overrideTimeSignatureSettings
 
 In addition to setting the printed time signature, the @code{\time}
 @funindex \overrideTimeSignatureSettings
 
 In addition to setting the printed time signature, the @code{\time}

-command also sets time-signature-based default values for the properties
-@code{baseMoment}, @code{beatStructure}, and @code{beamExceptions}.  The
-predefined default values for these properties can be found in
-@file{scm/time-signature-settings.scm}.  The existing default values can
-be changed, or new default values can be added:
+command also sets the values of the time-signature-based properties
+@code{baseMoment}, @code{beatStructure}, and @code{beamExceptions}.
+The predefined default values for these properties can be found in
+@file{scm/time-signature-settings.scm}.
+
+The default value of @code{beatStructure} can be overridden in the
+@code{\time} command itself by supplying it as the optional first
+argument:
+
+@lilypond[quote,verbatim]
+\score {
+  \new Staff {
+    \relative c' {
+      \time #'(2 2 3) 7/8
+      \repeat unfold 7 { c8 } |
+      \time #'(3 2 2) 7/8
+      \repeat unfold 7 { c8 } |
+    }
+  }
+}
+@end lilypond
+
+Alternatively, the default values of all these time-signature-based
+variables, including @code{baseMoment} and @code{beamExceptions},
+can be set together.  The values can be set independently for several
+different time signatures.  The new values take effect when a
+subsequent @code{\time} command with the same value of the time
+signature is executed:

 
 @lilypond[quote,verbatim]
 \score {
 
 @lilypond[quote,verbatim]
 \score {


@@ -1079,7 +1102,7 @@ be changed, or new default values can be added:
 
 @item
 @code{@var{timeSignatureFraction}}, a fraction describing the
 
 @item
 @code{@var{timeSignatureFraction}}, a fraction describing the

-time signature.
+time signature to which these values apply.

 
 @item
 @code{@var{baseMomentFraction}}, a fraction containing the numerator
 
 @item
 @code{@var{baseMomentFraction}}, a fraction containing the numerator


@@ -1194,6 +1217,10 @@ for different staves by moving the @code{Timing_translator} and the
 }
 @end lilypond
 
 }
 @end lilypond
 

+A further method of changing these time-signature-related variables,
+which avoids reprinting the time signature at the time of the change,
+is shown in @ref{Setting automatic beam behavior}.
+

 @predefined
 @code{\numericTimeSignature},
 @code{\defaultTimeSignature}.
 @predefined
 @code{\numericTimeSignature},
 @code{\defaultTimeSignature}.


@@ -1210,8 +1237,12 @@ Music Glossary:
 
 Notation Reference:
 @ref{Mensural time signatures},
 
 Notation Reference:
 @ref{Mensural time signatures},

+@ref{Setting automatic beam behavior},

 @ref{Time administration}.
 
 @ref{Time administration}.
 

+Installed Files:
+@file{scm/time-signature-settings.scm}.
+

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


@@ -1560,7 +1591,7 @@ Explicitly create a @code{Voice} context when starting a piece with
 Polymetric notation is supported explicitly or by manually modifying the
 visible time signature symbol and/or scaling note durations.
 
 Polymetric notation is supported explicitly or by manually modifying the
 visible time signature symbol and/or scaling note durations.
 

-@subsubheading Different time signatures with equal-length measures
+@subsubsubheading Different time signatures with equal-length measures

 
 Set a common time signature for each staff, and set the
 @code{timeSignatureFraction} to the desired fraction.  Then use the
 
 Set a common time signature for each staff, and set the
 @code{timeSignatureFraction} to the desired fraction.  Then use the


@@ -1602,7 +1633,7 @@ affect the autobeaming rules.
 >>
 @end lilypond
 
 >>
 @end lilypond
 

-@subsubheading Different time signatures with unequal-length measures
+@subsubsubheading Different time signatures with unequal-length measures

 
 Each staff can be given its own independent time signature by
 moving the @code{Timing_translator} and the
 
 Each staff can be given its own independent time signature by
 moving the @code{Timing_translator} and the


@@ -1650,7 +1681,7 @@ moving the @code{Timing_translator} and the
 @cindex compound time signatures
 @cindex time signature, compound
 
 @cindex compound time signatures
 @cindex time signature, compound
 

-@subsubheading Compound time signatures
+@subsubsubheading Compound time signatures

 
 These are created using the @code{\compoundMeter} function.  The syntax
 for this is:
 
 These are created using the @code{\compoundMeter} function.  The syntax
 for this is:


@@ -1829,7 +1860,7 @@ be done with the @code{Pitch_squash_engraver} and
     }
   }
   \new Voice \with {
     }
   }
   \new Voice \with {

-    \consists Pitch_squash_engraver
+    \consists "Pitch_squash_engraver"

   } \relative c'' {
     \improvisationOn
     c4 c8 c c4 c8 c
   } \relative c'' {
     \improvisationOn
     c4 c8 c c4 c8 c


@@ -1987,6 +2018,10 @@ new beam starts.
 When automatic beaming is enabled, the placement of automatic beams
 is determined by three context properties:
 @code{baseMoment}, @code{beatStructure}, and @code{beamExceptions}.
 When automatic beaming is enabled, the placement of automatic beams
 is determined by three context properties:
 @code{baseMoment}, @code{beatStructure}, and @code{beamExceptions}.

+The default values of these variables may be overridden as described
+below, or alternatively the default values themselves may be changed
+as explained in @ref{Time signature}.
+

 If a @code{beamExceptions} rule is defined for the time signature in
 force, that rule is used to determine the beam placement.  If no
 @code{beamExceptions} rule is defined for the time signature in force,
 If a @code{beamExceptions} rule is defined for the time signature in
 force, that rule is used to determine the beam placement.  If no
 @code{beamExceptions} rule is defined for the time signature in force,


@@ -2004,7 +2039,7 @@ by
 @end example
 
 
 @end example
 
 

-@subsubheading @i{Beaming based on @code{baseMoment} and @code{beatStructure}}
+@subsubsubheading Beaming based on @code{baseMoment} and @code{beatStructure}

 
 In most instances, automatic beams will end at the end of a beat.
 The ending points for beats are determined by the context properties
 
 In most instances, automatic beams will end at the end of a beat.
 The ending points for beats are determined by the context properties


@@ -2106,7 +2141,7 @@ By default @code{baseMoment} is set to one over the denominator of
 the time signature. Any exceptions to this default can be found in
 @file{scm/time-signature-settings.scm}.
 
 the time signature. Any exceptions to this default can be found in
 @file{scm/time-signature-settings.scm}.
 

-@subsubheading @i{Beaming based on @code{beamExceptions}}
+@subsubsubheading Beaming based on @code{beamExceptions}

 
 Special autobeaming rules (other than ending a beam on a beat)
 are defined in the @code{beamExceptions} property.
 
 Special autobeaming rules (other than ending a beam on a beat)
 are defined in the @code{beamExceptions} property.


@@ -2219,7 +2254,7 @@ r4. a8 a a |
 r4. a8 a a |
 @end lilypond
 
 r4. a8 a a |
 @end lilypond
 

-@subsubheading @i{How automatic beaming works}
+@subsubsubheading How automatic beaming works

 
 When automatic beaming is enabled, the placement of automatic beams
 is determined by the context properties
 
 When automatic beaming is enabled, the placement of automatic beams
 is determined by the context properties


@@ -2283,8 +2318,11 @@ The default beaming rules can be found in
 {beam-endings-in-score-context.ly}
 
 @seealso
 {beam-endings-in-score-context.ly}
 
 @seealso

+Notation Reference:
+@ref{Time signature}.
+

 Installed Files:
 Installed Files:

-@file{scm/beam-settings.scm}.
+@file{scm/time-signature-settings.scm}.

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