Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index 6c2c4685fb5b6fb172d60a5533c867b842798700..71533cd116cd8e353d853285578ed287fc3344c6 100644 (file)
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -3,7 +3,7 @@
 
   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>
 */
 
 #include "engraver-group.hh"
@@ -17,12 +17,13 @@
 void
 Engraver_group::announce_grob (Grob_info info)
 {
-  announce_infos_.push (info);
+  announce_infos_.push_back (info);
 
   Engraver_group *dad_eng
     = context_->get_parent_context ()
     ? dynamic_cast<Engraver_group *> (context_->get_parent_context ()->implementation ())
     : 0;
+
   if (dad_eng)
     dad_eng->announce_grob (info);
 }
@@ -36,10 +37,10 @@ Engraver_group::acknowledge_grobs ()
   SCM name_sym = ly_symbol2scm ("name");
   SCM meta_sym = ly_symbol2scm ("meta");
 
-  for (int j = 0; j < announce_infos_.size (); j++)
+  for (vsize j = 0; j < announce_infos_.size (); j++)
     {
       Grob_info info = announce_infos_[j];
-
+      
       SCM meta = info.grob ()->internal_get_property (meta_sym);
       SCM nm = scm_assoc (name_sym, meta);
       if (scm_is_pair (nm))
@@ -47,7 +48,9 @@ Engraver_group::acknowledge_grobs ()
       else
        continue;
 
-      SCM acklist = scm_hashq_ref (acknowledge_hash_table_, nm, SCM_BOOL_F);
+      SCM acklist = scm_hashq_ref (acknowledge_hash_table_drul_[info.start_end()],
+                                  nm, SCM_BOOL_F);
+      
       Engraver_dispatch_list *dispatch
        = Engraver_dispatch_list::unsmob (acklist);
 
@@ -56,12 +59,12 @@ Engraver_group::acknowledge_grobs ()
          SCM ifaces
            = scm_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta));
          acklist = Engraver_dispatch_list::create (get_simple_trans_list (),
-                                                   ifaces);
+                                                   ifaces, info.start_end ());
 
          dispatch
            = Engraver_dispatch_list::unsmob (acklist);
 
-         scm_hashq_set_x (acknowledge_hash_table_, nm, acklist);
+         scm_hashq_set_x (acknowledge_hash_table_drul_[info.start_end ()], nm, acklist);
        }
 
       if (dispatch)
@@ -95,6 +98,9 @@ Engraver_group::do_announces ()
 {
   do
     {
+      /*
+       DOCME: why is this inside the loop? 
+       */
       for (SCM s = context ()->children_contexts ();
           scm_is_pair (s); s = scm_cdr (s))
        {
@@ -105,6 +111,7 @@ Engraver_group::do_announces ()
            group->do_announces ();
        }
 
+      
       while (1)
        {
          precomputed_translator_foreach (PROCESS_ACKNOWLEDGED);
@@ -120,8 +127,12 @@ Engraver_group::do_announces ()
 
 Engraver_group::Engraver_group ()
 {
-  acknowledge_hash_table_ = SCM_EOL;
-  acknowledge_hash_table_ = scm_c_make_hash_table (61);
+  acknowledge_hash_table_drul_[LEFT] 
+    = acknowledge_hash_table_drul_[RIGHT] 
+    = SCM_EOL;
+  
+  acknowledge_hash_table_drul_[LEFT] = scm_c_make_hash_table (61);
+  acknowledge_hash_table_drul_[RIGHT] = scm_c_make_hash_table (61);
 }
 
 #include "translator.icc"
@@ -136,5 +147,6 @@ ADD_TRANSLATOR_GROUP (Engraver_group,
 void
 Engraver_group::derived_mark () const
 {
-  scm_gc_mark (acknowledge_hash_table_);
+  scm_gc_mark (acknowledge_hash_table_drul_[LEFT]);
+  scm_gc_mark (acknowledge_hash_table_drul_[RIGHT]);
 }