Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly

diff --git a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
index 0860b53b48828a34fbf5963a8c5a93f981c0e94b..6b37d262db98c34fbe131cbbdd8afed7e935085b 100644 (file)
--- a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
+++ b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
@@ -1,49 +1,27 @@
-% 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.15.17
-\version "2.15.17"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.18.0"
 
 \header {
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-  texidoces = "
-La propiedad @code{measureLength}, junto con
-@code{measurePosition}, determina cuándo es necesario dibujar una
-línea divisoria.  Sin embargo, al utilizar
-@code{\\scaleDurations}, el escalado proporcional de las
-duraciones hace difícil introducir cambios de compás.  En este
-caso se debe establecer manualmente el valor de
-@code{measureLength} utilizando la función @code{ly:make-moment}.
-El segundo argumento debe ser el mismo que el segundo argumento de
-@code{\\scaleDurations}.
+  lsrtags = "contemporary-notation, contexts-and-engravers, rhythms, workaround"
 
-"
-  doctitlees = "Modificar el compás dentro de una sección polimétrica utilizando @code{\\scaleDurations}"
-
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-La propriété @code{measureLength}, conjointement avec
-@code{measurePosition}, détermine l'endroit où une barre de mesure est
-requise.  L'utilisation d'un @code{\\scaleDurations} a ceci
-d'inconvénient que l'échelonnement des durées rend compliqués les
-changements de métrique.  Il est nécessaire en pareil cas de définir
-manuellement @code{measureLength}, avec un appel à
-@code{ly:make-moment}.  Le second argument devra être identique au
-deuxième argument de @code{\\scaleDurations}.
+  texidoc = "
+The @code{measureLength} property, together with
+@code{measurePosition}, determines when a bar line is needed.  However,
+when using @code{\\scaleDurations}, the scaling of durations makes it
+difficult to change time signatures.  In this case,
+@code{measureLength} should be set manually, using the
+@code{ly:make-moment} callback.  The second argument must be the same
+as the second argument of @code{\\scaleDurations}.
 
 "
-  doctitlefr = "Modification de la métrique au sein d'un fragment polymétrique à l'aide de @code{\\scaleDurations}"
-
-  lsrtags = "workaround, contexts-and-engravers, contemporary-notation, rhythms"
-
   doctitle = "Changing time signatures inside a polymetric section using \\scaleDurations"
 } % begin verbatim
 
-
-
 \layout {
   \context {
     \Score
@@ -61,10 +39,10 @@ deuxième argument de @code{\\scaleDurations}.
   \new Staff {
     \scaleDurations 8/5 {
       \time 6/8
-      \set Timing.measureLength = #(ly:make-moment 6 5)
+      \set Timing.measureLength = #(ly:make-moment 6/5)
       b8 b b b b b
       \time 2/4
-      \set Timing.measureLength = #(ly:make-moment 4 5)
+      \set Timing.measureLength = #(ly:make-moment 4/5)
       b4 b
     }
   }