* Another grand 2003 update.

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

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 9e97d0e0181980f561b077faac36bf82c07a21ab..c792ac795c7abd8a695ed02e44706028c18f3991 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -1,15 +1,24 @@
+/*   
+figured-bass-engraver.cc --  implement Figured_bass_engraver
+
+source file of the GNU LilyPond music typesetter
+
+(c)  2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
 #include "engraver.hh"
 #include "text-item.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "item.hh"
+#include "translator-group.hh"
 
 class Figured_bass_engraver : public Engraver
 {
-  
   TRANSLATOR_DECLARATIONS(Figured_bass_engraver);
 protected:
-  Link_array<Bass_figure_req> figures_;
-  Rest_req * rest_req_;
+  Link_array<Music> figures_;
+  Music * rest_req_;
 
   Grob * figure_;
   
@@ -41,14 +50,14 @@ Figured_bass_engraver::stop_translation_timestep ()
 bool
 Figured_bass_engraver::try_music (Music*m)
 {
-  if (Bass_figure_req* bfr = dynamic_cast<Bass_figure_req*> (m))
+  if (m->is_mus_type ("bass-figure-event"))
     {
-      figures_.push (bfr);
+      figures_.push (m);
       return true;
     }
-  else if (Rest_req * r = dynamic_cast<Rest_req*> (m))
+  else if (m->is_mus_type ("rest-event"))
     {
-      rest_req_ = r;
+      rest_req_ = m;
       return true;
     }
   return false;
@@ -61,25 +70,32 @@ Figured_bass_engraver::process_music ()
     {
       figure_ = new Item (get_property ("BassFigure"));
       announce_grob(figure_, rest_req_->self_scm()); // todo
-      figure_->set_grob_property ("text" , ly_str02scm ("-"));
+      figure_->set_grob_property ("text" , scm_makfrom0str ("-"));
     }
   else if (figures_.size ())
     {
-      figure_ = new Item (get_property ("BassFigure"));
-      SCM l = SCM_EOL;
+      SCM proc = get_property ("bassFigureFormatFunction");
+      if (gh_procedure_p (proc)) 
+       {
+         SCM l = SCM_EOL;
+
+         for (int i = 0; i <figures_.size (); i++)
+           l = gh_cons (figures_[i]->self_scm(), l);
+
+         SCM markup = scm_call_2 (proc, l, daddy_trans_->self_scm ());
 
-      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
+         figure_ = new Item (get_property ("BassFigure"));
+         figure_->set_grob_property ("text", markup);
+         announce_grob(figure_, figures_[0]->self_scm()); // todo
+       }
     }
 }
 
   
 ENTER_DESCRIPTION(Figured_bass_engraver,
-/* descr */       "Make volta brackets",
+/* descr */       "Make figured bass numbers.",
 /* creats*/       "BassFigure",
-/* acks  */       "",
-/* reads */       "",
+/* accepts */     "rest-event bass-figure-event",
+/* acks  */      "",
+/* reads */       "bassFigureFormatFunction",
 /* write */       "");