X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-breaking.cc;h=c46a04efa5c363b596da1fbf0ee83b91732cfa25;hb=d544bd3103acc8175089ec6aeecd57376f2d201d;hp=2e5854885e02eb432458442628696f329fb844e2;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc index 2e5854885e..c46a04efa5 100644 --- a/lily/page-breaking.cc +++ b/lily/page-breaking.cc @@ -265,9 +265,7 @@ Page_breaking::Page_breaking (Paper_book *pb, Break_predicate is_break, Prob_bre footnote_padding_ = robust_scm2double (pb->paper_->c_variable ("footnote-padding"), 0.0); footnote_footer_padding_ = robust_scm2double (pb->paper_->c_variable ("footnote-footer-padding"), 0.0); - footnote_number_raise_ = (to_boolean (pb->paper_->c_variable ("footnote-auto-numbering")) - ? robust_scm2double (pb->paper_->c_variable ("footnote-number-raise"), 0.0) - : 0.0); + footnote_number_raise_ = robust_scm2double (pb->paper_->c_variable ("footnote-number-raise"), 0.0); if (systems_per_page_ && (max_systems_per_page_ || min_systems_per_page_)) { @@ -577,7 +575,8 @@ Page_breaking::draw_page (SCM systems, SCM configuration, int page_num, int foot Page_layout_problem::add_footnotes_to_footer (footnotes, foot, book_); - p->set_property ("foot-stencil", foot->smobbed_copy ()); + if (foot) + p->set_property ("foot-stencil", foot->smobbed_copy ()); scm_apply_1 (page_stencil, page, SCM_EOL); return page;