X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=a617993b0e2ec95fc0ff84b82461ace9549dda02;hb=4ebb61bb6f16135ecbe329c5acb2f88969981a91;hp=a67946fe7b236e813ea9e29f7d5349300ad6b7f9;hpb=f0da063c7a52889d36d0ee293b76c390096b0a1f;p=lilypond.git

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index a67946fe7b..a617993b0e 100644
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -1,19 +1,17 @@
 /*   
-  new-chord-tremolo-engraver.cc --  implement Chord_tremolo_engraver
+     new-chord-tremolo-engraver.cc --  implement Chord_tremolo_engraver
   
-  source file of the GNU LilyPond music typesetter
+     source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+     (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
- */
+*/
 
-#include "engraver.hh"
 #include "beam.hh"
 #include "repeated-music.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "engraver-group-engraver.hh"
-#include "event.hh"
 #include "warn.hh"
 #include "misc.hh"
 #include "note-head.hh"
@@ -26,23 +24,23 @@
 
 /**
 
-  This acknowledges repeated music with "tremolo" style.  It typesets
-  a beam.
+This acknowledges repeated music with "tremolo" style.  It typesets
+a beam.
 
-  TODO:
+TODO:
 
-  - perhaps use engraver this to steer other engravers? That would
-  create dependencies between engravers, which is bad.
+- perhaps use engraver this to steer other engravers? That would
+create dependencies between engravers, which is bad.
 
-  - create dots if appropriate.
+- create dots if appropriate.
 
-  - create TremoloBeam iso Beam?
+- 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_;
 
@@ -71,7 +69,7 @@ protected:
 Chord_tremolo_engraver::Chord_tremolo_engraver ()
 {
   beam_  = finished_beam_ = 0;
-  repeat_ =0;
+  repeat_ = 0;
   flags_ = 0;
   stem_tremolo_ = 0;
   sequential_body_b_ = false;
@@ -82,7 +80,7 @@ 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_proc
+      && rp->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc
       && !repeat_) 
     {
       Moment l = rp->get_length ();
@@ -119,31 +117,15 @@ Chord_tremolo_engraver::try_music (Music * m)
 void
 Chord_tremolo_engraver::process_music ()
 {
-  if (repeat_)
+  if (repeat_ && sequential_body_b_ && !beam_)
     {
-      if (sequential_body_b_ && !beam_)
-	{
-	  beam_ = new Spanner (get_property ("Beam"));
-	  beam_->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_, repeat_->self_scm());
-	}
-      else if (!sequential_body_b_ && !stem_tremolo_)
-	{
-	  if (flags_)
-	    {
-	      stem_tremolo_ = new Item (get_property ("StemTremolo"));
-	      announce_grob(stem_tremolo_, repeat_->self_scm());
-	      stem_tremolo_->set_grob_property ("flag-count",
-						scm_int2num (flags_));
-	    }
-	}
+      beam_ = make_spanner ("Beam", repeat_->self_scm ());
+      beam_->set_property ("chord-tremolo", SCM_BOOL_T);
+
+      beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0));
     }
 }
+
 void
 Chord_tremolo_engraver::finalize ()
 {
@@ -158,11 +140,7 @@ Chord_tremolo_engraver::finalize ()
 void
 Chord_tremolo_engraver::typeset_beam ()
 {
-  if (finished_beam_)
-    {
-      typeset_grob (finished_beam_);
-      finished_beam_ = 0;
-    }
+  finished_beam_ = 0;
 }
 
 void
@@ -172,14 +150,14 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
     {
       Grob * s = info.grob_;
 
-      if (start_mom_ == now_mom())
+      if (start_mom_ == now_mom ())
 	Stem::set_beaming (s, flags_, RIGHT);
       else
 	Stem::set_beaming (s, flags_, LEFT);
 	  
       if (Stem::duration_log (s) != 1)
 	{
-	  beam_->set_grob_property ("gap-count", gh_int2scm (flags_ - total_duration_flags_));
+	  beam_->set_property ("gap-count", scm_int2num (flags_ - total_duration_flags_));
 	}
 
       if (info.music_cause ()->is_mus_type ("rhythmic-event"))
@@ -195,10 +173,15 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
 	    ::warning (s);
 	}
     }
-  else if (stem_tremolo_ && Stem::has_interface (info.grob_))
+  else if (repeat_ &&
+	   flags_ && !sequential_body_b_ && Stem::has_interface (info.grob_))
     {
-       Stem_tremolo::set_stem (stem_tremolo_, info.grob_);
-       stem_tremolo_->set_parent (info.grob_,X_AXIS);
+      stem_tremolo_ = make_item ("StemTremolo", repeat_->self_scm ());
+      stem_tremolo_->set_property ("flag-count",
+				   scm_int2num (flags_));
+      stem_tremolo_->set_property ("stem",
+				   info.grob_->self_scm ());
+      stem_tremolo_->set_parent (info.grob_, X_AXIS);
     }
 }
 
@@ -218,18 +201,20 @@ Chord_tremolo_engraver::start_translation_timestep ()
 void
 Chord_tremolo_engraver::stop_translation_timestep ()
 {
-  typeset_beam ();
-
   if (stem_tremolo_)
     {
-      typeset_grob (stem_tremolo_);
+      repeat_ = 0;
+      if (beam_)
+	programming_error ("Huh, beam and stem tremolo?");
       stem_tremolo_ = 0;
     }
+
+  typeset_beam ();
 }
 
 
 
-ENTER_DESCRIPTION(Chord_tremolo_engraver,
+ADD_TRANSLATOR (Chord_tremolo_engraver,
 /* descr */       "Generates beams for  tremolo repeats.",
 /* creats*/       "Beam",
 /* accepts */     "repeated-music",