]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/chord-tremolo-engraver.cc
Fix some bugs in the dynamic engraver and PostScript backend
[lilypond.git] / lily / chord-tremolo-engraver.cc
index 98c42bb9f47fe5848b83729a4c5dbbd4c4b96324..60800064c91ae4dd91b60b35827377fbbafc4694 100644 (file)
-/*   
-  new-chord-tremolo-engraver.cc --  implement Chord_tremolo_engraver
-  
+/*
+  chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "engraver.hh"
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+                Erik Sandberg <mandolaerik@gmail.com>
+*/
+
+#include "math.h" // ceil
+
 #include "beam.hh"
+#include "engraver-group.hh"
+#include "international.hh"
+#include "item.hh"
+#include "misc.hh"
 #include "repeated-music.hh"
-#include "stem.hh"
 #include "rhythmic-head.hh"
-#include "engraver-group-engraver.hh"
-#include "musical-request.hh"
-#include "warn.hh"
-#include "misc.hh"
-#include "note-head.hh"
 #include "spanner.hh"
-#include "item.hh"
-#include "chord-tremolo-iterator.hh"
 #include "stem-tremolo.hh"
-#include "music-list.hh"
+#include "stem.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 /**
-  This acknowledges repeated music with "tremolo" style.  It typesets
-  a beam.
 
-  TODO:
+This acknowledges repeated music with "tremolo" style.  It typesets
+a beam.
 
-  - perhaps use engraver this to steer other engravers? That would
-  create dependencies between engravers, which is bad.
+TODO:
 
-  - create dots if appropriate.
+- perhaps use engraver this to steer other engravers? That would
+create dependencies between engravers, which is bad.
 
-  - create  TremoloBeam iso Beam?
- */
+- create dots if appropriate.
 
+- create TremoloBeam iso Beam?
+*/
 class Chord_tremolo_engraver : public Engraver
 {
-  void typeset_beam ();
-TRANSLATOR_DECLARATIONS(Chord_tremolo_engraver);
+  TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver);
 protected:
-  Repeated_music * repeat_;
+  Music *repeat_;
 
-  /// moment (global time) where beam started.
-  Moment start_mom_;
-  Moment stop_mom_;
+  int flags_;
+  // number of beams for short tremolos
+  int expected_beam_count_;
+  // current direction of beam (first RIGHT, then LEFT)
+  Direction beam_dir_;
 
-  /// location  within measure where beam started.
-  Moment beam_start_location_;
-
-  int note_head_i_;
-
-  bool sequential_body_b_;
-  Spanner * beam_p_;
-  Spanner * finished_beam_p_;
-  Item * stem_tremolo_;
+  Spanner *beam_;
 protected:
   virtual void finalize ();
-  virtual bool try_music (Music*);
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  virtual bool try_music (Music *);
+  void process_music ();
+  DECLARE_ACKNOWLEDGER (stem);
 };
 
 Chord_tremolo_engraver::Chord_tremolo_engraver ()
 {
-  beam_p_  = finished_beam_p_ = 0;
-  repeat_ =0;
-  note_head_i_ = 0;
-  stem_tremolo_ = 0;
-  sequential_body_b_ = false;
+  beam_ = 0;
+  repeat_ = 0;
+  flags_ = 0;
+  expected_beam_count_ = 0;
+  beam_dir_ = CENTER;
 }
 
 bool
-Chord_tremolo_engraver::try_music (Music * m)
+Chord_tremolo_engraver::try_music (Music *m)
 {
-  Repeated_music * rp = dynamic_cast<Repeated_music*> (m);
-  if (rp
-      && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_cxx_function
-      && !repeat_) 
+  if (m->is_mus_type ("tremolo-span-event"))
     {
-      Moment l = rp->length_mom ();
-      repeat_ = rp;
-      start_mom_ = now_mom ();
-      stop_mom_ = start_mom_ + l;
-      sequential_body_b_ = dynamic_cast<Sequential_music*> (rp->body ());
-
-      // ugh. should generate dots, triplet beams.      
-      note_head_i_ = l.den () <? 4; 
+      Direction span_dir = to_dir (m->get_property ("span-direction"));
+      if (span_dir == START)
+       {
+         repeat_ = m;
+         int type = scm_to_int (m->get_property ("tremolo-type"));
+         /* e.g. 1 for type 8, 2 for type 16 */
+         flags_ = intlog2 (type) - 2;
+         expected_beam_count_ = scm_to_int (m->get_property ("expected-beam-count"));
+         beam_dir_ = RIGHT;
+       }
+      if (span_dir == STOP)
+       {
+         repeat_ = 0;
+          beam_ = 0;
+          expected_beam_count_ = 0;
+          beam_dir_ = CENTER;
+       }
       return true;
     }
-
   return false;
 }
 
 void
 Chord_tremolo_engraver::process_music ()
 {
-  if (repeat_)
+  if (repeat_ && !beam_)
     {
-      if (sequential_body_b_ && !beam_p_)
-       {
-         beam_p_ = new Spanner (get_property ("Beam"));
-         beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T);
-
-
-         SCM smp = get_property ("measurePosition");
-         Moment mp
-           = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
-         beam_start_location_ = mp;
-         announce_grob (beam_p_, repeat_);
-       }
-      else if (!sequential_body_b_ && !stem_tremolo_)
-       {
-         int flags = intlog2 (note_head_i_ * repeat_->repeat_count ()) -2;
-         if (flags)
-           {
-             stem_tremolo_ = new Item (get_property ("StemTremolo"));
-             Stem_tremolo::set_interface (stem_tremolo_);
-
-             announce_grob (stem_tremolo_, repeat_);
-             stem_tremolo_->set_grob_property ("tremolo-flags",
-                                               gh_int2scm (flags));
-
-           }
-       }
+      beam_ = make_spanner ("Beam", repeat_->self_scm ());
     }
 }
+
 void
 Chord_tremolo_engraver::finalize ()
 {
-  typeset_beam ();
-  if (beam_p_)
+  if (beam_)
     {
       repeat_->origin ()->warning (_ ("unterminated chord tremolo"));
-      beam_p_->suicide ();
+      beam_->suicide ();
     }
 }
 
 void
-Chord_tremolo_engraver::typeset_beam ()
+Chord_tremolo_engraver::acknowledge_stem (Grob_info info)
 {
-  if (finished_beam_p_)
+  if (beam_)
     {
-      typeset_grob (finished_beam_p_);
-      finished_beam_p_ = 0;
-    }
-}
+      Grob *s = info.grob ();
 
+      Stem::set_beaming (s, flags_, beam_dir_);
 
-void
-Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
-{
-  if (beam_p_)
-    {
-      if (Stem::has_interface (info.grob_l_))
+      if (Stem::duration_log (s) != 1)
+       beam_->set_property ("gap-count", scm_from_int (flags_ - expected_beam_count_));
+
+      if (beam_dir_ == RIGHT)
+        beam_dir_ = LEFT;
+
+      if (info.ultimate_music_cause ()->is_mus_type ("rhythmic-event"))
+       Beam::add_stem (beam_, s);
+      else
        {
-         Grob * s = info.grob_l_;
-         int f = Stem::flag_i (s);
-         f = (f > 2) ? f - 2 : 1;
-         Stem::set_beaming (s, f, LEFT);
-         Stem::set_beaming (s, f, RIGHT);
-         
-         /*
-           URG: this sets the direction of the Stem s.
-           It's amazing Mike:
-           
-             Stem:: type_i () ->first_head ()->get_direction () ->
-                     Directional_element_interface::set (me, d);
-
-
-             don't understand this comment.
-                     --hwn.
-          */
-         SCM d = s->get_grob_property ("direction");
-         if (Stem::type_i (s) != 1)
-           {
-             int gap_i =Stem::flag_i (s) - ((Stem::type_i (s) >? 2) - 2);
-             beam_p_->set_grob_property ("gap", gh_int2scm (gap_i));
-           }
-         s->set_grob_property ("direction", d);
-
-         if (dynamic_cast <Rhythmic_req *> (info.music_cause ()))
-           {
-             Beam::add_stem (beam_p_, s);
-           }
+         string s = _ ("stem must have Rhythmic structure");
+         if (info.music_cause ())
+           info.music_cause ()->origin ()->warning (s);
          else
-           {
-             String s = _ ("stem must have Rhythmic structure");
-             if (info.music_cause ())
-               info.music_cause ()->origin ()->warning (s);
-             else
-               ::warning (s);
-           }
+           ::warning (s);
        }
     }
-  else if (stem_tremolo_ && Stem::has_interface (info.grob_l_))
-    {
-       Stem_tremolo::set_stem (stem_tremolo_, info.grob_l_);
-
-       info.grob_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
-    }
-
-  
-  if (repeat_ && Note_head::has_interface (info.grob_l_))
-    {
-      info.grob_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
-    }
 }
 
-
-void
-Chord_tremolo_engraver::start_translation_timestep ()
-{
-  if (beam_p_ && stop_mom_ == now_mom ())
-    {
-      finished_beam_p_ = beam_p_;
-
-      repeat_ = 0;
-      beam_p_ = 0;
-    }
-}
-
-
-void
-Chord_tremolo_engraver::stop_translation_timestep ()
-{
-  typeset_beam ();
-
-  if (stem_tremolo_)
-    {
-      typeset_grob (stem_tremolo_);
-      stem_tremolo_ = 0;
-    }
-  
-}
-
-
-
-ENTER_DESCRIPTION(Chord_tremolo_engraver,
-/* descr */       "Generates beams for  tremolo repeats.",
-/* creats*/       "Beam",
-/* acks  */       "stem-interface note-head-interface",
-/* reads */       "",
-/* write */       "");
+ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem);
+ADD_TRANSLATOR (Chord_tremolo_engraver,
+               /* doc */ "Generates beams for tremolo repeats.",
+               /* create */ "Beam",
+               /* accept */ "tremolo-span-event",
+               /* read */ "",
+               /* write */ "");