Merge with master

[lilypond.git] / input / test / compound-time.ly

diff --git a/input/test/compound-time.ly b/input/test/compound-time.ly
index 43366dc6b06b5558208a805558ed12fd5bf09e30..a74b0baa8b94229ec85a632cc172631acbed73d3 100644 (file)
--- a/input/test/compound-time.ly
+++ b/input/test/compound-time.ly
@@ -1,38 +1,28 @@
 
-\version "2.5.20"
+\version "2.10.0"
 \header {
 texidoc = "@cindex compound time
 @cindex plus
 
-Compound time signatures can be printed.
+Compound time signatures can be printed.  Automatic beaming works in
+compound time.
 
 "
 }
 
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
+
+#(define (compound-time one two num)
+  (markup #:override '(baseline-skip . 0) #:number 
+   (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num))))))
 
-#(define (compound-time grob one two num)
-  (interpret-markup
-   (ly:grob-layout grob)
-   '(((baseline-skip . 2)
-      (word-space . 2)
-      (font-family . number)))
-   (markup
-    #:line ( #:column (one num) #:lower 1 "+" #:column (two num)))))
-%    ;;  #:line ( #:column (one num) #:lower 1 "+" #:column (two num)))))
 
 \relative {
   %% compound time signature hack
   \time 5/8
-  \override Staff.TimeSignature #'print-function
-  = #(lambda (grob) (compound-time grob "2" "3" "8"))
-
-  %% manual beaming, auto beam engraver cannot handle compound time,
-  %% it extends 2/8 pattern to 4/8, which does not work.
-
-  %% Hmm, why don't we just junk the modulo functionality, and
-  %% write-out all endings explicitely, we get compound time handling
-  %% for free?
-  
-  c4 c8[ c c]
+  \override Staff.TimeSignature #'stencil = #ly:text-interface::print
+  \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8" )
+  #(override-auto-beam-setting '(end 1 8 5 8) 1 4)
+  c8 c c8 c c
 }
+