* input/regression/new-part-combine-solo.ly: more cases.

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index ee40e52e0bdccb9516085e7407765e3a7d6806dc..1e2005265c11d4b4c23700ecc961116127c728ca 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -10,7 +10,7 @@
 #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"
@@ -23,11 +23,12 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
-  simple_trans_list_ = SCM_EOL;
+  simple_trans_list_ = SCM_BOOL_F;
   trans_group_list_ = SCM_EOL;
   properties_scm_ = SCM_EOL;
   definition_ = SCM_EOL;
   daddy_trans_ =0;
+  accepts_list_ = SCM_EOL;
 }
 
 Translator::Translator ()
@@ -50,7 +51,7 @@ Translator::Translator (Translator const &s)
 bool
 Translator::is_alias (SCM sym) const
 {
-  return unsmob_translator_def (definition_)->is_alias (sym);
+  return unsmob_context_def (definition_)->is_alias (sym);
 }
 
 bool
@@ -88,6 +89,15 @@ Translator:: stop_translation_timestep ()
 {
 }
 
+/*
+  this function has 2 properties
+
+  - 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 ()
 {
@@ -117,6 +127,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_;
 }
@@ -138,3 +149,8 @@ IMPLEMENT_SMOBS (Translator);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator);
 IMPLEMENT_TYPE_P(Translator,"ly:translator?");
 
+SCM
+Translator::get_simple_trans_list()
+{
+  return SCM_EOL;
+}