X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=199d9fd17ea735d1a1c2308324938d694268e208;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=40bee1c504c761bf062cb8579495bd44cd4b775c;hpb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;p=lilypond.git

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 40bee1c504..199d9fd17e 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -48,15 +48,16 @@ class Stem_engraver : public Engraver
 protected:
   void make_stem (Grob_info, bool);
 
-  DECLARE_TRANSLATOR_LISTENER (tremolo);
-  DECLARE_TRANSLATOR_LISTENER (tuplet_span);
-  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void listen_tremolo (Stream_event *);
+  void listen_tuplet_span (Stream_event *);
+  void acknowledge_rhythmic_head (Grob_info);
   void stop_translation_timestep ();
   void finalize ();
   void kill_unused_flags ();
 };
 
-Stem_engraver::Stem_engraver ()
+Stem_engraver::Stem_engraver (Context *c)
+  : Engraver (c)
 {
   tremolo_ev_ = 0;
   stem_ = 0;
@@ -84,24 +85,14 @@ Stem_engraver::make_stem (Grob_info gi, bool tuplet_start)
 
          the first and last (quarter) note both get one tremolo flag.  */
       int requested_type
-        = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 0);
-      SCM f = get_property ("tremoloFlags");
-      if (!requested_type)
-        {
-          if (scm_is_number (f))
-            requested_type = scm_to_int (f);
-          else
-            requested_type = 8;
-        }
-      else
-        context ()->set_property ("tremoloFlags", scm_from_int (requested_type));
+        = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 8);
 
       /*
         we take the duration log from the Event, since the duration-log
         for a note head is always <= 2.
       */
       Stream_event *ev = gi.event_cause ();
-      Duration *dur = unsmob_duration (ev->get_property ("duration"));
+      Duration *dur = unsmob<Duration> (ev->get_property ("duration"));
 
       int tremolo_flags = intlog2 (requested_type) - 2
                           - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0);
@@ -134,7 +125,7 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
   Stream_event *cause = gi.event_cause ();
   if (!cause)
     return;
-  Duration *d = unsmob_duration (cause->get_property ("duration"));
+  Duration *d = unsmob<Duration> (cause->get_property ("duration"));
   if (!d)
     return;
 
@@ -168,7 +159,8 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
   Stem::add_head (stem_, gi.grob ());
 
   if (Stem::is_normal_stem (stem_)
-      && Stem::duration_log (stem_) > 2)
+      && Stem::duration_log (stem_) > 2
+      && !(unsmob<Grob> (stem_->get_object ("flag"))))
     {
       Item *flag = make_item ("Flag", stem_->self_scm ());
       flag->set_parent (stem_, X_AXIS);
@@ -183,7 +175,7 @@ void
 Stem_engraver::kill_unused_flags ()
 {
   for (vsize i = 0; i < maybe_flags_.size (); i++)
-    if (unsmob_grob (maybe_flags_[i]->get_parent (X_AXIS)->get_object ("beam")))
+    if (unsmob<Grob> (maybe_flags_[i]->get_parent (X_AXIS)->get_object ("beam")))
       maybe_flags_[i]->suicide ();
 }
 
@@ -221,7 +213,6 @@ Stem_engraver::stop_translation_timestep ()
   tremolo_ev_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tuplet_span);
 void
 Stem_engraver::listen_tuplet_span (Stream_event *ev)
 {
@@ -235,26 +226,33 @@ Stem_engraver::listen_tuplet_span (Stream_event *ev)
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo);
 void
 Stem_engraver::listen_tremolo (Stream_event *ev)
 {
   ASSIGN_EVENT_ONCE (tremolo_ev_, ev);
 }
 
-ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
+
+void
+Stem_engraver::boot ()
+{
+  ADD_LISTENER (Stem_engraver, tuplet_span);
+  ADD_LISTENER (Stem_engraver, tremolo);
+  ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
+}
 
 ADD_TRANSLATOR (Stem_engraver,
                 /* doc */
-                "Create stems and single-stem tremolos.  It also works"
+                "Create stems, flags and single-stem tremolos.  It also works"
                 " together with the beam engraver for overriding beaming.",
 
                 /* create */
+                "Flag "
                 "Stem "
+                "StemStub "
                 "StemTremolo ",
 
                 /* read */
-                "tremoloFlags "
                 "stemLeftBeamCount "
                 "stemRightBeamCount "
                 "whichBar ",