From c478b5582949a0dc5f0aef8c6e7ebc453e8b77b4 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Fri, 24 Mar 2017 10:16:22 +0100 Subject: [PATCH] Issue 5106: Don't widespace \set/\unset arguments in display \displayLilyMusic \set Score.skipBars = #3 was displayed as \displayLilyMusic \set Score . skipBars = #3 as opposed to the entry method recommended now and already implemented for the display of \override/\revert . --- input/regression/display-lily-tests.ly | 6 +++--- scm/define-music-display-methods.scm | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index d96e40d21f..55d86c3516 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -215,12 +215,12 @@ stderr of this run." \remove "Clef_engraver" } { c4 d4 } #] %% Context properties -\test ##[ \once \set Score . skipBars = ##t #] % PropertySet +\test ##[ \once \set Score.skipBars = ##t #] % PropertySet \test ##[ \set autoBeaming = ##f #] -\test ##[ \unset Score . skipBars #] % PropertyUnset +\test ##[ \unset Score.skipBars #] % PropertyUnset \test ##[ \unset autoBeaming #] %% Layout properties -\test ##[ \override Staff.Stem.thickness = #4.0 #] % OverrideProperty +\test ##[ \override Staff.Stem.thickness = #4.0 #] % OverrideProperty \test ##[ \once \override Beam.beam-thickness = #0.6 #] \test ##[ \revert Staff.Stem.thickness #] % RevertProperty \test ##[ \revert Beam.beam-thickness #] diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm index 492050a9ba..a61c2e8b18 100644 --- a/scm/define-music-display-methods.scm +++ b/scm/define-music-display-methods.scm @@ -803,9 +803,9 @@ Otherwise, return #f." (if (and (not (null? once))) "\\once " "") - (if (eqv? (*current-context*) 'Bottom) + (if (eq? (*current-context*) 'Bottom) "" - (format #f "~a . " (*current-context*))) + (format #f "~a." (*current-context*))) property (value->lily-string value) (new-line->lily-string)))) @@ -813,9 +813,9 @@ Otherwise, return #f." (define-display-method PropertyUnset (expr) (format #f "~a\\unset ~a~a~a" (if (ly:music-property expr 'once #f) "\\once " "") - (if (eqv? (*current-context*) 'Bottom) + (if (eq? (*current-context*) 'Bottom) "" - (format #f "~a . " (*current-context*))) + (format #f "~a." (*current-context*))) (ly:music-property expr 'symbol) (new-line->lily-string))) -- 2.39.2