* lily/paper-outputter.cc (output_expr):

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 40044e0066165e6bf3f516a58dbae34e01cd9157..1b8d53f7924baabcfb613d695fa7d86088c36f7e 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -22,7 +22,7 @@ class Fingering_engraver : public Engraver
   Link_array<Item> fingerings_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Fingering_engraver);
+  TRANSLATOR_DECLARATIONS (Fingering_engraver);
 protected:
   virtual bool try_music (Music* m);
   virtual void stop_translation_timestep ();
@@ -69,9 +69,9 @@ Fingering_engraver::acknowledge_grob (Grob_info inf)
 void
 Fingering_engraver::process_music ()
 {
-  for (int i= reqs_.size(); i--;)
+  for (int i= reqs_.size (); i--;)
     {
-      SCM dir = reqs_[i]->get_mus_property ("direction");
+      SCM dir = reqs_[i]->get_property ("direction");
       make_script (to_dir (dir), reqs_[i], Y_AXIS, i);
     }
 }
@@ -79,13 +79,13 @@ Fingering_engraver::process_music ()
 void
 Fingering_engraver::make_script (Direction d, Music *r,Axis a,  int i)
 {
-  Item *fingering = new Item (get_property ("Fingering"));
+  Item *fingering = make_item ("Fingering");
 
   Axis other = other_axis (a);
 
-  SCM pitch = r->get_mus_property ("pitch");
+  SCM pitch = r->get_property ("pitch");
   if (unsmob_pitch (pitch))
-    fingering->set_grob_property ("pitch", pitch);
+    fingering->set_property ("pitch", pitch);
   
   Side_position_interface::set_axis (fingering, a);
       
@@ -94,28 +94,28 @@ Fingering_engraver::make_script (Direction d, Music *r,Axis a,  int i)
 
   // Hmm
   int priority = 200;
-  SCM s = fingering->get_grob_property ("script-priority");
+  SCM s = fingering->get_property ("script-priority");
   if (gh_number_p (s))
     priority = gh_scm2int (s);
   
   /* See script-engraver.cc */
   priority += i;
 
-  fingering->set_grob_property ("script-priority", gh_int2scm (priority));
+  fingering->set_property ("script-priority", gh_int2scm (priority));
 
 
-  if (!ly_dir_p (fingering->get_grob_property ("direction")))
+  if (!is_direction (fingering->get_property ("direction")))
     {
       if (d)
-       fingering->set_grob_property ("direction", gh_int2scm (d));
+       fingering->set_property ("direction", gh_int2scm (d));
       else
-       fingering->set_grob_property ("direction",  gh_int2scm (RIGHT));
+       fingering->set_property ("direction",  gh_int2scm (RIGHT));
     }
 
-  SCM dig =  r->get_mus_property ("digit");
-  fingering->set_grob_property ("text", scm_number_to_string (dig, gh_int2scm (10)));
+  SCM dig =  r->get_property ("digit");
+  fingering->set_property ("text", scm_number_to_string (dig, gh_int2scm (10)));
 
-  announce_grob (fingering, r->self_scm());
+  announce_grob (fingering, r->self_scm ());
   fingerings_.push (fingering);
 }
 
@@ -128,7 +128,6 @@ Fingering_engraver::stop_translation_timestep ()
   for (int i=0; i < fingerings_.size (); i++)
     {
       Item *ti = fingerings_[i];
-      Side_position_interface::add_staff_support (ti);
       typeset_grob (ti);
     }
   fingerings_.clear ();
@@ -140,15 +139,15 @@ Fingering_engraver::start_translation_timestep ()
   reqs_.clear ();
 }
 
-Fingering_engraver::Fingering_engraver()
+Fingering_engraver::Fingering_engraver ()
 {
 
 }
 
-ENTER_DESCRIPTION(Fingering_engraver,
+ENTER_DESCRIPTION (Fingering_engraver,
 /* descr */       "Create fingering-scripts",
 /* creats*/       "Fingering",
 /* accepts */     "fingering-event",
 /* acks  */      "rhythmic-head-interface stem-interface",
-/* reads */       "fingersHorizontal",
+/* reads */       "",
 /* write */       "");