(pango_item_string_stencil): update from 2.9.x

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

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 0bba903656f47ca2e0a70a50cd2c4fefa8a9f719..29fe53cbc5ca8be18b669a9287bdc4db0d3e4d3a 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"
 
@@ -91,9 +93,7 @@ Chord_tremolo_engraver::try_music (Music *m)
       int elt_count = body_is_sequential_ ? scm_ilength (body->get_property ("elements")) : 1;
 
       if (body_is_sequential_ && elt_count != 2)
-       {
-         m->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count));
-       }
+       m->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count));
 
       if (elt_count <= 0)
        elt_count = 1;
@@ -153,17 +153,13 @@ Chord_tremolo_engraver::acknowledge_stem (Grob_info info)
        Stem::set_beaming (s, flags_, LEFT);
 
       if (Stem::duration_log (s) != 1)
-       {
-         beam_->set_property ("gap-count", scm_from_int (flags_ - total_duration_flags_));
-       }
+       beam_->set_property ("gap-count", scm_from_int (flags_ - total_duration_flags_));
 
-      if (info.music_cause ()->is_mus_type ("rhythmic-event"))
-       {
-         Beam::add_stem (beam_, s);
-       }
+      if (info.ultimate_music_cause ()->is_mus_type ("rhythmic-event"))
+       Beam::add_stem (beam_, s);
       else
        {
-         String s = _ ("stem must have Rhythmic structure");
+         string s = _ ("stem must have Rhythmic structure");
          if (info.music_cause ())
            info.music_cause ()->origin ()->warning (s);
          else
@@ -178,8 +174,9 @@ Chord_tremolo_engraver::acknowledge_stem (Grob_info info)
       stem_tremolo_->set_property ("flag-count",
                                   scm_from_int (flags_));
       stem_tremolo_->set_object ("stem",
-                                  info.grob ()->self_scm ());
+                                info.grob ()->self_scm ());
       stem_tremolo_->set_parent (info.grob (), X_AXIS);
+      info.grob ()->set_object ("tremolo-flag", stem_tremolo_->self_scm ());
     }
 }
 
@@ -208,11 +205,10 @@ Chord_tremolo_engraver::stop_translation_timestep ()
   typeset_beam ();
 }
 
-
-ADD_ACKNOWLEDGER (Chord_tremolo_engraver,stem);
+ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem);
 ADD_TRANSLATOR (Chord_tremolo_engraver,
-               /* descr */ "Generates beams for  tremolo repeats.",
-               /* creats*/ "Beam",
-               /* accepts */ "repeated-music",
-               /* reads */ "",
+               /* doc */ "Generates beams for  tremolo repeats.",
+               /* create */ "Beam",
+               /* accept */ "repeated-music",
+               /* read */ "",
                /* write */ "");