release commit

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 7bb5d93a2b17bf7b729d346566b53b80b639690d..5e73d87eec1456a23e3d9386d825896c14a237c2 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "beam.hh"
 #include "repeated-music.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "warn.hh"
 #include "misc.hh"
 #include "spanner.hh"
@@ -19,6 +19,8 @@
 #include "stem-tremolo.hh"
 #include "math.h" // ceil
 
+#include "translator.icc"
+
 /**
 
 This acknowledges repeated music with "tremolo" style.  It typesets
@@ -56,10 +58,10 @@ protected:
 protected:
   virtual void finalize ();
   virtual bool try_music (Music *);
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_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 +91,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 +139,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,14 +151,10 @@ 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);
-       }
+       Beam::add_stem (beam_, s);
       else
        {
          String s = _ ("stem must have Rhythmic structure");
@@ -170,14 +166,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,12 +202,10 @@ Chord_tremolo_engraver::stop_translation_timestep ()
   typeset_beam ();
 }
 
-#include "translator.icc"
-
+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 */ "");