/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2006--2010 Joe Neeman <joeneeman@gmail.com>
+ Copyright (C) 2006--2011 Joe Neeman <joeneeman@gmail.com>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
if (rod_height_)
{
rod_height_ += line.tallness_;
+ spring_len_ += last_line_.spring_length (line);
+
}
else
{
first_line_ = line;
}
- spring_len_ += line.space_;
inverse_spring_k_ += line.inverse_hooke_;
last_line_ = line;
void
Page_spacing::prepend_system (const Line_details &line)
{
- if (!rod_height_)
+ if (rod_height_)
+ spring_len_ += line.spring_length (first_line_);
+ else
last_line_ = line;
rod_height_ -= first_line_.full_height ();
rod_height_ += first_line_.tallness_;
rod_height_ += line.full_height();
- spring_len_ += line.space_;
+
inverse_spring_k_ += line.inverse_hooke_;
first_line_ = line;
bool last = line == lines_.size () - 1;
// Note: if page == VPOS then we don't actually know yet which page number we're
- // working on, so we have to recalculate the page height in the loop. In that case,
- // the algorithm may not be optimal: if our page has a very large header then perhaps
- // we need to look ahead a few systems in order to find the best solution. But
- // we won't, because we stop once we overfill the page with the large header.
+ // working on, so we have to recalculate the page height in the loop. Therefore
+ // our early-exit condition from the loop depends on paper_height rather than
+ // page_height (ie. we break only if we would overfill a page without margins
+ // or headers/footers). Otherwise, the algorithm would not be optimal:
+ // if our page has a very large header then perhaps
+ // we should look ahead a few systems in order to find the best solution. A
+ // good example of this is input/regression/page-spacing-tall-headfoot.ly
vsize page_num = page == VPOS ? 0 : page;
Real paper_height = breaker_->paper_height ();
Page_spacing space (breaker_->page_height (page_num + first_page_num_, last),