Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / stem-engraver.cc

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index d665a96d068d45588ae0545b0037910665912e64..797406b4fbc062d28aa0cc9af6f152d3435073ce 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -3,12 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
+#include "duration.hh"
+#include "international.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "rhythmic-head.hh"
@@ -32,8 +35,8 @@ class Stem_engraver : public Engraver
 protected:
   void make_stem (Grob_info);
 
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void stop_translation_timestep ();
   virtual bool try_music (Music *);
 };
 
@@ -50,14 +53,16 @@ Stem_engraver::make_stem (Grob_info gi)
 {
   /* Announce the cause of the head as cause of the stem.  The
      stem needs a rhythmic structure to fit it into a beam.  */
-  stem_ = make_item ("Stem", gi.music_cause ()->self_scm ());
+  stem_ = make_item ("Stem", gi.grob ()->self_scm ());
 
   /*
-    docme: why do we take duration-log from request, not from note
-    head?
+    we take the duration log from the Event, since the duration-log
+    for a note head is always <= 2.
   */
-  int duration_log = gi.music_cause ()->duration_log ();
-  stem_->set_property ("duration-log", scm_int2num (duration_log));
+  Music *music = gi.music_cause ();
+  Duration *dur = unsmob_duration (music->get_property ("duration"));
+
+  stem_->set_property ("duration-log", dur ? scm_from_int (dur->duration_log ()) : 0);
 
   if (tremolo_ev_)
     {
@@ -79,10 +84,10 @@ Stem_engraver::make_stem (Grob_info gi)
            requested_type = 8;
        }
       else
-       context ()->set_property ("tremoloFlags", scm_int2num (requested_type));
+       context ()->set_property ("tremoloFlags", scm_from_int (requested_type));
 
       int tremolo_flags = intlog2 (requested_type) - 2
-       - (duration_log > 2 ? duration_log - 2 : 0);
+       - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0);
       if (tremolo_flags <= 0)
        {
          tremolo_ev_->origin ()->warning (_ ("tremolo duration is too long"));
@@ -95,39 +100,39 @@ Stem_engraver::make_stem (Grob_info gi)
 
          /* The number of tremolo flags is the number of flags of the
             tremolo-type minus the number of flags of the note itself.  */
-         tremolo_->set_property ("flag-count", scm_int2num (tremolo_flags));
+         tremolo_->set_property ("flag-count", scm_from_int (tremolo_flags));
          tremolo_->set_parent (stem_, X_AXIS);
-         stem_->set_property ("tremolo-flag", tremolo_->self_scm ());
-         tremolo_->set_property ("stem", stem_->self_scm ());
+         stem_->set_object ("tremolo-flag", tremolo_->self_scm ());
+         tremolo_->set_object ("stem", stem_->self_scm ());
        }
     }
 }
 
 void
-Stem_engraver::acknowledge_grob (Grob_info gi)
+Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
 {
-  if (Rhythmic_head::has_interface (gi.grob_))
-    {
-      if (Rhythmic_head::get_stem (gi.grob_))
-       return;
-
-      Music *cause = gi.music_cause ();
-      if (!cause)
-       return;
+  if (Rhythmic_head::get_stem (gi.grob ()))
+    return;
 
-      if (!stem_)
-       make_stem (gi);
+  Music *cause = gi.music_cause ();
+  if (!cause)
+    return;
+  Duration *d = unsmob_duration (cause->get_property ("duration"));
+  if (!d)
+    return;
 
-      int duration_log = cause->duration_log ();
-      if (Stem::duration_log (stem_) != duration_log)
-       {
-         // FIXME: 
-         gi.music_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_)));
-         gi.music_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices"));
-       }
+  if (!stem_)
+    make_stem (gi);
 
-      Stem::add_head (stem_, gi.grob_);
+  if (Stem::duration_log (stem_) != d->duration_log ())
+    {
+      // FIXME: 
+      gi.music_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)",
+                                                1 << Stem::duration_log (stem_)));
+      gi.music_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices"));
     }
+
+  Stem::add_head (stem_, gi.grob ());
 }
 
 void
@@ -165,11 +170,19 @@ Stem_engraver::try_music (Music *m)
   return false;
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
+
 ADD_TRANSLATOR (Stem_engraver,
-               /* descr */ "Create stems and single-stem tremolos.  It also works together with "
+               /* doc */ "Create stems and single-stem tremolos.  It also works together with "
                "the beam engraver for overriding beaming.",
-               /* creats*/ "Stem StemTremolo",
-               /* accepts */ "tremolo-event",
-               /* acks  */ "rhythmic-head-interface",
-               /* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount",
+               /* create */
+               "Stem "
+               "StemTremolo ",
+               /* accept */ "tremolo-event",
+               /* read */
+               "tremoloFlags "
+               "stemLeftBeamCount "
+               "stemRightBeamCount ",
                /* write */ "");