Doc-es: various updates.

[lilypond.git] / lily / stencil-expression.cc

diff --git a/lily/stencil-expression.cc b/lily/stencil-expression.cc
index d7a7526e988d9ce1241f948aeac3c467d19ca867..8d804196202368c1eaf1043cac78de4e91253fb2 100644 (file)
--- a/lily/stencil-expression.cc
+++ b/lily/stencil-expression.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -18,28 +18,24 @@
 */
 
 #include "stencil.hh"
+#include "protected-scm.hh"
 
-static SCM heads;
+static Protected_scm heads (SCM_EOL);
 
 void register_stencil_head (SCM symbol)
 {
-  if (!heads)
-    heads = scm_permanent_object (scm_cons (SCM_EOL, SCM_EOL));
-  
   scm_set_object_property_x (symbol, ly_symbol2scm ("stencil-head?"), SCM_BOOL_T);
-  scm_set_cdr_x (heads,  scm_cons (symbol, scm_cdr (heads)));
+  heads = scm_cons (symbol, heads);
 }
 
 bool
 is_stencil_head (SCM symbol)
 {
-  return scm_object_property (symbol, ly_symbol2scm ("stencil-head?"))
-    == SCM_BOOL_T;
+  return to_boolean (scm_object_property (symbol, ly_symbol2scm ("stencil-head?")));
 }
 
 SCM
 all_stencil_heads ()
 {
-  return scm_cdr (heads);
+  return heads;
 }
-