X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=987a879053dd808f7775c4b52ae94eb1d7438b09;hb=e426ea7b5af83739ab2f3a255e8cbac55b16e6ec;hp=331dde28310c9f16e8fa977160e7fe448d48a1d0;hpb=7801babeb37b4cbd7f56598629925c34f5304078;p=lilypond.git

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 331dde2831..987a879053 100644
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -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
@@ -38,19 +38,10 @@ Stencil::Stencil (Box b, SCM func)
   dim_ = b;
 }
 
-int
-Stencil::print_smob (SCM, SCM port, scm_print_state *)
-{
-  scm_puts ("#<Stencil ", port);
-  scm_puts (" >", port);
-  return 1;
-}
-
 SCM
-Stencil::mark_smob (SCM smob)
+Stencil::mark_smob () const
 {
-  Stencil *s = (Stencil *) SCM_CELL_WORD_1 (smob);
-  return s->expr_;
+  return expr_;
 }
 
 const char Stencil::type_p_name_[] = "ly:stencil?";
@@ -64,7 +55,7 @@ Stencil::extent (Axis a) const
 bool
 Stencil::is_empty () const
 {
-  return (expr_ == SCM_EOL
+  return (scm_is_null (expr_)
           || dim_.is_empty ());
 }