Merge master into nested-bookparts

[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 f390ab4126de5edaa079f8bea803869d7991f777..5a86c8c77b9768008e1b433b3da2f3e4ffcc5cdb 100644 (file)
--- a/input/lsr/compound-time-signatures.ly
+++ b/input/lsr/compound-time-signatures.ly
@@ -1,27 +1,45 @@
-%% Do not edit this file; it is auto-generated from LSR!
-%% Tags: rhythms
-\version "2.11.35"
+%% 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.62"
 
-\header { texidoc = "
+\header {
+  lsrtags = "rhythms"
+
+ 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
+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
+automático de las barras (también se pueden añadir indicaciones
+gráficas de la agrupación de compases; véase el fragmento de código
+apropiado en la base de datos).
+
+"
+  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
-more inequal metrics. LilyPond can make such musics quite easy to read
+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 behaviour. (You can even add graphic
-measure groping indications, the appropriate snippet in this database.)
+adapting the automatic beaming behavior. (Graphic measure grouping
+indications can also be added; see the appropriate snippet in this
+database.) 
 
-" }
-% begin verbatim
+"
+  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))))))
-
+  (markup #:override '(baseline-skip . 0) #:number
+   (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num))))
+  ))
 
-\relative {
-  %% compound time signature hack
-  \time 5/8
+\relative {  
   \override Staff.TimeSignature #'stencil = #ly:text-interface::print
-  \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8" )
+  \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8")
+  \time 5/8
   #(override-auto-beam-setting '(end 1 8 5 8) 1 4)
-  c8 d e fis gis | c fis, gis e d | c8 d e4  gis8
+  c8 d e fis gis
+  c8 fis, gis e d
+  c8 d e4 gis8
 }