* lily/include/grob-info.hh (class Grob_info): make data member

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 52ae7fde05c4152f6574131a81b265ed3bc07db5..363d756537a5231d496ede5b392d6d4a82b0abc6 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -1,10 +1,9 @@
-/*   
-     chord-tremolo-engraver.cc --  implement Chord_tremolo_engraver
-  
-     source file of the GNU LilyPond music typesetter
-  
-     (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+/*
+  chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "beam.hh"
@@ -19,7 +18,7 @@
 #include "item.hh"
 #include "chord-tremolo-iterator.hh"
 #include "stem-tremolo.hh"
-#include "math.h"           // ceil
+#include "math.h" // ceil
 
 /**
 
@@ -34,31 +33,30 @@ create dependencies between engravers, which is bad.
 - create dots if appropriate.
 
 - create TremoloBeam iso Beam?
-
 */
 class Chord_tremolo_engraver : public Engraver
 {
   void typeset_beam ();
   TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver);
 protected:
-  Music * repeat_;
+  Music *repeat_;
 
   /// moment (global time) where beam started.
   Moment start_mom_;
   Moment stop_mom_;
-  int flags_ ;
+  int flags_;
   int total_duration_flags_;
-  
+
   /// location  within measure where beam started.
   Moment beam_start_location_;
 
   bool body_is_sequential_;
-  Spanner * beam_;
-  Spanner * finished_beam_;
-  Item * stem_tremolo_;
+  Spanner *beam_;
+  Spanner *finished_beam_;
+  Item *stem_tremolo_;
 protected:
   virtual void finalize ();
-  virtual bool try_music (Music*);
+  virtual bool try_music (Music *);
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
@@ -67,7 +65,7 @@ protected:
 
 Chord_tremolo_engraver::Chord_tremolo_engraver ()
 {
-  beam_  = finished_beam_ = 0;
+  beam_ = finished_beam_ = 0;
   repeat_ = 0;
   flags_ = 0;
   stem_tremolo_ = 0;
@@ -75,18 +73,17 @@ Chord_tremolo_engraver::Chord_tremolo_engraver ()
 }
 
 bool
-Chord_tremolo_engraver::try_music (Music * m)
+Chord_tremolo_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("repeated-music")
       && m->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc
-      && !repeat_) 
+      && !repeat_)
     {
       Moment l = m->get_length ();
       repeat_ = m;
       start_mom_ = now_mom ();
       stop_mom_ = start_mom_ + l;
 
-
       Music *body = Repeated_music::body (m);
       body_is_sequential_ = body->is_mus_type ("sequential-music");
 
@@ -94,19 +91,19 @@ Chord_tremolo_engraver::try_music (Music * m)
 
       if (body_is_sequential_ && elt_count != 2)
        {
-         m->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count));
+         m->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count));
        }
 
       if (elt_count <= 0)
        elt_count = 1;
-         
+
       Rational total_dur = l.main_part_;
       Rational note_dur = total_dur / Rational (elt_count * Repeated_music::repeat_count (repeat_));
 
-      total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2);
-      
-      flags_ = intlog2 (note_dur.den ()) -2 ;
-      
+      total_duration_flags_ = max (0, (intlog2 (total_dur.den ()) - 2));
+
+      flags_ = intlog2 (note_dur.den ()) -2;
+
       return true;
     }
 
@@ -145,15 +142,15 @@ Chord_tremolo_engraver::typeset_beam ()
 void
 Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
 {
-  if (beam_ && Stem::has_interface (info.grob_))
+  if (beam_ && Stem::has_interface (info.grob ()))
     {
-      Grob * s = info.grob_;
+      Grob *s = info.grob ();
 
       if (start_mom_ == now_mom ())
        Stem::set_beaming (s, flags_, RIGHT);
       else
        Stem::set_beaming (s, flags_, LEFT);
-         
+
       if (Stem::duration_log (s) != 1)
        {
          beam_->set_property ("gap-count", scm_int2num (flags_ - total_duration_flags_));
@@ -172,19 +169,18 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
            ::warning (s);
        }
     }
-  else if (repeat_ &&
-          flags_ && !body_is_sequential_ && Stem::has_interface (info.grob_))
+  else if (repeat_
+          && flags_ && !body_is_sequential_ && Stem::has_interface (info.grob ()))
     {
       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 ());
-      stem_tremolo_->set_parent (info.grob_, X_AXIS);
+                                  info.grob ()->self_scm ());
+      stem_tremolo_->set_parent (info.grob (), X_AXIS);
     }
 }
 
-
 void
 Chord_tremolo_engraver::start_translation_timestep ()
 {
@@ -196,7 +192,6 @@ Chord_tremolo_engraver::start_translation_timestep ()
     }
 }
 
-
 void
 Chord_tremolo_engraver::stop_translation_timestep ()
 {
@@ -204,19 +199,17 @@ Chord_tremolo_engraver::stop_translation_timestep ()
     {
       repeat_ = 0;
       if (beam_)
-       programming_error ("Huh, beam and stem tremolo?");
+       programming_error ("beam and stem tremolo?");
       stem_tremolo_ = 0;
     }
 
   typeset_beam ();
 }
 
-
-
 ADD_TRANSLATOR (Chord_tremolo_engraver,
-/* descr */       "Generates beams for  tremolo repeats.",
-/* creats*/       "Beam",
-/* accepts */     "repeated-music",
-/* acks  */      "stem-interface note-head-interface",
-/* reads */       "",
-/* write */       "");
+               /* descr */ "Generates beams for  tremolo repeats.",
+               /* creats*/ "Beam",
+               /* accepts */ "repeated-music",
+               /* acks  */ "stem-interface note-head-interface",
+               /* reads */ "",
+               /* write */ "");