Merge branch 'master' into lilypond/translation

[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 af5ea7338f19eb2ad9d943995d36145a57508a78..bbbcade00745d17f99beefc26ecb6f9922ba1756 100644 (file)
--- a/Documentation/snippets/positioning-multi-measure-rests.ly
+++ b/Documentation/snippets/positioning-multi-measure-rests.ly
@@ -1,12 +1,14 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.13.4"
+% 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: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
  doctitlees = "Posicionar los silencios multicompás"
  texidoces = "
 A diferencia de los silencios normales, no existe una instrucción
@@ -20,7 +22,7 @@ ve a continuación:
 
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+%% 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
@@ -33,53 +35,72 @@ werden:
 
 
 
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+%% Translation of GIT committish: 4da4307e396243a5a3bc33a0c2753acac92cb685
   texidocfr = "
 Si l'on peut positionner verticalement un silence simple en le
 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'' {
-  % MMR - Multi-Measure Rest
-  % MMRs by default are set under the fourth 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
+  \override MultiMeasureRest #'staff-position = #2
   R1
-  % MMRs in odd-numbered voices are under the top line
+  \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 } >>
-  % MMRs 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 }
   >>
 }