*** 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 7f21e6a954070900800d3e433c7ecadbfd2ef617..681e61ba4e240a62c8bd3a632d264e2764bcd4cf 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -15,7 +15,7 @@
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "self-alignment-interface.hh"
-#include "script.hh"
+#include "script-interface.hh"
 #include "stem.hh"
 
 struct Finger_tuple
@@ -24,7 +24,7 @@ struct Finger_tuple
   Grob *script_;
   Music *note_event_;
   Music *finger_event_;
-  SCM description_;
+  bool follow_into_staff_;
   int position_;
 
   Finger_tuple ()
@@ -32,7 +32,7 @@ struct Finger_tuple
     position_ = 0;
     head_ = script_ = 0;
     note_event_ = finger_event_ = 0;
-    description_ = SCM_EOL;
+    follow_into_staff_ = false;
   }
   static int compare (Finger_tuple const & c1, Finger_tuple const & c2)
   {
@@ -64,12 +64,14 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf)
   if (Rhythmic_head::has_interface (inf.grob_))
     {
       Music * note_ev =inf.music_cause ();
-
+      if (!note_ev)
+       return;
+      
       SCM arts = note_ev->get_property ("articulations");
 
-      for (SCM s = arts; gh_pair_p (s); s = gh_cdr  (s))
+      for (SCM s = arts; scm_is_pair (s); s = scm_cdr  (s))
        {
-         Music * m = unsmob_music (gh_car (s));
+         Music * m = unsmob_music (scm_car (s));
 
          if (!m)
            continue;
@@ -111,15 +113,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.follow_into_staff_, 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,12 +134,11 @@ 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);
 
-  int d = gh_scm2int (event->get_property ("digit"));
+  int d = scm_to_int (event->get_property ("digit"));
   
   /*
     TODO:
@@ -154,7 +154,7 @@ New_fingering_engraver::add_fingering (Grob * head,
        */
       event->origin ()->warning (_("music for the martians."));
     }
-  SCM sstr = scm_number_to_string (gh_int2scm (d), gh_int2scm (10)) ;
+  SCM sstr = scm_number_to_string (scm_int2num (d), scm_int2num (10)) ;
   ft.script_->set_property ("text", sstr);
        
   ft.finger_event_ = event;
@@ -179,7 +179,7 @@ New_fingering_engraver::position_scripts ()
   */
   for (int i = 0; i < fingerings_.size (); i++)
     {      
-      fingerings_[i].position_ = gh_scm2int (fingerings_[i].head_ -> get_property ( "staff-position"));
+      fingerings_[i].position_ = scm_to_int (fingerings_[i].head_ -> get_property ( "staff-position"));
     }
 
   for (int i = fingerings_.size (); i--;)
@@ -247,8 +247,7 @@ New_fingering_engraver::position_scripts ()
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, Y_AXIS);
       f->add_offset_callback (Side_position_interface::aligned_side_proc, X_AXIS);
 
-      f->set_property ("direction", gh_int2scm (hordir));
-      typeset_grob (f);
+      f->set_property ("direction", scm_int2num (hordir));
     }
 
   int finger_prio = 200;
@@ -258,14 +257,13 @@ New_fingering_engraver::position_scripts ()
       Grob* f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_property ("script-priority",
-                           gh_int2scm (finger_prio + i));
+                           scm_int2num (finger_prio + i));
       f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS);
       f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);
       
-      f->set_property ("direction", gh_int2scm (UP));
+      f->set_property ("direction", scm_int2num (UP));
 
-      typeset_grob (f);
     }
   
   for (int i = 0; i < down.size (); i++)
@@ -274,13 +272,12 @@ New_fingering_engraver::position_scripts ()
       Grob* f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_property ("script-priority",
-                           gh_int2scm (finger_prio + down.size () - i));
+                           scm_int2num (finger_prio + down.size () - i));
 
       f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
       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", gh_int2scm (DOWN));
-      typeset_grob (f);
+      f->set_property ("direction", scm_int2num (DOWN));
     }
 }
 
@@ -289,27 +286,32 @@ New_fingering_engraver::stop_translation_timestep ()
 {
   if (fingerings_.size ())
     {
+      for (int i = 0;  i < fingerings_.size(); i++)
+       if (stem_ && to_boolean (fingerings_[i].script_->get_property ("add-stem-support")))
+         Side_position_interface::add_support (fingerings_[i].script_, stem_);
       position_scripts ();
       fingerings_.clear ();
     }
   
   for (int i =  articulations_.size (); i--;)
     {
-      Grob *sc = articulations_[i].script_;
+      Grob *script = articulations_[i].script_;
    
       for (int j = heads_.size () ; j--;)
-       Side_position_interface::add_support (sc, heads_[j]);
+       Side_position_interface::add_support (script, heads_[j]);
+
+      if (stem_ && to_dir (script->get_property ("side-relative-direction")))
+       script->set_property ("direction-source", stem_->self_scm ());
+
 
-      if (stem_ && to_dir (sc->get_property ("side-relative-direction")))
-       sc->set_property ("direction-source", stem_->self_scm ());
+      if (stem_ && to_boolean (script->get_property ("add-stem-support")))
+       Side_position_interface::add_support (script, stem_);
       
-      SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), articulations_[i].description_);
-      if (gh_pair_p (follow) && to_boolean (gh_cdr (follow)))
+      if (articulations_[i].follow_into_staff_)
        {
-         sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
-         sc->set_property ("staff-padding" , SCM_EOL);
+         script->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
+         script->set_property ("staff-padding" , SCM_EOL);
        }
-      typeset_grob (sc);
     }
 
   stem_ = 0;