* 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 fd9f367df62f796acf4c64007e79288d46e00e10..1e2005265c11d4b4c23700ecc961116127c728ca 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "translator.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "translator-group.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
 
 #include "moment.hh"
 #include "ly-smobs.icc"
@@ -23,41 +23,35 @@ 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_l_ =0;
+  daddy_trans_ =0;
+  accepts_list_ = SCM_EOL;
 }
 
 Translator::Translator ()
 {
+  self_scm_ = SCM_EOL;
   init ();
-  output_def_l_ = 0;
+  output_def_ = 0;
   smobify_self ();
-
 }
 
 Translator::Translator (Translator const &s)
-  : Input (s)
 {
+  self_scm_ = SCM_EOL;
   init ();
-  output_def_l_ = s.output_def_l_;
-  type_str_ = s.type_str_;
+  output_def_ = s.output_def_;
 
   smobify_self ();
 }
 
 bool
-Translator::is_alias_b (String s) const
+Translator::is_alias (SCM sym) const
 {
-  bool b  = s == type_str_;
-
-  for (SCM a = unsmob_translator_def (definition_)->type_aliases_;
-       !b && gh_pair_p (a); a = ly_cdr (a))
-    b = b || s == ly_scm2string (ly_car (a));
-
-  return b;
+  return unsmob_context_def (definition_)->is_alias (sym);
 }
 
 bool
@@ -70,44 +64,24 @@ Translator::try_music (Music *)
 Moment
 Translator::now_mom () const
 {
-  return daddy_trans_l_->now_mom ();
+  return daddy_trans_->now_mom ();
 }
 
-
-
-
-
-
 void
-Translator::removal_processing ()
-{
-  finalize ();
-}
-
-
-void
-Translator::announces ()
+Translator::do_announces ()
 {
-  do_announces ();
 }
 
-
 Music_output_def *
-Translator::output_def_l () const
+Translator::get_output_def () const
 {
-  return output_def_l_;
+  return output_def_;
 }
 
 SCM
-Translator::get_property (char const * id) const
+Translator::internal_get_property (SCM sym) const
 {
-  return daddy_trans_l_->get_property (ly_symbol2scm (id));
-}
-
-SCM
-Translator::get_property (SCM sym) const
-{
-  return daddy_trans_l_->get_property (sym);
+  return daddy_trans_->internal_get_property (sym);
 }
 
 void
@@ -115,13 +89,17 @@ Translator:: stop_translation_timestep ()
 {
 }
 
-void
-Translator::start_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::do_announces ()
+Translator::start_translation_timestep ()
 {
 }
 
@@ -149,64 +127,30 @@ 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_;
 }
 
-MAKE_SCHEME_CALLBACK(Translator,name,1);
-SCM
-Translator::name (SCM trans) 
-{
-  if (unsmob_translator (trans))
-    {
-      char const* nm = classname (unsmob_translator (trans));
-      return ly_str02scm (nm);
-    }
-  return
-    SCM_EOL;
-}
-
-MAKE_SCHEME_CALLBACK(Translator,description,1)
-SCM
-Translator::description (SCM me) 
-{
-  if (unsmob_translator (me))
-    return unsmob_translator(me)->translator_description ();
-  else
-    {
-      programming_error ("Translator::description ()");  
-      return SCM_EOL;
-    }
-}
-
 SCM
 Translator::translator_description () const
 {
   return SCM_EOL;
 }
 
-int
-Translator::print_smob (SCM s, SCM port, scm_print_state *)
-{
-  Translator *sc = (Translator *) ly_cdr (s);
-     
-  scm_puts ("#<Translator ", port);
-  scm_display (name (s), port);
-  scm_display (sc->simple_trans_list_, port);
-  /*
-    don't try to print properties, that is too much hassle.
-   */
-  scm_puts (" >", port);
-  
-  return 1;
-}
-
 SCM
 Translator::static_translator_description ()const
 {
   return SCM_EOL;
 }
 
-IMPLEMENT_UNSMOB (Translator, translator);
+
 IMPLEMENT_SMOBS (Translator);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator);
+IMPLEMENT_TYPE_P(Translator,"ly:translator?");
+
+SCM
+Translator::get_simple_trans_list()
+{
+  return SCM_EOL;
+}