Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / translator-group.cc

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index c05c6226f9201b896bce152306f0a662abff448d..e2541996efcbc998c88a11da8a16ee9a22cb8979 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -3,19 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+                 Erik Sandberg <mandolaerik@gmail.com>
 */
 
 #include "translator-group.hh"
 
-#include "output-def.hh"
-#include "warn.hh"
-#include "scm-hash.hh"
 #include "context-def.hh"
 #include "context.hh"
+#include "dispatcher.hh"
+#include "international.hh"
 #include "main.hh"
 #include "music.hh"
-
+#include "output-def.hh"
+#include "scm-hash.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
 Translator_group *
 Translator_group::get_daddy_translator () const
@@ -34,9 +37,15 @@ void
 Translator_group::initialize ()
 {
   precompute_method_bindings ();
+}
 
-  SCM tab = scm_make_vector (scm_int2num (19), SCM_BOOL_F);
-  context ()->set_property ("acceptHashTable", tab);
+void
+Translator_group::connect_to_context (Context *c)
+{
+  if (context_)
+    programming_error ("already connected to a context");
+  context_ = c;
+  c->event_source ()->add_listener (GET_LISTENER (eat_event), ly_symbol2scm ("MusicEvent"));
 }
 
 void
@@ -71,10 +80,19 @@ find_accept_translators (SCM gravlist, SCM ifaces)
   return l;
 }
 
+IMPLEMENT_LISTENER (Translator_group, eat_event);
+void
+Translator_group::eat_event (SCM sev)
+{
+  Stream_event *ev = unsmob_stream_event (sev);
+  SCM sm = ev->get_property ("music");
+  Music *m = unsmob_music (sm);
+  try_music (m);
+}
+
 bool
 Translator_group::try_music (Music *m)
 {
-  SCM tab = context ()->get_property ("acceptHashTable");
   SCM name = scm_sloppy_assq (ly_symbol2scm ("name"),
                              m->get_property_alist (false));
 
@@ -82,12 +100,12 @@ Translator_group::try_music (Music *m)
     return false;
 
   name = scm_cdr (name);
-  SCM accept_list = scm_hashq_ref (tab, name, SCM_UNDEFINED);
+  SCM accept_list = scm_hashq_ref (accept_hash_table_, name, SCM_UNDEFINED);
   if (accept_list == SCM_BOOL_F)
     {
       accept_list = find_accept_translators (get_simple_trans_list (),
                                             m->get_property ("types"));
-      scm_hashq_set_x (tab, name, accept_list);
+      scm_hashq_set_x (accept_hash_table_, name, accept_list);
     }
 
   for (SCM p = accept_list; scm_is_pair (p); p = scm_cdr (p))
@@ -96,6 +114,16 @@ Translator_group::try_music (Music *m)
       if (t && t->try_music (m))
        return true;
     }
+    
+  // We couldn't swallow the event in this context. Try parent.
+  Context *p = context ()->get_parent_context ();
+  // Global context's translator group is a dummy, so don't try it.
+  if (p->get_parent_context())
+    // ES todo: Make Translators listeners directly instead.
+    return p->implementation ()->try_music (m);
+  else
+    // We have tried all possible contexts. Give up.
+    m->origin ()->warning (_f ("junking event: `%s'", m->name ()));
   return false;
 }
 
@@ -105,13 +133,12 @@ Translator_group::get_simple_trans_list ()
   return simple_trans_list_;
 }
 
-                           
 void
 precomputed_recurse_over_translators (Context *c, Translator_precompute_index idx, Direction dir)
 {
   Translator_group *tg
     = dynamic_cast<Translator_group *> (c->implementation ());
-  
+
   if (dir == DOWN)
     {
       tg->precomputed_translator_foreach (idx);
@@ -120,16 +147,13 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id
 
   for (SCM s = c->children_contexts (); scm_is_pair (s);
        s = scm_cdr (s))
-    {
-      precomputed_recurse_over_translators (unsmob_context (scm_car (s)), idx, dir);
-    }
+    precomputed_recurse_over_translators (unsmob_context (scm_car (s)), idx, dir);
 
   if (dir == UP)
     {
       tg->precomputed_translator_foreach (idx);
       tg->call_precomputed_self_method (idx);
     }
-
 }
 
 void
@@ -137,7 +161,7 @@ recurse_over_translators (Context *c, Translator_method ptr, Translator_group_me
 {
   Translator_group *tg
     = dynamic_cast<Translator_group *> (c->implementation ());
-  
+
   if (dir == DOWN)
     {
       (tg->*tg_ptr) ();
@@ -146,9 +170,7 @@ recurse_over_translators (Context *c, Translator_method ptr, Translator_group_me
 
   for (SCM s = c->children_contexts (); scm_is_pair (s);
        s = scm_cdr (s))
-    {
-      recurse_over_translators (unsmob_context (scm_car (s)), ptr, tg_ptr, dir);
-    }
+    recurse_over_translators (unsmob_context (scm_car (s)), ptr, tg_ptr, dir);
 
   if (dir == UP)
     {
@@ -162,8 +184,11 @@ recurse_over_translators (Context *c, Translator_method ptr, Translator_group_me
 Translator_group::Translator_group ()
 {
   simple_trans_list_ = SCM_EOL;
+  accept_hash_table_ = SCM_EOL;
   context_ = 0;
   smobify_self ();
+
+  accept_hash_table_ = scm_c_make_hash_table (19);
 }
 
 void
@@ -171,7 +196,6 @@ Translator_group::derived_mark () const
 {
 }
 
-
 void
 Translator_group::precompute_method_bindings ()
 {
@@ -185,9 +209,7 @@ Translator_group::precompute_method_bindings ()
       for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
        {
          if (ptrs[i])
-           {
-             precomputed_method_bindings_[i].push (Translator_method_binding (tr, ptrs[i]));
-           }
+           precomputed_method_bindings_[i].push_back (Translator_method_binding (tr, ptrs[i]));
        }
     }
 
@@ -197,11 +219,9 @@ Translator_group::precompute_method_bindings ()
 void
 Translator_group::precomputed_translator_foreach (Translator_precompute_index idx)
 {
-  Array<Translator_method_binding> &bindings(precomputed_method_bindings_[idx]);
-  for (int i = 0; i < bindings.size (); i++)
-    {
-      bindings[i].invoke ();
-    }
+  vector<Translator_method_binding> &bindings (precomputed_method_bindings_[idx]);
+  for (vsize i = 0; i < bindings.size (); i++)
+    bindings[i].invoke ();
 }
 
 void
@@ -215,10 +235,9 @@ void
 Translator_group::call_precomputed_self_method (Translator_precompute_index idx)
 {
   if (precomputed_self_method_bindings_[idx])
-    (*precomputed_self_method_bindings_[idx])(this);
+    (*precomputed_self_method_bindings_[idx]) (this);
 }
 
-
 Translator_group::~Translator_group ()
 {
 }
@@ -229,26 +248,23 @@ IMPLEMENT_SMOBS (Translator_group);
 IMPLEMENT_DEFAULT_EQUAL_P (Translator_group);
 IMPLEMENT_TYPE_P (Translator_group, "ly:translator-group?");
 
-
 int
 Translator_group::print_smob (SCM s, SCM port, scm_print_state *)
 {
   Translator_group *me = (Translator_group *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Translator_group ", port);
-  scm_puts (classname (me), port);
+  scm_puts (me->class_name (), port);
   scm_display (me->simple_trans_list_, port);
   scm_puts (" >", port);
   return 1;
 }
 
-
 SCM
 Translator_group::mark_smob (SCM smob)
 {
-  Translator_group *me = (Translator_group*)SCM_CELL_WORD_1 (smob);
+  Translator_group *me = (Translator_group *)SCM_CELL_WORD_1 (smob);
 
   me->derived_mark ();
-  
+  scm_gc_mark (me->accept_hash_table_);
   return me->simple_trans_list_;
 }
-