patch::: 1.5.22.jcn4

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 78a2ad588587b96b586fdb3de6c981ba885f30b3..50f16f5e5c7c3324174dbc35babf9dc4222f5026 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -40,9 +40,7 @@
 class Chord_tremolo_engraver : public Engraver
 {
   void typeset_beam ();
-public:
-  VIRTUAL_COPY_CONS (Translator);
-  Chord_tremolo_engraver ();
+TRANSLATOR_DECLARATIONS(Chord_tremolo_engraver);
 protected:
   Repeated_music * repeat_;
 
@@ -159,9 +157,9 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
 {
   if (beam_p_)
     {
-      if (Stem::has_interface (info.elem_l_))
+      if (Stem::has_interface (info.grob_l_))
        {
-         Grob * s = info.elem_l_;
+         Grob * s = info.grob_l_;
          int f = Stem::flag_i (s);
          f = (f > 2) ? f - 2 : 1;
          Stem::set_beaming (s, f, LEFT);
@@ -178,11 +176,11 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
              don't understand this comment.
                      --hwn.
           */
-         SCM d = s->get_grob_property ("direction");
+         SCM d = s->get_grob_property ("direction");
          if (Stem::type_i (s) != 1)
            {
              int gap_i =Stem::flag_i (s) - ((Stem::type_i (s) >? 2) - 2);
-             beam_p_->set_grob_property ("beam-gap", gh_int2scm (gap_i));
+             beam_p_->set_grob_property ("gap", gh_int2scm (gap_i));
            }
          s->set_grob_property ("direction", d);
 
@@ -200,17 +198,17 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
            }
        }
     }
-  else if (stem_tremolo_ && Stem::has_interface (info.elem_l_))
+  else if (stem_tremolo_ && Stem::has_interface (info.grob_l_))
     {
-       Stem_tremolo::set_stem (stem_tremolo_, info.elem_l_);
+       Stem_tremolo::set_stem (stem_tremolo_, info.grob_l_);
 
-       info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
+       info.grob_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
     }
 
   
-  if (repeat_ && Note_head::has_interface (info.elem_l_))
+  if (repeat_ && Note_head::has_interface (info.grob_l_))
     {
-      info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
+      info.grob_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
     }
 }
 
@@ -241,5 +239,11 @@ Chord_tremolo_engraver::stop_translation_timestep ()
   
 }
 
-ADD_THIS_TRANSLATOR (Chord_tremolo_engraver);
 
+
+ENTER_DESCRIPTION(Chord_tremolo_engraver,
+/* descr */       "Generates beams for  tremolo repeats.",
+/* creats*/       "Beam",
+/* acks  */       "stem-interface note-head-interface",
+/* reads */       "",
+/* write */       "");