* lily/include/translator.icc: new file.

[lilypond.git] / lily / figured-bass-engraver.cc

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 2a63c10a5e5684ae2813e63fcb5855d9e388bfd6..daddfaf972123e78eda9f4178c8066bbb71a32a7 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -1,14 +1,13 @@
-/*   
-figured-bass-engraver.cc --  implement Figured_bass_engraver
+/*
+  figured-bass-engraver.cc -- implement Figured_bass_engraver
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "engraver.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "item.hh"
 #include "context.hh"
 
@@ -17,20 +16,19 @@ class Figured_bass_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Figured_bass_engraver);
 protected:
   Link_array<Music> figures_;
-  Music * rest_req_;
+  Music *rest_event_;
 
-  Grob * figure_;
-  
-  virtual bool try_music (Music*);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
-};
+  Grob *figure_;
 
+  virtual bool try_music (Music *);
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void process_music ();
+};
 
 Figured_bass_engraver::Figured_bass_engraver ()
 {
   figure_ = 0;
-  rest_req_ = 0;
+  rest_event_ = 0;
 }
 
 void
@@ -39,11 +37,11 @@ Figured_bass_engraver::stop_translation_timestep ()
   figure_ = 0;
 
   figures_.clear ();
-  rest_req_ = 0;
+  rest_event_ = 0;
 }
 
 bool
-Figured_bass_engraver::try_music (Music*m)
+Figured_bass_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("bass-figure-event"))
     {
@@ -52,7 +50,7 @@ Figured_bass_engraver::try_music (Music*m)
     }
   else if (m->is_mus_type ("rest-event"))
     {
-      rest_req_ = m;
+      rest_event_ = m;
       return true;
     }
   return false;
@@ -61,18 +59,18 @@ Figured_bass_engraver::try_music (Music*m)
 void
 Figured_bass_engraver::process_music ()
 {
-  if (rest_req_)
+  if (rest_event_)
     {
-      figure_ = make_item ("BassFigure", rest_req_->self_scm ());
-      figure_->set_property ("text" , scm_makfrom0str ("-"));
+      figure_ = make_item ("BassFigure", rest_event_->self_scm ());
+      figure_->set_property ("text", scm_makfrom0str ("-"));
     }
   else if (figures_.size ())
     {
       SCM proc = get_property ("bassFigureFormatFunction");
-      if (ly_c_procedure_p (proc)) 
+      if (ly_is_procedure (proc))
        {
          SCM l = SCM_EOL;
-         SCM * t = &l;
+         SCM *t = &l;
          for (int i = 0; i < figures_.size (); i++)
            {
              *t = scm_cons (figures_[i]->self_scm (), SCM_EOL);
@@ -85,11 +83,12 @@ Figured_bass_engraver::process_music ()
     }
 }
 
-  
+#include "translator.icc"
+
 ADD_TRANSLATOR (Figured_bass_engraver,
-/* descr */       "Make figured bass numbers.",
-/* creats*/       "BassFigure",
-/* accepts */     "rest-event bass-figure-event",
-/* acks  */      "",
-/* reads */       "bassFigureFormatFunction",
-/* write */       "");
+               /* descr */ "Make figured bass numbers.",
+               /* creats*/ "BassFigure",
+               /* accepts */ "rest-event bass-figure-event",
+               /* acks  */ "",
+               /* reads */ "bassFigureFormatFunction",
+               /* write */ "");