Revert pnmgray hack.

[lilypond.git] / lily / beam-engraver.cc

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index f20160518e6c88314df24c4ed662a30edadab9e2..cad443299c789b79f8402e937238e6a28d80c20c 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -16,6 +16,7 @@
 #include "item.hh"
 #include "rest.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
 #include "stem.hh"
 #include "warn.hh"
 
@@ -27,13 +28,13 @@ public:
   DECLARE_ACKNOWLEDGER (stem);
   DECLARE_ACKNOWLEDGER (rest);
 protected:
-  Music *start_ev_;
+  Stream_event *start_ev_;
 
   Spanner *finished_beam_;
   Spanner *beam_;
-  Music *prev_start_ev_;
+  Stream_event *prev_start_ev_;
 
-  Music *now_stop_ev_;
+  Stream_event *now_stop_ev_;
 
   Beaming_pattern *beam_info_;
   Beaming_pattern *finished_beam_info_;
@@ -55,12 +56,12 @@ protected:
   void start_translation_timestep ();
   virtual void finalize ();
 
-  virtual bool try_music (Music *);
   void process_music ();
 
   virtual bool valid_start_point ();
   virtual bool valid_end_point ();
 
+  DECLARE_TRANSLATOR_LISTENER (beam);
 public:
   TRANSLATOR_DECLARATIONS (Beam_engraver);
 };
@@ -94,24 +95,16 @@ Beam_engraver::Beam_engraver ()
   prev_start_ev_ = 0;
 }
 
-bool
-Beam_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam);
+void
+Beam_engraver::listen_beam (Stream_event *ev)
 {
-  if (m->is_mus_type ("beam-event"))
-    {
-      Direction d = to_dir (m->get_property ("span-direction"));
-      if (d == START && !valid_start_point ())
-       return false;
-      if (d == STOP && !valid_end_point ())
-       return false;
-
-      if (d == START)
-       start_ev_ = m;
-      else if (d == STOP)
-       now_stop_ev_ = m;
-      return true;
-    }
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+
+  if (d == START && valid_start_point ())
+    ASSIGN_EVENT_ONCE (start_ev_, ev);
+  else if (d == STOP && valid_end_point ())
+    ASSIGN_EVENT_ONCE (now_stop_ev_, ev);
 }
 
 void
@@ -213,7 +206,8 @@ Beam_engraver::finalize ()
 void
 Beam_engraver::acknowledge_rest (Grob_info info)
 {
-  if (beam_)
+  if (beam_
+      && !scm_is_number (info.grob ()->get_property_data ("staff-position")))
     {
       chain_offset_callback (info.grob(),
                             Beam::rest_collision_callback_proc, Y_AXIS);
@@ -238,23 +232,18 @@ Beam_engraver::acknowledge_stem (Grob_info info)
 
   
   
-  Music *m = info.ultimate_music_cause ();
-  if (!m->is_mus_type ("rhythmic-event"))
+  Stream_event *ev = info.ultimate_event_cause ();
+  if (!ev->in_event_class ("rhythmic-event"))
     {
-      string s = _ ("stem must have Rhythmic structure");
-      if (info.music_cause ())
-       info.music_cause ()->origin ()->warning (s);
-      else
-       ::warning (s);
-
+      info.grob ()->warning (_ ("stem must have Rhythmic structure"));
       return;
     }
 
   last_stem_added_at_ = now;
-  int durlog = unsmob_duration (m->get_property ("duration"))->duration_log ();
+  int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log ();
   if (durlog <= 2)
     {
-      m->origin ()->warning (_ ("stem doesn't fit in beam"));
+      ev->origin ()->warning (_ ("stem doesn't fit in beam"));
       prev_start_ev_->origin ()->warning (_ ("beam was started here"));
       /*
        don't return, since
@@ -281,7 +270,6 @@ ADD_TRANSLATOR (Beam_engraver,
                "printed with flags instead of beams.",
                
                /* create */ "Beam",
-               /* accept */ "beam-event",
 
                /* read */
                "beamMelismaBusy "
@@ -296,6 +284,8 @@ class Grace_beam_engraver : public Beam_engraver
 public:
   TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
 
+  DECLARE_TRANSLATOR_LISTENER (beam);
+  
 protected:
   virtual bool valid_start_point ();
   virtual bool valid_end_point ();
@@ -319,6 +309,22 @@ Grace_beam_engraver::valid_end_point ()
   return beam_ && valid_start_point ();
 }
 
+/*
+  Ugh, C&P code.
+ */
+IMPLEMENT_TRANSLATOR_LISTENER (Grace_beam_engraver, beam);
+void
+Grace_beam_engraver::listen_beam (Stream_event *ev)
+{
+  Direction d = to_dir (ev->get_property ("span-direction"));
+
+  if (d == START && valid_start_point ())
+    start_ev_ = ev;
+  else if (d == STOP && valid_end_point ())
+    now_stop_ev_ = ev;
+}
+
+
 ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
 ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
 
@@ -331,7 +337,6 @@ ADD_TRANSLATOR (Grace_beam_engraver,
                " are at grace points in time. ",
                
                /* create */ "Beam",
-               /* accept */ "beam-event",
                /* read */
                "beamMelismaBusy "
                "beatLength "