(framework_relocation): use INSTALLER_PREFIX.

[lilypond.git] / lily / stencil.cc

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 714d403638ae5d4bb8a8cfaaf32481bb9506f16b..2fad44274d43f0a99c685a143c5598be51dd2f34 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -3,17 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
 
-#include <math.h>
-
-#include "dimensions.hh"
+#include "main.hh"
 #include "font-metric.hh"
 #include "input-smob.hh"
-#include "libc-extension.hh"   // isinf
 #include "string-convert.hh"
 #include "warn.hh"
 
@@ -56,12 +53,12 @@ Stencil::extent (Axis a) const
   return dim_[a];
 }
 
-/* Hmm... maybe this is not such a good idea ; stuff can be empty,
-   while expr_ == '()  */
 bool
 Stencil::is_empty () const
 {
-  return expr_ == SCM_EOL;
+  return (expr_ == SCM_EOL
+         || dim_[X_AXIS].is_empty ()
+         || dim_[Y_AXIS].is_empty ());
 }
 
 SCM
@@ -91,12 +88,14 @@ Stencil::translate (Offset o)
          || isnan (o[a])
 
          // ugh, hardcoded. 
-         || fabs (o[a]) > 1e6) 
+         || fabs (o[a]) > 1e6)
        {
          programming_error (String_convert::form_string ("Improbable offset for stencil: %f staff space", o[a])
                             + "\n"
                             + "Setting to zero.");
          o[a] = 0.0;
+         if (strict_infinity_checking)
+           scm_misc_error (__FUNCTION__, "Improbable offset.", SCM_EOL);
        }
       incr (a);
     }
@@ -190,8 +189,6 @@ Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding,
   add_stencil (moved_to_edge (a, d, s, padding, minimum));
 }
 
-
-
 Stencil
 Stencil::in_color (Real r, Real g, Real b) const
 {