Fix 453.

[lilypond.git] / lily / chord-tremolo-engraver.cc

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index b0f17352baa49915e771c4b92d8d23f1fe34b60e..28790b5a868019d928deada7a9d305f50d5d55eb 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
                 Erik Sandberg <mandolaerik@gmail.com>
 */
 
@@ -43,13 +43,11 @@ class Chord_tremolo_engraver : public Engraver
 protected:
   Stream_event *repeat_;
 
-  int flags_;
-  // number of beams for short tremolos
-  int expected_beam_count_;
   // current direction of beam (first RIGHT, then LEFT)
   Direction beam_dir_;
 
   Spanner *beam_;
+
 protected:
   virtual void finalize ();
   void process_music ();
@@ -61,8 +59,6 @@ Chord_tremolo_engraver::Chord_tremolo_engraver ()
 {
   beam_ = 0;
   repeat_ = 0;
-  flags_ = 0;
-  expected_beam_count_ = 0;
   beam_dir_ = CENTER;
 }
 
@@ -73,18 +69,17 @@ Chord_tremolo_engraver::listen_tremolo_span (Stream_event *ev)
   Direction span_dir = to_dir (ev->get_property ("span-direction"));
   if (span_dir == START)
     {
-      repeat_ = ev;
-      int type = scm_to_int (ev->get_property ("tremolo-type"));
-      /* e.g. 1 for type 8, 2 for type 16 */
-      flags_ = intlog2 (type) - 2;
-      expected_beam_count_ = scm_to_int (ev->get_property ("expected-beam-count"));
-      beam_dir_ = RIGHT;
+      if (ASSIGN_EVENT_ONCE (repeat_, ev))
+       {
+         beam_dir_ = RIGHT;
+       }
     }
   else if (span_dir == STOP)
     {
+      if (!repeat_)
+       ev->origin ()->warning (_ ("No tremolo to end"));
       repeat_ = 0;
       beam_ = 0;
-      expected_beam_count_ = 0;
       beam_dir_ = CENTER;
     }
 }
@@ -104,6 +99,7 @@ Chord_tremolo_engraver::finalize ()
   if (beam_)
     {
       repeat_->origin ()->warning (_ ("unterminated chord tremolo"));
+      announce_end_grob (beam_, SCM_EOL);
       beam_->suicide ();
     }
 }
@@ -113,23 +109,30 @@ Chord_tremolo_engraver::acknowledge_stem (Grob_info info)
 {
   if (beam_)
     {
-      Grob *s = info.grob ();
+      int tremolo_type = robust_scm2int (repeat_->get_property ("tremolo-type"), 1);
+      int flags = max (0, intlog2 (tremolo_type) - 2);
+      int repeat_count = robust_scm2int (repeat_->get_property ("repeat-count"), 1);
+      int gap_count = min (flags, intlog2 (repeat_count) + 1);
 
-      Stem::set_beaming (s, flags_, beam_dir_);
+      Grob *s = info.grob ();
+      Stem::set_beaming (s, flags, beam_dir_);
 
       if (Stem::duration_log (s) != 1)
-       beam_->set_property ("gap-count", scm_from_int (flags_ - expected_beam_count_));
+       beam_->set_property ("gap-count", scm_from_int (gap_count));
 
       if (beam_dir_ == RIGHT)
-        beam_dir_ = LEFT;
-
-      if (info.ultimate_music_cause ()->is_mus_type ("rhythmic-event"))
+       {
+         beam_dir_ = LEFT;
+         announce_end_grob (beam_, s->self_scm ());
+       }
+      
+      if (info.ultimate_event_cause ()->in_event_class ("rhythmic-event"))
        Beam::add_stem (beam_, s);
       else
        {
          string s = _ ("stem must have Rhythmic structure");
-         if (info.music_cause ())
-           info.music_cause ()->origin ()->warning (s);
+         if (info.event_cause ())
+           info.event_cause ()->origin ()->warning (s);
          else
            ::warning (s);
        }
@@ -138,8 +141,15 @@ Chord_tremolo_engraver::acknowledge_stem (Grob_info info)
 
 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 */ "");
+               /* doc */
+               "Generate beams for tremolo repeats.",
+
+               /* create */
+               "Beam ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );