resolve merge

[lilypond.git] / lily / include / paper-system.hh

diff --git a/lily/include/paper-system.hh b/lily/include/paper-system.hh
index 25af72e025b9ce2787088901083786c2aa695bdc..1aaa530b8a916b37288f3ed7efe43ac3bd0c8636 100644 (file)
--- a/lily/include/paper-system.hh
+++ b/lily/include/paper-system.hh
@@ -1,9 +1,20 @@
 /*
-  paper-system.hh -- declare Paper_system
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2004--2009  Jan Nieuwenhuizen <janneke@gnu.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/>.
 */
 #ifndef PAPER_SYSTEM_HH
 #define PAPER_SYSTEM_HH
@@ -19,5 +30,6 @@
 */
 Prob *make_paper_system (SCM immutable_init);
 void paper_system_set_stencil (Prob *prob, Stencil s);
+SCM get_footnotes (SCM expr);
 
 #endif /* PAPER_SYSTEM_HH */