I've made the changes, and now the patch actually works.
Thanks all for your comments! Carl http://codereview.appspot.com/3832046/diff/2001/lily/page-layout-problem.cc File lily/page-layout-problem.cc (right): http://codereview.appspot.com/3832046/diff/2001/lily/page-layout-problem.cc#newcode266 lily/page-layout-problem.cc:266: Page_layout_problem::append_prob (Prob *prob, Spring const& spring, Real padding) On 2011/01/02 23:09:02, Keith wrote:
This function is not called for either of our test cases.
Yes, I guess this is called for adding a prob that is not a system. So I'm removing the code here. http://codereview.appspot.com/3832046/diff/2001/lily/page-layout-problem.cc#newcode274 lily/page-layout-problem.cc:274: minimum_distance = (*sky)[UP].distance (bottom_skyline_, scm_to_double (prob->get_property ("skyline-horizontal-padding"))); On 2011/01/02 05:19:58, joeneeman wrote:
robust_scm2double is probably better
removed (see above) http://codereview.appspot.com/3832046/diff/2001/lily/skyline.cc File lily/skyline.cc (right): http://codereview.appspot.com/3832046/diff/2001/lily/skyline.cc#newcode396 lily/skyline.cc:396: if ((i->slope_ == 0) && !isinf (i->y_intercept_) && i->y_intercept_ >= 0) OK, I got it to work properly now. I have a better algorithm for handling the bottom of the extracted box. http://codereview.appspot.com/3832046/diff/2001/lily/skyline.cc#newcode398 lily/skyline.cc:398: Interval (i->y_intercept_ < 0 ? i->y_intercept_ : 0 , i->y_intercept_))); Now I handle the y_intercept_ < 0 problem properly here. http://codereview.appspot.com/3832046/diff/2001/lily/skyline.cc#newcode399 lily/skyline.cc:399: Skyline padSky = Skyline (boxes, horizon_padding, a, (Direction) 1); Using sky_ now. http://codereview.appspot.com/3832046/diff/2001/lily/skyline.cc#newcode498 lily/skyline.cc:498: const Skyline *padded_other = &other; On 2011/01/02 05:19:58, joeneeman wrote:
I'm not sure, but I think "Skyline const *" is more consistent with
the rest of
the code.
Done. http://codereview.appspot.com/3832046/ _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel