updates

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 897b30a0cf3124e94d2380b52265a024e15ef867..477d2a111b8d87af9308165fa470588d624df066 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -27,21 +27,23 @@ Translator::init ()
   trans_group_list_ = SCM_EOL;
   properties_scm_ = SCM_EOL;
   definition_ = SCM_EOL;
-  daddy_trans_l_ =0;
+  daddy_trans_ =0;
 }
 
 Translator::Translator ()
 {
+  self_scm_ = SCM_EOL;
   init ();
-  output_def_l_ = 0;
+  output_def_ = 0;
   smobify_self ();
 }
 
 Translator::Translator (Translator const &s)
 {
+  self_scm_ = SCM_EOL;
   init ();
-  output_def_l_ = s.output_def_l_;
-  type_str_ = s.type_str_;
+  output_def_ = s.output_def_;
+  type_string_ = s.type_string_;
 
   smobify_self ();
 }
@@ -49,7 +51,7 @@ Translator::Translator (Translator const &s)
 bool
 Translator::is_alias_b (String s) const
 {
-  bool b  = s == type_str_;
+  bool b  = s == type_string_;
 
   for (SCM a = unsmob_translator_def (definition_)->type_aliases_;
        !b && gh_pair_p (a); a = ly_cdr (a))
@@ -68,7 +70,7 @@ Translator::try_music (Music *)
 Moment
 Translator::now_mom () const
 {
-  return daddy_trans_l_->now_mom ();
+  return daddy_trans_->now_mom ();
 }
 
 void
@@ -83,15 +85,15 @@ Translator::do_announces ()
 }
 
 Music_output_def *
-Translator::output_def_l () const
+Translator::get_output_def () const
 {
-  return output_def_l_;
+  return output_def_;
 }
 
 SCM
 Translator::internal_get_property (SCM sym) const
 {
-  return daddy_trans_l_->internal_get_property (sym);
+  return daddy_trans_->internal_get_property (sym);
 }
 
 void
@@ -132,51 +134,12 @@ Translator::mark_smob (SCM sm)
   return me->properties_scm_;
 }
 
-LY_DEFINE(ly_translator_name,
-         "ly-translator-name", 1,0,0,  (SCM trans),
-         "Return the type name of the translator @var{trans}.
-")
-{
-  Translator* tr =  unsmob_translator (trans);
-  SCM_ASSERT_TYPE(tr, trans, SCM_ARG1, __FUNCTION__, "Context");
-
-  char const* nm = classname (tr);
-  return ly_str02scm (nm);
-}
-
-LY_DEFINE(ly_translator_description,
-         "ly-translator-description",
-         1,0,0, (SCM me),
-         "Return an alist of properties of  translator @var{me}.")
-{
-  Translator *tr =unsmob_translator (me);
-  SCM_ASSERT_TYPE (tr, me, SCM_ARG1, __FUNCTION__, "Context");
-
-  return tr->translator_description ();
-}
-
 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 (ly_translator_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
 {