Let second argument of interpret_stencil_expression return an SCM value

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

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 65c0b7a0f1e295e0523b3f035c4b7ad8fa8bdd30..34bafa6d41a18c9958303028a16d517ad893029a 100644 (file)
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -71,6 +71,7 @@ public:
      Set dimensions to empty, or to (Interval (0, 0), Interval (0, 0) */
   void set_empty (bool);
   void add_at_edge (Axis a, Direction d, const Stencil &m, Real padding);
+  void stack (Axis a, Direction d, const Stencil &m, Real padding, Real mindist);
   void add_stencil (Stencil const &m);
   void translate (Offset);
   Stencil translated (Offset) const;
@@ -84,6 +85,7 @@ public:
   Interval extent (Axis) const;
   Box extent_box () const;
   bool is_empty () const;
+  bool is_empty (Axis) const;
   Stencil in_color (Real r, Real g, Real b) const;
   static SCM skylines_from_stencil (SCM, Real, Axis);
 };
@@ -91,7 +93,7 @@ public:
 DECLARE_UNSMOB (Stencil, stencil);
 
 void interpret_stencil_expression (SCM expr,
-                                   void (*func) (void *, SCM),
+                                   SCM (*func) (void *, SCM),
                                    void *func_arg,
                                    Offset o);
 SCM find_expression_fonts (SCM expr);