Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / context-def.cc

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 4dd527defbf3d91a82e28b1944ede796d0add7f8..fee67b661d043ad86a7777039fd84c7fabc53bb4 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -192,20 +192,20 @@ Context_def::get_default_child (SCM user_mod) const
   return name;
 }
 
-Link_array<Context_def>
+vector<Context_def*>
 Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
 {
   assert (scm_is_symbol (type_sym));
 
   SCM accepted = get_accepted (SCM_EOL);
 
-  Link_array<Context_def> accepteds;
+  vector<Context_def*> accepteds;
   for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s))
     if (Context_def *t = unsmob_context_def (find_context_def (odef,
                                                               scm_car (s))))
       accepteds.push_back (t);
 
-  Link_array<Context_def> best_result;
+  vector<Context_def*> best_result;
   for (vsize i = 0; i < accepteds.size (); i++)
     {
       /* do not check aliases, because \context Staff should not
@@ -222,12 +222,12 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
     {
       Context_def *g = accepteds[i];
 
-      Link_array<Context_def> result
+      vector<Context_def*> result
        = g->path_to_acceptable_context (type_sym, odef);
       if (result.size () && result.size () < best_depth)
        {
          best_depth = result.size ();
-         result.insert (g, 0);
+         result.insert (result.begin (), g);
          best_result = result;
        }
     }
@@ -298,6 +298,7 @@ Context_def::instantiate (SCM ops, Object_key const *key)
     context = new Context (key);
 
   context->definition_ = self_scm ();
+  context->definition_mods_ = ops;
 
   SCM trans_names = get_translator_names (ops);
 
@@ -308,7 +309,7 @@ Context_def::instantiate (SCM ops, Object_key const *key)
     {
       Translator *t = get_translator (scm_car (s));
       if (!t)
-       warning (_f ("can't find: `%s'", s));
+       warning (_f ("can't find: `%s'", ly_symbol2string (scm_car (s)).c_str ()));
       else
        {
          Translator *tr = t->clone ();
@@ -343,9 +344,8 @@ Context_def::instantiate (SCM ops, Object_key const *key)
   else if (dynamic_cast<Performer_group *> (g))
     g->simple_trans_list_ = filter_engravers (g->simple_trans_list_);
 
-  g->context_ = context;
   context->aliases_ = context_aliases_;
-
+  g->connect_to_context (context);
   g->unprotect ();
 
   context->accepts_list_ = get_accepted (ops);