(all-grob-descriptions): set thickness to

[lilypond.git] / lily / stencil.cc

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 3ebd5b28864f99d2d8a041e441c98fee80aa1ef8..9083737560bf5aeaa0ac9e07f70342bedc6afe37 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -3,17 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
 
-#include <math.h>
 
 #include "dimensions.hh"
 #include "font-metric.hh"
 #include "input-smob.hh"
-#include "libc-extension.hh"   // isinf
 #include "string-convert.hh"
 #include "warn.hh"
 
@@ -56,12 +54,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,7 +89,7 @@ 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"
@@ -190,103 +188,14 @@ Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding,
   add_stencil (moved_to_edge (a, d, s, padding, minimum));
 }
 
-/****************************************************************/
-
-void
-interpret_stencil_expression (SCM expr,
-                             void (*func) (void *, SCM),
-                             void *func_arg,
-                             Offset o)
-{
-  while (1)
-    {
-      if (!scm_is_pair (expr))
-       return;
-
-      SCM head = scm_car (expr);
-
-      if (head == ly_symbol2scm ("translate-stencil"))
-       {
-         o += ly_scm2offset (scm_cadr (expr));
-         expr = scm_caddr (expr);
-       }
-      else if (head == ly_symbol2scm ("combine-stencil"))
-       {
-         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 = scm_cadr (expr);
-
-         (*func) (func_arg, scm_list_3 (head,
-                                        ly_quote_scm (ly_offset2scm (o)), grob));
-         interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
-         (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin")));
-         return;
-       }
-      else if (head == ly_symbol2scm ("color"))
-       {
-         SCM color = scm_cadr (expr);
-         SCM r = scm_car (color);
-         SCM g = scm_cadr (color);
-         SCM b = scm_caddr (color);
-
-         (*func) (func_arg, scm_list_4 (ly_symbol2scm ("setcolor"), r, g, b));
-         interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
-         (*func) (func_arg, scm_list_1 (ly_symbol2scm ("resetcolor")));
-
-         return;
-       }
-      else
-       {
-         (*func) (func_arg,
-                  scm_list_4 (ly_symbol2scm ("placebox"),
-                              scm_make_real (o[X_AXIS]),
-                              scm_make_real (o[Y_AXIS]),
-                              expr));
-         return;
-       }
-    }
-}
-
-struct Font_list
-{
-  SCM fonts_;
-};
-
-static void
-find_font_function (void *fs, SCM x)
-{
-  Font_list *me = (Font_list *) fs;
-
-  if (scm_car (x) == ly_symbol2scm ("placebox"))
-    {
-      SCM args = scm_cdr (x);
-      SCM what = scm_caddr (args);
-
-      if (scm_is_pair (what))
-       {
-         SCM head = scm_car (what);
-         if (ly_symbol2scm ("text") == head)
-           me->fonts_ = scm_cons (scm_cadr (what), me->fonts_);
-         else if (head == ly_symbol2scm ("char"))
-           me->fonts_ = scm_cons (scm_cadr (what), me->fonts_);
-       }
-    }
-}
-
-SCM
-find_expression_fonts (SCM expr)
+Stencil
+Stencil::in_color (Real r, Real g, Real b) const
 {
-  Font_list fl;
-
-  fl.fonts_ = SCM_EOL;
-
-  interpret_stencil_expression (expr, &find_font_function,
-                               (void *) & fl, Offset (0, 0));
-
-  return fl.fonts_;
+  Stencil new_stencil (extent_box (),
+                      scm_list_3 (ly_symbol2scm ("color"),
+                                  scm_list_3 (scm_from_double (r),
+                                              scm_from_double (g),
+                                              scm_from_double (b)),
+                                  expr ()));
+  return new_stencil;
 }
-