* lily/moment.cc (robust_scm2moment): new function.

[lilypond.git] / lily / stencil.cc

diff --git a/lily/stencil.cc b/lily/stencil.cc
index bbca94953efb13023a8626d20e8b352102c7585f..25215052e166fdc8960e81534d2227fe83baac89 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -42,7 +42,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_;
 }
 
@@ -119,6 +119,8 @@ Stencil::add_stencil (Stencil const &s)
   dim_.unite (s.dim_);
 }
 
+
+
 void
 Stencil::set_empty (bool e)
 {
@@ -138,7 +140,7 @@ void
 Stencil::align_to (Axis a, Real x)
 {
   if (is_empty ())
-    return ;
+    return;
 
   Interval i (extent (a));
   translate_axis (-i.linear_combination (x), a);
@@ -187,54 +189,50 @@ Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding,
 
 /****************************************************************/
 
+
 void
 interpret_stencil_expression (SCM expr,
-                       void (*func) (void*, SCM),
-                       void *func_arg,
-                       Offset o)
+                             void (*func) (void*, SCM),
+                             void *func_arg,
+                             Offset o)
 {
   while (1)
     {
-      if (!ly_c_pair_p (expr))
-       return;
-  
-      SCM head =ly_car (expr);
-      if (unsmob_input (head))
-       {
-         Input *ip = unsmob_input (head);
-         (*func)(func_arg,
-                 scm_list_4 (ly_symbol2scm ("define-origin"),
-                             scm_makfrom0str (ip->file_string ()
-                                              .to_str0 ()),
-                             scm_int2num (ip->line_number ()),
-                             scm_int2num (ip->column_number ())));
-         
-         expr = ly_cadr (expr);
-       }
-      else  if (head ==  ly_symbol2scm ("no-origin"))
-       {
-         (*func) (func_arg, scm_list_1 (head));
-         expr = ly_cadr (expr);
-       }
-      else if (head == ly_symbol2scm ("translate-stencil"))
-       {
-         o += ly_scm2offset (ly_cadr (expr));
-         expr = ly_caddr (expr);
-       }
+      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"))
        {
-         interpret_stencil_expression (ly_cadr (expr), func, func_arg, o);
-         expr = ly_caddr (expr);
+         SCM grob = scm_cadr (expr);
+         
+         (*func) (func_arg, scm_list_2 (head, grob));
+         interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
+         (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin")));
+         
+         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;
-       }
+        {
+          (*func) (func_arg, 
+                   scm_list_4 (ly_symbol2scm ("placebox"),
+                               scm_make_real (o[X_AXIS]),
+                               scm_make_real (o[Y_AXIS]),
+                               expr));
+           return;
+        }
     }
 }
 
@@ -245,23 +243,23 @@ struct Font_list
 };
 
 static void
-find_font_function (void * fs, SCM x)
+find_font_function (void *fs, SCM x)
 {
-  Font_list * me = (Font_list*)fs;
-  
-  if (ly_car (x) == ly_symbol2scm ("placebox"))
-    {
-      SCM args = ly_cdr (x); 
-      SCM what = ly_caddr (args);
+  Font_list *me = (Font_list*) fs;
 
-      if (ly_c_pair_p (what))
-       {
-         SCM head = ly_car (what);
-         if (ly_symbol2scm ("text")  == head)
-           me->fonts_ = scm_cons (ly_cadr (what), me->fonts_);
-         else  if (head == ly_symbol2scm ("char"))
-           me->fonts_ = scm_cons (ly_cadr (what), me->fonts_);
-       }
+  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_);
+        }
     }
 }
 
@@ -273,16 +271,48 @@ 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}.")
+
+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);
+  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;
+}