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 2dbb0acb02200a3a516e0e023973751d012e1e5b..3803ee3ccc0ab8fd57c7da13cc151fc6a32fd0c5 100644 (file)
--- 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 bf8da68d31d2918b1b8864f9b238bedd166e5fd6..251de0488ed648a6f6291a2ba523a9f81819ac17 100644 (file)
--- 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 44ab47e03c88bb9f1bd8c4542f78cbd683ed6edf..f4d23debdbfbbde88884fce1b441c773e92ee116 100644 (file)
--- 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 e20e0bef35c5e9e55684b13815daa6da44cdef71..a824d95430f58b2808f93487ab63c80b24c99613 100644 (file)
--- 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))