Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index a473cc808fe16124493a7f222da858884e0faa2d..a8c4fcf68085bedfe8c5f78bd7e2306cc6345d8b 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -13,20 +13,19 @@
 #include "self-alignment-interface.hh"
 #include "pitch.hh"
 
-
 class Fingering_engraver : public Engraver
 {
-  Link_array<Music> events_;
-  Link_array<Item> fingerings_;
+  vector<Music*> events_;
+  vector<Item*> fingerings_;
 
 public:
   TRANSLATOR_DECLARATIONS (Fingering_engraver);
 protected:
   virtual bool try_music (Music *m);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
-  DECLARE_ACKNOWLEDGER(stem);
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
 
 private:
   void make_script (Direction, Music *, int);
@@ -37,7 +36,7 @@ Fingering_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("fingering-event"))
     {
-      events_.push (m);
+      events_.push_back (m);
       return true;
     }
   return false;
@@ -46,16 +45,14 @@ Fingering_engraver::try_music (Music *m)
 void
 Fingering_engraver::acknowledge_stem (Grob_info inf)
 {
-  for (int i = 0; i < fingerings_.size (); i++)
-    {
-      Side_position_interface::add_support (fingerings_[i], inf.grob ());
-    }
+  for (vsize i = 0; i < fingerings_.size (); i++)
+    Side_position_interface::add_support (fingerings_[i], inf.grob ());
 }
 
 void
 Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 {
-  for (int i = 0; i < fingerings_.size (); i++)
+  for (vsize i = 0; i < fingerings_.size (); i++)
     {
       Grob *t = fingerings_[i];
       Side_position_interface::add_support (t, inf.grob ());
@@ -67,7 +64,7 @@ Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 void
 Fingering_engraver::process_music ()
 {
-  for (int i = events_.size (); i--;)
+  for (vsize i = events_.size (); i--;)
     {
       SCM dir = events_[i]->get_property ("direction");
       make_script (to_dir (dir), events_[i], i);
@@ -78,8 +75,6 @@ void
 Fingering_engraver::make_script (Direction d, Music *r, int i)
 {
   Item *fingering = make_item ("Fingering", r->self_scm ());
-  Axis a = Y_AXIS;
-  Axis other = other_axis (a);
 
   /*
     Huh, what's this for? --hwn.
@@ -94,9 +89,9 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
     We can't fold these definitions into define-grobs since
     fingerings for chords need different settings.
   */
-  Side_position_interface::set_axis (fingering, a);
-  fingering->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, other);
-  fingering->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, other);
+  Side_position_interface::set_axis (fingering, Y_AXIS);
+  Self_alignment_interface::set_align_self (fingering, X_AXIS);
+  Self_alignment_interface::set_center_parent (fingering, X_AXIS);
 
   // Hmm
   int priority = 200;
@@ -107,20 +102,20 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
   /* See script-engraver.cc */
   priority += i;
 
-  fingering->set_property ("script-priority", scm_int2num (priority));
+  fingering->set_property ("script-priority", scm_from_int (priority));
 
-  if (!is_direction (fingering->get_property ("direction")))
+  if (!is_direction (fingering->get_property_data (ly_symbol2scm ("direction"))))
     {
       if (d)
-       fingering->set_property ("direction", scm_int2num (d));
+       fingering->set_property ("direction", scm_from_int (d));
       else
-       fingering->set_property ("direction", scm_int2num (RIGHT));
+       fingering->set_property ("direction", scm_from_int (RIGHT));
     }
 
   SCM dig = r->get_property ("digit");
-  fingering->set_property ("text", scm_number_to_string (dig, scm_int2num (10)));
+  fingering->set_property ("text", scm_number_to_string (dig, scm_from_int (10)));
 
-  fingerings_.push (fingering);
+  fingerings_.push_back (fingering);
 }
 
 void
@@ -139,11 +134,11 @@ Fingering_engraver::Fingering_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Fingering_engraver,rhythmic_head);
-ADD_ACKNOWLEDGER(Fingering_engraver,stem);
+ADD_ACKNOWLEDGER (Fingering_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Fingering_engraver, stem);
 ADD_TRANSLATOR (Fingering_engraver,
-               /* descr */ "Create fingering-scripts",
-               /* creats*/ "Fingering",
-               /* accepts */ "fingering-event",
-               /* reads */ "",
+               /* doc */ "Create fingering-scripts",
+               /* create */ "Fingering",
+               /* accept */ "fingering-event",
+               /* read */ "",
                /* write */ "");