X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=4e0ea654337118d8e3a057310c24c046e5be7f61;hb=c77189ccaa4e645850ad61779de7a4c8f3fdbc6f;hp=c749be110a169b2319d68059070dbb7f5f2bf1de;hpb=ac6c83f047635535d0481a15654c13e776334dc6;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index c749be110a..4e0ea65433 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,9 +1,20 @@
 /*
-  engraver.cc -- implement Engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  Sourcefile of GNU LilyPond music type setter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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 "engraver.hh"
@@ -59,9 +70,8 @@ Engraver::announce_grob (Grob *e, SCM cause)
 
 
 /*
-  CAUSE is the object (typically a Music object)  that
-  was the reason for making E.
-*/
+  CAUSE is the object (typically a grob or stream-event object) that
+  was the reason for ending E.  */
 void
 Engraver::announce_end_grob (Grob *e, SCM cause)
 {
@@ -70,7 +80,8 @@ Engraver::announce_end_grob (Grob *e, SCM cause)
     {
       cause = m->to_event ()->unprotect ();
     }
-  if (unsmob_stream_event (cause) || unsmob_grob (cause))
+  if (e->get_property ("cause") == SCM_EOL
+      && (unsmob_stream_event (cause) || unsmob_grob (cause)))
     e->set_property ("cause", cause);
 
   Grob_info i (this, e);
@@ -105,13 +116,19 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
 #endif
 
 Grob *
-Engraver::internal_make_grob (SCM symbol, SCM cause, char const *name, char const *file, int line, char const *fun)
+Engraver::internal_make_grob (SCM symbol,
+			      SCM cause,
+			      char const * /* name */,
+			      char const *file,
+			      int line,
+			      char const *fun)
 {
-  (void) file;
-  (void) fun;
-  (void) line;
-  (void) name;
-  
+#ifdef NDEBUG
+  (void)file;
+  (void)line;
+  (void)fun;
+#endif
+
   SCM props = updated_grob_properties (context (), symbol);
 
   Grob *grob = 0;
@@ -157,13 +174,26 @@ Engraver::internal_make_column (SCM x, char const *name,
 }
 
 Spanner *
-Engraver::internal_make_spanner (SCM x, SCM cause, char const *name, char const *file, int line, char const *fun)
+Engraver::internal_make_spanner (SCM x, SCM cause, char const *name,
+				 char const *file, int line, char const *fun)
 {
   Spanner *sp = dynamic_cast<Spanner *> (internal_make_grob (x, cause, name, file, line, fun));
   assert (sp);
   return sp;
 }
 
+Engraver*
+unsmob_engraver (SCM eng)
+{
+  return dynamic_cast<Engraver*> (unsmob_translator (eng));
+}
+
+bool
+ly_is_grob_cause (SCM obj)
+{
+  return unsmob_grob (obj) || unsmob_stream_event (obj);
+}
+
 #include "translator.icc"
 
 ADD_TRANSLATOR (Engraver,
@@ -180,3 +210,4 @@ ADD_TRANSLATOR (Engraver,
 		""
 		);
 
+