Run `make grand-replace'.

[lilypond.git] / lily / translator-scheme.cc

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index 35054fd0d2f20728d41fdd39bf2ec1e5f7f109eb..4f920c8b1a6a003ad90c2f505f05752ff2683d23 100644 (file)
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -1,45 +1,32 @@
 /*
-  translator-scheme.cc --  implement Scheme context functions
+  translator-scheme.cc -- implement Scheme context functions
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
- */
-
-#include "translator.hh"
 #include "context-def.hh"
 #include "translator-group.hh"
-#include "lily-guile.hh"
-
+#include "moment.hh"
 
 LY_DEFINE (ly_translator_name, "ly:translator-name",
           1, 0, 0, (SCM trans),
-         "Return the type name of the translator object @var{trans}. "
-          "The name is a symbol.")
+          "Return the type name of the translator object @var{trans}."
+          "  The name is a symbol.")
 {
+  LY_ASSERT_SMOB (Translator, trans, 1);
   Translator *tr = unsmob_translator (trans);
-  SCM_ASSERT_TYPE (tr, trans, SCM_ARG1, __FUNCTION__, "Translator");
-  char const *nm = classname (tr);
+  char const *nm = tr->class_name ();
   return ly_symbol2scm (nm);
 }
 
 LY_DEFINE (ly_translator_description, "ly:translator-description",
-         1,0,0, (SCM me),
-         "Return an alist of properties of  translator @var{me}.")
+          1, 0, 0, (SCM me),
+          "Return an alist of properties of translator @var{me}.")
 {
+  LY_ASSERT_SMOB (Translator, me, 1);
   Translator *tr = unsmob_translator (me);
-  SCM_ASSERT_TYPE (tr, me, SCM_ARG1, __FUNCTION__, "Translator");
   return tr->translator_description ();
 }
 
-int
-Translator::print_smob (SCM s, SCM port, scm_print_state *)
-{
-  Translator *me = (Translator*) SCM_CELL_WORD_1 (s);
-  scm_puts ("#<Translator ", port);
-  scm_puts (classname (me), port);
-  scm_puts (" >", port);
-  return 1;
-}
-