Release: bump Welcome versions.

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

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index ad686dcfe782c1925c5526431f9e0676537e25de..a55c7f47e4a26bd968220cd8a748e7c35dc1de11 100644 (file)
--- 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 Stencil::unsmob(). 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
@@ -58,9 +58,8 @@ using namespace std;
 class Stencil : public Simple_smob<Stencil>
 {
 public:
-  SCM mark_smob ();
-  static int print_smob (SCM, SCM, scm_print_state *);
-  static const char type_p_name_[];
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
 private:
   Box dim_;
   SCM expr_;
@@ -91,6 +90,7 @@ 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);
 };