* lily/object-key-dumper-scheme.cc: new file.

[lilypond.git] / lily / include / stencil.hh

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index c403ff8201697483b13b7ce60e15d63dcf861ebb..dfda4f2547e9d8485d9051892ebae484f5740e9b 100644 (file)
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -8,11 +8,10 @@
 #ifndef STENCIL_HH
 #define STENCIL_HH
 
-#include <stdlib.h>            // size_t
+#include <cstdlib>             // size_t
+
 #include "lily-proto.hh"
 #include "box.hh"
-#include "direction.hh"
-#include "lily-guile.hh"
 #include "smobs.hh"
 
 /** a group of individually translated symbols. You can add stencils
@@ -20,7 +19,7 @@
 
     It is implemented as a "tree" of scheme expressions, as in
 
-     Expr = combine Expr Expr
+     Expr = combine Expr-list
             | translate Offset Expr
            | origin (ORIGIN) Expr
            | no-origin Expr
@@ -91,13 +90,12 @@ public:
 DECLARE_UNSMOB(Stencil,stencil);
 SCM fontify_atom (Font_metric const*, SCM atom);
 
-void interpret_stencil_expr (SCM expr,
-                       void (*func) (void*, SCM),
-                       void *func_arg,
-                       Offset o);
+void interpret_stencil_expression (SCM expr,
+                        void (*func) (void*, SCM),
+                        void *func_arg,
+                        Offset o);
 
 Stencil create_stencil (SCM print);
+SCM find_expression_fonts (SCM expr);
 
-
-
-#endif
+#endif /* STENCIL_HH */