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 8adf44f71543770726e45f330396a1d42831d0dc..fee67b661d043ad86a7777039fd84c7fabc53bb4 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 /* TODO: should junk this class an replace by
@@ -11,8 +11,11 @@
 
 #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"
@@ -104,31 +107,28 @@ Context_def::add_context_mod (SCM mod)
     }
 
   /*
-    other modifiers take symbols as argument. 
+    other modifiers take symbols as argument.
   */
   SCM sym = scm_cadr (mod);
   if (scm_is_string (sym))
     sym = scm_string_to_symbol (sym);
 
   if (ly_symbol2scm ("default-child") == tag)
-    {
-      default_child_ = sym;
-    }
+    default_child_ = sym;
   else if (ly_symbol2scm ("consists") == tag
-      || ly_symbol2scm ("consists-end") == tag
-      || ly_symbol2scm ("remove") == tag)
+          || ly_symbol2scm ("consists-end") == tag
+          || ly_symbol2scm ("remove") == tag)
     {
       if (!get_translator (sym))
        error (_f ("program has no such type: `%s'",
-                  ly_symbol2string (sym).to_str0 ()));
+                  ly_symbol2string (sym).c_str ()));
       else
        translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_);
     }
   else if (ly_symbol2scm ("accepts") == tag
           || ly_symbol2scm ("denies") == tag)
     accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_);
-  else if (ly_symbol2scm ("poppush") == tag
-          || ly_symbol2scm ("pop") == tag
+  else if (ly_symbol2scm ("pop") == tag
           || ly_symbol2scm ("push") == tag
           || ly_symbol2scm ("assign") == tag
           || ly_symbol2scm ("unset") == tag)
@@ -171,11 +171,10 @@ Context_def::get_accepted (SCM user_mod) const
        acc = scm_delete_x (def, acc);
       acc = scm_cons (def, acc);
     }
-  
+
   return acc;
 }
 
-
 SCM
 Context_def::get_default_child (SCM user_mod) const
 {
@@ -193,42 +192,42 @@ 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 (t);
+      accepteds.push_back (t);
 
-  Link_array<Context_def> best_result;
-  for (int i = 0; i < accepteds.size (); i++)
+  vector<Context_def*> best_result;
+  for (vsize i = 0; i < accepteds.size (); i++)
     {
       /* do not check aliases, because \context Staff should not
         create RhythmicStaff. */
       if (ly_is_equal (accepteds[i]->get_context_name (), type_sym))
        {
-         best_result.push (accepteds[i]);
+         best_result.push_back (accepteds[i]);
          return best_result;
        }
     }
 
-  int best_depth = INT_MAX;
-  for (int i = 0; i < accepteds.size (); i++)
+  vsize best_depth = INT_MAX;
+  for (vsize i = 0; i < accepteds.size (); i++)
     {
       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;
        }
     }
@@ -254,9 +253,7 @@ Context_def::get_translator_names (SCM user_mod) const
       if (ly_symbol2scm ("consists") == tag)
        l1 = scm_cons (arg, l1);
       else if (ly_symbol2scm ("remove") == tag)
-       {
-         l1 = scm_delete_x (arg, l1);
-       }
+       l1 = scm_delete_x (arg, l1);
     }
 
   return l1;
@@ -271,7 +268,7 @@ filter_performers (SCM ell)
       if (dynamic_cast<Performer *> (unsmob_translator (scm_car (*tail))))
        *tail = scm_cdr (*tail);
       else
-       tail = SCM_CDRLOC(*tail);
+       tail = SCM_CDRLOC (*tail);
     }
   return ell;
 }
@@ -285,7 +282,7 @@ filter_engravers (SCM ell)
       if (dynamic_cast<Engraver *> (unsmob_translator (scm_car (*tail))))
        *tail = scm_cdr (*tail);
       else
-       tail = SCM_CDRLOC(*tail);
+       tail = SCM_CDRLOC (*tail);
     }
   return ell;
 }
@@ -301,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);
 
@@ -311,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 ();
@@ -326,16 +324,13 @@ Context_def::instantiate (SCM ops, Object_key const *key)
                trans_list = cons;
            }
          else
-           {
-             trans_list = scm_cons (str, trans_list);
-           }
+           trans_list = scm_cons (str, trans_list);
 
          tr->daddy_context_ = context;
-         scm_gc_unprotect_object (str);
+         tr->unprotect ();
        }
     }
 
-
   /*
     Ugh,  todo: should just make a private
     copy of Context_def with the user mods.
@@ -344,18 +339,17 @@ Context_def::instantiate (SCM ops, Object_key const *key)
   g->simple_trans_list_ = trans_list;
 
   context->implementation_ = g;
-  if (dynamic_cast<Engraver *> (g))
+  if (dynamic_cast<Engraver_group *> (g))
     g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
-  else if (dynamic_cast<Performer *> (g))
+  else if (dynamic_cast<Performer_group *> (g))
     g->simple_trans_list_ = filter_engravers (g->simple_trans_list_);
 
-  g->context_ = context;
   context->aliases_ = context_aliases_;
-
-  scm_gc_unprotect_object (g->self_scm ());
+  g->connect_to_context (context);
+  g->unprotect ();
 
   context->accepts_list_ = get_accepted (ops);
-    
+
   return context;
 }
 
@@ -363,18 +357,14 @@ SCM
 Context_def::clone_scm () const
 {
   Context_def *t = new Context_def (*this);
-  SCM x = t->self_scm ();
-  scm_gc_unprotect_object (x);
-  return x;
+  return t->unprotect ();
 }
 
 SCM
 Context_def::make_scm ()
 {
   Context_def *t = new Context_def;
-  SCM x = t->self_scm ();
-  scm_gc_unprotect_object (x);
-  return x;
+  return t->unprotect ();
 }
 
 void