X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2Fheavily-customized-polymetric-time-signatures.ly;h=b311b94ff3549b425d454fb95f57caf68a10fb30;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=3272e7eaa77914a7abcfeb34ac3756168a618393;hpb=30e1840bcc05a2d51f0742b0235a47bf0ef66f86;p=lilypond.git

diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly
index 3272e7eaa7..b311b94ff3 100644
--- a/input/lsr/heavily-customized-polymetric-time-signatures.ly
+++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.49"
+\version "2.12.3"
 
 \header {
   lsrtags = "rhythms, percussion"
@@ -13,42 +13,37 @@ is the template of a real Balkan song!).
 "
   doctitle = "Heavily customized polymetric time signatures"
 } % begin verbatim
-#(define (set-time-signature one two three four five six seven eight nine ten
-          eleven num)
-          (markup #:override '(baseline-skip . 0) #:number
-          (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num))
-          #:vcenter "+" (#:column (three num)) #:vcenter "+" (#:column (four num))
-          #:vcenter "+" (#:column (five num)) #:vcenter "+" (#:column (six num))
-          #:vcenter "+" (#:column (seven num)) #:vcenter "+" (#:column (eight num))
-          #:vcenter "+" (#:column (nine num)) #:vcenter "+" (#:column (ten num))
-          #:vcenter "+" (#:column (eleven num))))
-          ))
 
+#(define plus (markup #:vcenter "+"))
+#(define ((custom-time-signature one two three four five six
+           seven eight nine ten eleven num) grob)
+            (grob-interpret-markup grob
+              (markup #:override '(baseline-skip . 0) #:number
+                (#:line (
+                    (#:column (one num)) plus
+                    (#:column (two num)) plus
+                    (#:column (three num)) plus
+                    (#:column (four num)) plus
+                    (#:column (five num)) plus
+                    (#:column (six num)) plus
+                    (#:column (seven num)) plus
+                    (#:column (eight num)) plus
+                    (#:column (nine num)) plus
+                    (#:column (ten num)) plus
+                    (#:column (eleven num)))))))
 
 melody = \relative c'' {
-  \set Staff.instrumentName = "Bb Sop."
+  \set Staff.instrumentName = #"Bb Sop."
   \key g \major
-  \time 25/8
-  \override Staff.TimeSignature #'stencil = #ly:text-interface::print
-  \override Staff.TimeSignature #'text = #(set-time-signature "3" "2" "2" "3"
-    "2" "2" "2" "2 " "3" "2" "2" "8" )
-  \set Staff.beatGrouping = #'(3 2 2 3 2 2 2 2 3 2 2)
-  #(override-auto-beam-setting '(end * * 25 8) 3 8)
-  #(override-auto-beam-setting '(end * * 25 8) 5 8)
-  #(override-auto-beam-setting '(end * * 25 8) 7 8)
-  #(override-auto-beam-setting '(end * * 25 8) 10 8)
-  #(override-auto-beam-setting '(end * * 25 8) 12 8)
-  #(override-auto-beam-setting '(end * * 25 8) 14 8)
-  #(override-auto-beam-setting '(end * * 25 8) 16 8)
-  #(override-auto-beam-setting '(end * * 25 8) 18 8)
-  #(override-auto-beam-setting '(end * * 25 8) 21 8)
-  #(override-auto-beam-setting '(end * * 25 8) 23 8)
-
-  c8 c c d4 c8 c b c b a4 g fis8 e d c b' c d e4-^ fis8 g | \break
-  c,4. d4 c4 d4. c4 d c2 d4. e4-^ d4 |
-  c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break
-  c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 |
-  c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break
+  #(set-time-signature 25 8 '(3 2 2 3 2 2 2 2 3 2 2))
+  \override Staff.TimeSignature #'stencil =
+    #(custom-time-signature "3" "2" "2" "3" "2" "2"
+      "2" "2" "3" "2" "2" "8")
+  c8 c c d4 c8 c b c b a4 g fis8 e d c b' c d e4-^ fis8 g \break
+  c,4. d4 c4 d4. c4 d c2 d4. e4-^ d4
+  c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break
+  c4. d4 c4 d4. c4 d c2 d4. e4-^ d4
+  c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break
 }
 
 drum = \new DrumStaff \drummode {