* scm/music-functions.scm (glue-mm-rest-texts): use

MultiMeasureTextEvent

* Documentation/user/refman.itely (Multi measure rests): update.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 7cb69f1e0f727eb66179b755bccd18f637e8def7..503f97e55489ec487ba3d2848aa1755ded5e3d63 100644 (file)
--- 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 a5f3d58a316bd38b0392bcc0c6f5c5f174077437..e42418d7537551188f89a79c46c06afa59e16df2 100644 (file)
--- 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 823c8e1c240112c75a63a08fef9f793609732ba4..056a7b328dcd8580c8283d297884238d55cfcf1a 100644 (file)
--- 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 da4bf788af09bc46fa540eace2177f72f030cdfa..47ef6232a222da87f202b1722e8ceaaa67e6789b 100644 (file)
--- 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
   )