X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=5290743e2e3c29536303bfd1daa7ec0d2f9665bc;hb=69bfbbd345ec788aef31315b6174cd15a2e3a48e;hp=874402d49011fa9e81cc85bdf523f5ea5ae348e9;hpb=0d3c78505a6adb958f9280509bb7fa170de54611;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 874402d490..5290743e2e 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,10 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
+
+#include "international.hh"
 #include "scm-hash.hh"
 #include "warn.hh"
 
@@ -17,14 +19,13 @@
 Scheme_hash_table *global_translator_dict = 0;
 
 LY_DEFINE (get_all_translators, "ly:get-all-translators", 0, 0, 0, (),
-	   "Return a list of all translator objects that may be instantiated. ")
+	   "Return a list of all translator objects that may be"
+	   " instantiated.")
 {
   SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
 
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
-    {
-      scm_set_car_x (s, scm_cdar (s));
-    }
+    scm_set_car_x (s, scm_cdar (s));
 
   return l;
 }
@@ -35,7 +36,7 @@ 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 ());
 
   t->unprotect ();
@@ -49,7 +50,7 @@ get_translator (SCM sym)
     global_translator_dict->try_retrieve (sym, &v);
 
   if (v == SCM_BOOL_F)
-    error (_f ("unknown translator: `%s'", ly_symbol2string (sym).to_str0 ()));
+    error (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
 
   return unsmob_translator (v);
 }