resolve merge

[lilypond.git] / lily / paper-system-scheme.cc

diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc
index 137cef0c5c2f22f6d0c22febf16324babaf34206..4187cfa3dbdf2dedea0af0cc96bad81025597619 100644 (file)
--- a/lily/paper-system-scheme.cc
+++ b/lily/paper-system-scheme.cc
@@ -1,10 +1,21 @@
-/* 
-  paper-system-scheme.cc -- implement Paper_system bindings.
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2008--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
   
+
+  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 "prob.hh"
@@ -13,7 +24,8 @@
   
 LY_DEFINE (ly_paper_system_p, "ly:paper-system?",
          1, 0, 0, (SCM obj),
-         "Type predicate.")
+         "Is @var{obj} a C++ @code{Prob} object of type"
+         " @code{paper-system}?")
 {
   return ly_prob_type_p (obj, ly_symbol2scm ("paper-system"));
 }