Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / scm / ly-syntax-constructors.scm

diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 23befc939e7b0605b556e465f4afed901cde5936..9e6325a1563b9897828eb8e8ebfa3e2cfac3fdb2 100644 (file)
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -98,10 +98,14 @@
 
 (define (script-to-mmrest-text music)
   "Extract 'direction and 'text from SCRIPT-MUSIC, and transform MultiMeasureTextEvent"
+
   (if (memq 'script-event (ly:music-property music 'types))
       
-      (let ((dir (ly:music-property music 'direction))
-           (p   (make-music 'MultiMeasureTextEvent
+      (let*
+         ((dir (ly:music-property music 'direction))
+          (tags (ly:music-property music 'tags))
+          (p   (make-music 'MultiMeasureTextEvent
+                            'tags tags
                             'text (ly:music-property music 'text))))
        (if (ly:dir? dir)
            (set! (ly:music-property p 'direction) dir))
@@ -128,7 +132,10 @@
                  ((OverrideProperty) (list 'grob-value (car args)
                                            'grob-property-path (cdr args)
                                            'pop-first #t))
-                 ((RevertProperty) (list 'grob-property-path args))
+                 ((RevertProperty)
+                  (if (list? (car args))
+                      (list 'grob-property-path (car args))
+                      (list 'grob-property-path args)))
                  (else (ly:error (_ "Invalid property operation ~a") music-type))))
         (oprops (if once (cons* 'once once props) props))
         (m (apply make-music music-type