resolve merge

[lilypond.git] / lily / simple-closure.cc

diff --git a/lily/simple-closure.cc b/lily/simple-closure.cc
index 34bfd58f1bb6d06741b031a3d1cee0785d451e77..7c46c0198b728fbbdd83c7cd226f43885def37e7 100644 (file)
--- a/lily/simple-closure.cc
+++ b/lily/simple-closure.cc
@@ -1,10 +1,21 @@
 /*
-  closure.cc -- chained closures.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--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 "simple-closure.hh"
 
@@ -84,8 +95,8 @@ evaluate_with_simple_closure (SCM delayed_argument,
 }
 
 LY_DEFINE (ly_simple_closure_p, "ly:simple-closure?",
-         1,0,0, (SCM clos),
-         "Type predicate.")
+         1, 0, 0, (SCM clos),
+         "Is @var{clos} a simple closure?")
 {
   return scm_from_bool (is_simple_closure (clos));
 }
@@ -93,7 +104,7 @@ LY_DEFINE (ly_simple_closure_p, "ly:simple-closure?",
 LY_DEFINE (ly_make_simple_closure, "ly:make-simple-closure",
          1, 0, 0, (SCM expr),
          "Make a simple closure.  @var{expr} should be form of"
-         " @code{(@var{func} @var{a1} @var{A2} @dots{})}, and will be"
+         " @code{(@var{func} @var{a1} @var{a2} @dots{})}, and will be"
          " invoked as @code{(@var{func} @var{delayed-arg} @var{a1}"
          " @var{a2} @dots{})}.")
 {