(convert-to-dvi): redirect output to

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index d8211a24c1f3c1c19855317d7107482979d9ca49..a5c612a929bdda8f9f4288db93a0598e62a6670e 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -24,8 +24,8 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
+  must_be_last_ = false;
   self_scm_ = SCM_EOL;
-  simple_trans_list_ = SCM_BOOL_F;
   daddy_context_ =0;
   smobify_self ();
 }
@@ -46,9 +46,10 @@ Translator::Translator ()
   init ();
 }
 
-Translator::Translator (Translator const &)
+Translator::Translator (Translator const &src)
 {
   init ();
+  must_be_last_ = src.must_be_last_;
 }
 
 bool
@@ -64,7 +65,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 ();
@@ -74,9 +75,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 ();
 }
 
 
@@ -125,7 +124,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
@@ -159,3 +159,15 @@ Translator::static_translator_description ()const
 IMPLEMENT_SMOBS (Translator);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator);
 IMPLEMENT_TYPE_P (Translator,"ly:translator?");
+
+bool
+Translator::must_be_last () const
+{
+  return must_be_last_;
+}
+
+void
+Translator::derived_mark () const
+{
+  
+}