From: David Kastrup <dak@gnu.org>
Date: Mon, 3 Jun 2013 17:00:52 +0000 (+0200)
Subject: Run scripts/auxiliar/makelsr.py
X-Git-Tag: release/2.17.20-1~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d000c543411bb4c2fb459578bd87ef357ac4aa92;p=lilypond.git

Run scripts/auxiliar/makelsr.py
---

diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly
index f6061bbf40..9b1a047a5b 100644
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -1,9 +1,10 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
-%% and then run scripts/auxiliar/makelsr.py
-%%
-%% This file is in the public domain.
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.17.15
 \version "2.17.15"
 
 \header {
@@ -20,17 +21,9 @@ signatures and adapting the automatic beaming behavior.
   doctitle = "Compound time signatures"
 } % begin verbatim
 
-#(define ((compound-time one two num) grob)
-   (grob-interpret-markup grob
-                          (markup #:override '(baseline-skip . 0) #:number
-                                  (#:line ((#:column (one num))
-                                           #:vcenter "+"
-                                           (#:column (two num)))))))
 
 \relative c' {
-  \override Staff.TimeSignature.stencil = #(compound-time "2" "3" "8")
-  \time 5/8
-  \set Staff.beatStructure = #'(2 3)
+  \compoundMeter #'((2 8) (3 8))
   c8 d e fis gis
   c8 fis, gis e d
   c8 d e4 gis8
diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index fc5748f3fe..8c939d25c1 100644
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -1,9 +1,10 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
-%% and then run scripts/auxiliar/makelsr.py
-%%
-%% This file is in the public domain.
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.17.15
 \version "2.17.15"
 
 \header {
@@ -19,29 +20,11 @@ is the template of a real Balkan song!).
 } % begin verbatim
 
 
-#(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."
   \key g \major
-  \time #'(3 2 2 3 2 2 2 2 3 2 2) 25/8
-  \override Staff.TimeSignature.stencil =
-    #(custom-time-signature "3" "2" "2" "3" "2" "2"
-      "2" "2" "3" "2" "2" "8")
+  \compoundMeter #'((3 8) (2 8) (2 8) (3 8) (2 8) (2 8)
+                    (2 8) (2 8) (3 8) (2 8) (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