Merge commit 'origin' into release/unstable

[lilypond.git] / Documentation / snippets / compound-time-signatures.ly

diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly
index b3017d0f769ea67de200ec84365c3a8ce3c2d222..d9788da6b156dab651a9d4d449355cd63648b83d 100644 (file)
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -1,15 +1,15 @@
-%% 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.13.1"
+% Do not edit this file; it is automatically
+% generated from Documentation/snippets/new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.4
+\version "2.13.10"
 
 \header {
-  lsrtags = "rhythms"
-
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 45fc8488655f9ea122d1ec6e3328892618bd6971
  doctitlees = "Indicaciones de compases compuestos"
  texidoces = "
-Las indicaciones de compás poco frecuentes como \"5/8\" se pueden
-ejecutar como compases compuestos (p.ej. \"3/8 + 2/8\"), que combinan
+Las indicaciones de compás poco frecuentes como @qq{5/8} se pueden
+ejecutar como compases compuestos (p.ej. @qq{3/8 + 2/8}), que combinan
 dos o más metros diferentes. LilyPond puede hacer la música de este
 tipo fácil de leer e interpretar, imprimiendo explícitamente las
 indicaciones de compás compuesto y adaptando el comportamiento
@@ -19,6 +19,7 @@ apropiado en la base de datos).
 
 "
 
+
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Ungerade Taktarten werden (wie etwa \"5/8\") werden oft als zusammengesetzte
@@ -31,6 +32,7 @@ Bebalkung angepasst wird.
   doctitlede = "Zusammengesetzte Taktarten"
 
 
+
 %% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
   texidocfr = "
 Des métriques telles que @qq{5/8} peuvent s'interpréter sous une forme
@@ -42,6 +44,7 @@ métriques.  LilyPond est capable de rendre ce type de notation, plus
 "
   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
@@ -49,24 +52,24 @@ more inequal metrics. LilyPond can make such music quite easy to read
 and play, by explicitly printing the compound time signatures and
 adapting the automatic beaming behavior. (Graphic measure grouping
 indications can also be added; see the appropriate snippet in this
-database.) 
-
+database.)
 "
   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)))))))
+   (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)
+  \overrideBeamSettings #'Staff #'(5 . 8) #'end
+    #'((* . (2 3)))
   c8 d e fis gis
   c8 fis, gis e d
   c8 d e4 gis8