Page breaking: use next-space and next-padding property of toplevel markups.

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index 2d93ff2a8d9a28f5d985d55dfe07ad947702b66f..9aa5862761e4a4b78c5256524696721ac369b3da 100644 (file)
--- 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 709ee52cb3eb433a9d9ead01143f12e49a07d9f2..270337da7d306255e932dcfd90597461971c6300 100644 (file)
--- 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_);