*** empty log message ***

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 9547d7abff2413924c1cc414472f05e9433690ae..d28af332f6e892053a42a17c223da2380e9255c9 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -3,21 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "math.h" // ceil
+
 #include "beam.hh"
+#include "chord-tremolo-iterator.hh"
+#include "engraver-group.hh"
+#include "international.hh"
+#include "item.hh"
+#include "misc.hh"
 #include "repeated-music.hh"
-#include "stem.hh"
 #include "rhythmic-head.hh"
-#include "engraver-group-engraver.hh"
-#include "warn.hh"
-#include "misc.hh"
 #include "spanner.hh"
-#include "item.hh"
-#include "chord-tremolo-iterator.hh"
 #include "stem-tremolo.hh"
-#include "math.h" // ceil
+#include "stem.hh"
+#include "warn.hh"
 
 #include "translator.icc"
 
@@ -153,11 +155,11 @@ Chord_tremolo_engraver::acknowledge_stem (Grob_info info)
       if (Stem::duration_log (s) != 1)
        beam_->set_property ("gap-count", scm_from_int (flags_ - total_duration_flags_));
 
-      if (info.music_cause ()->is_mus_type ("rhythmic-event"))
+      if (info.ultimate_music_cause ()->is_mus_type ("rhythmic-event"))
        Beam::add_stem (beam_, s);
       else
        {
-         String s = _ ("stem must have Rhythmic structure");
+         std::string s = _ ("stem must have Rhythmic structure");
          if (info.music_cause ())
            info.music_cause ()->origin ()->warning (s);
          else