update for the lily-wins.py script.

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

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index c792ac795c7abd8a695ed02e44706028c18f3991..f46a86b6711221204e69bfe53721f5df9d5c45d1 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -3,7 +3,7 @@ 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>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
@@ -11,11 +11,11 @@ source file of the GNU LilyPond music typesetter
 #include "text-item.hh"
 #include "event.hh"
 #include "item.hh"
-#include "translator-group.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_;
@@ -28,7 +28,7 @@ protected:
 };
 
 
-Figured_bass_engraver::Figured_bass_engraver()
+Figured_bass_engraver::Figured_bass_engraver ()
 {
   figure_ = 0;
   rest_req_ = 0;
@@ -68,31 +68,30 @@ 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 ())
     {
       SCM proc = get_property ("bassFigureFormatFunction");
-      if (gh_procedure_p (proc)) 
+      if (ly_c_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 ());
-
-         figure_ = new Item (get_property ("BassFigure"));
-         figure_->set_grob_property ("text", markup);
-         announce_grob(figure_, figures_[0]->self_scm()); // todo
+         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",