* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / lily / stencil.cc

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 4bae8827b5654716b81fc036eb5c01d9b96b96ed..c684dcb31c7d7fc4feeb5cd12532f88592b290c3 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -6,15 +6,16 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "stencil.hh"
+
 #include <math.h>
+
 #include <libc-extension.hh>   // isinf
 
 #include "input-smob.hh"
-#include "font-metric.hh" 
+#include "font-metric.hh"
 #include "dimensions.hh"
-#include "interval.hh"
-#include "string.hh"
-#include "stencil.hh"
+#include "string-convert.hh"
 #include "warn.hh"
 
 #include "ly-smobs.icc"
@@ -42,7 +43,7 @@ Stencil::print_smob (SCM, SCM port, scm_print_state *)
 SCM
 Stencil::mark_smob (SCM smob)
 {
-  Stencil *s = (Stencil*) ly_cdr (smob);
+  Stencil *s = (Stencil*) SCM_CELL_WORD_1 (smob);
   return s->expr_;
 }
 
@@ -87,10 +88,11 @@ Stencil::translate (Offset o)
   Axis a = X_AXIS;
   while (a < NO_AXES)
     {
-      if (abs (o[a]) > 100 CM
-         || isinf (o[a]) || isnan (o[a]))
+      if (isinf (o[a]) || isnan (o[a]))
        {
-         programming_error ("Improbable offset for translation: setting to zero");
+         programming_error (String_convert::form_string ("Improbable offset for stencil: %f staff space", o[a])
+                            + "\n"
+                            + "Setting to zero.");
          o[a] =  0.0;
        }
       incr (a);
@@ -103,7 +105,7 @@ Stencil::translate (Offset o)
     dim_.translate (o);
   origin_ += o;
 }
-  
+
 void
 Stencil::translate_axis (Real x, Axis a)
 {
@@ -161,6 +163,7 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s,
     {
       programming_error ("Stencil::moved_to_edge: adding empty stencil.");
       his_extent = 0.0;
+      SCM_ASSERT_TYPE(0, SCM_EOL, SCM_ARG1, __FUNCTION__, "");
     }
   else
     his_extent = i[-d];
@@ -201,32 +204,31 @@ interpret_stencil_expression (SCM expr,
       if (!scm_is_pair (expr))
         return;
 
-      SCM head = ly_car (expr);
-     
+      SCM head = scm_car (expr);
+
       if (head == ly_symbol2scm ("translate-stencil"))
         {
-          o += ly_scm2offset (ly_cadr (expr));
-          expr = ly_caddr (expr);
+          o += ly_scm2offset (scm_cadr (expr));
+          expr = scm_caddr (expr);
         }
       else if (head == ly_symbol2scm ("combine-stencil"))
         {
-          for (SCM x = ly_cdr (expr); scm_is_pair (x); x = ly_cdr (x))
-           interpret_stencil_expression (ly_car (x), func, func_arg, o);
+          for (SCM x = scm_cdr (expr); scm_is_pair (x); x = scm_cdr (x))
+           interpret_stencil_expression (scm_car (x), func, func_arg, o);
           return;
         }
       else if (head == ly_symbol2scm ("grob-cause"))
        {
-         SCM grob = ly_cadr (expr);
-         
+         SCM grob = scm_cadr (expr);
+       
          (*func) (func_arg, scm_list_2 (head, grob));
-         interpret_stencil_expression (ly_caddr (expr), func, func_arg, o);
+         interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
          (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin")));
-         
-         return ; 
+         return;
        }
       else
         {
-          (*func) (func_arg, 
+          (*func) (func_arg,
                    scm_list_4 (ly_symbol2scm ("placebox"),
                                scm_make_real (o[X_AXIS]),
                                scm_make_real (o[Y_AXIS]),
@@ -247,18 +249,18 @@ find_font_function (void *fs, SCM x)
 {
   Font_list *me = (Font_list*) fs;
 
-  if (ly_car (x) == ly_symbol2scm ("placebox"))
+  if (scm_car (x) == ly_symbol2scm ("placebox"))
     {
-      SCM args = ly_cdr (x); 
-      SCM what = ly_caddr (args);
+      SCM args = scm_cdr (x);
+      SCM what = scm_caddr (args);
 
       if (scm_is_pair (what))
         {
-          SCM head = ly_car (what);
+          SCM head = scm_car (what);
           if (ly_symbol2scm ("text") == head)
-            me->fonts_ = scm_cons (ly_cadr (what), me->fonts_);
+            me->fonts_ = scm_cons (scm_cadr (what), me->fonts_);
           else if (head == ly_symbol2scm ("char"))
-            me->fonts_ = scm_cons (ly_cadr (what), me->fonts_);
+            me->fonts_ = scm_cons (scm_cadr (what), me->fonts_);
         }
     }
 }
@@ -267,10 +269,10 @@ SCM
 find_expression_fonts (SCM expr)
 {
   Font_list fl;
-  
+
   fl.fonts_ = SCM_EOL;
-  
-  interpret_stencil_expression (expr, &find_font_function, 
+
+  interpret_stencil_expression (expr, &find_font_function,
                                (void*) &fl, Offset (0,0));
 
   return fl.fonts_;
@@ -316,3 +318,4 @@ LY_DEFINE (ly_interpret_stencil_expression, "ly:interpret-stencil-expression",
 
   return SCM_UNSPECIFIED;
 }
+