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

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 11baeaf76e..6b78c18e4b 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--2014 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 Stencil::unsmob(). 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 ();
+  static const char type_p_name_[];
+private:
   Box dim_;
   SCM expr_;
 
-  DECLARE_SIMPLE_SMOBS (Stencil);
 public:
   Stencil (Box, SCM s);
   Stencil ();
@@ -90,7 +93,6 @@ public:
   static SCM skylines_from_stencil (SCM, Real, Axis);
 };
 
-DECLARE_UNSMOB (Stencil, stencil);
 
 void interpret_stencil_expression (SCM expr,
                                    SCM (*func) (void *, SCM),