* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 897b30a0cf3124e94d2380b52265a024e15ef867..dd4ea8c236e5f3425665d126cb9dd0da4d1f139c 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -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
@@ -141,7 +143,7 @@ LY_DEFINE(ly_translator_name,
   SCM_ASSERT_TYPE(tr, trans, SCM_ARG1, __FUNCTION__, "Context");
 
   char const* nm = classname (tr);
-  return ly_str02scm (nm);
+  return scm_makfrom0str (nm);
 }
 
 LY_DEFINE(ly_translator_description,