From: Carl Sorensen <c_sorensen@byu.edu>
Date: Mon, 28 Sep 2009 13:07:49 +0000 (-0600)
Subject: Fix autobeaming bugs
X-Git-Tag: release/2.13.5-0~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=51f0b5dbbd1b93207a6d02bb40cf24ad04e78feb;p=lilypond.git

Fix autobeaming bugs

Add warning that complete rule set is needed for override.

Fix override/revert snippet.

Fix default grouping for 3/4 time.
---

diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 7bcd48dc1c..70019121b3 100644
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -730,7 +730,7 @@ Notation Reference:
 Snippets:
 @rlsr{Rhythms}.
 
-Internals Reference: 
+Internals Reference:
 @rinternals{SkipMusic}.
 
 
@@ -1697,9 +1697,21 @@ the beam.  For default rules (where beam type is
 @code{*}, the grouping is in units of @code{beatLength}.
 For explicit rules, the grouping is in units of the beam type.
 
+For reference, the default beaming rules are found in
+@file{scm/beam-settings.scm}.
+
 Beam settings are changed with
 @code{\overrideBeamSettings} and @code{\revertBeamSettings}.
 
+@warning{
+The ending and subdivision settings must be
+@emph{complete} rules.  That is, every rule that should apply to
+the current time signature must be included in the setting.
+It is not possible to change the grouping of only one beam type
+for a given time signature.  While this may seem cumbersome,
+it means that the current beaming settings need not be known
+in order to specify a new beaming pattern.}
+
 @lilypond[quote,relative=2,verbatim]
 \time 5/16
 c8^"beats" c16 c8 |
@@ -1764,13 +1776,13 @@ for @var{grouping} is given:
 
 @lilypond[quote,verbatim,relative=2]
 \time 4/4
-\repeat unfold 16 { a16 }
+\repeat unfold 8 {a8}
 % set default rule for (1 1 1 1) grouping
 \overrideBeamSettings #'Score #'(4 . 4) #'end #'((* . (1 1 1 1)))
-\repeat unfold 16 { a16 }
+\repeat unfold 8 {a8}
 % revert the new rule
 \revertBeamSettings #'Score #'(4 . 4) #'end
-\repeat unfold 16 { a16 }
+\repeat unfold 8 {a8}
 @end lilypond
 
 
@@ -1803,6 +1815,9 @@ for @var{grouping} is given:
 
 
 @seealso
+Installed files:
+@file{scm/beam-settings.scm}.
+
 Snippets:
 @rlsr{Rhythms}.
 
diff --git a/scm/beam-settings.scm b/scm/beam-settings.scm
index 6649aad73b..878e1024c9 100644
--- a/scm/beam-settings.scm
+++ b/scm/beam-settings.scm
@@ -48,7 +48,7 @@
     ;; in 3 4 time:
     ;;   default: end beams on beats
     ;;   group 1/8 note beams on measure
-   (((3 . 4) end) .((* . (3))
+   (((3 . 4) end) .((* . (1 1 1))
                     ((1 . 16) . (4 4 4))
                     ((1 . 32) . (8 8 8))
                     ((1 . 64) . (16 16 16))