From: David Kastrup <dak@gnu.org>
Date: Wed, 7 Nov 2012 12:02:09 +0000 (+0100)
Subject: Issue 2953: Teach \displayLilyMusic the recommended override/revert syntax
X-Git-Tag: release/2.17.7-1~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=823403a0718dfdf09124089ce1b32763ca6f4cf1;p=lilypond.git

Issue 2953: Teach \displayLilyMusic the recommended override/revert syntax

This is a followup to the large issue 2934 change.
---

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index 9631da734d..e429c92b6f 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -848,33 +848,25 @@ Otherwise, return #f."
 	 (value	  (ly:music-property expr 'grob-value))
 	 (once	  (ly:music-property expr 'once)))
 
-    (format #f "~a\\override ~a~a #'~a = ~a~a"
+    (format #f "~a\\override ~{~a~^.~} = ~a~a"
 	    (if (or (null? once)
 		    (not once))
 		""
 		"\\once ")
-	    (if (eqv? (*current-context*) 'Bottom)
-		""
-		(format #f "~a . " (*current-context*)))
-	    symbol
-	    (if (null? (cdr properties))
-		(car properties)
-		properties)
-	    (property-value->lily-string value parser)
+            (if (eqv? (*current-context*) 'Bottom)
+                (cons symbol properties)
+                (cons* (*current-context*) symbol properties))
+            (property-value->lily-string value parser)
 	    (new-line->lily-string))))
 
 (define-display-method RevertProperty (expr parser)
   (let* ((symbol (ly:music-property expr 'symbol))
          (properties (ly:music-property expr 'grob-property-path
                                              (list (ly:music-property expr 'grob-property)))))
-    (format #f "\\revert ~a~a #'~a~a"
-	    (if (eqv? (*current-context*) 'Bottom)
-		""
-		(format #f "~a . " (*current-context*)))
-	    symbol
-	    (if (null? (cdr properties))
-		(car properties)
-		properties)
+    (format #f "\\revert ~{~a~^.~}~a"
+            (if (eqv? (*current-context*) 'Bottom)
+                (cons symbol properties)
+                (cons* (*current-context*) symbol properties))
 	    (new-line->lily-string))))
 
 (define-display-method TimeSignatureMusic (expr parser)
diff --git a/scm/display-lily.scm b/scm/display-lily.scm
index 3348434da3..55c9f9f135 100644
--- a/scm/display-lily.scm
+++ b/scm/display-lily.scm
@@ -87,7 +87,7 @@ display method will be called."
 			 (if (pair? (car tweak))
 			     (format #f "~a.~a"
 				     (caar tweak) (cdar tweak))
-			     (format #f "#'~a" (car tweak)))
+			     (format #f "~a" (car tweak)))
                          (scheme-expr->lily-string (cdr tweak))))
                (ly:music-property expr 'tweaks))))