* lily/ various: Introduce stream events of types Prepare,

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

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 4dd527defbf3d91a82e28b1944ede796d0add7f8..f4ee43b1608fbfda98e673b9f648601ada5d3795 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -11,14 +11,10 @@
 
 #include "context-def.hh"
 
-#include "engraver-group.hh"
-#include "engraver.hh"
 #include "international.hh"
 #include "output-def.hh"
-#include "performer-group.hh"
-#include "performer.hh"
 #include "score-context.hh"
-#include "translator-group.hh"
+#include "translator.hh"
 #include "warn.hh"
 
 Context_def::Context_def ()
@@ -143,12 +139,6 @@ Context_def::add_context_mod (SCM mod)
     programming_error ("unknown context mod tag");
 }
 
-SCM
-Context_def::get_context_name () const
-{
-  return context_name_;
-}
-
 SCM
 Context_def::get_accepted (SCM user_mod) const
 {
@@ -192,20 +182,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 +212,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;
        }
     }
@@ -259,34 +249,6 @@ Context_def::get_translator_names (SCM user_mod) const
   return l1;
 }
 
-SCM
-filter_performers (SCM ell)
-{
-  SCM *tail = &ell;
-  for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
-    {
-      if (dynamic_cast<Performer *> (unsmob_translator (scm_car (*tail))))
-       *tail = scm_cdr (*tail);
-      else
-       tail = SCM_CDRLOC (*tail);
-    }
-  return ell;
-}
-
-SCM
-filter_engravers (SCM ell)
-{
-  SCM *tail = &ell;
-  for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
-    {
-      if (dynamic_cast<Engraver *> (unsmob_translator (scm_car (*tail))))
-       *tail = scm_cdr (*tail);
-      else
-       tail = SCM_CDRLOC (*tail);
-    }
-  return ell;
-}
-
 Context *
 Context_def::instantiate (SCM ops, Object_key const *key)
 {
@@ -298,56 +260,8 @@ Context_def::instantiate (SCM ops, Object_key const *key)
     context = new Context (key);
 
   context->definition_ = self_scm ();
-
-  SCM trans_names = get_translator_names (ops);
-
-  Translator_group *g = get_translator_group (translator_group_type_);
-  SCM trans_list = SCM_EOL;
-
-  for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s))
-    {
-      Translator *t = get_translator (scm_car (s));
-      if (!t)
-       warning (_f ("can't find: `%s'", s));
-      else
-       {
-         Translator *tr = t->clone ();
-         SCM str = tr->self_scm ();
-
-         if (tr->must_be_last ())
-           {
-             SCM cons = scm_cons (str, SCM_EOL);
-             if (scm_is_pair (trans_list))
-               scm_set_cdr_x (scm_last_pair (trans_list), cons);
-             else
-               trans_list = cons;
-           }
-         else
-           trans_list = scm_cons (str, trans_list);
-
-         tr->daddy_context_ = context;
-         tr->unprotect ();
-       }
-    }
-
-  /*
-    Ugh,  todo: should just make a private
-    copy of Context_def with the user mods.
-  */
-
-  g->simple_trans_list_ = trans_list;
-
-  context->implementation_ = g;
-  if (dynamic_cast<Engraver_group *> (g))
-    g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
-  else if (dynamic_cast<Performer_group *> (g))
-    g->simple_trans_list_ = filter_engravers (g->simple_trans_list_);
-
-  g->context_ = context;
+  context->definition_mods_ = ops;
   context->aliases_ = context_aliases_;
-
-  g->unprotect ();
-
   context->accepts_list_ = get_accepted (ops);
 
   return context;