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 697a4844a20ed14462671b464126fda8d7e5fd05..eebd22e4bea706dbf8635b70c0e1ebf412cedb24 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,138 +1,87 @@
 /*
   engraver.cc -- implement Engraver
 
-  Sourcefile of GNU LilyPond musictypesetter
+  Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music-list.hh"
-#include "musical-request.hh"
 #include "engraver.hh"
-#include "engraver-group.hh"
-#include "debug.hh"
 
-void
-Engraver::post_move_processing()
-{
-    if (status < CREATION_INITED) {
-       do_creation_processing();
-       status = CREATION_INITED;
-    }
-    if (status >= MOVE_INITED)
-       return;
-
-    do_post_move_processing();
-    status = MOVE_INITED;
-}
+#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"
 
-void
-Engraver::removal_processing()
+Engraver_group *
+Engraver::get_daddy_engraver () const
 {
-    if ( status < CREATION_INITED )
-       do_creation_processing();
-    
-    do_removal_processing();
-}
-
-bool
-Engraver::try_request(Request * r)
-{
-    if (status < MOVE_INITED)
-       post_move_processing();
-
-    return do_try_request(r);
+  return dynamic_cast<Engraver_group *> (get_daddy_translator ());
 }
 
 void
-Engraver::process_requests()
+Engraver::announce_grob (Grob_info inf)
 {
-    if (status < PROCESSED_REQS)
-       post_move_processing();
-    else if (status >= PROCESSED_REQS)
-       return; 
-    
-    status = PROCESSED_REQS;
-    do_process_requests();
+  get_daddy_engraver ()->announce_grob (inf);
 }
 
 void
-Engraver::pre_move_processing()
+Engraver::announce_end_grob (Grob_info inf)
 {
-    do_pre_move_processing();
-    status = CREATION_INITED;
+  get_daddy_engraver ()->announce_grob (inf);
 }
 
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+*/
 void
-Engraver::fill_staff_info(Staff_info&)
+Engraver::announce_grob (Grob *e, SCM cause)
 {
-    
-}
+  if (unsmob_music (cause) || unsmob_grob (cause))
+    e->set_property ("cause", cause);
 
-Scalar
-Engraver::get_feature(String t)
-{
-    return daddy_grav_l_->get_feature(t);
-}
+  Grob_info i (this, e);
 
-bool
-Engraver::do_try_request(Request*)
-{
-    return false;
+  Engraver_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
-Engraver::Engraver()
-{
-    status = VIRGIN;
-    daddy_grav_l_ = 0;
-}
-
-void
-Engraver::announce_element(Score_elem_info i)
-{
-    i.origin_grav_l_arr_.push(this);
-    daddy_grav_l_->announce_element(i);
-}
 
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+*/
 void
-Engraver::typeset_element(Score_elem*p)
+Engraver::announce_end_grob (Grob *e, SCM cause)
 {
-    daddy_grav_l_->typeset_element(p);
-}
+  if (unsmob_music (cause) || unsmob_grob (cause))
+    e->set_property ("cause", cause);
 
-Paper_def*
-Engraver::paper()const
-{
-    return daddy_grav_l_->paper();
-}
+  Grob_info i (this, e);
 
-bool
-Engraver::contains_b(Engraver *grav_l)const
-{
-    return this == grav_l;
+  i.start_end_ = STOP;
+  Engraver_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
-Staff_info
-Engraver::get_staff_info() const
-{
-    return daddy_grav_l_->get_staff_info();
-}
 
-void
-Engraver::print() const
+Engraver::Engraver ()
 {
-#ifndef NPRINT
-    mtor << "\n" << name() << " {";
-    do_print();
-    mtor << "}";
-#endif
 }
 
+#include "translator.icc"
 
-IMPLEMENT_IS_TYPE_B(Engraver);
-
-void
-Engraver::do_print() const
-{
-}
+ADD_TRANSLATOR (Engraver,
+               "Base class for engravers. Does nothing, so it is not used.",
+               "",
+               "",
+               "",
+               "");