X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=dcda3031b4835508dd14b6b5524b2b3d60603792;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=487b289f268124836ce855a71330de9872861e04;hpb=f8f86f7e61fbea1b289f98f26e6253532dc4a356;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 487b289f26..dcda3031b4 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,19 +3,19 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 
+#include "context.hh"
+#include "international.hh"
 #include "music.hh"
+#include "paper-column.hh"
 #include "score-engraver.hh"
-#include "warn.hh"
 #include "spanner.hh"
-#include "item.hh"
-#include "context.hh"
-#include "score-context.hh"
-#include "lilypond-key.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
 Engraver_group *
 Engraver::get_daddy_engraver () const
@@ -29,39 +29,155 @@ Engraver::announce_grob (Grob_info inf)
   get_daddy_engraver ()->announce_grob (inf);
 }
 
+void
+Engraver::announce_end_grob (Grob_info inf)
+{
+  get_daddy_engraver ()->announce_grob (inf);
+}
+
 /*
-  CAUSE is the object (typically a Music object)  that
+  CAUSE is the object (typically a Stream_event object)  that
   was the reason for making E.
 */
 void
 Engraver::announce_grob (Grob *e, SCM cause)
 {
-  if (unsmob_music (cause) || unsmob_grob (cause))
+  /* TODO: Remove Music code when it's no longer needed */
+  if (Music *m = unsmob_music (cause))
+    {
+      cause = m->to_event ()->unprotect ();
+    }
+  if (unsmob_stream_event (cause) || unsmob_grob (cause))
+    e->set_property ("cause", cause);
+
+  Grob_info i (this, e);
+
+  Engraver_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
+}
+
+
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+*/
+void
+Engraver::announce_end_grob (Grob *e, SCM cause)
+{
+  /* TODO: Remove Music code when it's no longer needed */
+  if (Music *m = unsmob_music (cause))
+    {
+      cause = m->to_event ()->unprotect ();
+    }
+  if (e->get_property ("cause") == SCM_EOL
+      && (unsmob_stream_event (cause) || unsmob_grob (cause)))
     e->set_property ("cause", cause);
 
   Grob_info i (this, e);
 
+  i.start_end_ = STOP;
   Engraver_group *g = get_daddy_engraver ();
   if (g)
     g->announce_grob (i);
 }
 
+
 Engraver::Engraver ()
 {
 }
 
-Score_engraver *
-Engraver::get_score_engraver () const
+#ifndef NDEBUG
+static SCM creation_callback = SCM_EOL;
+LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
+	   1, 0, 0, (SCM cb),
+	   "Specify a procedure that will be called every time a new grob"
+	   " is created.  The callback will receive as arguments the grob"
+	   " that was created, the name of the C++ source file that caused"
+	   " the grob to be created, and the corresponding line number in"
+	   " the C++ source file.")
 {
-  return dynamic_cast<Score_engraver *> (get_score_context ()->implementation ());
+  LY_ASSERT_TYPE (ly_is_procedure, cb, 1);
+
+  creation_callback = cb;
+
+  return SCM_UNSPECIFIED;
+}
+#endif
+
+Grob *
+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;
+  
+  SCM props = updated_grob_properties (context (), symbol);
+
+  Grob *grob = 0;
+
+  SCM handle = scm_sloppy_assq (ly_symbol2scm ("meta"), props);
+  SCM klass = scm_cdr (scm_sloppy_assq (ly_symbol2scm ("class"), scm_cdr (handle)));
+
+  if (klass == ly_symbol2scm ("Item"))
+    grob = new Item (props);
+  else if (klass == ly_symbol2scm ("Spanner"))
+    grob = new Spanner (props);
+  else if (klass == ly_symbol2scm ("Paper_column"))
+    grob = new Paper_column (props);
+
+  assert (grob);
+  announce_grob (grob, cause);
+
+#ifndef NDEBUG
+  if (ly_is_procedure (creation_callback))
+    scm_apply_0 (creation_callback,
+		 scm_list_n (grob->self_scm (), scm_from_locale_string (file),
+			     scm_from_int (line), scm_from_locale_string (fun), SCM_UNDEFINED));
+#endif
+
+  return grob;
+}
+
+Item *
+Engraver::internal_make_item (SCM x, SCM cause,
+			      char const *name,
+			      char const *file, int line, char const *fun)
+{
+  Item *it = dynamic_cast<Item *> (internal_make_grob (x, cause, name, file, line, fun));
+  assert (it);
+  return it;
+}
+
+Paper_column *
+Engraver::internal_make_column (SCM x, char const *name,
+				char const *file, int line, char const *fun)
+{
+  return dynamic_cast<Paper_column *> (internal_make_grob (x, SCM_EOL, name, file, line, fun));
+}
+
+Spanner *
+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;
 }
 
 #include "translator.icc"
 
 ADD_TRANSLATOR (Engraver,
-		"Base class for engravers. Does nothing, so it is not used.",
-		"",
+		/* doc */
+		"Base class for engravers.  Does nothing, so it is not used.",
+
+		/* create */
 		"",
+
+		/* read */
 		"",
-		"");
+
+		/* write */
+		""
+		);