release: 1.3.16

[lilypond.git] / lily / rhythmic-column-engraver.cc

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 5862e6f790e2910aae9d633fff7fb52177618a4d..2709b60a82568c89481782773b4994b45759896c 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -59,7 +59,7 @@ Rhythmic_column_engraver::process_acknowledged ()
        }
 
       SCM wg = get_property ("weAreGraceContext",0);
-      bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
+      bool wegrace = to_boolean (wg);
 
       if (!wegrace)
        for (int i=0; i < grace_slur_endings_.size(); i++)
@@ -72,9 +72,9 @@ void
 Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
 {
   SCM wg = get_property ("weAreGraceContext",0);
-  bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
+  bool wegrace = to_boolean (wg);
   if ((wegrace !=
-      (i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F))
+      (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED))
     && !dynamic_cast<Slur*> (i.elem_l_))
     return ;
   
@@ -97,7 +97,7 @@ Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
        end slurs starting on grace notes
        */
       
-      if (s->get_elt_property (grace_scm_sym) != SCM_BOOL_F)
+      if (s->get_elt_property ("grace") != SCM_UNDEFINED)
        grace_slur_endings_.push (s);
    }
 }
@@ -121,3 +121,4 @@ Rhythmic_column_engraver::do_post_move_processing()
 }
 
 ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
+