*** empty log message ***

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 62846fb3cd783120b48ed6ddc9ec658853a33467..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,9 +22,9 @@ 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 ();
 }
 
@@ -46,9 +44,10 @@ Translator::Translator ()
   init ();
 }
 
-Translator::Translator (Translator const &)
+Translator::Translator (Translator const &src)
 {
   init ();
+  must_be_last_ = src.must_be_last_;
 }
 
 bool
@@ -64,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 ();
@@ -123,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
@@ -156,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
+{
+  
+}