X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=d55fe15729b9677b7f07d138b26c8d66fe836c25;hb=b37e3f652677ae0298423db9fa0e552e5fce0c92;hp=aac514c3a106225e64a4aecc51841100e45a7197;hpb=3adcf6c67a62a5f8b15003a5450efc925f23405d;p=lilypond.git

diff --git a/lily/translator.cc b/lily/translator.cc
index aac514c3a1..d55fe15729 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,19 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #include "translator.hh"
+
 #include "warn.hh"
 #include "translator-group.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
+#include "global-context.hh"
 
-#include "moment.hh"
+#include "translator.icc"
 #include "ly-smobs.icc"
 
-
 Translator::~Translator ()
 {
 }
@@ -23,34 +23,31 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
-  simple_trans_list_ = SCM_BOOL_F;
-  trans_group_list_ = SCM_EOL;
-  properties_scm_ = SCM_EOL;
-  definition_ = SCM_EOL;
-  daddy_trans_ =0;
+  must_be_last_ = false;
+  self_scm_ = SCM_EOL;
+  daddy_context_ = 0;
+  smobify_self ();
 }
 
-Translator::Translator ()
+void
+Translator::process_music ()
 {
-  self_scm_ = SCM_EOL;
-  init ();
-  output_def_ = 0;
-  smobify_self ();
 }
 
-Translator::Translator (Translator const &s)
+void
+Translator::process_acknowledged ()
 {
-  self_scm_ = SCM_EOL;
-  init ();
-  output_def_ = s.output_def_;
+}
 
-  smobify_self ();
+Translator::Translator ()
+{
+  init ();
 }
 
-bool
-Translator::is_alias (SCM sym) const
+Translator::Translator (Translator const &src)
 {
-  return unsmob_context_def (definition_)->is_alias (sym);
+  init ();
+  must_be_last_ = src.must_be_last_;
 }
 
 bool
@@ -58,45 +55,44 @@ Translator::try_music (Music *)
 {
   return false;
 }
-			    
 
 Moment
 Translator::now_mom () const
 {
-  return daddy_trans_->now_mom ();
+  return daddy_context_->now_mom ();
 }
 
-void
-Translator::do_announces ()
+Output_def *
+Translator::get_output_def () const
 {
+  return daddy_context_->get_output_def ();
 }
 
-Music_output_def *
-Translator::get_output_def () const
+Translator_group *
+Translator::get_daddy_translator () const
 {
-  return output_def_;
+  return daddy_context_->implementation ();
 }
 
 SCM
 Translator::internal_get_property (SCM sym) const
 {
-  return daddy_trans_->internal_get_property (sym);
+  return daddy_context_->internal_get_property (sym);
 }
 
 void
-Translator:: stop_translation_timestep ()
+Translator::stop_translation_timestep ()
 {
 }
 
 /*
   this function has 2 properties
 
-  - It is called before try_music()
+  - It is called before try_music ()
 
   - 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,43 +108,85 @@ Translator::finalize ()
 {
 }
 
-
 /*
-
   SMOBS
-
 */
 SCM
 Translator::mark_smob (SCM sm)
 {
-  Translator * me = (Translator*) SCM_CELL_WORD_1 (sm);
-  scm_gc_mark (me->simple_trans_list_);
-  scm_gc_mark (me->trans_group_list_);
-  scm_gc_mark (me->definition_);  
-  scm_gc_mark (me->properties_scm_);  
-
-  return me->properties_scm_;
+  Translator *me = (Translator *) SCM_CELL_WORD_1 (sm);
+  me->derived_mark ();
+  return SCM_EOL;
 }
 
-SCM
-Translator::translator_description () const
+Global_context *
+Translator::get_global_context () const
 {
-  return SCM_EOL;
+  return daddy_context_->get_global_context ();
 }
 
-SCM
-Translator::static_translator_description ()const
+Score_context *
+Translator::get_score_context () const
 {
-  return SCM_EOL;
+  return daddy_context_->get_score_context ();
 }
 
-
 IMPLEMENT_SMOBS (Translator);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator);
-IMPLEMENT_TYPE_P(Translator,"ly:translator?");
+IMPLEMENT_TYPE_P (Translator, "ly:translator?");
 
-SCM
-Translator::get_simple_trans_list()
+bool
+Translator::must_be_last () const
+{
+  return must_be_last_;
+}
+
+void
+Translator::derived_mark () const
 {
-  return SCM_EOL;
 }
+
+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,
+		  Array<Acknowledge_information> *ack_array)
+{
+  Acknowledge_information inf;
+  inf.function_ = ptr;
+
+  std::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 (inf);
+}
+
+Engraver_void_function_engraver_grob_info
+generic_get_acknowledger (SCM sym, Array<Acknowledge_information> const *ack_array)
+{
+  for (int i = 0; i < ack_array->size (); i++)
+    {
+      if (ack_array->elem (i).symbol_ == sym)
+	return ack_array->elem (i).function_;
+    }
+  return 0;
+}
+
+ADD_TRANSLATOR (Translator,
+		"Base class. Unused",
+		"",
+		"",
+		"",
+		"");