X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fstencil.hh;h=a55c7f47e4a26bd968220cd8a748e7c35dc1de11;hb=db449e3935bc8b765979e1d4a4ab3018908cbbd8;hp=34bafa6d41a18c9958303028a16d517ad893029a;hpb=d0b51cc48c2d66efbd1cbdc682dd622e7a2a93f9;p=lilypond.git

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 34bafa6d41..a55c7f47e4 100644
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -47,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 unsmob<Stencil>(). Either
     copy Stencil objects, or use SCM references.
 
     * Empty stencils have empty dimensions.  If add_at_edge is used to
@@ -55,12 +55,15 @@ using namespace std;
 
     DIMENSIONS = (Interval (0, 0), Interval (0, 0)
 */
-class Stencil
+class Stencil : public Simple_smob<Stencil>
 {
+public:
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
+private:
   Box dim_;
   SCM expr_;
 
-  DECLARE_SIMPLE_SMOBS (Stencil);
 public:
   Stencil (Box, SCM s);
   Stencil ();
@@ -87,10 +90,10 @@ public:
   bool is_empty () const;
   bool is_empty (Axis) const;
   Stencil in_color (Real r, Real g, Real b) const;
+  Stencil with_outline (Stencil const &ol) const;
   static SCM skylines_from_stencil (SCM, Real, Axis);
 };
 
-DECLARE_UNSMOB (Stencil, stencil);
 
 void interpret_stencil_expression (SCM expr,
                                    SCM (*func) (void *, SCM),