lilypond-1.3.109

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 60a72fa594ff6a6dd7e6f484c290d9eac25d354f..0d3f2a67f83c82f751dac14a1d11481851d899aa 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -6,51 +6,41 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "music-list.hh"
-#include "musical-request.hh"
+#include "music.hh"
 #include "engraver.hh"
 #include "engraver-group-engraver.hh"
-#include "debug.hh"
-#include "paper-def.hh"
-#include "score-element.hh"
-#include "group-interface.hh"
+#include "grob.hh"
 
 
 void
-Engraver::announce_element (Score_element_info inf)
+Engraver::announce_grob (Grob_info inf)
 {
-  daddy_grav_l()->announce_element (inf);
+  daddy_grav_l()->announce_grob (inf);
 }
 
 void
-Engraver::announce_element (Score_element* e, Music *m)
+Engraver::announce_grob (Grob* e, Music *m)
 {
   if (m && m->origin ()->location_str ().length_i ())
     {
-      e->set_elt_property ("origin", m->get_mus_property ("origin"));
+      e->set_grob_property ("origin", m->get_mus_property ("origin"));
     }
   
-  Score_element_info i (e, m);
+  Grob_info i (e, m);
   if (!i.origin_trans_l_)
     i.origin_trans_l_ = this;
-  daddy_grav_l()->announce_element (i);
+  daddy_grav_l()->announce_grob (i);
 }
 
 
  
 void
-Engraver::typeset_element (Score_element*p)
+Engraver::typeset_grob (Grob*p)
 {
-  daddy_grav_l()->typeset_element (p);
+  daddy_grav_l()->typeset_grob (p);
 }
 
 
-Paper_def*
-Engraver::paper_l () const
-{
-  return dynamic_cast<Paper_def*>(output_def_l_);
-}
-
 Engraver_group_engraver*
 Engraver::daddy_grav_l () const
 {
@@ -58,3 +48,9 @@ Engraver::daddy_grav_l () const
        ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
        : 0;
 }
+
+void
+Engraver::process_music ()
+{
+  
+}

diff --git a/lily/translator.cc b/lily/translator.cc
index 4946af8027e4be13812f60cc3d43cb8d627e64e1..485f807eb18f4e278f52028974e99873dd7a95ae 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -27,7 +27,6 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
-  status_ = ORPHAN;
   simple_trans_list_ = SCM_EOL;
   trans_group_list_ = SCM_EOL;
   properties_scm_ = SCM_EOL;
@@ -60,7 +59,7 @@ Translator::is_alias_b (String s) const
 }
 
 bool
-Translator::do_try_music (Music *)
+Translator::try_music (Music *)
 {
   return false;
 }
@@ -76,11 +75,7 @@ Translator::now_mom () const
 void
 Translator::add_processing ()
 {
-  if (status_ > ORPHAN)
-    return;
-  
   do_add_processing ();
-  status_ = VIRGIN;
 }
 
 void
@@ -88,62 +83,31 @@ Translator::do_add_processing ()
 {
 }
 
-void
-Translator::creation_processing ()
-{
-  if (status_ >= CREATION_INITED)
-    return ;
-  
-  do_creation_processing ();
-  status_ = CREATION_INITED;
-}
 
 void
 Translator::post_move_processing ()
 {
-  if (status_ >= MOVE_INITED)
-    return;
-
-  creation_processing ();
-  do_post_move_processing ();
-  status_ = MOVE_INITED;
+  start_translation_timestep ();
 }
 
 void
 Translator::removal_processing ()
 {
-  if (status_ == ORPHAN)
-    return;
-  creation_processing ();
   do_removal_processing ();
 }
 
-bool
-Translator::try_music (Music * r)
-{
-  if (status_ < MOVE_INITED)
-    post_move_processing ();
-
-  return do_try_music (r);
-}
 
 void
-Translator::process_music ()
+Translator::announces ()
 {
-  if (status_ < PROCESSED_REQS)
-    post_move_processing ();
-  else if (status_ >= PROCESSED_REQS)
-    return; 
-  
-  status_ = PROCESSED_REQS;
-  do_process_music ();
+  do_announces ();
 }
 
+
 void
 Translator::pre_move_processing ()
 {
-  do_pre_move_processing ();
-  status_ = CREATION_INITED;
+  stop_translation_timestep ();
 }
 
 
@@ -167,17 +131,17 @@ Translator::get_property (SCM sym) const
 }
 
 void
-Translator:: do_pre_move_processing ()
+Translator:: stop_translation_timestep ()
 {
 }
 
 void
-Translator::do_post_move_processing ()
+Translator::start_translation_timestep ()
 {
 }
 
 void
-Translator::do_process_music ()
+Translator::do_announces ()
 {
 }