release: 1.5.19

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 03adb249f91a22bb4065e746183fab71e21248e4..ddac9aae3ccd15599ae0230b31548e996cbf2b7c 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -15,11 +15,6 @@
 #include "moment.hh"
 #include "ly-smobs.icc"
 
-char const*
-Translator::name () const
-{
-  return classname (this);
-}
 
 Translator::~Translator ()
 {
@@ -59,8 +54,8 @@ Translator::is_alias_b (String s) const
   bool b  = s == type_str_;
 
   for (SCM a = unsmob_translator_def (definition_)->type_aliases_;
-       !b && gh_pair_p (a); a = gh_cdr (a))
-    b = b || s == ly_scm2string (gh_car (a));
+       !b && gh_pair_p (a); a = ly_cdr (a))
+    b = b || s == ly_scm2string (ly_car (a));
 
   return b;
 }
@@ -102,17 +97,18 @@ Translator::output_def_l () const
 {
   return output_def_l_;
 }
-
+#if 0
 SCM
 Translator::get_property (char const * id) const
 {
   return daddy_trans_l_->get_property (ly_symbol2scm (id));
 }
+#endif
 
 SCM
-Translator::get_property (SCM sym) const
+Translator::internal_get_property (SCM sym) const
 {
-  return daddy_trans_l_->get_property (sym);
+  return daddy_trans_l_->internal_get_property (sym);
 }
 
 void
@@ -158,14 +154,45 @@ Translator::mark_smob (SCM sm)
   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 *) gh_cdr (s);
+  Translator *sc = (Translator *) ly_cdr (s);
      
   scm_puts ("#<Translator ", port);
-  scm_puts ((char *)sc->name (), port);
+  scm_display (name (s), port);
   scm_display (sc->simple_trans_list_, port);
   /*
     don't try to print properties, that is too much hassle.
@@ -175,6 +202,12 @@ Translator::print_smob (SCM s, SCM port, scm_print_state *)
   return 1;
 }
 
-IMPLEMENT_UNSMOB (Translator, translator);
+SCM
+Translator::static_translator_description ()const
+{
+  return SCM_EOL;
+}
+
+
 IMPLEMENT_SMOBS (Translator);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator);