* 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 1a4f310e988664c31cf69253890c319352ce619f..c792ac795c7abd8a695ed02e44706028c18f3991 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -1,11 +1,20 @@
+/*   
+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<Music> figures_;
@@ -65,14 +74,20 @@ Figured_bass_engraver::process_music ()
     }
   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
+       }
     }
 }
 
@@ -80,7 +95,7 @@ Figured_bass_engraver::process_music ()
 ENTER_DESCRIPTION(Figured_bass_engraver,
 /* descr */       "Make figured bass numbers.",
 /* creats*/       "BassFigure",
-/* accepts */     "general-music",
+/* accepts */     "rest-event bass-figure-event",
 /* acks  */      "",
-/* reads */       "",
+/* reads */       "bassFigureFormatFunction",
 /* write */       "");