X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=141f7313e45d266c8489137d16c97cff1a411d98;hb=0d7788bc36b5d98931e9fb5115c38abf9b7d4854;hp=60800064c91ae4dd91b60b35827377fbbafc4694;hpb=8b500afb9431f5471e385fa2eeb8fde868e4fc49;p=lilypond.git

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 60800064c9..141f7313e4 100644
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -1,24 +1,35 @@
 /*
-  chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
   		 Erik Sandberg <mandolaerik@gmail.com>
-*/
 
-#include "math.h" // ceil
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "beam.hh"
 #include "engraver-group.hh"
 #include "international.hh"
 #include "item.hh"
+#include "math.h" // ceil
 #include "misc.hh"
 #include "repeated-music.hh"
 #include "rhythmic-head.hh"
 #include "spanner.hh"
 #include "stem-tremolo.hh"
 #include "stem.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
 #include "translator.icc"
@@ -41,19 +52,17 @@ class Chord_tremolo_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver);
 protected:
-  Music *repeat_;
+  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 ();
-  virtual bool try_music (Music *);
   void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (tremolo_span);
   DECLARE_ACKNOWLEDGER (stem);
 };
 
@@ -61,36 +70,29 @@ Chord_tremolo_engraver::Chord_tremolo_engraver ()
 {
   beam_ = 0;
   repeat_ = 0;
-  flags_ = 0;
-  expected_beam_count_ = 0;
   beam_dir_ = CENTER;
 }
 
-bool
-Chord_tremolo_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Chord_tremolo_engraver, tremolo_span);
+void
+Chord_tremolo_engraver::listen_tremolo_span (Stream_event *ev)
 {
-  if (m->is_mus_type ("tremolo-span-event"))
+  Direction span_dir = to_dir (ev->get_property ("span-direction"));
+  if (span_dir == START)
     {
-      Direction span_dir = to_dir (m->get_property ("span-direction"));
-      if (span_dir == START)
+      if (ASSIGN_EVENT_ONCE (repeat_, ev))
 	{
-	  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;
+  else if (span_dir == STOP)
+    {
+      if (!repeat_)
+	ev->origin ()->warning (_ ("No tremolo to end"));
+      repeat_ = 0;
+      beam_ = 0;
+      beam_dir_ = CENTER;
+    }
 }
 
 void
@@ -108,6 +110,7 @@ Chord_tremolo_engraver::finalize ()
   if (beam_)
     {
       repeat_->origin ()->warning (_ ("unterminated chord tremolo"));
+      announce_end_grob (beam_, SCM_EOL);
       beam_->suicide ();
     }
 }
@@ -117,23 +120,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);
 	}
@@ -142,8 +152,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 */
+		""
+		);