Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / beam-settings.scm

diff --git a/scm/beam-settings.scm b/scm/beam-settings.scm
index def8949abdf15d470f1c9ee05d4cd7bd1e98e8b0..cd86f6d46431ce21db1ff6d4a1b2a862d160cdc5 100644 (file)
--- 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
 
@@ -13,7 +24,7 @@
 ;;;
 ;;; where
 ;;;
-;;;     time-signature = time signature fraction (pair of numbers, (4 .4) )
+;;;     time-signature = time signature fraction (pair of numbers, (4 . 4) )
 ;;;     function = 'end or 'subdivide (possibly implement 'begin in the future)
 ;;;     beam-type = '* or (numerator . denominator); e.g. (1 . 16)
 ;;;       NOTE: numerator is kept in beam-type because of
@@ -46,13 +57,16 @@
      ((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 16) . (4 4 4))
-                    ((1 32) . (8 8 8))
-                    ((1 64) . (16 16 16))
-                    ((1 128) . (32 32 32))))
+                    ((1 . 8) . (6))
+                    ((1 . 16) . (4 4 4))
+                    ((1 . 32) . (8 8 8))
+                    ((1 . 64) . (16 16 16))
+                    ((1 . 128) . (32 32 32))))
 
     ;; in 3 8 and 3 16 time time:
     ;;   default: group on 3
@@ -73,12 +87,10 @@
 
     ;; in 4 4 (common) time:
     ;;   default: end beams on beats
-    ;;  use beatLength for all except 32nd notes:
-    ;;  end beams with 32nd notes each 1 8 beat
+    ;;   end beams with 8th notes each 1 2 beat
    (((4 . 4) end) .
-    ((* . (2 2))
-     ((1 . 32) . (4 4 4 4
-                  4 4 4 4))))
+    ((* . (1 1 1 1))
+     ((1 . 8) . (4 4))))
 
     ;; in 4 8 time:
     ;;   default: group on 1 4 notes
@@ -101,7 +113,7 @@
     ;;   end beams with 32nd notes each 1 8 beat
    (((6 . 8) end) .
     ((* . (3 3))
-     ((6 . 8) . (4 4 4 4 4 4))))
+     ((1 . 32) . (4 4 4 4 4 4))))
 
     ;; in 6 16 time:
     ;;   default: group at 3 16
@@ -133,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