Shutup warnings about springs of length 0

diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index 0b8f8295d6b8b446369ca82139771b9c93ef28c2..7803cc06f23034f87e31ea2910b12391ff758ae6 100644 (file)
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -91,7 +91,7 @@ compress_lines (const vector<Line_details> &orig)
 
   for (vsize i = 0; i < orig.size (); i++)
     {
-      if (ret.size () && ret.back ().page_permission_ == SCM_EOL)
+      if (ret.size () && !scm_is_symbol (ret.back ().page_permission_))
        {
          Line_details const &old = ret.back ();
          Line_details compressed = orig[i];

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 9200554822b87030d8e0b6c452fd7b3fe5ba859a..3f4e678cd6d4ddf1c60f56ea69cc085eaba4999a 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -274,7 +274,7 @@ bool
 Spring_description::is_sane () const
 {
   return (inverse_hooke_ >= 0)
-    && ideal_ > 0
+    && ideal_ >= 0
     && !isinf (ideal_) && !isnan (ideal_)
     && (inverse_hooke_ == 0.0 || fabs (inverse_hooke_) > 1e-8)
     ;