Run grand replace for 2015.

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

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 728dd00271bb16e63f2e24ea5208661fb10e3cfc..1368e7376246dfd2dd224633863995879e638f9c 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,12 +1,25 @@
 /*
-  translator-ctors.cc -- implement Translator construction
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "translator.hh"
+
+#include "international.hh"
 #include "scm-hash.hh"
 #include "warn.hh"
 
@@ -17,7 +30,8 @@
 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;
 
@@ -33,7 +47,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 ();
@@ -47,8 +61,11 @@ 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 ()));
+    {
+      warning (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
+      return 0;
+    }
 
-  return unsmob_translator (v);
+  return Translator::unsmob (v);
 }