X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ffigured-bass-engraver.cc;h=82115d8212009196855dbf0e764072c427463ec2;hb=428909a52eedefe201a8cd89876336f76e29fa28;hp=a086ac5808884c95155e7b31fd3842f6bee0cd81;hpb=f68bbd7a1ed1b0e7146bbbffcbcbb7f9c9bda3cc;p=lilypond.git

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index a086ac5808..82115d8212 100644
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -1,27 +1,31 @@
+/*
+  figured-bass-engraver.cc -- implement Figured_bass_engraver
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
 #include "engraver.hh"
-#include "text-item.hh"
-#include "musical-request.hh"
+#include "text-interface.hh"
 #include "item.hh"
+#include "context.hh"
 
 class Figured_bass_engraver : public Engraver
 {
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Figured_bass_engraver();
-
+  TRANSLATOR_DECLARATIONS (Figured_bass_engraver);
 protected:
-  Link_array<Note_req> figures_;
-  Rest_req * rest_req_;
+  Link_array<Music> figures_;
+  Music *rest_req_;
 
-  Grob * figure_;
-  
-  virtual bool try_music (Music*);
+  Grob *figure_;
+
+  virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
   virtual void process_music ();
 };
 
-
-Figured_bass_engraver::Figured_bass_engraver()
+Figured_bass_engraver::Figured_bass_engraver ()
 {
   figure_ = 0;
   rest_req_ = 0;
@@ -30,26 +34,23 @@ Figured_bass_engraver::Figured_bass_engraver()
 void
 Figured_bass_engraver::stop_translation_timestep ()
 {
-  if (figure_)
-    {
-      typeset_grob (figure_);
-      figure_ =00;
-    }
+  figure_ = 0;
 
   figures_.clear ();
+  rest_req_ = 0;
 }
 
 bool
-Figured_bass_engraver::try_music (Music*m)
+Figured_bass_engraver::try_music (Music *m)
 {
-  if (Note_req* n = dynamic_cast<Note_req*> (m))
+  if (m->is_mus_type ("bass-figure-event"))
     {
-      figures_.push (n);
+      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;
@@ -60,45 +61,32 @@ Figured_bass_engraver::process_music ()
 {
   if (rest_req_)
     {
-      figure_ = new Item (get_property ("BassFigure"));
-      announce_grob (figure_, rest_req_); // todo
-      figure_->set_grob_property ("text" , gh_str02scm ("-"));
+      figure_ = make_item ("BassFigure", rest_req_->self_scm ());
+      figure_->set_property ("text", scm_makfrom0str ("-"));
     }
   else if (figures_.size ())
     {
-      figure_ = new Item (get_property ("BassFigure"));
-      announce_grob (figure_, figures_[0]); // todo
-      SCM flist = SCM_EOL;
-      for (int i = 0; i < figures_.size (); i++)
+      SCM proc = get_property ("bassFigureFormatFunction");
+      if (ly_c_procedure_p (proc))
 	{
-	  Note_req * n = figures_[i];
-	  Pitch *p = unsmob_pitch (n->get_mus_property ("pitch"));
-	  
-	  String fstr = to_str (p->steps ()+ 1);
-	  
-	  SCM one_fig = ly_str02scm(fstr.ch_C ());
-
-	  if (p->alteration_i_ || to_boolean (n->get_mus_property ("force-accidental") ))
+	  SCM l = SCM_EOL;
+	  SCM *t = &l;
+	  for (int i = 0; i < figures_.size (); i++)
 	    {
-	      SCM alter = scm_assoc (gh_int2scm (p->alteration_i_),
-				     figure_->get_grob_property ("accidental-alist"));
-	      if (gh_pair_p (alter))
-		{
-		  one_fig = scm_listify (ly_symbol2scm ("columns"),
-				     one_fig,
-				     ly_cdr(alter),
-				     SCM_UNDEFINED);
-		}
+	      *t = scm_cons (figures_[i]->self_scm (), SCM_EOL);
+	      t = SCM_CDRLOC (*t);
 	    }
-	  
-	  flist = gh_cons (one_fig, flist);
+	  figure_ = make_item ("BassFigure", figures_[0]->self_scm ());
+	  scm_call_3 (proc, l, context ()->self_scm (),
+		      figure_->self_scm ());
 	}
-
-      flist = gh_cons (ly_symbol2scm ("lines"), flist);
-
-      figure_-> set_grob_property ("text", flist);
     }
 }
 
-  
-ADD_THIS_TRANSLATOR(Figured_bass_engraver);
+ADD_TRANSLATOR (Figured_bass_engraver,
+		/* descr */ "Make figured bass numbers.",
+		/* creats*/ "BassFigure",
+		/* accepts */ "rest-event bass-figure-event",
+		/* acks  */ "",
+		/* reads */ "bassFigureFormatFunction",
+		/* write */ "");