* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 386447ab03ad65401ea281d325ce3f90d710180c..11a567dbd077ebfbb2996b9648c7f404b9fd3edb 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -9,7 +9,6 @@
 #include "context.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "event.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "rhythmic-head.hh"
@@ -18,21 +17,21 @@
 #include "stem-tremolo.hh"
 #include "stem.hh"
 
-
 /**
   Make stems upon receiving noteheads.
  */
 class Stem_engraver : public Engraver
 {
-  Grob  *stem_;
+  Grob *stem_;
   Grob *tremolo_;
   Music *rhythmic_ev_;
-  Music* tremolo_ev_;
+  Music *tremolo_ev_;
+  
   TRANSLATOR_DECLARATIONS (Stem_engraver);
 
 protected:
-  void add_script (Grob *);
   void make_stem (Grob_info);
+  
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
   virtual bool try_music (Music *);
@@ -53,6 +52,10 @@ Stem_engraver::make_stem (Grob_info gi)
      stem needs a rhythmic structure to fit it into a beam.  */
   stem_ = make_item ("Stem", gi.music_cause ()->self_scm ());
 
+  /*
+    docme: why do we take duration-log from request, not from note
+    head?
+   */
   int duration_log = gi.music_cause ()->duration_log ();
   stem_->set_property ("duration-log", scm_int2num (duration_log));
 
@@ -66,12 +69,12 @@ Stem_engraver::make_stem (Grob_info gi)
 
         the first and last (quarter) note bothe get one tremolo flag.  */
       int requested_type
-       = ly_scm2int (tremolo_ev_->get_property ("tremolo-type"));
+       = scm_to_int (tremolo_ev_->get_property ("tremolo-type"));
       SCM f = get_property ("tremoloFlags");
       if (!requested_type)
        {
-         if (ly_c_number_p (f))
-           requested_type = ly_scm2int (f);
+         if (scm_is_number (f))
+           requested_type = scm_to_int (f);
          else
            requested_type = 8;
        }
@@ -100,19 +103,6 @@ Stem_engraver::make_stem (Grob_info gi)
     }
 }
 
-void
-Stem_engraver::add_script (Grob *script)
-{
-  Direction d = get_grob_direction (script);
-  if (d == UP || d == DOWN)
-    {
-      char const *property = d == UP ? "script-up" : "script-down";
-      stem_->set_property (property,
-                          scm_cons (script->self_scm (),
-                                    stem_->get_property (property)));
-    }
-}
-
 void
 Stem_engraver::acknowledge_grob (Grob_info gi)
 {
@@ -120,11 +110,15 @@ Stem_engraver::acknowledge_grob (Grob_info gi)
     {
       if (Rhythmic_head::get_stem (gi.grob_))
        return;
+
+      Music * cause = gi.music_cause ();
+      if (!cause)
+       return ;
       
       if (!stem_)
        make_stem (gi);
       
-      int duration_log = gi.music_cause ()->duration_log ();
+      int duration_log = cause->duration_log ();
       if (Stem::duration_log (stem_) != duration_log)
        {
          // FIXME: 
@@ -135,8 +129,6 @@ Stem_engraver::acknowledge_grob (Grob_info gi)
 
       Stem::add_head (stem_, gi.grob_);
     }
-  else if (Script_interface::has_interface (gi.grob_))
-    add_script (gi.grob_);
 }
 
 void
@@ -147,15 +139,15 @@ Stem_engraver::stop_translation_timestep ()
     {
       /* FIXME: junk these properties.  */
       SCM prop = get_property ("stemLeftBeamCount");
-      if (ly_c_number_p (prop))
+      if (scm_is_number (prop))
        {
-         Stem::set_beaming (stem_,ly_scm2int (prop),LEFT);
+         Stem::set_beaming (stem_,scm_to_int (prop),LEFT);
          context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       prop = get_property ("stemRightBeamCount");
-      if (ly_c_number_p (prop))
+      if (scm_is_number (prop))
        {
-         Stem::set_beaming (stem_,ly_scm2int (prop), RIGHT);
+         Stem::set_beaming (stem_,scm_to_int (prop), RIGHT);
          context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
       stem_ = 0;