* flower/include/axis.hh: rename from axes.hh

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

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index a80b4c1661bedca200252c6051f340522c4ca218..6efd36b591955244c208bbfe6191775468a49034 100644 (file)
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -1,21 +1,18 @@
 /*
-  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--2005 Han-Wen Nienhuys <hanwen@cs.uu.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}. "
+          "Return the type name of the translator object @var{trans}. "
           "The name is a symbol.")
 {
   Translator *tr = unsmob_translator (trans);
@@ -25,8 +22,8 @@ LY_DEFINE (ly_translator_name, "ly:translator-name",
 }
 
 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}.")
 {
   Translator *tr = unsmob_translator (me);
   SCM_ASSERT_TYPE (tr, me, SCM_ARG1, __FUNCTION__, "Translator");
@@ -36,7 +33,7 @@ LY_DEFINE (ly_translator_description, "ly:translator-description",
 int
 Translator::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Translator *me = (Translator*) ly_cdr (s);
+  Translator *me = (Translator *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Translator ", port);
   scm_puts (classname (me), port);
   scm_puts (" >", port);