Merge commit 'origin'

[lilypond.git] / input / lsr / compound-time-signatures.ly

diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly
index 35d380ff56b6bd95e3ea601313452658825e5814..0d368e29e3449c21337576c947c7284268826c22 100644 (file)
--- a/input/lsr/compound-time-signatures.ly
+++ b/input/lsr/compound-time-signatures.ly
@@ -1,10 +1,9 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.62"
+%% Note: this file works from version 2.12.0
+\version "2.13.1"
 
 \header {
-  lsrtags = "rhythms"
-
  doctitlees = "Indicaciones de compases compuestos"
  texidoces = "
 Las indicaciones de compás poco frecuentes como \"5/8\" se pueden
@@ -29,6 +28,19 @@ Bebalkung angepasst wird.
 "
   doctitlede = "Zusammengesetzte Taktarten"
 
+
+%% Translation of GIT committish :<e71f19ad847d3e94ac89750f34de8b6bb28611df>
+  texidocfr = "
+Des métriques telles que \"5/8\" pauvent s'interpréter sous une forme
+décomposée --- \"3/8 + 2/8\" par exemple --- qui combine plusieurs
+métriques.  LilyPond est capable de rendre ce type de notation, plus
+  facile à lire et à interpréter, en imprimant cette métrique composite
+  et en adaptant les règles de ligature automatique en conséquence.
+
+"
+  doctitlefr = "Métrique décomposée"
+
+  lsrtags = "rhythms"
   texidoc = "
 Odd 20th century time signatures (such as \"5/8\") can often be played
 as compound time signatures (e.g. \"3/8 + 2/8\"), which combine two or
@@ -42,14 +54,18 @@ database.)
   doctitle = "Compound time signatures"
 } % begin verbatim
 
-#(define (compound-time one two num)
-  (markup #:override '(baseline-skip . 0) #:number
-   (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num))))
-  ))
 
-\relative {  
-  \override Staff.TimeSignature #'stencil = #ly:text-interface::print
-  \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8")
+#(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
   #(override-auto-beam-setting '(end 1 8 5 8) 1 4)
   c8 d e fis gis