release: 1.3.8

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index eac8f66427e9e16786b2ba0d64880c5100bdaf0b..567c31ec6a6b0db8f506ce69501665a3c268eead 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  abbreviation-beam-engraver.cc -- implement Chord_tremolo_engraver
+  chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
 
   source file of the GNU LilyPond music typesetter
 
@@ -8,10 +8,10 @@
 */
 
 #include "duration-convert.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
 #include "chord-tremolo-engraver.hh"
 #include "stem.hh"
-#include "chord-tremolo.hh"
+#include "beam.hh"
 #include "musical-request.hh"
 #include "misc.hh"
 #include "warn.hh"
@@ -55,7 +55,7 @@ Chord_tremolo_engraver::do_process_requests ()
   if (reqs_drul_[STOP])
     {
       if (!abeam_p_)
-       reqs_drul_[STOP]->warning (_("no tremolo beam to end"));
+       reqs_drul_[STOP]->warning (_ ("no tremolo beam to end"));
       prev_start_req_ = 0;
       finished_abeam_p_ = abeam_p_;
       abeam_p_ = 0;
@@ -80,13 +80,15 @@ Chord_tremolo_engraver::do_process_requests ()
     {
       if (abeam_p_)
        {
-         reqs_drul_[START]->warning (_ ("already have a tremolo beam"));
+         reqs_drul_[START]->warning (_ ("Already have a tremolo beam"));
          return;
        }
 
       prev_start_req_ = reqs_drul_[START];
 
-      abeam_p_ = new Chord_tremolo;
+      abeam_p_ = new Beam;
+      abeam_p_->set_elt_property ("chord-tremolo", SCM_BOOL_T);
+      
       announce_element (Score_element_info (abeam_p_, reqs_drul_[LEFT]));
   }
 }
@@ -148,13 +150,13 @@ Chord_tremolo_engraver::acknowledge_element (Score_element_info i)
          if (s->type_i () != 1)
            {
              int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2);
-             s->set_elt_property (beam_gap_scm_sym, gh_int2scm(gap_i));
+             s->set_elt_property ("beam-gap", gh_int2scm(gap_i));
            }
 #else
          if (s->type_i () != 1)
            {
              int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2);
-             abeam_p_->set_elt_property (beam_gap_scm_sym, gh_int2scm(gap_i));
+             abeam_p_->set_elt_property ("beam-gap", gh_int2scm(gap_i));
            }
 #endif
          
@@ -162,3 +164,4 @@ Chord_tremolo_engraver::acknowledge_element (Score_element_info i)
        }
     }
 }
+