release: 1.3.0

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 296422cfea1d11d03fb87c75c8bfa80e3c078510..d48fa3925f3f0db14beaafa23a510d69a3780219 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -28,10 +28,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 (SCM_NUMBERP(prop)) 
     {
-      default_abbrev_i_  = prop;
+      default_abbrev_i_  = gh_scm2int (prop);
     }
 }
 
@@ -77,7 +77,7 @@ Stem_engraver::acknowledge_element(Score_element_info i)
 
       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,38 +96,43 @@ 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)
+      SCM prop = get_property ("verticalDirection", 0);
+      if (SCM_NUMBERP(prop))
        {
-         stem_p_->dir_ = dir;
+         stem_p_->dir_ = to_dir (prop);
          stem_p_->set_elt_property (dir_forced_scm_sym, SCM_BOOL_T);
        }
 
-      Translator_group const *which;
+      Translator_group* which;
       prop = get_property ("stemLeftBeamCount", &which);
-      if (prop.isnum_b ())
+      if (SCM_NUMBERP(prop))
        {
-         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 (SCM_NUMBERP(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 ())
+      if (SCM_NUMBERP(prop))
        {
-         stem_p_->set_elt_property (length_scm_sym, gh_double2scm (prop.to_f ()));
+         stem_p_->set_elt_property (length_scm_sym, prop);
        }
 
       prop = get_property ("stemStyle", 0);
-      if (prop.to_bool ())
+      if (gh_string_p (prop))
        {
-         stem_p_->set_elt_property (style_scm_sym, gh_str02scm (prop.ch_C()));
+         stem_p_->set_elt_property (style_scm_sym, prop);
+       }
+      
+      prop = get_property ("noStemExtend", 0);
+      if (gh_boolean_p (prop) && gh_scm2bool (prop))
+       {
+         stem_p_->set_elt_property (no_stem_extend_scm_sym, prop);
        }
       
       typeset_element(stem_p_);