release: 1.3.18

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 7c721c203d3503ece4b6cf4338e53d83e13296e2..18889df2d9723ec02c0a6085d5c197c5e0fcc5a8 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -8,6 +8,8 @@
 
   TODO: This is way too hairy
 */
+#include <math.h>              // m_pi
+
 #include "directional-element-interface.hh"
 #include "dimension-cache.hh"
 #include "stem.hh"
@@ -252,7 +254,7 @@ Stem::get_default_dir () const
 Real
 Stem::get_default_stem_end_position () const
 {
-  bool grace_b = get_elt_property ("grace") != SCM_UNDEFINED;
+  bool grace_b = to_boolean (get_elt_property ("grace"));
   String type_str = grace_b ? "grace-" : "";
   SCM s;
   Array<Real> a;
@@ -411,7 +413,7 @@ Stem::flag () const
 {
   String style;
   SCM st = get_elt_property ("flag-style");
-  if ( st != SCM_UNDEFINED)
+  if ( gh_string_p (st))
     {
       style = ly_scm2string (st);
     }
@@ -430,7 +432,7 @@ Stem::dim_callback (Dimension_cache const* c)
   Stem * s = dynamic_cast<Stem*> (c->element_l ());
   
   Interval r (0, 0);
-  if (s->get_elt_property ("beam") != SCM_UNDEFINED || abs (s->flag_i ()) <= 2)
+  if (unsmob_element (s->get_elt_property ("beam")) || abs (s->flag_i ()) <= 2)
     ;  // TODO!
   else
     {