*** empty log message ***

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index ee0709fbe19fbf063311039bb35f904aad88cd5b..af72ca083a723697ec0d3820b2e51533862f10ea 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,19 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "translator.hh"
+
 #include "warn.hh"
 #include "translator-group.hh"
 #include "context-def.hh"
 #include "global-context.hh"
-#include "moment.hh"
-#include "context.hh"
-#include "ly-smobs.icc"
 
+#include "ly-smobs.icc"
 
 Translator::~Translator ()
 {
@@ -24,20 +22,32 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
+  must_be_last_ = false;
   self_scm_ = SCM_EOL;
-  simple_trans_list_ = SCM_BOOL_F;
-  daddy_context_ =0;
+  daddy_context_ = 0;
   smobify_self ();
 }
 
+void
+Translator::do_announces ()
+{
+}
+
+void
+Translator::process_music ()
+{
+  
+}
+
 Translator::Translator ()
 {
   init ();
 }
 
-Translator::Translator (Translator const &)
+Translator::Translator (Translator const &src)
 {
   init ();
+  must_be_last_ = src.must_be_last_;
 }
 
 bool
@@ -53,7 +63,7 @@ Translator::now_mom () const
   return daddy_context_->now_mom ();
 }
 
-Music_output_def *
+Output_def *
 Translator::get_output_def () const
 {
   return daddy_context_->get_output_def ();
@@ -63,9 +73,7 @@ Translator::get_output_def () const
 Translator_group*
 Translator::get_daddy_translator () const
 {
-  Translator *t
-    = unsmob_translator (daddy_context_->implementation_);
-  return dynamic_cast<Translator_group*> (t);
+  return daddy_context_->implementation ();
 }
 
 
@@ -83,7 +91,7 @@ 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.)
@@ -114,7 +122,8 @@ SCM
 Translator::mark_smob (SCM sm)
 {
   Translator * me = (Translator*) SCM_CELL_WORD_1 (sm);
-  return me->simple_trans_list_;
+  me->derived_mark ();
+  return SCM_EOL;
 }
 
 SCM
@@ -147,4 +156,16 @@ Translator::static_translator_description ()const
 
 IMPLEMENT_SMOBS (Translator);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator);
-IMPLEMENT_TYPE_P(Translator,"ly:translator?");
+IMPLEMENT_TYPE_P (Translator, "ly:translator?");
+
+bool
+Translator::must_be_last () const
+{
+  return must_be_last_;
+}
+
+void
+Translator::derived_mark () const
+{
+  
+}