release: 1.3.0

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

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index adace25f0acbbf75568ff71ca910a6fb88190b82..d355840d244c6e113f8ad614382933f6bd7f3839 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -12,6 +12,8 @@
 #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
@@ -38,21 +40,25 @@ 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);
+      Translator * t = i.val ()->access_content_Translator_group (false);
       t-> output_def_l_ = this;
     }
 }
 
 void
-Music_output_def::assign_translator (Translator*tp)
+Music_output_def::assign_translator (Translator_group*tp)
 {
   String s =tp->type_str_;
+  if (s.empty_b ())
+    {
+      tp->warning (_("Interpretation context with empty type"));
+    }
   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_group_identifier (tp, 0);
   tp ->output_def_l_ = this;
 }
 
@@ -60,10 +66,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_group (false);
 
   if (global_translator_dict_p->elem_b (name))
-    return (*global_translator_dict_p)[name];
+    return global_translator_dict_p->elem(name);
 
   return 0;
 }
@@ -74,7 +80,7 @@ Music_output_def::get_global_translator_p ()
 {
   Translator * t = find_translator_l ("Score");
   if (!t)
-    error (_("Can't find Score context"));
+    error (_f ("Can't find `%s' context", "Score"));
   t = t->clone ();
   Global_translator *g = dynamic_cast <Global_translator *> (t);
   t->add_processing ();
@@ -86,7 +92,9 @@ void
 Music_output_def::print () const
 {
 #ifndef NPRINT
+  DEBUG_OUT << "Translators: \n";
   translator_p_dict_p_->print ();
+  DEBUG_OUT << "Other definitions.\n";
   scope_p_->print( );
 #endif
 }
@@ -94,9 +102,9 @@ Music_output_def::print () const
 String
 Music_output_def::get_default_output () const
 {
-  if (!scope_p_->elem_b ("output"))
-    return "";  
-  Identifier * id = (*scope_p_) ["output"];
+  if (safe_global_b || !scope_p_->elem_b (output_scm_sym))
+    return "";
+  Identifier * id = scope_p_->elem (output_scm_sym);
 
   String *p = id->access_content_String (false);
   return p ? *p : String ("");