2003 -> 2004

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index bf3859264f73afd4ba2220e14b806f9c862f1a58..49d62e12de9edcd0d9f0c35577296423be4906c8 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,7 +13,7 @@
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "engraver-group-engraver.hh"
-#include "request.hh"
+#include "event.hh"
 #include "warn.hh"
 #include "misc.hh"
 #include "note-head.hh"
@@ -25,6 +25,7 @@
 #include "math.h"           // ceil
 
 /**
+
   This acknowledges repeated music with "tremolo" style.  It typesets
   a beam.
 
@@ -35,13 +36,13 @@
 
   - create dots if appropriate.
 
-  - create  TremoloBeam iso Beam?
- */
+  - create TremoloBeam iso Beam?
 
+*/
 class Chord_tremolo_engraver : public Engraver
 {
   void typeset_beam ();
-TRANSLATOR_DECLARATIONS(Chord_tremolo_engraver);
+  TRANSLATOR_DECLARATIONS(Chord_tremolo_engraver);
 protected:
   Repeated_music * repeat_;
 
@@ -49,6 +50,8 @@ protected:
   Moment start_mom_;
   Moment stop_mom_;
   int flags_ ;
+  int total_duration_flags_;
+  
   /// location  within measure where beam started.
   Moment beam_start_location_;
 
@@ -86,11 +89,26 @@ Chord_tremolo_engraver::try_music (Music * m)
       repeat_ = rp;
       start_mom_ = now_mom ();
       stop_mom_ = start_mom_ + l;
-      sequential_body_b_ = dynamic_cast<Sequential_music*> (rp->body ());
 
+      Sequential_music * seq = dynamic_cast<Sequential_music*> (rp->body ());
+      sequential_body_b_ = seq;
+
+      int elt_count = seq ? scm_ilength (seq-> music_list ()) : 1;
+
+      if (seq && elt_count != 2)
+       {
+         rp->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count));
+       }
+
+      if (elt_count <= 0)
+       elt_count = 1;
+         
       Rational total_dur = l.main_part_;
-      Rational note_dur = (total_dur / Rational (repeat_->repeat_count ()));
-       flags_ = intlog2 ((total_dur / note_dur).num ());
+      Rational note_dur = total_dur / Rational (elt_count * repeat_->repeat_count ());
+
+      total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2);
+      
+      flags_ = intlog2 (note_dur.den ()) -2 ;
       
       return true;
     }
@@ -105,7 +123,7 @@ Chord_tremolo_engraver::process_music ()
     {
       if (sequential_body_b_ && !beam_)
        {
-         beam_ = new Spanner (get_property ("Beam"));
+         beam_ = make_spanner ("Beam");
          beam_->set_grob_property ("chord-tremolo", SCM_BOOL_T);
 
          SCM smp = get_property ("measurePosition");
@@ -116,14 +134,12 @@ Chord_tremolo_engraver::process_music ()
        }
       else if (!sequential_body_b_ && !stem_tremolo_)
        {
-
          if (flags_)
            {
-             stem_tremolo_ = new Item (get_property ("StemTremolo"));
+             stem_tremolo_ = make_item ("StemTremolo");
              announce_grob(stem_tremolo_, repeat_->self_scm());
              stem_tremolo_->set_grob_property ("flag-count",
                                                scm_int2num (flags_));
-
            }
        }
     }
@@ -149,22 +165,22 @@ Chord_tremolo_engraver::typeset_beam ()
     }
 }
 
-
 void
 Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
 {
   if (beam_ && Stem::has_interface (info.grob_))
     {
       Grob * s = info.grob_;
-      Stem::set_beaming (s, flags_, LEFT);
-      Stem::set_beaming (s, flags_, RIGHT);
+
+      if (start_mom_ == now_mom())
+       Stem::set_beaming (s, flags_, RIGHT);
+      else
+       Stem::set_beaming (s, flags_, LEFT);
          
-      SCM d = s->get_grob_property ("direction");
       if (Stem::duration_log (s) != 1)
        {
-         beam_->set_grob_property ("gap", gh_double2scm (0.8));
+         beam_->set_grob_property ("gap-count", gh_int2scm (flags_ - total_duration_flags_));
        }
-      s->set_grob_property ("direction", d);
 
       if (info.music_cause ()->is_mus_type ("rhythmic-event"))
        {
@@ -193,7 +209,6 @@ Chord_tremolo_engraver::start_translation_timestep ()
   if (beam_ && stop_mom_ == now_mom ())
     {
       finished_beam_ = beam_;
-
       repeat_ = 0;
       beam_ = 0;
     }
@@ -210,7 +225,6 @@ Chord_tremolo_engraver::stop_translation_timestep ()
       typeset_grob (stem_tremolo_);
       stem_tremolo_ = 0;
     }
-  
 }