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 4417d7ff9a1823f79c41e064404763a366ec571a..120972a6e206cff8736c77d12f62145eb673c055 100644 (file)
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -1,11 +1,14 @@
-% Do not edit this file; it is automatically
+% 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.13.4
-\version "2.13.10"
+%% Note: this file works from version 2.14.0
+\version "2.14.0"
 
 \header {
-%% Translation of GIT committish: 5cab62e8738ff02eead438042743116391f306f5
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
  doctitlees = "Indicaciones de compases compuestos"
  texidoces = "
 Las indicaciones de compás poco frecuentes como @qq{5/8} se pueden
@@ -20,7 +23,7 @@ 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
@@ -33,13 +36,13 @@ Bebalkung angepasst wird.
 
 
 
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   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
 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"
@@ -58,19 +61,6 @@ database.)
 } % 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
-  \overrideBeamSettings #'Staff #'(5 . 8) #'end
-    #'((* . (2 3)))
-  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
 }