X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Fproperty-engraver.cc;h=9861866e82442545206b97bdfc2f00153a1dd147;hb=0af6d4cb04fa3e4aa69a7aecb76034e4cb1ec49b;hp=baddf06bb6999e70cb79cbb886da892cefa0c98f;hpb=ef0696c47e7b5e3f7f2b018bca3d9eaef62439b0;p=lilypond.git diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index baddf06bb6..9861866e82 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -109,7 +109,7 @@ Property_engraver::apply_properties (SCM p, Score_element *e, Translator_group*o SCM val = get_property (prop_sym); - if (val == SCM_UNDEFINED) + if (val == SCM_EOL) ; // Not defined in context. else if (gh_apply (type_p, scm_listify (val, SCM_UNDEFINED)) == SCM_BOOL_T) // defined and right type: do it @@ -135,16 +135,16 @@ Property_engraver::apply_properties (SCM p, Score_element *e, Translator_group*o else /* - we don't print a warning if VAL == #f, because we would + we don't print a warning if VAL == (), because we would get lots of warnings when we restore stuff to default, eg. - slurDash = #1 [...] slurDash = ##f + slurDash = #1 [...] slurDash = () should not cause "type error: slurDash expects number not - boolean" + boolean */ - if (val != SCM_BOOL_F) + if (val != SCM_EOL) { // not the right type: error message. SCM errport = scm_current_error_port (); warning (_("Wrong type for property"));