resolve merge

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

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 87f6cd1019f9d19eb4b8b64bd08a589acf317881..8d7c14b99900f40e42d823cc0f91c8a31becf215 100644 (file)
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -1,9 +1,20 @@
 /*
-  function-documentation.cc -- Scheme doc strings.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2009 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 <cstring>
@@ -58,7 +69,7 @@ LY_DEFINE (ly_get_all_function_documentation, "ly:get-all-function-documentation
 
 #include <map>
 
-map<void *, string>  type_names;
+map<void *, string> type_names;
   
 void
 ly_add_type_predicate (void *ptr,
@@ -80,14 +91,15 @@ predicate_to_typename (void *ptr)
 }
 
 /* type predicates. */
-#include "spanner.hh"
+#include "global-context.hh"
+#include "input.hh"
 #include "item.hh"
 #include "music.hh"
 #include "music-function.hh"
-#include "performance.hh"
 #include "paper-score.hh"
-#include "global-context.hh"
-#include "input.hh"
+#include "performance.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
 
 void
 init_func_doc ()
@@ -117,6 +129,7 @@ init_func_doc ()
   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);