From c10fb9a8db5ad8cc6ca3c0411bce1df6dc8bb48f Mon Sep 17 00:00:00 2001 From: Nicolas Sceaux Date: Mon, 9 Jul 2007 14:11:42 +0200 Subject: [PATCH] Page breaking: use next-space and next-padding property of toplevel markups. --- lily/include/constrained-breaking.hh | 4 ++-- lily/page-breaking.cc | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh index 2d93ff2a8d..9aa5862761 100644 --- a/lily/include/constrained-breaking.hh +++ b/lily/include/constrained-breaking.hh @@ -50,9 +50,9 @@ struct Line_details { { force_ = 0; extent_ = unsmob_stencil (pb->get_property ("stencil")) ->extent (Y_AXIS); - padding_ = 0; + padding_ = robust_scm2double (pb->get_property ("next-padding"), 0); bottom_padding_ = 0; - space_ = 1.0; + space_ = robust_scm2double (pb->get_property ("next-space"), 1.0); inverse_hooke_ = 1.0; break_permission_ = ly_symbol2scm ("allow"); page_permission_ = pb->get_property ("page-break-permission"); diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc index 709ee52cb3..270337da7d 100644 --- a/lily/page-breaking.cc +++ b/lily/page-breaking.cc @@ -549,7 +549,9 @@ Page_breaking::cache_line_details (vsize configuration_index) { assert (div[i] == 1); uncompressed_line_details_.push_back (Line_details (system_specs_[sys].prob_)); - uncompressed_line_details_.back ().padding_ = padding; + uncompressed_line_details_.back ().padding_ = + robust_scm2double (system_specs_[sys].prob_->get_property ("next-padding"), + padding); } } cached_line_details_ = compress_lines (uncompressed_line_details_); -- 2.39.5