Fix \lyricsto Staff = "sop" syntax

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

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 557d986f9059106145b6271e0735a8798065be89..67fa95a610b139608d94482ae54d6afb202221b3 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,31 +1,44 @@
 /*
-  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--2004 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"
+#include "protected-scm.hh"
 
 /*
   should delete these after exit.
 */
 
-Scheme_hash_table *global_translator_dict=0;
+Protected_scm global_translator_dict;
 
-LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0,  (),
-         "Return a list of all translator objects that may be instantiated. "
-          )
+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;
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  SCM l = dict ? dict->to_alist () : SCM_EOL;
 
-  for (SCM s =l; is_pair (s); s = ly_cdr (s))
-    {
-      scm_set_car_x (s, ly_cdar (s));
-    }
+  for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
+    scm_set_car_x (s, scm_cdar (s));
 
   return l;
 }
@@ -33,25 +46,30 @@ LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0,  (),
 void
 add_translator (Translator *t)
 {
-  if (!global_translator_dict)
-    global_translator_dict = new Scheme_hash_table;
-
-  SCM k= ly_symbol2scm  (classname (t));
-  global_translator_dict->set (k, t->self_scm ());
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  if (!dict)
+    {
+      global_translator_dict = Scheme_hash_table::make_smob ();
+      dict = unsmob<Scheme_hash_table> (global_translator_dict);
+    }
 
-  scm_gc_unprotect_object (t->self_scm ());
+  SCM k = ly_symbol2scm (t->class_name ());
+  dict->set (k, t->unprotect ());
 }
 
-Translator*
+Translator *
 get_translator (SCM sym)
 {
   SCM v = SCM_BOOL_F;
-  if (global_translator_dict)
-    global_translator_dict->try_retrieve (sym, &v);
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  if (dict)
+    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);
 }
-