*** empty log message ***

[lilypond.git] / lily / new-fingering-engraver.cc

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 54ec772291b8ca48b7dd380dc1a2e258993cdc76..c9a359e9a4427d64c51b6ae98de10b6bc63032ee 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -67,7 +67,7 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf)
 
       SCM arts = note_ev->get_property ("articulations");
 
-      for (SCM s = arts; ly_pair_p (s); s = ly_cdr  (s))
+      for (SCM s = arts; ly_c_pair_p (s); s = ly_cdr  (s))
        {
          Music * m = unsmob_music (ly_car (s));
 
@@ -111,15 +111,14 @@ New_fingering_engraver::add_script (Grob * head,
 {
   Finger_tuple ft ;
 
-  Grob * g=  make_item ("Script");
-  make_script_from_event (g, &ft.description_, daddy_context_,
+  Grob * g=  make_item ("Script", event->self_scm () );
+  make_script_from_event (g, &ft.description_, context (),
                          event->get_property ("articulation-type"), 0);
   if (g)
     {
       ft.script_ =g ;
       
       articulations_.push (ft);
-      announce_grob (g, event->self_scm ());
  
       ft.script_->set_parent (head, X_AXIS);
     }
@@ -133,8 +132,7 @@ New_fingering_engraver::add_fingering (Grob * head,
 {
   Finger_tuple ft;
 
-  ft.script_ = make_item ("Fingering");
-  announce_grob (ft.script_, event->self_scm ());
+  ft.script_ = make_item ("Fingering", event->self_scm () );
   
   Side_position_interface::add_support (ft.script_, head);
 
@@ -248,7 +246,6 @@ New_fingering_engraver::position_scripts ()
       f->add_offset_callback (Side_position_interface::aligned_side_proc, X_AXIS);
 
       f->set_property ("direction", scm_int2num (hordir));
-      typeset_grob (f);
     }
 
   int finger_prio = 200;
@@ -265,7 +262,6 @@ New_fingering_engraver::position_scripts ()
       
       f->set_property ("direction", scm_int2num (UP));
 
-      typeset_grob (f);
     }
   
   for (int i = 0; i < down.size (); i++)
@@ -280,7 +276,6 @@ New_fingering_engraver::position_scripts ()
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);
       f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS);
       f->set_property ("direction", scm_int2num (DOWN));
-      typeset_grob (f);
     }
 }
 
@@ -304,12 +299,11 @@ New_fingering_engraver::stop_translation_timestep ()
        sc->set_property ("direction-source", stem_->self_scm ());
       
       SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), articulations_[i].description_);
-      if (ly_pair_p (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);
     }
 
   stem_ = 0;