]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/beam-engraver.cc
Fix some bugs in the dynamic engraver and PostScript backend
[lilypond.git] / lily / beam-engraver.cc
index 7b506953c8eb1904381b761bbffae8119f0462a5..c8104d0bd09f8a877c6c50cb68f23ab9927e3caa 100644 (file)
-/*   
-  beam-engraver.cc --  implement Beam_engraver
-  
+/*
+  beam-engraver.cc -- implement Beam_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "engraver-group-engraver.hh"
-#include "engraver.hh"
-#include "musical-request.hh"
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "beam.hh"
-#include "stem.hh"
-#include "warn.hh"
-#include "beaming.hh"
-#include "score-engraver.hh"
-#include "rest.hh"
+#include "beaming-pattern.hh"
+#include "context.hh"
 #include "drul-array.hh"
+#include "duration.hh"
+#include "engraver.hh"
+#include "international.hh"
 #include "item.hh"
+#include "rest.hh"
+#include "score-context.hh"
 #include "spanner.hh"
+#include "stem.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 class Beam_engraver : public Engraver
 {
-  Drul_array<Span_req*> reqs_drul_;
+public:
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rest);
+protected:
+  Music *start_ev_;
 
-  Link_array<Stem> stems_;
-  
-  
-  Spanner *finished_beam_p_;
-  Spanner *beam_p_;
-  Span_req * prev_start_req_;
+  Spanner *finished_beam_;
+  Spanner *beam_;
+  Music *prev_start_ev_;
+
+  Music *now_stop_ev_;
 
-  Beaming_info_list * beam_info_p_;
-  Beaming_info_list * finished_beam_info_p_;  
+  Beaming_pattern *beam_info_;
+  Beaming_pattern *finished_beam_info_;
 
   /// location  within measure where beam started.
   Moment beam_start_location_;
 
   /// moment (global time) where beam started.
   Moment beam_start_mom_;
-  
+
+  bool subdivide_beams_;
+  Moment beat_length_;
+
   void typeset_beam ();
   void set_melisma (bool);
-protected:
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+
+  Moment last_stem_added_at_;
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
   virtual void finalize ();
-  virtual void create_grobs ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual bool try_music (Music*);
-  virtual void process_music ();
+
+  virtual bool try_music (Music *);
+  void process_music ();
+
+  virtual bool valid_start_point ();
+  virtual bool valid_end_point ();
 
 public:
-  Beam_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Beam_engraver);
 };
 
+/*
+  Hmm. this isn't necessary, since grace beams and normal beams are
+  always nested.
+*/
+bool
+Beam_engraver::valid_start_point ()
+{
+  Moment n = now_mom ();
+
+  return n.grace_part_ == Rational (0);
+}
+
+bool
+Beam_engraver::valid_end_point ()
+{
+  return valid_start_point ();
+}
 
 Beam_engraver::Beam_engraver ()
 {
-  beam_p_ = 0;
-  finished_beam_p_ =0;
-  finished_beam_info_p_=0;
-  beam_info_p_ =0;
-  reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
-  prev_start_req_ =0;
+  beam_ = 0;
+  finished_beam_ = 0;
+  finished_beam_info_ = 0;
+  beam_info_ = 0;
+  now_stop_ev_ = 0;
+  start_ev_ = 0;
+  prev_start_ev_ = 0;
 }
 
 bool
 Beam_engraver::try_music (Music *m)
 {
-  if (Span_req * c = dynamic_cast<Span_req*> (m))
+  if (m->is_mus_type ("beam-event"))
     {
-      if (scm_equal_p (c->get_mus_property ("span-type"),
-                      ly_str02scm ("abort")) == SCM_BOOL_T)
-       {
-         reqs_drul_[START] = 0;
-         reqs_drul_[STOP] = 0;
-         if (beam_p_)
-           beam_p_->suicide ();
-         beam_p_ = 0;
-       }
-      else if (scm_equal_p (c->get_mus_property ("span-type"),
-                      ly_str02scm ("beam")) == SCM_BOOL_T)
-       {
-      
-         Direction d =c->get_span_dir ();
-
-         if (d == STOP && !beam_p_)
-           {
-             m->origin ()->warning (_ ("can't find start of beam"));
-             return false;
-           }
-
-         if (d == STOP)
-           {
-             SCM m = get_property ("automaticMelismata");
-             SCM b = get_property ("noAutoBeaming");
-             if (to_boolean (m) && to_boolean (b))
-               {
-                 set_melisma (false);
-               }
-           }
-
-         reqs_drul_[d ] = c;
-         return true;
-       }
+      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;
 }
 
 void
-Beam_engraver::set_melisma (bool m)
+Beam_engraver::set_melisma (bool ml)
 {
-  daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  SCM b = get_property ("autoBeaming");
+  if (!to_boolean (b))
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
 Beam_engraver::process_music ()
 {
-  if (reqs_drul_[STOP])
-    {
-      if (!beam_p_)
-       reqs_drul_[STOP]->origin ()->warning (_ ("can't find start of beam"));
-      prev_start_req_ =0;
-      finished_beam_p_ = beam_p_;
-      finished_beam_info_p_ = beam_info_p_;
-
-      beam_info_p_ =0;
-      beam_p_ = 0;
-    }
-
+  if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
+    context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
 
-  if (beam_p_)
+  if (start_ev_)
     {
-      Score_engraver * e = 0;
-      Translator * t  =  daddy_grav_l ();
-      for (; !e && t;  t = t->daddy_trans_l_)
+      if (beam_)
        {
-         e = dynamic_cast<Score_engraver*> (t);
-       }
-      
-      if (!e)
-       programming_error ("No score engraver!");
-      else
-       e->forbid_breaks ();
-    }
-}
-
-
-void
-Beam_engraver::create_grobs ()
-{
-  if (reqs_drul_[START])
-    {
-      if (beam_p_)
-       {
-         reqs_drul_[START]->origin ()->warning (_ ("already have a beam"));
+         start_ev_->origin ()->warning (_ ("already have a beam"));
          return;
        }
 
-      prev_start_req_ = reqs_drul_[START];
-      beam_p_ = new Spanner (get_property ("Beam"));
-      SCM smp = get_property ("measurePosition");
-      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      set_melisma (true);
+      prev_start_ev_ = start_ev_;
+      beam_ = make_spanner ("Beam", start_ev_->self_scm ());
+      Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
 
       beam_start_location_ = mp;
       beam_start_mom_ = now_mom ();
-      
-      beam_info_p_ = new Beaming_info_list;
-      
+
+      beam_info_ = new Beaming_pattern;
       /* urg, must copy to Auto_beam_engraver too */
-      announce_grob (beam_p_, reqs_drul_[START]);
     }
-  reqs_drul_[STOP] = 0;
-  reqs_drul_[START] = 0;
 }
 
 void
 Beam_engraver::typeset_beam ()
 {
-  if (finished_beam_p_)
+  if (finished_beam_)
     {
-      finished_beam_info_p_->beamify ();
-      
-      Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
-      typeset_grob (finished_beam_p_);
-      delete finished_beam_info_p_;
-      finished_beam_info_p_ =0;
-      finished_beam_p_ = 0;
-    
-      reqs_drul_[STOP] = 0;
+      if (!finished_beam_->get_bound (RIGHT))
+       finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
+         
+      finished_beam_info_->beamify (context ());
+      Beam::set_beaming (finished_beam_, finished_beam_info_);
+
+      delete finished_beam_info_;
+      finished_beam_info_ = 0;
+      finished_beam_ = 0;
     }
 }
 
 void
 Beam_engraver::start_translation_timestep ()
 {
-  reqs_drul_ [START] =0;
-  if (beam_p_) {
-    SCM m = get_property ("automaticMelismata");
-    SCM b = get_property ("noAutoBeaming");
-    if (to_boolean (m) && to_boolean (b)) {
+  start_ev_ = 0;
+
+  if (beam_)
+    {
       set_melisma (true);
     }
-  }
 }
 
 void
 Beam_engraver::stop_translation_timestep ()
 {
   typeset_beam ();
+  if (now_stop_ev_)
+    {
+      finished_beam_ = beam_;
+      finished_beam_info_ = beam_info_;
+
+      now_stop_ev_ = 0;
+      beam_ = 0;
+      beam_info_ = 0;
+      typeset_beam ();
+      set_melisma (false);
+    }
 }
 
 void
 Beam_engraver::finalize ()
 {
   typeset_beam ();
-  if (beam_p_)
+  if (beam_)
     {
-      prev_start_req_->origin ()->warning (_ ("unterminated beam"));
+      prev_start_ev_->origin ()->warning (_ ("unterminated beam"));
 
       /*
        we don't typeset it, (we used to, but it was commented
        out. Reason unknown) */
-      beam_p_->suicide ();
-      delete beam_info_p_;
+      beam_->suicide ();
+      delete beam_info_;
     }
 }
 
 void
-Beam_engraver::acknowledge_grob (Grob_info info)
+Beam_engraver::acknowledge_rest (Grob_info info)
 {
-  if (beam_p_)
+  if (beam_)
     {
-      if (Rest::has_interface (info.elem_l_))
-       {
-         info.elem_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
-       }
-      else if (Stem::has_interface (info.elem_l_))
-       {
-         Moment now = now_mom();
+      chain_offset_callback (info.grob(),
+                            Beam::rest_collision_callback_proc, Y_AXIS);
+    }
+}
 
-         if(bool (now.grace_mom_ ) != bool (beam_start_mom_.grace_mom_))
-           return ;
-         
-         Item *stem_l = dynamic_cast<Item*> (info.elem_l_);
-         if (Stem::beam_l (stem_l))
-           return;
-
-         Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
-         if (!rhythmic_req)
-           {
-             String s = _ ("stem must have Rhythmic structure");
-             if (info.req_l_)
-               info.req_l_->origin ()->warning (s);
-             else
-               ::warning (s);
-         
-             return;
-           }
-
-      int durlog  = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log ();
-         if (durlog <= 2)
-           {
-             rhythmic_req->origin ()->warning (_ ("stem doesn't fit in beam"));
-             prev_start_req_->origin ()->warning (_ ("beam was started here"));
-             /*
-               don't return, since
-
-               [r4 c8] can just as well be modern notation.
-             */
-           }
-
-         stem_l->set_grob_property ("duration-log",
-                                   gh_int2scm (durlog));
-         Moment stem_location = now - beam_start_mom_ + beam_start_location_;
-         beam_info_p_->add_stem (stem_location,
- (durlog- 2) >? 1);
-         Beam::add_stem (beam_p_, stem_l);
-       }
+
+
+void
+Beam_engraver::acknowledge_stem (Grob_info info)
+{
+  if (!beam_)
+    return;
+  
+  Moment now = now_mom ();
+  if (!valid_start_point ())
+    return;
+
+  Item *stem = dynamic_cast<Item *> (info.grob ());
+  if (Stem::get_beam (stem))
+    return;
+
+  
+  
+  Music *m = info.ultimate_music_cause ();
+  if (!m->is_mus_type ("rhythmic-event"))
+    {
+      string s = _ ("stem must have Rhythmic structure");
+      if (info.music_cause ())
+       info.music_cause ()->origin ()->warning (s);
+      else
+       ::warning (s);
+
+      return;
     }
+
+  last_stem_added_at_ = now;
+  int durlog = unsmob_duration (m->get_property ("duration"))->duration_log ();
+  if (durlog <= 2)
+    {
+      m->origin ()->warning (_ ("stem doesn't fit in beam"));
+      prev_start_ev_->origin ()->warning (_ ("beam was started here"));
+      /*
+       don't return, since
+
+       [r4 c8] can just as well be modern notation.
+      */
+    }
+
+  stem->set_property ("duration-log",
+                     scm_from_int (durlog));
+  Moment stem_location = now - beam_start_mom_ + beam_start_location_;
+  beam_info_->add_stem (stem_location,
+                       max (durlog- 2, 0));
+  Beam::add_stem (beam_, stem);
+}
+
+ADD_ACKNOWLEDGER (Beam_engraver, stem);
+ADD_ACKNOWLEDGER (Beam_engraver, rest);
+
+ADD_TRANSLATOR (Beam_engraver,
+               /* doc */
+
+               "Handles Beam events by engraving Beams.  If omitted, then notes will be "
+               "printed with flags instead of beams.",
+               
+               /* create */ "Beam",
+               /* accept */ "beam-event",
+
+               /* read */
+               "beamMelismaBusy "
+               "beatLength "
+               "subdivideBeams "
+               ,
+               /* write */
+               "forbidBreak");
+
+class Grace_beam_engraver : public Beam_engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
+
+protected:
+  virtual bool valid_start_point ();
+  virtual bool valid_end_point ();
+};
+
+Grace_beam_engraver::Grace_beam_engraver ()
+{
 }
 
+bool
+Grace_beam_engraver::valid_start_point ()
+{
+  Moment n = now_mom ();
+
+  return n.grace_part_ != Rational (0);
+}
 
+bool
+Grace_beam_engraver::valid_end_point ()
+{
+  return beam_ && valid_start_point ();
+}
 
-ADD_THIS_TRANSLATOR (Beam_engraver);
+ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
+
+ADD_TRANSLATOR (Grace_beam_engraver,
+
+               /* doc */
+
+               "Handles Beam events by engraving Beams.  If omitted, then notes will "
+               "be printed with flags instead of beams. Only engraves beams when we "
+               " are at grace points in time. ",
+               
+               /* create */ "Beam",
+               /* accept */ "beam-event",
+               /* read */
+               "beamMelismaBusy "
+               "beatLength "
+               "allowBeamBreak "
+               "subdivideBeams "
+               ,
+               /* write */ "");