*** empty log message ***

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

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 67078978c878522d16ba436d9ab294a5b4f734be..4d5a1644bbfeec172fb633e24a533753010d87cc 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -50,7 +50,7 @@ Script_engraver::try_music (Music *r)
        This is necessary for part-combining.
        */
       for (int j = 0; j < scripts_.size (); j++)
-       if (is_equal (scripts_[j]. event_->get_property ("articulation-type"),
+       if (ly_c_equal_p (scripts_[j]. event_->get_property ("articulation-type"),
                        r->get_property ("articulation-type")
                        ))
          return true;
@@ -70,7 +70,7 @@ copy_property (Grob * g , SCM sym, SCM alist)
   if (g->internal_get_property (sym) == SCM_EOL)
     {
       SCM entry = scm_assoc (sym,alist);
-      if (is_pair (entry))
+      if (ly_c_pair_p (entry))
        {
          g->internal_set_property (sym, ly_cdr (entry));
        }
@@ -110,7 +110,7 @@ void make_script_from_event (Grob *p,
 
   int prio =0;
   SCM sprio = scm_assoc (ly_symbol2scm ("script-priority"), art);
-  if (is_pair (sprio))
+  if (ly_c_pair_p (sprio))
     prio = ly_scm2int (ly_cdr (sprio));
 
 
@@ -132,9 +132,9 @@ Script_engraver::process_music ()
     {
       Music* l=scripts_[i].event_;
 
-      Grob * p = make_item ("Script");
+      Grob * p = make_item ("Script", l->self_scm ());
 
-      make_script_from_event (p, &scripts_[i].description_, daddy_context_,
+      make_script_from_event (p, &scripts_[i].description_, context (),
                              l->get_property ("articulation-type"),
                              i);
 
@@ -144,9 +144,6 @@ Script_engraver::process_music ()
       SCM force_dir = l->get_property ("direction");
       if (is_direction (force_dir) && to_dir (force_dir))
        p->set_property ("direction", force_dir);
-      
-      if (p)
-       announce_grob (p, l->self_scm ());
     }
 }
 
@@ -219,12 +216,11 @@ Script_engraver::stop_translation_timestep ()
       Grob * sc = scripts_[i].script_;
 
       SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), scripts_[i].description_);
-      if (is_pair (follow) && to_boolean (ly_cdr (follow)))
+      if (ly_c_pair_p (follow) && to_boolean (ly_cdr (follow)))
        {
          sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
          sc->set_property ("staff-padding", SCM_EOL);
        }
-      typeset_grob (sc);
     }
   scripts_.clear ();
 }