X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstencil.hh;h=c887be149c7ae1b858059e381bdd0e3abe93b264;hb=44ad1d66c072e4d6545e75c769c86a460cb1df13;hp=311b6eff188b0f45c268c91f011da91aae5269b7;hpb=60ca75ba7056c0a829991df19a1c89d7ceec55f0;p=lilypond.git

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 311b6eff18..c887be149c 100644
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -3,16 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef STENCIL_HH
 #define STENCIL_HH
 
-#include <stdlib.h>		// size_t
+#include <cstdlib>		// size_t
+using namespace std;
+
 #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,50 +20,51 @@
 
     It is implemented as a "tree" of scheme expressions, as in
 
-     Expr = combine Expr Expr
-              | translate Offset Expr
-	      | SCHEME
-	      ;
+    Expr = combine Expr-list
+    | translate Offset Expr
+    | origin (ORIGIN) Expr
+    | no-origin Expr
+    | (SCHEME)
+    ;
 
     SCHEME is a Scheme expression that --when eval'd-- produces the
-    desired output.  
+    desired output.
 
     Notes:
-    
+
     * Because of the way that Stencil is implemented, it is the most
     efficient to add "fresh" stencils to what you're going to build.
 
     * Do not create Stencil objects on the heap. That includes passing
-    around Stencil* which are produced by unsmob_stencil().
-    
+    around Stencil* which are produced by unsmob_stencil(). Either
+    copy Stencil objects, or use SCM references.
+
     * 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
 {
-  friend SCM ly_stencil_set_extent_x (SCM, SCM, SCM);
-
   /*
     This provides the reference point of the symbol, for example with
     characters, it is on the base line of the character. Usually,
     ORIGIN is inside DIM_
-   */
+  */
   Offset origin_;
   Box dim_;
   SCM expr_;
-  
-  DECLARE_SIMPLE_SMOBS (Stencil,);  
+
+  DECLARE_SIMPLE_SMOBS (Stencil);
 public:
   Stencil (Box, SCM s);
   Stencil ();
-  
+
   Offset origin () const;
   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;
@@ -72,24 +73,26 @@ public:
 		    Real minimum);
   void add_stencil (Stencil const &m);
   void translate (Offset);
+  void rotate (Real, 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);
+  Stencil in_color (Real r, Real g, Real b) const;
 };
 
+DECLARE_UNSMOB (Stencil, stencil);
 
-DECLARE_UNSMOB(Stencil,stencil);
-SCM fontify_atom (Font_metric const*, SCM atom);
-
-Stencil create_stencil (SCM print);
-
+void interpret_stencil_expression (SCM expr,
+				   void (*func) (void *, SCM),
+				   void *func_arg,
+				   Offset o);
+SCM find_expression_fonts (SCM expr);
 
+void register_stencil_head (SCM symbol);
+bool is_stencil_head (SCM symbol);
+SCM all_stencil_heads ();
 
-#endif
+#endif /* STENCIL_HH */