*** empty log message ***

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

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 9020cf334e5429f6552c3fa1d20b006d9dd0dd78..2368748c2a41e30fc9c62d461bf474ac4324189b 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -1,12 +1,21 @@
+/*   
+figured-bass-engraver.cc --  implement Figured_bass_engraver
+
+source file of the GNU LilyPond music typesetter
+
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
 #include "engraver.hh"
 #include "text-item.hh"
-#include "request.hh"
+#include "event.hh"
 #include "item.hh"
+#include "context.hh"
 
 class Figured_bass_engraver : public Engraver
 {
-  
-  TRANSLATOR_DECLARATIONS(Figured_bass_engraver);
+  TRANSLATOR_DECLARATIONS (Figured_bass_engraver);
 protected:
   Link_array<Music> figures_;
   Music * rest_req_;
@@ -19,7 +28,7 @@ protected:
 };
 
 
-Figured_bass_engraver::Figured_bass_engraver()
+Figured_bass_engraver::Figured_bass_engraver ()
 {
   figure_ = 0;
   rest_req_ = 0;
@@ -28,11 +37,7 @@ Figured_bass_engraver::Figured_bass_engraver()
 void
 Figured_bass_engraver::stop_translation_timestep ()
 {
-  if (figure_)
-    {
-      typeset_grob (figure_);
-      figure_ = 0;
-    }
+  figure_ = 0;
 
   figures_.clear ();
   rest_req_ = 0;
@@ -59,28 +64,33 @@ Figured_bass_engraver::process_music ()
 {
   if (rest_req_)
     {
-      figure_ = new Item (get_property ("BassFigure"));
-      announce_grob(figure_, rest_req_->self_scm()); // todo
-      figure_->set_grob_property ("text" , scm_makfrom0str ("-"));
+      figure_ = make_item ("BassFigure", rest_req_->self_scm ());
+      figure_->set_property ("text" , scm_makfrom0str ("-"));
     }
   else if (figures_.size ())
     {
-      figure_ = new Item (get_property ("BassFigure"));
-      SCM l = SCM_EOL;
-
-      for (int i = 0; i <figures_.size (); i++)
-       l = gh_cons (figures_[i]->self_scm(), l);
-      figure_->set_grob_property ("causes", l);
-      
-      announce_grob(figure_, figures_[0]->self_scm()); // todo
+      SCM proc = get_property ("bassFigureFormatFunction");
+      if (ly_c_procedure_p (proc)) 
+       {
+         SCM l = SCM_EOL;
+         SCM * t = &l;
+         for (int i = 0; i < figures_.size (); i++)
+           {
+             *t = scm_cons (figures_[i]->self_scm (), SCM_EOL);
+             t = SCM_CDRLOC (*t);
+           }
+         figure_ = make_item ("BassFigure", figures_[0]->self_scm ());
+         scm_call_3 (proc, l, context ()->self_scm (),
+                     figure_->self_scm ());
+       }
     }
 }
 
   
-ENTER_DESCRIPTION(Figured_bass_engraver,
+ENTER_DESCRIPTION (Figured_bass_engraver,
 /* descr */       "Make figured bass numbers.",
 /* creats*/       "BassFigure",
 /* accepts */     "rest-event bass-figure-event",
 /* acks  */      "",
-/* reads */       "",
+/* reads */       "bassFigureFormatFunction",
 /* write */       "");