* The grand 2005-2006 replace.

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

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index abac03a98699d3edf0124e02cd0d544b5c6540a9..ff5e3823f7c8062649c2cb818fe088af3249aba4 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
@@ -14,18 +14,15 @@
   should delete these after exit.
 */
 
-Scheme_hash_table *global_translator_dict=0;
+Scheme_hash_table *global_translator_dict = 0;
 
-LY_DEFINE(get_all_translators,"ly:get-all-translators", 0, 0, 0,  (),
-         "Return an list of a all translator objects that may be instantiated "
-         " during a lilypond run.")
+LY_DEFINE (get_all_translators, "ly:get-all-translators", 0, 0, 0, (),
+          "Return a list of all translator objects that may be instantiated. ")
 {
-  SCM l = global_translator_dict ?  global_translator_dict->to_alist () : SCM_EOL;
+  SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
 
-  for (SCM s =l; gh_pair_p (s); s = gh_cdr (s))
-    {
-      gh_set_car_x (s, gh_cdar (s));
-    }
+  for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
+    scm_set_car_x (s, scm_cdar (s));
 
   return l;
 }
@@ -36,13 +33,13 @@ add_translator (Translator *t)
   if (!global_translator_dict)
     global_translator_dict = new Scheme_hash_table;
 
-  SCM k= ly_symbol2scm  (classname (t));
+  SCM k = ly_symbol2scm (t->class_name ());
   global_translator_dict->set (k, t->self_scm ());
 
-  scm_gc_unprotect_object (t->self_scm ());
+  t->unprotect ();
 }
 
-Translator*
+Translator *
 get_translator (SCM sym)
 {
   SCM v = SCM_BOOL_F;