* Merge from stable:

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

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 7a65215c810a41a0594d391833237b4c775848dd..339454b86f594cd2c89f097deace4560f95fe292 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,56 +3,54 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
-#include "plist.hh"
 #include "translator.hh"
 #include "dictionary.hh"
-#include "debug.hh"
+#include "warn.hh"
 
-Dictionary<Translator*> *global_translator_dict_p=0;
+/*
+  should delete these after exit.
+ */
+
+/*
+  UGH. Dictionary is deprecated
+ */
+Dictionary<Translator*> *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.")
+{
+  SCM l = SCM_EOL;
+  for (std::map<String,Translator*>::const_iterator (ci (global_translator_dict->begin()));
+       ci != global_translator_dict->end (); ci++)
+    {
+      l = scm_cons ((*ci).second->self_scm (), l);
+    }
+  return l;
+}
 
 void
 add_translator (Translator *t)
 {
-  if (!global_translator_dict_p)
-    global_translator_dict_p = new Dictionary<Translator*>;
+  if (!global_translator_dict)
+    global_translator_dict = new Dictionary<Translator*>;
 
-  global_translator_dict_p->elem (t->name ()) = t;
+ (*global_translator_dict)[classname (t)] = t;
 }
 
 Translator*
-get_translator_l (String s)
+get_translator (String s)
 {
-  if (global_translator_dict_p->elt_b (s))
+  if (global_translator_dict->elem_b (s))
     {
-      return (*global_translator_dict_p)[s];
+       Translator* t = (*global_translator_dict)[s];
+       return t;
     }
 
-  error (_("Unknown translator `") + s +"\'");
+  error (_f ("unknown translator: `%s'", s));
   return 0;
 }
 
-Array<Translator_ctor> *ctor_global_static_arr_p_;
-
-
-/*
-  Very special greetings go out to Steve Jobs for creating a system 
-  that doesn't handle global construction correctly.
- */
-void
-add_constructor (Translator_ctor c)
-{
-  if (!ctor_global_static_arr_p_)
-    ctor_global_static_arr_p_ = new Array<Translator_ctor>;
-  ctor_global_static_arr_p_->push (c);
-}
-
-void
-call_constructors ()
-{
-  for (int i=0; i < ctor_global_static_arr_p_->size (); i++)
-    add_translator (ctor_global_static_arr_p_->elem (i) ());
-}