X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fpage-breaking.hh;h=9a38485c28d181c0b6781879079e03272444394e;hb=23bb09401ef1d8c5f5256b8f7a6c002365b1d88c;hp=7d50db2524e9eaffc55705ce1fc2be206067aadc;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/include/page-breaking.hh b/lily/include/page-breaking.hh index 7d50db2524..9a38485c28 100644 --- 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--2011 Joe Neeman + Copyright (C) 2006--2015 Joe Neeman LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -126,6 +126,7 @@ public: vsize system_count () const; Real footnote_separator_stencil_height () const; Real footnote_padding () const; + Real in_note_padding () const; Real footnote_number_raise () const; Real footnote_footer_padding () const; Real line_count_penalty (int line_count) const; @@ -177,10 +178,11 @@ protected: SCM breakpoint_property (vsize breakpoint, char const *str); vsize last_break_position () const; + + vector system_specs_; private: vector breaks_; vector chunks_; - vector system_specs_; vector line_breaking_; bool ragged_; bool ragged_last_; @@ -190,6 +192,7 @@ private: vsize system_count_; Real footnote_separator_stencil_height_; Real footnote_padding_; + Real in_note_padding_; Real footnote_number_raise_; Real footnote_footer_padding_; int orphan_penalty_; @@ -230,7 +233,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, int footnote_count, bool ragged, bool last); - SCM draw_page (SCM systems, SCM config, int page_num, int footnote_num, bool last); + 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); }; #endif /* PAGE_BREAKING_HH */