From 52a2f40f17e47b1d0dd120dee70f11302233a8d8 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 9 Apr 2003 13:43:09 +0000
Subject: [PATCH] * scm/music-functions.scm (glue-mm-rest-texts): use
 MultiMeasureTextEvent

* Documentation/user/refman.itely (Multi measure rests): update.
---
 Documentation/user/refman.itely   |  8 ++++++--
 NEWS                              |  5 +++++
 input/test/beamed-slur-endings.ly | 14 +++++++-------
 scm/music-functions.scm           |  1 -
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 7cb69f1e0f..503f97e554 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3889,8 +3889,11 @@ rest centered in the measure, regardless of the time signature.
 @cindex fermata on multi-measure rest
 
 Texts can be added to multi-measure rests by using the
-@var{note}-@code{markup} syntax.  An identifier
-is provided for a fermata. 
+@var{note}-@code{markup} syntax.  In this case, the number is
+replaced. If you need both texts and the number, you must add the
+number by hand. An identifier (@code{fermataMarkup}) is provided for
+adding fermatas.
+
 
 @lilypond[verbatim,fragment]
   \time 3/4
@@ -3898,6 +3901,7 @@ is provided for a fermata.
   R2.^\fermataMarkup
 @end lilypond
 
+
 @cindex whole rests for a full measure 
 
 The object for this object is @internalsref{MultiMeasureRest},
diff --git a/NEWS b/NEWS
index a5f3d58a31..e42418d753 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,11 @@ and
 
 ** Friendly chord-name exception entry.
 
+** Texts can be put on multimeasure rests, eg.
+
+	R1*20^\markup { "GP" }
+
+
 * OUTPUT
 
 ** Preliminary Sodipodi/SVG output
diff --git a/input/test/beamed-slur-endings.ly b/input/test/beamed-slur-endings.ly
index 823c8e1c24..056a7b328d 100644
--- a/input/test/beamed-slur-endings.ly
+++ b/input/test/beamed-slur-endings.ly
@@ -2,20 +2,20 @@
 
 \score{
 	\notes \relative c''{
-		\slurUp c8((c-)(c4-))
+		\slurUp c8-(-( c-)-( c4-)-)
 		\slurDown a8-(-(a-)a4-)
 		\break
 
-		\slurDown a8(()a())a4
-		\slurUp c8(()c)c4
+		\slurDown a8-(-(a-)-(a4-)-)
+		\slurUp c8-(-( c-)c4-)
 		\break
 
-		\slurDown e8(()e())e4
-		\slurUp f,8(()f)f4
+		\slurDown e8-(-(e-)-( e4-)-)
+		\slurUp f,8-(-( f-) f4-)
 		\break
 
-		\slurUp e8(()e())e4
-		\slurDown f'8(()f)f4
+		\slurUp e8-(-(e-)-( e4-)-)
+		\slurDown f'8-(-(f-)f4-)
 		\break
 
 	}
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index da4bf788af..47ef6232a2 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -278,7 +278,6 @@ a property set for MultiMeasureRestNumber."
 	     music 'elements
 	     (cons (make-event-chord texts) others)
 	    ))
-	(display-music music)
       ))
   music
   )
-- 
2.39.5