source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "scope.hh"
#include "global-translator.hh"
#include "dictionary-iter.hh"
#include "identifier.hh"
+#include "main.hh"
+#include "lily-guile.hh"
int
Music_output_def::get_next_default_count () const
scope_p_ = new Scope (*s.scope_p_);
translator_p_dict_p_ = new Scope (*s.translator_p_dict_p_);
- for (Dictionary_iter<Identifier*> i (*translator_p_dict_p_); i.ok (); i++)
+ for (Scope_iter i (*translator_p_dict_p_); i.ok (); i++)
{
Translator * t = i.val ()->access_content_Translator (false);
t-> output_def_l_ = this;
if (translator_p_dict_p_->elem_b (s))
delete translator_p_dict_p_->elem (s);
- (*translator_p_dict_p_)[s] = new Translator_identifier (tp, 0);
+ translator_p_dict_p_->elem (s) = new Translator_identifier (tp, 0);
tp ->output_def_l_ = this;
}
Music_output_def::find_translator_l (String name) const
{
if (translator_p_dict_p_->elem_b (name))
- return (*translator_p_dict_p_)[name]->access_content_Translator (false);
+ return translator_p_dict_p_->elem (name)->access_content_Translator (false);
if (global_translator_dict_p->elem_b (name))
- return (*global_translator_dict_p)[name];
+ return global_translator_dict_p->elem(name);
return 0;
}
String
Music_output_def::get_default_output () const
{
- if (!scope_p_->elem_b ("output"))
- return "";
- Identifier * id = (*scope_p_) ["output"];
+ static SCM output_sym;
+ if (!output_sym)
+ output_sym = scm_protect_object (ly_symbol ("output"));
+ if (safe_global_b || !scope_p_->elem_b (output_sym))
+ return "";
+ Identifier * id = scope_p_->elem (output_sym);
String *p = id->access_content_String (false);
return p ? *p : String ("");