From 411e25bc64574f41af48b906932f69c3377b8bd7 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 4 Feb 2017 16:34:09 +0100 Subject: [PATCH] Issue 5054: Fix SCM/int confusion in clef engravers Tests for explicitClefVisibility and explicitCueClefVisibility were fishy. --- lily/clef-engraver.cc | 9 +++++---- lily/cue-clef-engraver.cc | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 5d30ce07c2..05c9420623 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -191,12 +191,13 @@ Clef_engraver::stop_translation_timestep () { if (clef_) { - SCM vis = 0; if (to_boolean (clef_->get_property ("non-default"))) - vis = get_property ("explicitClefVisibility"); + { + SCM vis = get_property ("explicitClefVisibility"); - if (vis) - clef_->set_property ("break-visibility", vis); + if (scm_is_vector (vis)) + clef_->set_property ("break-visibility", vis); + } clef_ = 0; diff --git a/lily/cue-clef-engraver.cc b/lily/cue-clef-engraver.cc index b39b5ba34d..cf7f0bd968 100644 --- a/lily/cue-clef-engraver.cc +++ b/lily/cue-clef-engraver.cc @@ -198,12 +198,13 @@ Cue_clef_engraver::stop_translation_timestep () { if (clef_) { - SCM vis = 0; if (to_boolean (clef_->get_property ("non-default"))) - vis = get_property ("explicitCueClefVisibility"); + { + SCM vis = get_property ("explicitCueClefVisibility"); - if (vis) - clef_->set_property ("break-visibility", vis); + if (scm_is_vector (vis)) + clef_->set_property ("break-visibility", vis); + } clef_ = 0; modifier_ = 0; -- 2.39.2