patch::: 1.3.8.uu1

[lilypond.git] / lily / tuplet-engraver.cc

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index c067169a8c4aeb906470d2fa99c291e91d44e768..e1e0f54c8542b6e2ed70663bed33152470b5b791 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -35,13 +35,13 @@ void
 Tuplet_engraver::do_process_requests ()
 {
   int dir = 0;
-  Scalar prop = get_property ("tupletDirection", 0);
-  if (prop.isnum_b())
-    dir = (int)prop;
+  SCM prop = get_property ("tupletDirection", 0);
+  if (isdir_b (prop))
+    dir = to_dir (prop);
   int visibility = 3;
   prop = get_property ("tupletVisibility", 0);
-  if (prop.isnum_b())
-    visibility = (int)prop;
+  if (gh_number_p(prop))
+    visibility = gh_scm2int (prop);    // bool ?
 
   for (int i= started_span_p_arr_.size ();
        i < time_scaled_music_arr_.size (); i++)
@@ -49,10 +49,10 @@ Tuplet_engraver::do_process_requests ()
       Tuplet_spanner* glep = new Tuplet_spanner;
       started_span_p_arr_.push (glep);
       glep->number_str_ = to_str (time_scaled_music_arr_[i]->den_i_);
-      glep->set_elt_property(tuplet_visibility_scm_sym,
+      glep->set_elt_property("tuplet-visibility",
                              gh_int2scm (visibility));
       if (dir != 0)
-       glep->set_elt_property(dir_forced_scm_sym, gh_int2scm (dir));
+       glep->set_elt_property("dir-forced", gh_int2scm (dir));
       announce_element (Score_element_info (glep, time_scaled_music_arr_ [i]));
     }
 }
@@ -60,8 +60,10 @@ Tuplet_engraver::do_process_requests ()
 void
 Tuplet_engraver::acknowledge_element (Score_element_info i)
 {
-  bool grace= (i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F);
-  if (grace != get_property ("weAreGraceContext",0).to_bool ())
+  bool grace= (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED);
+  SCM wg = get_property ("weAreGraceContext",0);
+  bool wgb = gh_boolean_p (wg) && gh_scm2bool (wg);
+  if (grace != wgb)
     return;
   
   if (Note_column *nc = dynamic_cast<Note_column *> (i.elem_l_))
@@ -103,3 +105,4 @@ Tuplet_engraver::do_removal_processing ()
 
 ADD_THIS_TRANSLATOR(Tuplet_engraver);
 
+