Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / multi-measure-rest-markup.ly

diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly
index d7bd204f2c74614869f8ee3d85b336d87eecb1f5..752aca16ed98d8a2998e4319d8739de4a2bbb312 100644 (file)
--- a/Documentation/snippets/multi-measure-rest-markup.ly
+++ b/Documentation/snippets/multi-measure-rest-markup.ly
@@ -1,10 +1,10 @@
 %% 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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, text"
@@ -13,27 +13,25 @@
 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"
 } % begin verbatim
 
-
 \relative c' {
   \compressFullBarRests
   \textLengthOn
-  s1*0^\markup { [MAJOR GENERAL] }
+  <>^\markup { [MAJOR GENERAL] }
   R1*19
-  s1*0_\markup { \italic { Cue: ... it is yours } }
-  s1*0^\markup { A }
+  <>_\markup { \italic { Cue: ... it is yours } }
+  <>^\markup { A }
   R1*30^\markup { [MABEL] }
   \textLengthOff
   c4^\markup { CHORUS } d f c