Doc: run makelsr locally

[lilypond.git] / Documentation / snippets / positioning-multi-measure-rests.ly

diff --git a/Documentation/snippets/positioning-multi-measure-rests.ly b/Documentation/snippets/positioning-multi-measure-rests.ly
index 0792d41889a44ac0483aacdda8cf83fd79f2a814..147c63ea97b4b6feef29dcb3ecce1c9922a1bc6a 100644 (file)
--- a/Documentation/snippets/positioning-multi-measure-rests.ly
+++ b/Documentation/snippets/positioning-multi-measure-rests.ly
@@ -1,24 +1,28 @@
-%% 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.15.14
+\version "2.15.14"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
-
-%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc
+%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
  doctitlees = "Posicionar los silencios multicompás"
  texidoces = "
 A diferencia de los silencios normales, no existe una instrucción
-predefinida para modificar la posición predefinida de un símbolo
-multicompás sobre el pentagrama, adjuntándolo a una nota,
-independientemente de cuál sea su forma.  Sin embargo, en la música
-polifónica los silencios multicompás de las voces de numeración par e
-impar están separados verticalmente.  La colocación de los silencios
-multicompás se puede controlar como se ve a continuación:
+predefinida para modificar la posición predeterminada de un
+símbolo de silencio multicompás sobre el pentagrama, adjuntándolo
+a una nota, independientemente de cuál sea su forma.  Sin embargo,
+en la música polifónica los silencios multicompás de las voces de
+numeración par e impar están separados verticalmente.  La
+colocación de los silencios multicompás se puede controlar como se
+ve a continuación:
 
 "
-%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36
 
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
 texidocde = "
 Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die
 vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an
@@ -30,52 +34,73 @@ werden:
   doctitlede = "Positionierung von Ganztaktpausen"
 
 
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
 Si l'on peut positionner verticalement un silence simple en le
-rattachant à une note, il n'en va pas de même pur un silence
-multi-mesure.  Néanmoins, et uniquement dans le cadre de musique
-polyphonique, les silences multi-mesures sont positionnées différemment
+rattachant à une note, il n'en va pas de même pour un silence
+multi-mesures.  Néanmoins, et uniquement dans le cadre de musique
+polyphonique, les silences multi-mesures sont positionnés différemment
 selon qu'ils appartiennent à une voix au numéro pair ou impair.  Le
-positionnement des silences multi-mesures peut se contrôler ainsi :
+positionnement des silences multi-mesures peut se contrôler ainsi@tie{}:
+
 "
   doctitlefr = "Positionnement des silences multi-mesures"
 
+  lsrtags = "rhythms, tweaks-and-overrides"
+
   texidoc = "
 Unlike ordinary rests, there is no predefined command to change the
 staff position of a multi-measure rest symbol of either form by
 attaching it to a note.  However, in polyphonic music multi-measure
 rests in odd-numbered and even-numbered voices are vertically
 separated. The positioning of multi-measure rests can be controlled as
-follows: 
+follows:
 
 "
   doctitle = "Positioning multi-measure rests"
 } % begin verbatim
 
+
 \relative c'' {
-  % Multi-measure rests by default are set under the second line
+  % Multi-measure rests by default are set under the fourth line
   R1
-  % They can be moved with an override
+  % They can be moved using an override
   \override MultiMeasureRest #'staff-position = #-2
   R1
-  % A value of 0 is the default position;
-  % the following trick moves the rest to the center line
-  \override MultiMeasureRest #'staff-position = #-0.01
+  \override MultiMeasureRest #'staff-position = #0
   R1
-  % Multi-measure rests in odd-numbered voices are under the top line
+  \override MultiMeasureRest #'staff-position = #2
+  R1
+  \override MultiMeasureRest #'staff-position = #3
+  R1
+  \override MultiMeasureRest #'staff-position = #6
+  R1
+  \revert MultiMeasureRest #'staff-position
+  \break
+
+  % In two Voices, odd-numbered voices are under the top line
   << { R1 } \\ { a1 } >>
-  % Multi-measure rests in even-numbered voices are under the bottom line
-  << { c1 } \\ { R1 } >>
-  % They remain separated even in empty measures
+  % Even-numbered voices are under the bottom line
+  << { a1 } \\ { R1 } >>
+  % Multi-measure rests in both voices remain separate
   << { R1 } \\ { R1 } >>
-  % This brings them together even though there are two voices
+
+  % Separating multi-measure rests in more than two voices
+  % requires an override
+  << { R1 } \\ { R1 } \\
+     \once \override MultiMeasureRest #'staff-position = #0
+     { R1 }
+  >>
+
+  % Using compressed bars in multiple voices requires another override
+  % in all voices to avoid multiple instances being printed
   \compressFullBarRests
   <<
-    \revert MultiMeasureRest #'staff-position
+   \revert MultiMeasureRest #'staff-position
     { R1*3 }
     \\
-    \revert MultiMeasureRest #'staff-position
+   \revert MultiMeasureRest #'staff-position
     { R1*3 }
   >>
 }