Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 2badb89cd66a5614f16752bf0b5a1a3857c5004a..eebd22e4bea706dbf8635b70c0e1ebf412cedb24 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,98 +3,85 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music.hh"
 #include "engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "grob.hh"
+
+#include "music.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"
+
+Engraver_group *
+Engraver::get_daddy_engraver () const
+{
+  return dynamic_cast<Engraver_group *> (get_daddy_translator ());
+}
 
 void
 Engraver::announce_grob (Grob_info inf)
 {
-  get_daddy_grav ()->announce_grob (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
   was the reason for making E.
- */
+*/
 void
-Engraver::announce_grob (Grob* e, SCM cause)
+Engraver::announce_grob (Grob *e, SCM cause)
 {
-  /*
-    TODO: junk grob-info, and make a cause grob-property to store
-    `causes' generically.
-  */
   if (unsmob_music (cause) || unsmob_grob (cause))
-    e->set_grob_property ("cause", cause);
-
-  Grob_info i;
-  i.grob_ = e;
-  if (!i.origin_trans_)
-    i.origin_trans_ = this;
+    e->set_property ("cause", cause);
 
+  Grob_info i (this, e);
 
-
-  get_daddy_grav ()->announce_grob (i);
+  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::typeset_grob (Grob*p)
-{
-  get_daddy_grav ()->typeset_grob (p);
-}
-
-
-Engraver_group_engraver*
-Engraver::get_daddy_grav () const
+Engraver::announce_end_grob (Grob *e, SCM cause)
 {
-  return (daddy_trans_)
-       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_)
-       : 0;
-}
+  if (unsmob_music (cause) || unsmob_grob (cause))
+    e->set_property ("cause", cause);
 
-void
-Engraver::process_music ()
-{
-  
-}
+  Grob_info i (this, e);
 
-Item*
-Engraver::internal_make_item (SCM x)
-{
-  SCM props = internal_get_property (x);
-  return new Item (props);
+  i.start_end_ = STOP;
+  Engraver_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
-Spanner*
-Engraver::internal_make_spanner (SCM x)
-{
-  SCM props = internal_get_property (x);
-  return new Spanner (props);
-}
 
-Engraver::Engraver()
+Engraver::Engraver ()
 {
 }
 
+#include "translator.icc"
 
-Score_engraver* 
-Engraver::top_engraver () const
-{
-  return dynamic_cast<Score_engraver*> (top_translator());
-}
-
-ENTER_DESCRIPTION(Engraver,
-                  "", "",
-                 "",
-                 "", "", "");
+ADD_TRANSLATOR (Engraver,
+               "Base class for engravers. Does nothing, so it is not used.",
+               "",
+               "",
+               "",
+               "");