Release: bump Welcome versions.

[lilypond.git] / lily / function-documentation.cc

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 8535f7f2a672fc0c80c411bdc7589b4a55e8220c..99fbdfe6c8ce17838c2f58a90f1eba3517995a4d 100644 (file)
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -18,13 +18,27 @@
 */
 
 #include <cstring>
+#include <map>
 using namespace std;
 
 #include "std-string.hh"
 #include "lily-guile.hh"
 #include "warn.hh"
 
-static SCM doc_hash_table;
+/* type predicates. */
+#include "global-context.hh"
+#include "input.hh"
+#include "item.hh"
+#include "music.hh"
+#include "music-function.hh"
+#include "paper-score.hh"
+#include "performance.hh"
+#include "protected-scm.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "unpure-pure-container.hh"
+
+static Protected_scm doc_hash_table;
 
 void
 ly_check_name (const string &cxx, const string &scm_name)
@@ -45,8 +59,8 @@ ly_add_function_documentation (SCM func,
   if (doc == "")
     return;
 
-  if (!doc_hash_table)
-    doc_hash_table = scm_permanent_object (scm_c_make_hash_table (59));
+  if (!doc_hash_table.is_bound ())
+    doc_hash_table = scm_c_make_hash_table (59);
 
   string s = string (" - ") + "LilyPond procedure: " + fname + " " + varlist
              + "\n" + doc;
@@ -64,8 +78,6 @@ LY_DEFINE (ly_get_all_function_documentation, "ly:get-all-function-documentation
   return doc_hash_table;
 }
 
-#include <map>
-
 map<void *, string> type_names;
 
 void
@@ -87,18 +99,6 @@ predicate_to_typename (void *ptr)
     return type_names[ptr];
 }
 
-/* type predicates. */
-#include "global-context.hh"
-#include "input.hh"
-#include "item.hh"
-#include "music.hh"
-#include "music-function.hh"
-#include "paper-score.hh"
-#include "performance.hh"
-#include "spanner.hh"
-#include "stream-event.hh"
-#include "unpure-pure-container.hh"
-
 void
 init_func_doc ()
 {