X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fengraver-group.cc;h=a5782d23b0b8fbbcb8fa5272fb2cbdef77b389d2;hb=907e4ec4b3d11754b9df79ecad0bad075f7b4ac9;hp=d76214fa51b7afe6f0a8e84f2029194f0b9cf77c;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index d76214fa51..a5782d23b0 100644
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -1,28 +1,87 @@
 /*
-  engraver-group.cc -- implement Engraver_group
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "context.hh"
+#include "dispatcher.hh"
 #include "engraver-group.hh"
-
-#include "warn.hh"
-#include "paper-score.hh"
 #include "grob.hh"
-#include "context.hh"
+#include "paper-score.hh"
 #include "translator-dispatch-list.hh"
+#include "warn.hh"
+
+IMPLEMENT_LISTENER (Engraver_group, override);
+void
+Engraver_group::override (SCM sev)
+{
+  Stream_event *ev = unsmob_stream_event (sev);
+  
+  sloppy_general_pushpop_property (context (),
+				   ev->get_property ("symbol"),
+				   ev->get_property ("property-path"),
+				   ev->get_property ("value"));
+}
+
+IMPLEMENT_LISTENER (Engraver_group, revert);
+void
+Engraver_group::revert (SCM sev)
+{
+  Stream_event *ev = unsmob_stream_event (sev);
+  
+  sloppy_general_pushpop_property (context (),
+				   ev->get_property ("symbol"),
+				   ev->get_property ("property-path"),
+				   SCM_UNDEFINED);
+}
+
+void
+Engraver_group::connect_to_context (Context *c)
+{
+  Translator_group::connect_to_context (c);
+  c->event_source ()->add_listener (GET_LISTENER (override), ly_symbol2scm ("Override"));
+  c->event_source ()->add_listener (GET_LISTENER (revert), ly_symbol2scm ("Revert"));
+}
+
+void
+Engraver_group::disconnect_from_context ()
+{
+  context ()->event_source ()->remove_listener (GET_LISTENER (override), ly_symbol2scm ("Override"));
+  context ()->event_source ()->remove_listener (GET_LISTENER (revert), ly_symbol2scm ("Revert"));
+  Translator_group::disconnect_from_context ();
+}
 
 void
 Engraver_group::announce_grob (Grob_info info)
 {
-  announce_infos_.push (info);
+  announce_infos_.push_back (info);
+
+  Context *dad_con = context_->get_parent_context ();
+  if (info.rerouting_daddy_context_)
+    {
+      dad_con = info.rerouting_daddy_context_;
+      info.rerouting_daddy_context_ = 0;
+    }
 
   Engraver_group *dad_eng
-    = context_->get_parent_context ()
-    ? dynamic_cast<Engraver_group *> (context_->get_parent_context ()->implementation ())
+    = dad_con
+    ? dynamic_cast<Engraver_group *> (dad_con->implementation ())
     : 0;
+
   if (dad_eng)
     dad_eng->announce_grob (info);
 }
@@ -36,10 +95,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 +106,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 +117,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)
@@ -124,21 +185,33 @@ 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"
 
 ADD_TRANSLATOR_GROUP (Engraver_group,
-		      /* doc */ "A group of engravers taken together",
-		      /* create */ "",
-		      /* accept */ "",
-		      /* read */ "",
-		      /* write */ "");
+		      /* doc */
+		      "A group of engravers taken together.",
+
+		      /* create */
+		      "",
+
+		      /* read */
+		      "",
+
+		      /* write */
+		      ""
+		      );
 
 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]);
 }