release: 1.1.24

[lilypond.git] / lily / music-output-def.cc

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 83d97ab59b3ccf392b0f414b1be27da0c2fe524d..4622d11526283d967e25a8cfb0f14e3323822e48 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -13,6 +13,7 @@
 #include "dictionary-iter.hh"
 #include "identifier.hh"
 #include "main.hh"
+#include "lily-guile.hh"
 
 int
 Music_output_def::get_next_default_count () const
@@ -39,7 +40,7 @@ Music_output_def::Music_output_def (Music_output_def const &s)
   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;
@@ -53,7 +54,7 @@ Music_output_def::assign_translator (Translator*tp)
   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;
 }
 
@@ -61,10 +62,10 @@ Translator*
 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;
 }
@@ -95,9 +96,12 @@ Music_output_def::print () const
 String
 Music_output_def::get_default_output () const
 {
-  if (safe_global_b || !scope_p_->elem_b ("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_) ["output"];
+  Identifier * id = scope_p_->elem (output_sym);
 
   String *p = id->access_content_String (false);
   return p ? *p : String ("");