From: Joe Neeman <joeneeman@gmail.com>
Date: Fri, 9 Mar 2007 20:47:35 +0000 (+1100)
Subject: Don't ignore padding for markup blocks
X-Git-Tag: release/2.11.21-1~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=431029da44663278375c19cddd8c243afe98f473;p=lilypond.git

Don't ignore padding for markup blocks
---

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index abb2a3e214..c80e0aa223 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -128,6 +128,11 @@ Page_breaking::line_details (vsize start_break, vsize end_break, Line_division c
   vector<Line_details> ret;
   assert (chunks.size () == div.size () + 1);
 
+  SCM padding_scm = book_->paper_->c_variable ("page-breaking-between-system-padding");
+  if (!scm_is_number (padding_scm))
+    padding_scm = book_->paper_->c_variable ("between-system-padding");
+  Real padding = robust_scm2double (padding_scm, 0.0);
+
   for (vsize i = 0; i + 1 < chunks.size (); i++)
     {
       vsize sys = next_system (chunks[i]);
@@ -144,6 +149,7 @@ Page_breaking::line_details (vsize start_break, vsize end_break, Line_division c
 	{
 	  assert (div[i] == 1);
 	  ret.push_back (Line_details (all_[sys].prob_));
+	  ret.back ().padding_ = padding;
 	}
     }
   return ret;