X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstencil.hh;h=6b78c18e4b313ac59980909a917ed6dd90556152;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=5706d539c0499631e43994a38e53ea67efc6ee0d;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 5706d539c0..6b78c18e4b 100644
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -1,14 +1,25 @@
 /*
-  stencil.hh -- declare Stencil
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef STENCIL_HH
 #define STENCIL_HH
 
-#include <cstdlib>		// size_t
+#include <cstdlib>              // size_t
 using namespace std;
 
 #include "lily-proto.hh"
@@ -36,7 +47,7 @@ using namespace std;
     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(). Either
+    around Stencil* which are produced by Stencil::unsmob(). Either
     copy Stencil objects, or use SCM references.
 
     * Empty stencils have empty dimensions.  If add_at_edge is used to
@@ -44,50 +55,49 @@ using namespace std;
 
     DIMENSIONS = (Interval (0, 0), Interval (0, 0)
 */
-class Stencil
+class Stencil : public Simple_smob<Stencil>
 {
-  /*
-    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_;
+public:
+  SCM mark_smob ();
+  static const char type_p_name_[];
+private:
   Box dim_;
   SCM expr_;
 
-  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) */
   void set_empty (bool);
-  Stencil moved_to_edge (Axis a, Direction d, const Stencil &m, Real padding,
-			 Real minimum) const;
-
-  void add_at_edge (Axis a, Direction d, const Stencil &m, Real padding,
-		    Real minimum);
+  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;
+  void rotate (Real, Offset);
+  void rotate_degrees (Real, Offset);
+  void rotate_degrees_absolute (Real, Offset);
   void align_to (Axis a, Real x);
   void translate_axis (Real, Axis);
+  void scale (Real, Real);
 
   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);
 };
 
-DECLARE_UNSMOB (Stencil, stencil);
 
 void interpret_stencil_expression (SCM expr,
-				   void (*func) (void *, SCM),
-				   void *func_arg,
-				   Offset o);
+                                   SCM (*func) (void *, SCM),
+                                   void *func_arg,
+                                   Offset o);
 SCM find_expression_fonts (SCM expr);
 
 void register_stencil_head (SCM symbol);