* lily/kpath.cc:

[lilypond.git] / lily / stencil.cc

diff --git a/lily/stencil.cc b/lily/stencil.cc
index c684dcb31c7d7fc4feeb5cd12532f88592b290c3..688efe2855bea5771efca0e166a9d42676da4a5a 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "stencil.hh"
@@ -109,7 +109,7 @@ Stencil::translate (Offset o)
 void
 Stencil::translate_axis (Real x, Axis a)
 {
-  Offset o (0,0);
+  Offset o (0, 0);
   o[a] = x;
   translate (o);
 }
@@ -133,8 +133,8 @@ Stencil::set_empty (bool e)
     }
   else
     {
-      dim_[X_AXIS] = Interval (0,0);
-      dim_[Y_AXIS] = Interval (0,0);
+      dim_[X_AXIS] = Interval (0, 0);
+      dim_[Y_AXIS] = Interval (0, 0);
     }
 }
 
@@ -163,7 +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__, "");
+      //      SCM_ASSERT_TYPE (0, s.expr (), SCM_ARG1, __FUNCTION__, "non-empty stencil");
     }
   else
     his_extent = i[-d];
@@ -172,7 +172,7 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s,
     + d * padding;
 
   Stencil toadd (s);
-  toadd.translate_axis (offset,a);
+  toadd.translate_axis (offset, a);
 
   if (minimum > 0 && d * (-origin ()[a] + toadd.origin ()[a]) < minimum)
     toadd.translate_axis ( -toadd.origin ()[a]
@@ -221,11 +221,25 @@ interpret_stencil_expression (SCM expr,
        {
          SCM grob = scm_cadr (expr);
        
-         (*func) (func_arg, scm_list_2 (head, grob));
+         (*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,
@@ -273,49 +287,9 @@ find_expression_fonts (SCM expr)
   fl.fonts_ = SCM_EOL;
 
   interpret_stencil_expression (expr, &find_font_function,
-                               (void*) &fl, Offset (0,0));
+                               (void*) &fl, Offset (0, 0));
 
   return fl.fonts_;
 }
 
 
-LY_DEFINE (ly_stencil_fonts, "ly:stencil-fonts",
-          1, 0, 0, (SCM s),
-         " Analyse @var{s}, and return a list of fonts used in @var{s}.")
-{
-  Stencil *stil = unsmob_stencil (s);
-  SCM_ASSERT_TYPE (stil, s, SCM_ARG1, __FUNCTION__, "Stencil");
-  return find_expression_fonts (stil->expr ());
-}
-
-struct Stencil_interpret_arguments
-{
-  SCM func;
-  SCM arg1;
-};
-
-void stencil_interpret_in_scm (void *p, SCM expr)
-{
-  Stencil_interpret_arguments *ap = (Stencil_interpret_arguments*) p;
-  scm_call_2 (ap->func, ap->arg1, expr);
-}
-
-
-
-LY_DEFINE (ly_interpret_stencil_expression, "ly:interpret-stencil-expression",
-           4, 0, 0, (SCM expr, SCM func, SCM arg1, SCM offset),
-           "Parse EXPR, feed bits to FUNC with first arg ARG1")
-{
-  SCM_ASSERT_TYPE (ly_c_procedure_p(func), func, SCM_ARG1, __FUNCTION__,
-                  "procedure");
-
-  Stencil_interpret_arguments a;
-  a.func = func;
-  a.arg1 = arg1;
-  Offset o = ly_scm2offset (offset);
-
-  interpret_stencil_expression (expr, stencil_interpret_in_scm, (void*) &a, o);
-
-  return SCM_UNSPECIFIED;
-}
-