Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index af72ca083a723697ec0d3820b2e51533862f10ea..391af52b4b70534ad8e49716e37d1fbf496edd4f 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
@@ -13,6 +13,7 @@
 #include "context-def.hh"
 #include "global-context.hh"
 
+#include "translator.icc"
 #include "ly-smobs.icc"
 
 Translator::~Translator ()
@@ -29,14 +30,13 @@ Translator::init ()
 }
 
 void
-Translator::do_announces ()
+Translator::process_music ()
 {
 }
 
 void
-Translator::process_music ()
+Translator::process_acknowledged ()
 {
-  
 }
 
 Translator::Translator ()
@@ -55,7 +55,6 @@ Translator::try_music (Music *)
 {
   return false;
 }
-                           
 
 Moment
 Translator::now_mom () const
@@ -69,14 +68,12 @@ Translator::get_output_def () const
   return daddy_context_->get_output_def ();
 }
 
-
-Translator_group*
+Translator_group *
 Translator::get_daddy_translator () const
 {
   return daddy_context_->implementation ();
 }
 
-
 SCM
 Translator::internal_get_property (SCM sym) const
 {
@@ -95,8 +92,7 @@ Translator::stop_translation_timestep ()
 
   - It is called before any user information enters the translators.
   (i.e. any \property or event is not processed yet.)
-
-  */
+*/
 void
 Translator::start_translation_timestep ()
 {
@@ -112,48 +108,29 @@ Translator::finalize ()
 {
 }
 
-
 /*
-
   SMOBS
-
 */
 SCM
 Translator::mark_smob (SCM sm)
 {
-  Translator * me = (Translator*) SCM_CELL_WORD_1 (sm);
+  Translator *me = (Translator *) SCM_CELL_WORD_1 (sm);
   me->derived_mark ();
   return SCM_EOL;
 }
 
-SCM
-Translator::translator_description () const
-{
-  return SCM_EOL;
-}
-
-
 Global_context *
 Translator::get_global_context () const
 {
-  return daddy_context_ ->get_global_context ();
+  return daddy_context_->get_global_context ();
 }
 
-
 Score_context *
 Translator::get_score_context () const
 {
   return daddy_context_->get_score_context ();
-}  
-
-
-SCM
-Translator::static_translator_description ()const
-{
-  return SCM_EOL;
 }
 
-
 IMPLEMENT_SMOBS (Translator);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator);
 IMPLEMENT_TYPE_P (Translator, "ly:translator?");
@@ -167,5 +144,49 @@ Translator::must_be_last () const
 void
 Translator::derived_mark () const
 {
-  
 }
+
+int
+Translator::print_smob (SCM s, SCM port, scm_print_state *)
+{
+  Translator *me = (Translator *) SCM_CELL_WORD_1 (s);
+  scm_puts ("#<Translator ", port);
+  scm_puts (me->class_name (), port);
+  scm_puts (" >", port);
+  return 1;
+}
+
+void
+add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
+                 char const *func_name,
+                 vector<Acknowledge_information> *ack_array)
+{
+  Acknowledge_information inf;
+  inf.function_ = ptr;
+
+  string interface_name (func_name);
+
+  interface_name = replace_all (interface_name, '_', '-');
+  interface_name += "-interface";
+
+  inf.symbol_ = scm_gc_protect_object (ly_symbol2scm (interface_name.c_str ()));
+  ack_array->push_back (inf);
+}
+
+Engraver_void_function_engraver_grob_info
+generic_get_acknowledger (SCM sym, vector<Acknowledge_information> const *ack_array)
+{
+  for (vsize i = 0; i < ack_array->size (); i++)
+    {
+      if (ack_array->at (i).symbol_ == sym)
+       return ack_array->at (i).function_;
+    }
+  return 0;
+}
+
+ADD_TRANSLATOR (Translator,
+               "Base class. Unused",
+               "",
+               "",
+               "",
+               "");