X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=15edd7df4ab67a39ed9b7ddaff1d8bf6d0f9139a;hb=0c14539bc83d6bb405141b6f21430b33d1e8fcf0;hp=bd803ac690173757b423c1cd7174451bbb235449;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index bd803ac690..15edd7df4a 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,23 +1,39 @@
 /*
-  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@xs4all.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"
+#include "protected-scm.hh"
 
 /*
   should delete these after exit.
 */
 
 Scheme_hash_table *global_translator_dict = 0;
+Protected_scm global_translator_dict_scm;
 
 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;
 
@@ -31,12 +47,13 @@ void
 add_translator (Translator *t)
 {
   if (!global_translator_dict)
-    global_translator_dict = new Scheme_hash_table;
+    {
+      global_translator_dict = new Scheme_hash_table;
+      global_translator_dict_scm = global_translator_dict->unprotect ();
+    }
 
   SCM k = ly_symbol2scm (t->class_name ());
-  global_translator_dict->set (k, t->self_scm ());
-
-  t->unprotect ();
+  global_translator_dict->set (k, t->unprotect ());
 }
 
 Translator *
@@ -46,9 +63,12 @@ get_translator (SCM sym)
   if (global_translator_dict)
     global_translator_dict->try_retrieve (sym, &v);
 
-  if (v == SCM_BOOL_F)
-    error (_f ("unknown translator: `%s'", ly_symbol2string (sym).to_str0 ()));
+  if (scm_is_false (v))
+    {
+      warning (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
+      return 0;
+    }
 
-  return unsmob_translator (v);
+  return unsmob<Translator> (v);
 }