patch::: 1.3.136.jcn3

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 496baacbd0758f086771e72496847f484728586a..78a2ad588587b96b586fdb3de6c981ba885f30b3 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -20,6 +20,8 @@
 #include "spanner.hh"
 #include "item.hh"
 #include "chord-tremolo-iterator.hh"
+#include "stem-tremolo.hh"
+#include "music-list.hh"
 
 /**
   This acknowledges repeated music with "tremolo" style.  It typesets
@@ -39,8 +41,8 @@ class Chord_tremolo_engraver : public Engraver
 {
   void typeset_beam ();
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Chord_tremolo_engraver();
+  VIRTUAL_COPY_CONS (Translator);
+  Chord_tremolo_engraver ();
 protected:
   Repeated_music * repeat_;
 
@@ -52,24 +54,27 @@ protected:
   Moment beam_start_location_;
 
   int note_head_i_;
-  
+
+  bool sequential_body_b_;
   Spanner * beam_p_;
   Spanner * finished_beam_p_;
-  
+  Item * stem_tremolo_;
 protected:
-  virtual void finalize();
+  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 create_grobs ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+  virtual void process_music ();
 };
 
-Chord_tremolo_engraver::Chord_tremolo_engraver()
+Chord_tremolo_engraver::Chord_tremolo_engraver ()
 {
   beam_p_  = finished_beam_p_ = 0;
   repeat_ =0;
   note_head_i_ = 0;
+  stem_tremolo_ = 0;
+  sequential_body_b_ = false;
 }
 
 bool
@@ -84,32 +89,49 @@ 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 ());
 
       // ugh. should generate dots, triplet beams.      
       note_head_i_ = l.den () <? 4; 
       return true;
     }
+
   return false;
 }
 
 void
-Chord_tremolo_engraver::create_grobs ()
+Chord_tremolo_engraver::process_music ()
 {
-  if (repeat_ && !beam_p_)
+  if (repeat_)
     {
-      beam_p_ = new Spanner (get_property ("Beam"));
-      Beam::set_interface (beam_p_);
-      beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T);
+      if (sequential_body_b_ && !beam_p_)
+       {
+         beam_p_ = new Spanner (get_property ("Beam"));
+         beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T);
 
 
-      SCM smp = get_property ("measurePosition");
-      Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
-      beam_start_location_ = mp;
-      announce_grob (beam_p_, repeat_);
-    }
-}
+         SCM smp = get_property ("measurePosition");
+         Moment mp
+           = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+         beam_start_location_ = mp;
+         announce_grob (beam_p_, repeat_);
+       }
+      else if (!sequential_body_b_ && !stem_tremolo_)
+       {
+         int flags = intlog2 (note_head_i_ * repeat_->repeat_count ()) -2;
+         if (flags)
+           {
+             stem_tremolo_ = new Item (get_property ("StemTremolo"));
+             Stem_tremolo::set_interface (stem_tremolo_);
 
+             announce_grob (stem_tremolo_, repeat_);
+             stem_tremolo_->set_grob_property ("tremolo-flags",
+                                               gh_int2scm (flags));
 
+           }
+       }
+    }
+}
 void
 Chord_tremolo_engraver::finalize ()
 {
@@ -117,12 +139,7 @@ Chord_tremolo_engraver::finalize ()
   if (beam_p_)
     {
       repeat_->origin ()->warning (_ ("unterminated chord tremolo"));
-#if 0
-      finished_beam_p_ = beam_p_;
-      typeset_beam ();
-#else
       beam_p_->suicide ();
-#endif
     }
 }
 
@@ -162,10 +179,10 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
                      --hwn.
           */
          SCM d = s->get_grob_property ("direction");
-         if (Stem::type_i (s ) != 1)
+         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));
+             int gap_i =Stem::flag_i (s) - ((Stem::type_i (s) >? 2) - 2);
+             beam_p_->set_grob_property ("beam-gap", gh_int2scm (gap_i));
            }
          s->set_grob_property ("direction", d);
 
@@ -182,10 +199,18 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
                ::warning (s);
            }
        }
-      if (Note_head::has_interface (info.elem_l_))
-       {
-         info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
-       }
+    }
+  else if (stem_tremolo_ && Stem::has_interface (info.elem_l_))
+    {
+       Stem_tremolo::set_stem (stem_tremolo_, info.elem_l_);
+
+       info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
+    }
+
+  
+  if (repeat_ && Note_head::has_interface (info.elem_l_))
+    {
+      info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
     }
 }
 
@@ -207,7 +232,14 @@ void
 Chord_tremolo_engraver::stop_translation_timestep ()
 {
   typeset_beam ();
+
+  if (stem_tremolo_)
+    {
+      typeset_grob (stem_tremolo_);
+      stem_tremolo_ = 0;
+    }
+  
 }
 
-ADD_THIS_TRANSLATOR(Chord_tremolo_engraver);
+ADD_THIS_TRANSLATOR (Chord_tremolo_engraver);