Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[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..27b618f2e8185a83293477426362000821d48aee 100644 (file)
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -1,15 +1,18 @@
-%% 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 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.14.0
+\version "2.14.0"
 
 \header {
-  lsrtags = "rhythms"
-
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
  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,7 +22,8 @@ apropiado en la base de datos).
 
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
 texidocde = "
 Ungerade Taktarten werden (wie etwa \"5/8\") werden oft als zusammengesetzte
 Taktarten interpretiert (bspw. \"3/8 + 2/8\"), in welchen zwei oder mehr
@@ -31,7 +35,8 @@ Bebalkung angepasst wird.
   doctitlede = "Zusammengesetzte Taktarten"
 
 
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+
+%% Translation of GIT committish: 4da4307e396243a5a3bc33a0c2753acac92cb685
   texidocfr = "
 Des métriques telles que @qq{5/8} peuvent s'interpréter sous une forme
 décomposée --- @qq{3/8 + 2/8} par exemple --- qui combine plusieurs
@@ -42,6 +47,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 +55,23 @@ 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)
+  \set Staff.beatStructure = #'(2 3)
   c8 d e fis gis
   c8 fis, gis e d
   c8 d e4 gis8