make beams in 6/4, 9/4 and 12/4 behave like those in 3/4 (issue 6389044)

[benko . pal]

Reviewers: ,

Message:
note that the newly added regtest shows some cases I'm not really sure
about: e.g. beaming/breaking of six eigth (or a4 a8 a8 a4) may have to
depend on whether it's a triplet or sextuplet.

Description:
make beams in 6/4, 9/4 and 12/4 behave like those in 3/4

Please review this at http://codereview.appspot.com/6389044/

Affected files:
  A input/regression/autobeam-default-tuplets.ly
  M input/regression/autobeam-show-defaults.ly
  M scm/time-signature-settings.scm


Index: input/regression/autobeam-default-tuplets.ly
diff --git a/input/regression/autobeam-default-tuplets.ly  
b/input/regression/autobeam-default-tuplets.ly
new file mode 100644
index  
0000000000000000000000000000000000000000..44a77794281262e167842290a5a8949e1ff72e8b
--- /dev/null
+++ b/input/regression/autobeam-default-tuplets.ly
@@ -0,0 +1,40 @@
+\version "2.15.40"
+
+\header {
+
+  texidoc = "
+Default autobeam settings for tuplets
+"
+
+}
+
+{
+  \time 2/2
+  \times 4/5 { \repeat unfold 5 a8 }
+  \times 8/10 { \repeat unfold 10 a16 } |
+  \times 4/5 { \repeat unfold 10 a16 }
+  \times 4/5 { \repeat unfold 5 a16 }
+  \times 4/5 { \repeat unfold 5 a16 } |
+  \times 4/5 { \repeat unfold 10 a32 }
+  \times 4/5 { a4 a16 }
+  \set tupletSpannerDuration = #(ly:make-moment 1 4)
+  \times 4/5 { a8. a8 a8 a8. } |
+
+  \times 2/3 { a8 a a }
+  \times 2/3 { a4 a8 }
+  \times 2/3 { \repeat unfold 6 a8 } |
+  \times 4/6 { \repeat unfold 6 a8 }
+  \unset tupletSpannerDuration
+  \times 4/6 { \repeat unfold 6 a8 } |
+  \times 2/3 { a4 a8 a8 a4 }
+  \times 4/6 { a4 a8 a8 a4 } |
+}
+{
+  \time 3/4
+  \times 6/8 { \repeat unfold 8 a8 } |
+  \times 6/9 { \repeat unfold 9 a8 } |
+  \times 6/10 { \repeat unfold 10 a8 } |
+  \times 3/4 { \repeat unfold 8 a8 } |
+  \times 3/5 { \repeat unfold 10 a8 } |
+  \times 6/9 { a4 a8 a8 a4 a8 a a } |
+}
Index: input/regression/autobeam-show-defaults.ly
diff --git a/input/regression/autobeam-show-defaults.ly  
b/input/regression/autobeam-show-defaults.ly
index  
59a948ce59acb06ae54ce0b5f91deece92bfe19f..52c71baf062c5421a822908f02c265a3209bfd83  
100644
--- a/input/regression/autobeam-show-defaults.ly
+++ b/input/regression/autobeam-show-defaults.ly
@@ -34,11 +34,12 @@ Each score shows the desired beaming
 {
   \time 3/2
   a8^\markup "Beams should end at 4/8, 8/8, 10/8 and 12/8"
-  \repeat unfold 10 a8 a16 a32 a64 a128 a }
+  \repeat unfold 3 a8 \repeat unfold 8 a16 a8 a8 a8 a16 a32 a64 a128 a }
 {
   \time 3/4
   a8^\markup "1/8 beams should end at 3/4; smaller beams should end at  
1/4, 2/4, and 3/4"
   \repeat unfold 5 a8
+  \repeat unfold 12 a16
   \repeat unfold 11 a16 a32 a64 a128 a
 }
 {
@@ -55,9 +56,9 @@ Each score shows the desired beaming
 }
 {
   \time 4/2
-  a8^\markup "Beams should end at 4/8, 8/8, 12/8, 14/8, and 16/8"
-  \repeat unfold 14 a8
-  a16 a32 a64 a128 a
+  a8^\markup "Beams should end at 4/8, 8/8, 10/8, 12/8, 14/8, and 16/8"
+  \repeat unfold 3 a8 \repeat unfold 8 a16 \repeat unfold 16 a32
+  a8 a8 a8 a16 a32 a64 a128 a
 }
 {
   \time 4/4
@@ -91,9 +92,10 @@ Each score shows the desired beaming
 }
 {
   \time 9/4
-  a8^\markup "Beams should end at 6/8, 12/8, 14/8, 16/8, and 18/8"
-  \repeat unfold 16
-  a8 a16 a32 a64 a128 a
+  a8^\markup "Beams should end at 6/8, 8/8, 10/8, 12/8, 14/8, 16/8, and  
18/8"
+  \repeat unfold 5 a8
+  \repeat unfold 12 a16
+  \repeat unfold 5 a8 a16 a32 a64 a128 a
 }
 {
   \time 9/8
@@ -110,9 +112,11 @@ Each score shows the desired beaming
 }
 {
   \time 12/4
-  a8^\markup "Beams should end at 6/8, 12/8, 18/8, 20/8, 22/8, and 24/8"
-  \repeat unfold 22 a8
-  a16 a32 a64 a128 a
+  a8^\markup "Beams should end at 6/8, 8/8, 10/8, 12/8, 14/8, 16/8, 18/8,  
20/8, 22/8, and 24/8"
+  \repeat unfold 5 a8
+  \repeat unfold 12 a16
+  \repeat unfold 24 a32
+  \repeat unfold 5 a8 a16 a32 a64 a128 a
 }
 {
   \time 12/8
Index: scm/time-signature-settings.scm
diff --git a/scm/time-signature-settings.scm  
b/scm/time-signature-settings.scm
index  
af852575dcedeb521c56b44be4672d29e1b21210..22f483ea6174f195f7c595a7f78736325bff2de5  
100644
--- a/scm/time-signature-settings.scm
+++ b/scm/time-signature-settings.scm
@@ -121,9 +121,9 @@
     ;;   use defaults, so no entries necessary

     ;; in 6 4 time:
-    ;;   use defaults, but end beams with 32nd or finer each 1/4 beat
+    ;;   use defaults, but end beams with 8th triplets or finer each 1/4  
beat
     ((6 . 4) .
-             ((beamExceptions . ((end .  (((1 . 16) . (4 4 4 4 4 4))))))))
+             ((beamExceptions . ((end .  (((1 . 12) . (3 3 3 3 3 3))))))))

     ;; in 6 8 time:
     ;;   use defaults, so no entries necessary
@@ -132,9 +132,9 @@
     ;;   use defaults, so no entries necessary

     ;; in 9 4 time:
-    ;;   use defaults, but end beams with 32nd or finer each 1 4 beat
+    ;;   use defaults, but end beams with 8th triplets or finer each 1/4  
beat
     ((9 . 4) .
-             ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8 8 8 8  
8))))))))
+             ((beamExceptions . ((end . (((1 . 12) . (3 3 3 3 3 3 3 3  
3))))))))

     ;; in 9 8 time
     ;;   use defaults, so no entries necessary
@@ -143,9 +143,9 @@
     ;;   use defaults, so no entries necessary

     ;; in 12 4 time:
-    ;;   use defaults, but end beams with 32nd or finer notes each 1 4 beat
+    ;;   use defaults, but end beams with 8th triplets or finer each 1/4  
beat
     ((12 . 4) .
-              ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8 8 8 8 8 8 8  
8 8))))))))
+              ((beamExceptions . ((end . (((1 . 12) . (3 3 3 3 3 3 3 3 3 3  
3 3))))))))

     ;; in 12 8 time:
     ;;   use defaults, so no entries necessary