X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fmulti-measure-rest-markup.ly;h=6ee5046d9e19eb5e98e4f3d6fe3101b3e0e6b2a3;hb=2ba2ca2073f389842aa87f85b6c740b8488f0125;hp=e9f61dc55ab78314c9f26ee7fc817b1adfa95759;hpb=559a79b8ff4144181431e327c175047d0c808164;p=lilypond.git

diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly
index e9f61dc55a..6ee5046d9e 100644
--- a/Documentation/snippets/multi-measure-rest-markup.ly
+++ b/Documentation/snippets/multi-measure-rest-markup.ly
@@ -1,80 +1,27 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.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.14.2"
+% 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.19.20
 
-\header {
-  lsrtags = "text, rhythms"
-
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-texidoces = "
-Los elementos de marcado aplicados a un silencio multicompás se
-centran encima o debajo de éste.  Los elementos de marcado extensos
-que se adjuntan a silencios multicompás no producen la expansión del
-compás.  Para expandir un silencio multicompás de forma que quepa todo
-el marcado, utilice un silencio de separación con un marcado aplicado
-antes del silencio multicompás.
-
-Observe que el silencio separador produce la inserción de un compás.
-El texto aplicado a un siencio sparador de esta forma se alinea por la
-izquierda a la posición en que la nota estaría situada dentro del
-compás, pero si la longitud del compás está determinada por la
-longitud del texto, éste aparecerá centrado.
-
-"
-
-doctitlees = "Marcado de silencios multicompás"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "Textbeschriftungen, die an Mehrtaktpausen gehängt wird,
-wird über oder unter der Pause zentriert.  Lange Beschriftungen
-lassen den Takt nicht breiter werden.  Um eine Mehrtaktpause einer
-Beschriftung anzupassen, muss eine unsichtbare Pause mit der
-Beschriftung direkt vor der Mehrtaktpause eingesetzt werden.
+\version "2.19.20"
 
-Man sollte beachten, dass unsichtbare Pausen automatische Taktstriche
-nach sich ziehen.  Text, der an eine unsichtbare Pause gehängt wird,
-ist links ausgerichtet an der Position, wo die Pause erscheinen
-würde.  Wenn aber die Länge des Taktes durch die Länge des Textes
-bestimmt wird, sieht es so aus, als ob der Text zentriert gesetzt
-ist."
-
-  doctitlede = "Textbeschriftung und Mehrtaktpausen"
-
-
-
-%% Translation of GIT committish: 4da4307e396243a5a3bc33a0c2753acac92cb685
-  texidocfr = "
-Lorsque du texte est attaché à un silence multi-mesures, il sera centré
-dans la mesure, au-dessus ou en dessous de la portée.  Afin d'étirer la
-mesure dans le cas ou ce texte est relativement long, il suffit
-d'insérer un silence invisible auquel on attache le texte en question,
-avant le silence multi-mesures.
-
-Rappelez-vous qu'un silence invisible génère une barre de mesure.  Le
-texte attaché à ce silence invisible sera alors aligné sur la gauche de
-là où serait positionnée la note.  Cependant, si la taille de la mesure
-est déterminée par la longueur du texte, il apparaîtra comme centré.
-
-"
-  doctitlefr = "Ajout de texte à un silence multi-mesures"
+\header {
+  lsrtags = "rhythms, text"
 
   texidoc = "
 Markups attached to a multi-measure rest will be centered above or
 below it.  Long markups attached to multi-measure rests do not cause
 the measure to expand.  To expand a multi-measure rest to fit the
-markup, use a spacer rest with an attached markup before the
+markup, use an empty chord with an attached markup before the
 multi-measure rest.
 
-Note that the spacer rest causes a bar line to be inserted.  Text
-attached to a spacer rest in this way is left-aligned to the position
-where the note would be placed in the measure, but if the measure
-length is determined by the length of the text, the text will appear to
-be centered.
+Text attached to a spacer rest in this way is left-aligned to the
+position where the note would be placed in the measure, but if the
+measure length is determined by the length of the text, the text will
+appear to be centered.
 
 "
   doctitle = "Multi-measure rest markup"
@@ -82,13 +29,14 @@ be centered.
 
 
 \relative c' {
-  \compressFullBarRests
-  \textLengthOn
-  s1*0^\markup { [MAJOR GENERAL] }
-  R1*19
-  s1*0_\markup { \italic { Cue: ... it is yours } }
-  s1*0^\markup { A }
-  R1*30^\markup { [MABEL] }
-  \textLengthOff
-  c4^\markup { CHORUS } d f c
+  \compressMMRests {
+    \textLengthOn
+    <>^\markup { [MAJOR GENERAL] }
+    R1*19
+    <>_\markup { \italic { Cue: ... it is yours } }
+    <>^\markup { A }
+    R1*30^\markup { [MABEL] }
+    \textLengthOff
+    c4^\markup { CHORUS } d f c
+  }
 }