release: 1.3.11

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 296422cfea1d11d03fb87c75c8bfa80e3c078510..e6bd43c2bdd8d121ed3f18296e4fd76eeb6335dc 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -6,6 +6,7 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "staff-symbol-referencer.hh"
 #include "stem-engraver.hh"
 #include "note-head.hh"
 #include "stem.hh"
@@ -28,10 +29,10 @@ Stem_engraver::Stem_engraver()
 void
 Stem_engraver::do_creation_processing ()
 {
-  Scalar prop = get_property ("abbrev", 0);
-  if (prop.isnum_b ()) 
+  SCM prop = get_property ("abbrev", 0);
+  if (gh_number_p(prop)) 
     {
-      default_abbrev_i_  = prop;
+      default_abbrev_i_  = gh_scm2int (prop);
     }
 }
 
@@ -40,7 +41,7 @@ Stem_engraver::acknowledge_element(Score_element_info i)
 {
   if (Rhythmic_head * h = dynamic_cast<Rhythmic_head *> (i.elem_l_))
     {
-      if (h->stem_l_)
+      if (h->stem_l ())
        return;
       
       Rhythmic_req * r = dynamic_cast <Rhythmic_req *> (i.req_l_);
@@ -48,7 +49,10 @@ Stem_engraver::acknowledge_element(Score_element_info i)
       if (!stem_p_) 
        {
          stem_p_ = new Stem;
-         stem_p_->flag_i_ = duration_log;
+         Staff_symbol_referencer_interface st(stem_p_);
+         st.set_interface ();
+         
+         stem_p_->set_elt_property ("duration-log", gh_int2scm (duration_log));
 
          if (abbrev_req_l_)
            {
@@ -75,9 +79,9 @@ Stem_engraver::acknowledge_element(Score_element_info i)
          announce_element (Score_element_info (stem_p_, r));
        }
 
-      if (stem_p_->flag_i_ != duration_log)
+      if (stem_p_->flag_i () != duration_log)
        {
-         r->warning (_f("Adding note head to incompatible stem (type = %d)", 1 <<  stem_p_->flag_i_));
+         r->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  stem_p_->flag_i ()));
        }
 
       stem_p_->add_head (h);
@@ -96,40 +100,28 @@ Stem_engraver::do_pre_move_processing()
 
   if (stem_p_)
     {
-      Scalar prop = get_property ("verticalDirection", 0);
-      Direction dir = prop.isnum_b () ? (Direction)int(prop) : CENTER;
-      if (dir)
+      Translator_group* which;
+      SCM prop = get_property ("stemLeftBeamCount", &which);
+      if (gh_number_p(prop))
        {
-         stem_p_->dir_ = dir;
-         stem_p_->set_elt_property (dir_forced_scm_sym, SCM_BOOL_T);
-       }
-
-      Translator_group const *which;
-      prop = get_property ("stemLeftBeamCount", &which);
-      if (prop.isnum_b ())
-       {
-         stem_p_->beams_i_drul_[LEFT] = prop;
-         ((Translator_group*)which)->set_property ("stemLeftBeamCount", "");
+         stem_p_->beams_i_drul_[LEFT] = gh_scm2int (prop);
+         ((Translator_group*)which)->set_property ("stemLeftBeamCount", SCM_UNDEFINED);
        }
       prop = get_property ("stemRightBeamCount", &which);
-      if (prop.isnum_b ())
+      if (gh_number_p(prop))
        {
-         stem_p_->beams_i_drul_[RIGHT] = prop;
-         ((Translator_group*)which)->set_property ("stemRightBeamCount", "");
+         stem_p_->beams_i_drul_[RIGHT] = gh_scm2int (prop);
+         ((Translator_group*)which)->set_property ("stemRightBeamCount", SCM_UNDEFINED);
        }
 
-      prop = get_property ("stemLength", 0);
-      if (prop.isnum_b ())
+      // UGH. Should mark non-forced instead.
+      SCM dir = stem_p_->get_elt_property ("direction");
+      if (gh_number_p (dir) && to_dir(dir))
        {
-         stem_p_->set_elt_property (length_scm_sym, gh_double2scm (prop.to_f ()));
+         stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T);   
        }
 
-      prop = get_property ("stemStyle", 0);
-      if (prop.to_bool ())
-       {
-         stem_p_->set_elt_property (style_scm_sym, gh_str02scm (prop.ch_C()));
-       }
-      
+
       typeset_element(stem_p_);
       stem_p_ = 0;
     }
@@ -149,3 +141,4 @@ Stem_engraver::do_try_music (Music* r)
 
 
 ADD_THIS_TRANSLATOR(Stem_engraver);
+