Run grand-replace (issue 3765)

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

diff --git a/lily/stencil-expression.cc b/lily/stencil-expression.cc
index fb60ae26f8458e8c865fcd6f900e06239c56fdf5..6e97e27b188d7903a2379480cdc86390bc81af45 100644 (file)
--- a/lily/stencil-expression.cc
+++ b/lily/stencil-expression.cc
@@ -1,33 +1,45 @@
 /*
-  stencil-expression.cc -- keep track of which expressions are valid
-  stencil exps.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stencil.hh"
 
-#include "protected-scm.hh"
-
-static Protected_scm heads = SCM_EOL;
+static SCM heads;
 
 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);
-  heads = scm_cons (symbol, heads);
+  scm_set_cdr_x (heads, scm_cons (symbol, scm_cdr (heads)));
 }
+
 bool
 is_stencil_head (SCM symbol)
 {
   return scm_object_property (symbol, ly_symbol2scm ("stencil-head?"))
-    == SCM_BOOL_T;
+         == SCM_BOOL_T;
 }
 
 SCM
 all_stencil_heads ()
 {
-  return heads;
+  return scm_cdr (heads);
 }