X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fpositioning-multi-measure-rests.ly;h=b49d162f12e26e5753820a2e359bc7d06ee204d9;hb=f509f0d4df0b7d4336d904ca61902ad67dc2be5e;hp=483e38090bb073cb8498ce4344813d288f817c71;hpb=f3a35eaef2b78440cdb150d36d8ff6d93e9c8d46;p=lilypond.git

diff --git a/Documentation/snippets/positioning-multi-measure-rests.ly b/Documentation/snippets/positioning-multi-measure-rests.ly
index 483e38090b..b49d162f12 100644
--- a/Documentation/snippets/positioning-multi-measure-rests.ly
+++ b/Documentation/snippets/positioning-multi-measure-rests.ly
@@ -1,52 +1,14 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% 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.12.2"
+\version "2.19.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 59caa3adce63114ca7972d18f95d4aadc528ec3d
- doctitlees = "Posicionar los silencios multicompás"
- texidoces = "
-A diferencia de los silencios normales, no existe una instrucció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: 0a868be38a775ecb1ef935b079000cebbc64de40
-texidocde = "
-Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die
-vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an
-eine Tonhöhe anhängt.  In polyphoner Notation wird aber dennoch die
-Position der Pausen von geraden und ungeraden Stimmen voneinander
-unterschieden.  Die Position von Ganztaktpausen kann wie folgt verändert
-werden:
- "
-  doctitlede = "Positionierung von Ganztaktpausen"
-
-
-
-%% 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 :
-"
-  doctitlefr = "Positionnement des silences multi-mesures"
-
   texidoc = "
 Unlike ordinary rests, there is no predefined command to change the
 staff position of a multi-measure rest symbol of either form by
@@ -60,29 +22,44 @@ follows:
 } % 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
-  \override MultiMeasureRest #'staff-position = #-2
+  % 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
-  % MMRs 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 } >>
-  % 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
-  \compressFullBarRests
+
+  % 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
+  \compressMMRests
   <<
-    \revert MultiMeasureRest #'staff-position
+   \revert MultiMeasureRest.direction
     { R1*3 }
     \\
-    \revert MultiMeasureRest #'staff-position
+   \revert MultiMeasureRest.direction
     { R1*3 }
   >>
 }