]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/stem-engraver.cc
``slikken kreng''
[lilypond.git] / lily / stem-engraver.cc
index caebede28bb60e1a2e91e6947fbae7a01f6e5337..eb2bf92e110b117d1f24af216fad492ba2fefb0c 100644 (file)
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "staff-symbol-referencer.hh"
 #include "translator-group.hh"
 #include "engraver.hh"
 
+
+
 /**
   Make stems upon receiving noteheads.
  */
 class Stem_engraver : public Engraver
 {
-
-public:
-  VIRTUAL_COPY_CONS (Translator);
-  Stem_engraver();
-  
+  TRANSLATOR_DECLARATIONS(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_;
-  Rhythmic_req *rhythmic_req_l_;
-  Tremolo_req* tremolo_req_l_;
+  Grob  *stem_;
+  Grob *tremolo_;
+  Rhythmic_req *rhythmic_req_;
+  Tremolo_req* tremolo_req_;
 };
 
-ADD_THIS_TRANSLATOR (Stem_engraver);
-
 Stem_engraver::Stem_engraver ()
 {
-  tremolo_req_l_ = 0;
-  stem_p_ = 0;
-  tremolo_p_ = 0;
-  rhythmic_req_l_ =0;
+  tremolo_req_ = 0;
+  stem_ = 0;
+  tremolo_ = 0;
+  rhythmic_req_ =0;
 }
 
 
 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.grob_;
   if (Rhythmic_head::has_interface (h))
     {
-      if (Rhythmic_head::stem_l (h))
+      if (Rhythmic_head::get_stem (h))
        return;
+
+      /* Reverted to the old method so chord tremolos work again. /MB 
+      */
+      int duration_log = 0;
+      Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (i.music_cause ()); 
+      if (rhythmic_req)
+       duration_log = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log (); 
       
-      Rhythmic_req * r = dynamic_cast <Rhythmic_req *> (i.req_l_);
-      int duration_log = r->duration_.durlog_i_;      
-      if (!stem_p_) 
+      if (!stem_) 
        {
-         stem_p_ = new Item (get_property ("Stem"));
-         Stem::set_interface (stem_p_);
-         Staff_symbol_referencer::set_interface(stem_p_);
+         stem_ = new Item (get_property ("Stem"));
 
-         
-         stem_p_->set_elt_property ("duration-log", gh_int2scm (duration_log));
+         stem_->set_grob_property ("duration-log", gh_int2scm (duration_log));
 
-         if (tremolo_req_l_)
+         if (tremolo_req_)
            {
              /*
                Stem tremolo is never applied to a note by default,
@@ -80,20 +78,19 @@ Stem_engraver::acknowledge_element(Score_element_info i)
 
                the first and last (quarter) note bothe get one tremolo flag.
               */
-             int requested_type = gh_scm2int (tremolo_req_l_->get_mus_property ("tremolo-type"));
+             int requested_type = gh_scm2int (tremolo_req_->get_mus_property ("tremolo-type"));
              
              SCM f = get_property ("tremoloFlags");
              if (!requested_type && gh_number_p (f))
                requested_type = gh_scm2int (f);
              else
-               daddy_trans_l_->set_property ("tremoloFlags", gh_int2scm (requested_type));
+               daddy_trans_->set_property ("tremoloFlags", gh_int2scm (requested_type));
 
              if (requested_type)
                {
-                 tremolo_p_ = new Item (get_property ("StemTremolo"));
-                 Stem_tremolo::set_interface (tremolo_p_);
+                 tremolo_ = new Item (get_property ("StemTremolo"));
+                 announce_grob(tremolo_, tremolo_req_->self_scm());
 
-                 announce_element (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,76 +100,93 @@ 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_->set_grob_property ("flag-count",
                                                gh_int2scm (tremolo_flags));
+                 tremolo_->set_parent (stem_, X_AXIS);
                }
            }
-         announce_element (stem_p_, r);
+
+         /*
+           We announce the cause of the head as cause of the stem.
+           The stem needs a rhythmic structure to fit it into a beam.  */
+         announce_grob(stem_, i.music_cause ()->self_scm());
        }
 
-      if (Stem::flag_i (stem_p_) != duration_log)
+      if (Stem::duration_log (stem_) != duration_log)
        {
-         r->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::flag_i (stem_p_)));
+         i.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::duration_log (stem_)));
        }
 
-      Stem::add_head (stem_p_,h);
+      Stem::add_head (stem_,h);
     }
 }
 
 void
-Stem_engraver::do_pre_move_processing()
+Stem_engraver::stop_translation_timestep ()
 {
-  if (tremolo_p_)
+  if (tremolo_)
     {
-      Stem_tremolo::set_stem (tremolo_p_, stem_p_);
-      typeset_element (tremolo_p_);
-      tremolo_p_ = 0;
+      Stem_tremolo::set_stem (tremolo_, stem_);
+      typeset_grob (tremolo_);
+      tremolo_ = 0;
     }
 
-  if (stem_p_)
+  if (stem_)
     {
       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);
+         Stem::set_beaming (stem_,gh_scm2int (prop),LEFT);
+         daddy_trans_->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       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);
+         Stem::set_beaming (stem_,gh_scm2int (prop), RIGHT);
+         daddy_trans_->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
 
       
       // 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))
+
+      /*
+       Why the separate check for forced directions? --hwn.
+
+       (docme)
+       */
+      SCM dir = stem_->get_grob_property ("direction");
+      if (gh_number_p (dir) && to_dir (dir))
        {
-         stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T);   
+         stem_->set_grob_property ("dir-forced", SCM_BOOL_T);    
        }
 
-      typeset_element(stem_p_);
-      stem_p_ = 0;
+      typeset_grob (stem_);
+      stem_ = 0;
     }
 
 
-  tremolo_req_l_ = 0;
+  tremolo_req_ = 0;
 }
 
 bool
-Stem_engraver::do_try_music (Music* r)
+Stem_engraver::try_music (Music* r)
 {
   if (Tremolo_req* a = dynamic_cast <Tremolo_req *> (r))
     {
-      tremolo_req_l_ = a;
+      tremolo_req_ = a;
       return true;
     }
   return false;
 }
 
+ENTER_DESCRIPTION(Stem_engraver,
+/* descr */       "Create stems and single-stem tremolos.  It also works together with
+the beam engraver for overriding beaming.",
+/* creats*/       "Stem StemTremolo",
+/* acks  */       "rhythmic-head-interface",
+/* reads */       "tremoloFlags stemLeftBeamCount stemRightBeamCount",
+/* write */       "");