*** 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 3dbb171395178ddc75d91674afcde5fc07f092be..e1a71795b373c9beba568a1a77c589f357cc3531 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -10,8 +10,6 @@
 #include "warn.hh"
 #include "engraver.hh"
 #include "side-position-interface.hh"
-#include "item.hh"
-#include "event.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "self-alignment-interface.hh"
@@ -24,7 +22,7 @@ struct Finger_tuple
   Grob *script_;
   Music *note_event_;
   Music *finger_event_;
-  SCM description_;
+  bool follow_into_staff_;
   int position_;
 
   Finger_tuple ()
@@ -32,7 +30,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)
   {
@@ -63,15 +61,15 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Rhythmic_head::has_interface (inf.grob_))
     {
-      Music * note_ev =inf.music_cause ();
+      Music * note_ev = inf.music_cause ();
       if (!note_ev)
        return;
       
       SCM arts = note_ev->get_property ("articulations");
 
-      for (SCM s = arts; ly_c_pair_p (s); s = ly_cdr  (s))
+      for (SCM s = arts; scm_is_pair (s); s = scm_cdr  (s))
        {
-         Music * m = unsmob_music (ly_car (s));
+         Music * m = unsmob_music (scm_car (s));
 
          if (!m)
            continue;
@@ -113,12 +111,12 @@ New_fingering_engraver::add_script (Grob * head,
 {
   Finger_tuple ft ;
 
-  Grob * g=  make_item ("Script", event->self_scm () );
-  make_script_from_event (g, &ft.description_, 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 ;
+      ft.script_ = g ;
       
       articulations_.push (ft);
  
@@ -138,7 +136,7 @@ New_fingering_engraver::add_fingering (Grob * head,
   
   Side_position_interface::add_support (ft.script_, head);
 
-  int d = ly_scm2int (event->get_property ("digit"));
+  int d = scm_to_int (event->get_property ("digit"));
   
   /*
     TODO:
@@ -179,7 +177,7 @@ New_fingering_engraver::position_scripts ()
   */
   for (int i = 0; i < fingerings_.size (); i++)
     {      
-      fingerings_[i].position_ = ly_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--;)
@@ -286,25 +284,31 @@ 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 (sc->get_property ("side-relative-direction")))
-       sc->set_property ("direction-source", stem_->self_scm ());
+      if (stem_ && to_dir (script->get_property ("side-relative-direction")))
+       script->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 (ly_c_pair_p (follow) && to_boolean (ly_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);
        }
     }