apply Julian's patch to fix install-info warnings

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

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index 6271d93979b729b97fea32db94b7e96df56d5ba9..a5782d23b0b8fbbcb8fa5272fb2cbdef77b389d2 100644 (file)
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -1,9 +1,20 @@
 /*
-  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--2006 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"
@@ -11,7 +22,6 @@
 #include "engraver-group.hh"
 #include "grob.hh"
 #include "paper-score.hh"
-#include "stream-event.hh"
 #include "translator-dispatch-list.hh"
 #include "warn.hh"
 
@@ -21,10 +31,10 @@ Engraver_group::override (SCM sev)
 {
   Stream_event *ev = unsmob_stream_event (sev);
   
-  execute_general_pushpop_property (context (),
-                                   ev->get_property ("symbol"),
-                                   ev->get_property ("property-path"),
-                                   ev->get_property ("value"));
+  sloppy_general_pushpop_property (context (),
+                                  ev->get_property ("symbol"),
+                                  ev->get_property ("property-path"),
+                                  ev->get_property ("value"));
 }
 
 IMPLEMENT_LISTENER (Engraver_group, revert);
@@ -33,10 +43,10 @@ Engraver_group::revert (SCM sev)
 {
   Stream_event *ev = unsmob_stream_event (sev);
   
-  execute_general_pushpop_property (context (),
-                                   ev->get_property ("symbol"),
-                                   ev->get_property ("property-path"),
-                                   SCM_UNDEFINED);
+  sloppy_general_pushpop_property (context (),
+                                  ev->get_property ("symbol"),
+                                  ev->get_property ("property-path"),
+                                  SCM_UNDEFINED);
 }
 
 void
@@ -60,9 +70,16 @@ Engraver_group::announce_grob (Grob_info 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)
@@ -89,7 +106,7 @@ Engraver_group::acknowledge_grobs ()
       else
        continue;
 
-      SCM acklist = scm_hashq_ref (acknowledge_hash_table_drul_[info.start_end()],
+      SCM acklist = scm_hashq_ref (acknowledge_hash_table_drul_[info.start_end ()],
                                   nm, SCM_BOOL_F);
       
       Engraver_dispatch_list *dispatch
@@ -179,11 +196,18 @@ Engraver_group::Engraver_group ()
 #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