X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-display-methods.scm;h=e429c92b6fcf0e3b641e321d0319b4dd9b143305;hb=d409c67cbbdebe840220c17f796544a8a9dd193e;hp=9631da734ddd6ad0d6e3389ec2fb5683b9b5a10f;hpb=952705bbbb000581a13836e6a733df04511e93c5;p=lilypond.git 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)