From: David Kastrup Date: Wed, 1 Jan 2014 19:54:15 +0000 (+0100) Subject: Provide value->lily-string function X-Git-Tag: release/2.18.1-1~11 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=024cbc651e4e64a5a0476e0da92c92f2a70e6a9f;p=lilypond.git Provide value->lily-string function --- diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm index fd759d52d1..ed6b844219 100644 --- a/scm/define-music-display-methods.scm +++ b/scm/define-music-display-methods.scm @@ -808,13 +808,19 @@ Otherwise, return #f." (music->lily-string element parser)) #f))) -(define (property-value->lily-string arg parser) +(define-public (value->lily-string arg parser) (cond ((ly:music? arg) (music->lily-string arg parser)) ((string? arg) (format #f "#~s" arg)) ((markup? arg) (markup->lily-string arg)) + ((ly:duration? arg) + (format #f "##{ ~a #}" (duration->lily-string arg #:force-duration #t))) + ((ly:pitch? arg) + (format #f "~a~a" + (note-name->lily-string arg parser) + (octave->lily-string arg))) (else (format #f "#~a" (scheme-expr->lily-string arg))))) @@ -830,7 +836,7 @@ Otherwise, return #f." "" (format #f "~a . " (*current-context*))) property - (property-value->lily-string value parser) + (value->lily-string value parser) (new-line->lily-string)))) (define-display-method PropertyUnset (expr parser) @@ -858,7 +864,7 @@ Otherwise, return #f." (if (eqv? (*current-context*) 'Bottom) (cons symbol properties) (cons* (*current-context*) symbol properties)) - (property-value->lily-string value parser) + (value->lily-string value parser) (new-line->lily-string)))) (define-display-method RevertProperty (expr parser)