From 98d34812576efba5953bbe1303e1b473d2879203 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Fri, 10 Jan 2014 14:52:23 +0100 Subject: [PATCH] Simplify tremolo display (issue 3783) --- input/regression/display-lily-tests.ly | 2 +- scm/define-music-display-methods.scm | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 10dccdded2..3b99a96bc2 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -107,7 +107,7 @@ stderr of this run." \test ##[ c4 ~ #] % TieEvent \test ##[ c\noBeam #] % BeamForbidEvent \test ##[ c\1 #] % StringNumberEvent -\test ##[ { c: c:1 } #] % TremoloEvent +\test ##[ { c:8 c:1 } #] % TremoloEvent \test ##[ { c-^ c^^ c_^ } #] % ArticulationEvent \test ##[ { c-+ c^+ c_+ } #] \test ##[ { c-- c^- c_- } #] diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm index 431f9a6e95..c4ed534478 100644 --- a/scm/define-music-display-methods.scm +++ b/scm/define-music-display-methods.scm @@ -167,10 +167,8 @@ expression." (define-display-method TremoloEvent (event parser) - (let ((tremolo-type (ly:music-property event 'tremolo-type))) - (format #f ":~a" (if (= 0 tremolo-type) - "" - tremolo-type)))) + (let ((tremolo-type (ly:music-property event 'tremolo-type 8))) + (format #f ":~a" tremolo-type))) (define-display-method ArticulationEvent (event parser) #t (let* ((articulation (ly:music-property event 'articulation-type)) -- 2.39.5