* scm/lily.scm (completize-formats): new function

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

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index 6df422ae5f40cf5a06d35800d44b9dd733c29d4e..8d8f262d3a0467f303a3f6f98bfb1a56fcaa4fea 100644 (file)
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -1,58 +1,42 @@
-/*   
+/*
   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>
 
  */
 
-#include "translator.hh"
 #include "context-def.hh"
-
 #include "translator-group.hh"
-#include "lily-guile.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.")
+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.")
 {
-  Translator * tr =  unsmob_translator (trans);
-  SCM_ASSERT_TYPE(tr, trans, SCM_ARG1, __FUNCTION__, "Translator");
-
-  char const* nm = classname (tr);
+  Translator *tr = unsmob_translator (trans);
+  SCM_ASSERT_TYPE (tr, trans, SCM_ARG1, __FUNCTION__, "Translator");
+  char const *nm = classname (tr);
   return ly_symbol2scm (nm);
 }
 
-
-LY_DEFINE(ly_translator_description,
-         "ly:translator-description",
+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");
-
+  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 *sc = (Translator *) ly_cdr (s);
-     
+  Translator *me = (Translator*) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Translator ", port);
-  scm_puts (classname (sc), port);
-
-  /*
-    don't try to print properties, that is too much hassle.
-   */
+  scm_puts (classname (me), port);
   scm_puts (" >", port);
-  
   return 1;
 }