* Documentation/user/music-glossary.itely: add Finnish author.

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index aac514c3a106225e64a4aecc51841100e45a7197..c8a99998c55bc1e6424cdaebf8436c18c0d89d7f 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "translator.hh"
 #include "warn.hh"
 #include "translator-group.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
 
 #include "moment.hh"
 #include "ly-smobs.icc"
@@ -28,6 +28,7 @@ Translator::init ()
   properties_scm_ = SCM_EOL;
   definition_ = SCM_EOL;
   daddy_trans_ =0;
+  accepts_list_ = SCM_EOL;
 }
 
 Translator::Translator ()
@@ -74,7 +75,10 @@ Translator::do_announces ()
 Music_output_def *
 Translator::get_output_def () const
 {
-  return output_def_;
+  return
+    (daddy_trans_)
+    ? daddy_trans_->get_output_def ()
+    : 0;
 }
 
 SCM
@@ -84,7 +88,7 @@ Translator::internal_get_property (SCM sym) const
 }
 
 void
-Translator:: stop_translation_timestep ()
+Translator::stop_translation_timestep ()
 {
 }
 
@@ -126,6 +130,7 @@ Translator::mark_smob (SCM sm)
   scm_gc_mark (me->trans_group_list_);
   scm_gc_mark (me->definition_);  
   scm_gc_mark (me->properties_scm_);  
+  scm_gc_mark (me->accepts_list_);
 
   return me->properties_scm_;
 }