Fixes from mailist.

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

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 8daf4baf0cf73f87cbbfa508a91817f27400ccd8..7e450528ae13e65813f26cbbd6baeba9fa61a6ef 100644 (file)
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -3,15 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstring>
+using namespace std;
 
-#include "protected-scm.hh"
-#include "string.hh"
+#include "std-string.hh"
+#include "lily-guile.hh"
 
-static Protected_scm doc_hash_table;
+static SCM doc_hash_table;
 
 void ly_add_function_documentation (SCM func,
                                    char const *fname,
@@ -21,15 +22,15 @@ void ly_add_function_documentation (SCM func,
   if (!strlen (doc))
     return;
 
-  if (!scm_is_vector (doc_hash_table))
-    doc_hash_table = scm_make_vector (scm_int2num (59), SCM_EOL);
+  if (!doc_hash_table)
+    doc_hash_table = scm_permanent_object (scm_c_make_hash_table (59));
 
-  String s = String (" - ") + "LilyPond procedure: " + fname + " " + varlist
+  string s = string (" - ") + "LilyPond procedure: " + fname + " " + varlist
     + "\n" + doc;
 
   scm_set_procedure_property_x (func, ly_symbol2scm ("documentation"),
-                               scm_makfrom0str (s.to_str0 ()));
-  SCM entry = scm_cons (scm_makfrom0str (varlist), scm_makfrom0str (doc));
+                               ly_string2scm (s));
+  SCM entry = scm_cons (scm_from_locale_string (varlist), scm_from_locale_string (doc));
   scm_hashq_set_x (doc_hash_table, ly_symbol2scm (fname), entry);
 }