patch::: 1.3.147.jcn1

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index caebede28bb60e1a2e91e6947fbae7a01f6e5337..9375bd9a7f18ff554ed46a0d111c035fe33db985 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "staff-symbol-referencer.hh"
@@ -24,16 +24,16 @@ class Stem_engraver : public Engraver
 
 public:
   VIRTUAL_COPY_CONS (Translator);
-  Stem_engraver();
+  Stem_engraver ();
   
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing ();
-  virtual bool do_try_music (Music*);
+  virtual void acknowledge_grob (Grob_info);
+  virtual void stop_translation_timestep ();
+  virtual bool try_music (Music*);
   
 private:
-  Score_element  *stem_p_;
-  Score_element *tremolo_p_;
+  Grob  *stem_p_;
+  Grob *tremolo_p_;
   Rhythmic_req *rhythmic_req_l_;
   Tremolo_req* tremolo_req_l_;
 };
@@ -50,24 +50,24 @@ Stem_engraver::Stem_engraver ()
 
 
 void
-Stem_engraver::acknowledge_element(Score_element_info i)
+Stem_engraver::acknowledge_grob (Grob_info i)
 {
-  Score_element* h = i.elem_l_;
+  Grob* h = i.elem_l_;
   if (Rhythmic_head::has_interface (h))
     {
       if (Rhythmic_head::stem_l (h))
        return;
       
-      Rhythmic_req * r = dynamic_cast <Rhythmic_req *> (i.req_l_);
-      int duration_log = r->duration_.durlog_i_;      
+      int duration_log  = unsmob_duration (i.req_l_->get_mus_property ("duration"))-> duration_log ();
+           
       if (!stem_p_) 
        {
          stem_p_ = new Item (get_property ("Stem"));
          Stem::set_interface (stem_p_);
-         Staff_symbol_referencer::set_interface(stem_p_);
+         Staff_symbol_referencer::set_interface (stem_p_);
 
          
-         stem_p_->set_elt_property ("duration-log", gh_int2scm (duration_log));
+         stem_p_->set_grob_property ("duration-log", gh_int2scm (duration_log));
 
          if (tremolo_req_l_)
            {
@@ -93,7 +93,7 @@ Stem_engraver::acknowledge_element(Score_element_info i)
                  tremolo_p_ = new Item (get_property ("StemTremolo"));
                  Stem_tremolo::set_interface (tremolo_p_);
 
-                 announce_element (tremolo_p_, tremolo_req_l_);
+                 announce_grob (tremolo_p_, tremolo_req_l_);
                  /*
                    The number of tremolo flags is the number of flags of
                    the tremolo-type minus the number of flags of the note
@@ -103,16 +103,16 @@ Stem_engraver::acknowledge_element(Score_element_info i)
                    - (duration_log > 2 ? duration_log - 2 : 0);
                  if (tremolo_flags < 0)
                    tremolo_flags = 0;
-                 tremolo_p_->set_elt_property ("tremolo-flags",
+                 tremolo_p_->set_grob_property ("tremolo-flags",
                                                gh_int2scm (tremolo_flags));
                }
            }
-         announce_element (stem_p_, r);
+         announce_grob (stem_p_, i.req_l_);
        }
 
       if (Stem::flag_i (stem_p_) != duration_log)
        {
-         r->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::flag_i (stem_p_)));
+         i.req_l_->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::flag_i (stem_p_)));
        }
 
       Stem::add_head (stem_p_,h);
@@ -120,25 +120,25 @@ Stem_engraver::acknowledge_element(Score_element_info i)
 }
 
 void
-Stem_engraver::do_pre_move_processing()
+Stem_engraver::stop_translation_timestep ()
 {
   if (tremolo_p_)
     {
       Stem_tremolo::set_stem (tremolo_p_, stem_p_);
-      typeset_element (tremolo_p_);
+      typeset_grob (tremolo_p_);
       tremolo_p_ = 0;
     }
 
   if (stem_p_)
     {
       SCM prop = get_property ("stemLeftBeamCount");
-      if (gh_number_p(prop))
+      if (gh_number_p (prop))
        {
          Stem::set_beaming (stem_p_,gh_scm2int (prop),LEFT);
          daddy_trans_l_->set_property ("stemLeftBeamCount", SCM_UNDEFINED);
        }
       prop = get_property ("stemRightBeamCount");
-      if (gh_number_p(prop))
+      if (gh_number_p (prop))
        {
          Stem::set_beaming (stem_p_,gh_scm2int (prop), RIGHT);
          daddy_trans_l_->set_property ("stemRightBeamCount", SCM_UNDEFINED);
@@ -146,18 +146,17 @@ Stem_engraver::do_pre_move_processing()
 
       
       // UGH. Should mark non-forced instead.
-
       /*
         aargh: I don't get it.  direction is being set (and then set
         to forced), if we have a Chord_tremolo.
        */
-      SCM dir = stem_p_->get_elt_property ("direction");
-      if (gh_number_p (dir) && to_dir(dir))
+      SCM dir = stem_p_->get_grob_property ("direction");
+      if (gh_number_p (dir) && to_dir (dir))
        {
-         stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T);   
+         stem_p_->set_grob_property ("dir-forced", SCM_BOOL_T);          
        }
 
-      typeset_element(stem_p_);
+      typeset_grob (stem_p_);
       stem_p_ = 0;
     }
 
@@ -166,7 +165,7 @@ Stem_engraver::do_pre_move_processing()
 }
 
 bool
-Stem_engraver::do_try_music (Music* r)
+Stem_engraver::try_music (Music* r)
 {
   if (Tremolo_req* a = dynamic_cast <Tremolo_req *> (r))
     {