X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ffunction-documentation.cc;h=df73ddcefe478875c0fe3dc3aa01fdb5cc9612ef;hb=ae601eb98f9c2710b8708a7220e70e8ff8e72204;hp=8d7c14b99900f40e42d823cc0f91c8a31becf215;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 8d7c14b999..df73ddcefe 100644
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -24,7 +24,6 @@ using namespace std;
 #include "lily-guile.hh"
 #include "warn.hh"
 
-
 static SCM doc_hash_table;
 
 void
@@ -33,16 +32,15 @@ ly_check_name (string cxx, string scm_name)
   string mangle = mangle_cxx_identifier (cxx);
   if (mangle != scm_name)
     {
-      programming_error ("wrong cxx name: " + mangle + ", " + cxx +  ", " + scm_name);
+      programming_error ("wrong cxx name: " + mangle + ", " + cxx + ", " + scm_name);
     }
 }
 
-
 void
 ly_add_function_documentation (SCM func,
-				    string fname,
-				    string varlist,
-				    string doc)
+                               string fname,
+                               string varlist,
+                               string doc)
 {
   if (doc == "")
     return;
@@ -51,31 +49,30 @@ ly_add_function_documentation (SCM func,
     doc_hash_table = scm_permanent_object (scm_c_make_hash_table (59));
 
   string s = string (" - ") + "LilyPond procedure: " + fname + " " + varlist
-    + "\n" + doc;
+             + "\n" + doc;
 
   scm_set_procedure_property_x (func, ly_symbol2scm ("documentation"),
-				ly_string2scm (s));
+                                ly_string2scm (s));
   SCM entry = scm_cons (ly_string2scm (varlist), ly_string2scm (doc));
   scm_hashq_set_x (doc_hash_table, ly_symbol2scm (fname.c_str ()), entry);
 }
 
 LY_DEFINE (ly_get_all_function_documentation, "ly:get-all-function-documentation",
-	   0, 0, 0, (),
-	   "Get a hash table with all LilyPond Scheme extension functions.")
+           0, 0, 0, (),
+           "Get a hash table with all LilyPond Scheme extension functions.")
 {
   return doc_hash_table;
 }
 
-
 #include <map>
 
 map<void *, string> type_names;
-  
+
 void
 ly_add_type_predicate (void *ptr,
-		       string name)
+                       string name)
 {
-  type_names[ptr] = name; 
+  type_names[ptr] = name;
 }
 
 string
@@ -100,36 +97,38 @@ predicate_to_typename (void *ptr)
 #include "performance.hh"
 #include "spanner.hh"
 #include "stream-event.hh"
+#include "unpure-pure-container.hh"
 
 void
 init_func_doc ()
 {
-  ly_add_type_predicate ((void*) &is_direction, "direction");
-  ly_add_type_predicate ((void*) &is_music_function, "Music_function");
-  ly_add_type_predicate ((void*) &ly_is_port, "port");
-  ly_add_type_predicate ((void*) &ly_cheap_is_list, "list");
-  ly_add_type_predicate ((void*) &unsmob_global_context, "Global_context");
-  ly_add_type_predicate ((void*) &unsmob_input, "Input");
-  ly_add_type_predicate ((void*) &unsmob_moment, "Moment");
-  ly_add_type_predicate ((void*) &unsmob_paper_score, "Paper_score");
-  ly_add_type_predicate ((void*) &unsmob_performance, "Performance");
-
-  ly_add_type_predicate ((void*) &is_axis, "axis");
-  ly_add_type_predicate ((void*) &is_number_pair, "number pair");
-  ly_add_type_predicate ((void*) &ly_is_list, "list");
-  ly_add_type_predicate ((void*) &ly_is_procedure, "procedure");
-  ly_add_type_predicate ((void*) &ly_is_symbol, "symbol");
-  ly_add_type_predicate ((void*) &scm_is_bool, "boolean");
-  ly_add_type_predicate ((void*) &scm_is_integer, "integer");
-  ly_add_type_predicate ((void*) &scm_is_number, "number");
-  ly_add_type_predicate ((void*) &scm_is_pair, "pair");
-  ly_add_type_predicate ((void*) &scm_is_rational, "rational");
-  ly_add_type_predicate ((void*) &scm_is_string, "string");
-  ly_add_type_predicate ((void*) &scm_is_vector, "vector");
-  ly_add_type_predicate ((void*) &unsmob_item, "Item");
-  ly_add_type_predicate ((void*) &unsmob_music, "Music");
-  ly_add_type_predicate ((void*) &unsmob_spanner, "Spanner");
-  ly_add_type_predicate ((void*) &unsmob_stream_event, "Stream_event");
+  ly_add_type_predicate ((void *) &is_direction, "direction");
+  ly_add_type_predicate ((void *) &is_music_function, "Music_function");
+  ly_add_type_predicate ((void *) &ly_is_port, "port");
+  ly_add_type_predicate ((void *) &ly_cheap_is_list, "list");
+  ly_add_type_predicate ((void *) &unsmob_global_context, "Global_context");
+  ly_add_type_predicate ((void *) &unsmob_input, "Input");
+  ly_add_type_predicate ((void *) &unsmob_moment, "Moment");
+  ly_add_type_predicate ((void *) &unsmob_paper_score, "Paper_score");
+  ly_add_type_predicate ((void *) &unsmob_performance, "Performance");
+  ly_add_type_predicate ((void *) &is_unpure_pure_container, "unpure pure container");
+
+  ly_add_type_predicate ((void *) &is_axis, "axis");
+  ly_add_type_predicate ((void *) &is_number_pair, "number pair");
+  ly_add_type_predicate ((void *) &ly_is_list, "list");
+  ly_add_type_predicate ((void *) &ly_is_procedure, "procedure");
+  ly_add_type_predicate ((void *) &ly_is_symbol, "symbol");
+  ly_add_type_predicate ((void *) &scm_is_bool, "boolean");
+  ly_add_type_predicate ((void *) &scm_is_integer, "integer");
+  ly_add_type_predicate ((void *) &scm_is_number, "number");
+  ly_add_type_predicate ((void *) &scm_is_pair, "pair");
+  ly_add_type_predicate ((void *) &scm_is_rational, "rational");
+  ly_add_type_predicate ((void *) &scm_is_string, "string");
+  ly_add_type_predicate ((void *) &scm_is_vector, "vector");
+  ly_add_type_predicate ((void *) &unsmob_item, "Item");
+  ly_add_type_predicate ((void *) &unsmob_music, "Music");
+  ly_add_type_predicate ((void *) &unsmob_spanner, "Spanner");
+  ly_add_type_predicate ((void *) &unsmob_stream_event, "Stream_event");
 }
 
 ADD_SCM_INIT_FUNC (func_doc, init_func_doc);