Merge branch 'master' into lilypond/translation

[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 4a0f811eefd2b1692500107fd267b293e8cb98f9..120972a6e206cff8736c77d12f62145eb673c055 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: a634a20e0ab2a874ff8bf423e5651139df8733fc
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
  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: 6ce7f350682dfa99af97929be1dec6b9f1cbc01a
+
+%% 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,17 +35,19 @@ Bebalkung angepasst wird.
   doctitlede = "Zusammengesetzte Taktarten"
 
 
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   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
+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
 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.
+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
@@ -49,25 +55,12 @@ 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)))))))
 
-\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
-  c8 fis, gis e d
-  c8 d e4 gis8
+\markup {
+  This snippet is deprecated as of 2.15.9 and will be removed in 2.16
 }