X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbeam-settings.scm;h=cd86f6d46431ce21db1ff6d4a1b2a862d160cdc5;hb=c6b8818201add8f2e2114b5583bca805ac63574a;hp=6649aad73b45dc3755f25f0ccdd9657ac797c502;hpb=1efdabf3b2349ea7fa3183dca5bba5104c347c36;p=lilypond.git

diff --git a/scm/beam-settings.scm b/scm/beam-settings.scm
index 6649aad73b..cd86f6d464 100644
--- a/scm/beam-settings.scm
+++ b/scm/beam-settings.scm
@@ -1,8 +1,19 @@
-;;;; beam-settings.scm --  Handle auto-beam and subdivide-beam settings
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2009 Carl Sorensen <c_sorensen@byu.edu>
 ;;;;
-;;;; (c) 2009 Carl Sorensen <c_sorensen@byu.edu>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; specify default beaming rules
 
@@ -46,9 +57,12 @@
      ((1 . 32) . (8 8 8 8 8 8))))
 
     ;; in 3 4 time:
-    ;;   default: end beams on beats
-    ;;   group 1/8 note beams on measure
+    ;;   default: set grouping to (3) so we'll get
+    ;;     the proper measure grouping symbol
+    ;;
+    ;;   set all beams to end on beats, but 1 8 to beam entire measure
    (((3 . 4) end) .((* . (3))
+                    ((1 . 8) . (6))
                     ((1 . 16) . (4 4 4))
                     ((1 . 32) . (8 8 8))
                     ((1 . 64) . (16 16 16))
@@ -131,7 +145,7 @@
    (((12 . 4) end) .
     ((* . (3 3 3 3))
      ((1 . 16) . (4 4 4 4 4 4 4 4 4 4 4 4 4))
-     ((12 . 4) . (8 8 8 8 8 8 8 8 8 8 8 8 8))))
+     ((1 . 32) . (8 8 8 8 8 8 8 8 8 8 8 8 8))))
 
     ;; in 12 8 time:
     ;;   default: group at 3 8