Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / lily / include / page-breaking.hh

diff --git a/lily/include/page-breaking.hh b/lily/include/page-breaking.hh
index 9f226ebafdcba931b3804bfaa9185e1396650f0b..acf6bac51ce43e9d9a11263994c2deabb8eebd03 100644 (file)
--- a/lily/include/page-breaking.hh
+++ b/lily/include/page-breaking.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2010 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2006--2011 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -124,6 +124,10 @@ public:
   Real page_height (int page_number, bool last) const;
   Real paper_height () const;
   vsize system_count () const;
+  Real footnote_separator_stencil_height () const;
+  Real footnote_padding () const;
+  Real footnote_number_raise () const;
+  Real footnote_footer_padding () const;
   Real line_count_penalty (int line_count) const;
   int line_count_status (int line_count) const;
   bool too_many_lines (int line_count) const;
@@ -145,6 +149,7 @@ protected:
 
   void break_into_pieces (vsize start, vsize end, Line_division const &div);
   SCM systems ();
+  SCM footnotes ();
 
   void set_current_breakpoints (vsize start,
                                vsize end,
@@ -184,6 +189,10 @@ private:
   int max_systems_per_page_;
   int min_systems_per_page_;
   vsize system_count_;
+  Real footnote_separator_stencil_height_;
+  Real footnote_padding_;
+  Real footnote_number_raise_;
+  Real footnote_footer_padding_;
   int orphan_penalty_;
 
   vector<Line_division> current_configurations_;
@@ -222,7 +231,7 @@ private:
   void create_system_list ();
   void find_chunks_and_breaks (Break_predicate, Prob_break_predicate);
   SCM make_page (int page_num, bool last) const;
-  SCM get_page_configuration (SCM systems, int page_num, bool ragged, bool last);
-  SCM draw_page (SCM systems, SCM config, int page_num, bool last);
+  SCM get_page_configuration (SCM systems, int page_num, int footnote_count, bool ragged, bool last);
+  SCM draw_page (SCM systems, SCM config, int page_num, int footnote_num, bool last);
 };
 #endif /* PAGE_BREAKING_HH */