From: Erik Sandberg <mandolaerik@gmail.com>
Date: Tue, 4 Jul 2006 07:38:50 +0000 (+0000)
Subject: rename MultiMeasureRest->MultiMeasureRestMusic, to prevent name clash in documentation
X-Git-Tag: release/2.10.0-2~484
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=05acd5edad83e30653d81698ced14bc59822843b;p=lilypond.git

rename MultiMeasureRest->MultiMeasureRestMusic, to prevent name clash in documentation
---

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index 2dbb0acb02..3803ee3ccc 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -481,7 +481,7 @@ Otherwise, return #f."
 		  ;; command_element
 		  (format #f "~{~a ~}" (map-in-order music->lily-string elements))))))))
 
-(define-display-method MultiMeasureRest (mmrest)
+(define-display-method MultiMeasureRestMusic (mmrest)
   (let* ((dur (ly:music-property mmrest 'duration))
 	 (ly (format #f "R~a~{~a ~}"
 		     (duration->lily-string dur)
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index bf8da68d31..251de0488e 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -296,7 +296,7 @@ Syntax: @code{c4\\melisma d\\melismaEnd}.")
 	(types . (general-music melisma-span-event event))
 	))
 
-    (MultiMeasureRest
+    (MultiMeasureRestMusic
      . (
 	(description . "Rests that may be compressed into Multi rests. 
 
@@ -309,7 +309,7 @@ Syntax
 
     (MultiMeasureRestEvent
      . (
-	(description . "Used internally by MultiMeasureRest to signal rests")
+	(description . "Used internally by MultiMeasureRestMusic to signal rests")
 	(types . (general-music event rhythmic-event multi-measure-rest-event))
 	))
     
diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 44ab47e03c..f4d23debdb 100644
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -98,7 +98,7 @@
       music))
 
 (define-ly-syntax (multi-measure-rest parser location duration articulations)
-  (make-music 'MultiMeasureRest
+  (make-music 'MultiMeasureRestMusic
 	      'articulations (map script-to-mmrest-text articulations)
 	      'duration duration
 	      'origin location))
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index e20e0bef35..a824d95430 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -387,7 +387,7 @@ i.e.  this is not an override"
 
 ;; mmrest
 (define-public (make-multi-measure-rest duration location)
-  (make-music 'MultiMeasureRest
+  (make-music 'MultiMeasureRestMusic
 	      'origin location
 	      'duration duration))