* scm/music-functions.scm (has-request-chord): don't use

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

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index a01c891a813cfc594828f291344a2de929864736..23621ecf8ffe4bba40df4a504812e480770b8a63 100644 (file)
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -3,16 +3,15 @@
 
   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>
 */
 #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
@@ -42,7 +41,7 @@
     * Empty stencils have empty dimensions.  If add_at_edge is used to
     init the stencil, we assume that
 
-      DIMENSIONS = (Interval (0,0),Interval (0,0)
+      DIMENSIONS = (Interval (0, 0), Interval (0, 0)
 */
 class Stencil
 {
@@ -57,7 +56,7 @@ class Stencil
   Box dim_;
   SCM expr_;
   
-  DECLARE_SIMPLE_SMOBS (Stencil,);  
+  DECLARE_SIMPLE_SMOBS (Stencil, );  
 public:
   Stencil (Box, SCM s);
   Stencil ();
@@ -66,7 +65,7 @@ public:
   SCM expr () const;
 
   /**
-     Set dimensions to empty, or to (Interval (0,0),Interval (0,0) */
+     Set dimensions to empty, or to (Interval (0, 0), Interval (0, 0) */
   void set_empty (bool);
   Stencil moved_to_edge (Axis a, Direction d, const Stencil &m, Real padding,
                         Real minimum) const;
@@ -76,27 +75,27 @@ public:
   void add_stencil (Stencil const &m);
   void translate (Offset);
   void align_to (Axis a, Real x);
-  void translate_axis (Real,Axis);
+  void translate_axis (Real, Axis);
   
   Interval extent (Axis) const;
   Box extent_box () const;
   bool is_empty () const;
 
   static SCM ly_get_stencil_extent (SCM mol, SCM axis);
-  static SCM ly_set_stencil_extent_x (SCM,SCM,SCM);
-  static SCM ly_stencil_combined_at_edge (SCM,SCM,SCM,SCM,SCM);
+  static SCM ly_set_stencil_extent_x (SCM, SCM, SCM);
+  static SCM ly_stencil_combined_at_edge (SCM, SCM, SCM, SCM, SCM);
 };
 
 
-DECLARE_UNSMOB(Stencil,stencil);
+DECLARE_UNSMOB(Stencil, stencil);
 SCM fontify_atom (Font_metric const*, SCM atom);
 
 void interpret_stencil_expression (SCM expr,
-                       void (*func) (void*, SCM),
-                       void *func_arg,
-                       Offset o);
+                        void (*func) (void*, SCM),
+                        void *func_arg,
+                        Offset o);
 
 Stencil create_stencil (SCM print);
 SCM find_expression_fonts (SCM expr);
 
-#endif
+#endif /* STENCIL_HH */