* input/regression/tie-chord.ly (testLong): add a chord in 4ths

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 363d756537a5231d496ede5b392d6d4a82b0abc6..2202efc6414b87a8b827663286a1555350316c56 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -10,16 +10,17 @@
 #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 "note-head.hh"
 #include "spanner.hh"
 #include "item.hh"
 #include "chord-tremolo-iterator.hh"
 #include "stem-tremolo.hh"
 #include "math.h" // ceil
 
+#include "translator.icc"
+
 /**
 
 This acknowledges repeated music with "tremolo" style.  It typesets
@@ -57,10 +58,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 ()
@@ -90,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;
@@ -140,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 ();
 
@@ -152,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,13 +165,14 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
        }
     }
   else if (repeat_
-          && flags_ && !body_is_sequential_ && Stem::has_interface (info.grob ()))
+          && flags_
+          && !body_is_sequential_)
     {
       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 ());
+                                  scm_from_int (flags_));
+      stem_tremolo_->set_object ("stem",
+                                info.grob ()->self_scm ());
       stem_tremolo_->set_parent (info.grob (), X_AXIS);
     }
 }
@@ -206,10 +202,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 note-head-interface",
-               /* reads */ "",
+               /* doc */ "Generates beams for  tremolo repeats.",
+               /* create */ "Beam",
+               /* accept */ "repeated-music",
+               /* read */ "",
                /* write */ "");