X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=d28af332f6e892053a42a17c223da2380e9255c9;hb=6c68e65859bae109509e1c464fdfca6de4b5ddd1;hp=e3d3078eccb9a800836b52175af4ce2d765517bc;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index e3d3078ecc..d28af332f6 100644
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -3,21 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "math.h" // ceil
+
 #include "beam.hh"
+#include "chord-tremolo-iterator.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 "warn.hh"
-#include "misc.hh"
 #include "spanner.hh"
-#include "item.hh"
-#include "chord-tremolo-iterator.hh"
 #include "stem-tremolo.hh"
-#include "math.h" // ceil
+#include "stem.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 /**
 
@@ -56,10 +60,10 @@ protected:
 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 ();
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
+  void process_music ();
+  DECLARE_ACKNOWLEDGER (stem);
 };
 
 Chord_tremolo_engraver::Chord_tremolo_engraver ()
@@ -89,9 +93,7 @@ Chord_tremolo_engraver::try_music (Music *m)
       int elt_count = body_is_sequential_ ? scm_ilength (body->get_property ("elements")) : 1;
 
       if (body_is_sequential_ && elt_count != 2)
-	{
-	  m->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count));
-	}
+	m->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count));
 
       if (elt_count <= 0)
 	elt_count = 1;
@@ -139,9 +141,9 @@ Chord_tremolo_engraver::typeset_beam ()
 }
 
 void
-Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
+Chord_tremolo_engraver::acknowledge_stem (Grob_info info)
 {
-  if (beam_ && Stem::has_interface (info.grob ()))
+  if (beam_)
     {
       Grob *s = info.grob ();
 
@@ -151,17 +153,13 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
 	Stem::set_beaming (s, flags_, LEFT);
 
       if (Stem::duration_log (s) != 1)
-	{
-	  beam_->set_property ("gap-count", scm_int2num (flags_ - total_duration_flags_));
-	}
+	beam_->set_property ("gap-count", scm_from_int (flags_ - total_duration_flags_));
 
-      if (info.music_cause ()->is_mus_type ("rhythmic-event"))
-	{
-	  Beam::add_stem (beam_, s);
-	}
+      if (info.ultimate_music_cause ()->is_mus_type ("rhythmic-event"))
+	Beam::add_stem (beam_, s);
       else
 	{
-	  String s = _ ("stem must have Rhythmic structure");
+	  std::string s = _ ("stem must have Rhythmic structure");
 	  if (info.music_cause ())
 	    info.music_cause ()->origin ()->warning (s);
 	  else
@@ -170,14 +168,13 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
     }
   else if (repeat_
 	   && flags_
-	   && !body_is_sequential_
-	   && Stem::has_interface (info.grob ()))
+	   && !body_is_sequential_)
     {
       stem_tremolo_ = make_item ("StemTremolo", repeat_->self_scm ());
       stem_tremolo_->set_property ("flag-count",
-				   scm_int2num (flags_));
+				   scm_from_int (flags_));
       stem_tremolo_->set_object ("stem",
-				   info.grob ()->self_scm ());
+				 info.grob ()->self_scm ());
       stem_tremolo_->set_parent (info.grob (), X_AXIS);
     }
 }
@@ -207,10 +204,10 @@ Chord_tremolo_engraver::stop_translation_timestep ()
   typeset_beam ();
 }
 
+ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem);
 ADD_TRANSLATOR (Chord_tremolo_engraver,
-		/* descr */ "Generates beams for  tremolo repeats.",
-		/* creats*/ "Beam",
-		/* accepts */ "repeated-music",
-		/* acks  */ "stem-interface",
-		/* reads */ "",
+		/* doc */ "Generates beams for  tremolo repeats.",
+		/* create */ "Beam",
+		/* accept */ "repeated-music",
+		/* read */ "",
 		/* write */ "");