if (!orig[i].tight_spacing_)
padding = orig[i].title_ ? old.title_padding_ : old.padding_;
+ // FIXME: double check these. Doesn't foo.piggyback (bar) mean
+ // that foo goes on top?
+ // TODO: break out a Line_details::piggyback from here?
compressed.shape_ = old.shape_.piggyback (orig[i].shape_, padding);
- compressed.first_refpoint_offset_ += compressed.shape_.rest_[UP] - old.shape_.rest_[UP];
+ compressed.refpoint_extent_[UP] = old.refpoint_extent_[UP];
+ compressed.refpoint_extent_[DOWN] += compressed.shape_.rest_[UP] - old.shape_.rest_[UP];
compressed.space_ += old.space_;
compressed.inverse_hooke_ += old.inverse_hooke_;
{
book_ = pb;
system_count_ = 0;
+ paper_height_ = robust_scm2double (pb->paper_->c_variable ("paper-height"), 1.0);
ragged_ = to_boolean (pb->paper_->c_variable ("ragged-bottom"));
ragged_last_ = to_boolean (pb->paper_->c_variable ("ragged-last-bottom"));
systems_per_page_ = max (0, robust_scm2int (pb->paper_->c_variable ("systems-per-page"), 0));
->get_broken_system_grobs ();
ret = scm_cons (lines, ret);
}
- else
+ else if (Prob *pb = system_specs_[sys].prob_)
{
- Prob *pb = system_specs_[sys].prob_;
ret = scm_cons (scm_list_1 (pb->self_scm ()), ret);
pb->unprotect ();
}
SCM_UNDEFINED));
}
+// Returns the total height of the paper, including margins and
+// space for the header/footer. This is an upper bound on
+// page_height, and it doesn't depend on the current page.
+Real
+Page_breaking::paper_height () const
+{
+ return paper_height_;
+}
+
Real
Page_breaking::page_height (int page_num, bool last) const
{
SCM
Page_breaking::make_pages (vector<vsize> lines_per_page, SCM systems)
{
+ if (scm_is_null (systems))
+ return SCM_EOL;
+
int first_page_number
= robust_scm2int (book_->paper_->c_variable ("first-page-number"), 1);
SCM ret = SCM_EOL;
system_specs_.push_back (System_spec (pb));
}
}
+ if (!system_specs_.size ())
+ system_specs_.push_back (System_spec ());
}
void
}
line_breaking_.push_back (Constrained_breaking (system_specs_[i].pscore_, line_breaker_columns));
}
- else
+ else if (system_specs_[i].prob_)
{
bool break_point = prob_is_break && prob_is_break (system_specs_[i].prob_);
if (break_point || i == system_specs_.size () - 1)
else
{
assert (div[i] == 1);
- uncompressed_line_details_.push_back (Line_details (system_specs_[sys].prob_, book_->paper_));
+ uncompressed_line_details_.push_back (system_specs_[sys].prob_
+ ? Line_details (system_specs_[sys].prob_, book_->paper_)
+ : Line_details ());
}
}
cached_line_details_ = compress_lines (uncompressed_line_details_);
Line_division *cur_division)
{
vsize my_index = cur_division->size ();
- vsize others_min = 0;
- vsize others_max = 0;
+ int others_min = 0;
+ int others_max = 0;
for (vsize i = my_index + 1; i < min_sys.size (); i++)
{
others_min += min_sys[i];
others_max += max_sys[i];
}
- others_max = min (others_max, system_count);
- vsize real_min = max (min_sys[my_index], system_count - others_max);
- vsize real_max = min (max_sys[my_index], system_count - others_min);
+ others_max = min (others_max, (int) system_count);
+ int real_min = max ((int) min_sys[my_index], (int) system_count - others_max);
+ int real_max = min ((int) max_sys[my_index], (int) system_count - others_min);
if (real_min > real_max || real_min <= 0)
{
return;
}
- for (vsize i = real_min; i <= real_max; i++)
+ for (int i = real_min; i <= real_max; i++)
{
cur_division->push_back (i);
if (my_index == min_sys.size () - 1)
Real prev_hanging = 0;
Real prev_hanging_begin = 0;
Real prev_hanging_rest = 0;
+
+ // refpoint_hanging is the y coordinate of the origin of this system.
+ // It may not be the same as refpoint_extent[UP], which is the
+ // refpoint of the first spaceable staff in this system.
Real prev_refpoint_hanging = 0;
for (vsize i = 0; i < cached_line_details_.size (); i++)
{
- Line_shape shape = cached_line_details_[i].shape_;
+ Line_details& cur = cached_line_details_[i];
+ Line_shape shape = cur.shape_;
Real a = shape.begin_[UP];
Real b = shape.rest_[UP];
- bool title = cached_line_details_[i].title_;
+ bool title = cur.title_;
Real refpoint_hanging = max (prev_hanging_begin + a, prev_hanging_rest + b);
if (i > 0)
{
Real padding = 0;
- if (!cached_line_details_[i].tight_spacing_)
+ Line_details const& prev = cached_line_details_[i-1];
+ if (!cur.tight_spacing_)
padding = title
- ? cached_line_details_[i-1].title_padding_
- : cached_line_details_[i-1].padding_;
+ ? prev.title_padding_
+ : prev.padding_;
Real min_dist = title
- ? cached_line_details_[i-1].title_min_distance_
- : cached_line_details_[i-1].min_distance_;
+ ? prev.title_min_distance_
+ : prev.min_distance_;
refpoint_hanging = max (refpoint_hanging + padding,
- prev_refpoint_hanging + min_dist
- + cached_line_details_[i].first_refpoint_offset_);
+ prev_refpoint_hanging - prev.refpoint_extent_[DOWN]
+ + cur.refpoint_extent_[UP] + min_dist);
}
Real hanging_begin = refpoint_hanging - shape.begin_[DOWN];
Real hanging_rest = refpoint_hanging - shape.rest_[DOWN];
Real hanging = max (hanging_begin, hanging_rest);
- cached_line_details_[i].tallness_ = hanging - prev_hanging;
+ cur.tallness_ = hanging - prev_hanging;
prev_hanging = hanging;
prev_hanging_begin = hanging_begin;
prev_hanging_rest = hanging_rest;
calculations that treated it as a non-last page were ok.
*/
- cur_page_height = page_height (first_page_num + ret - 1, true);
- cur_page_height -= min_whitespace_at_top_of_page (cached_line_details_[page_starter]);
- cur_page_height -= min_whitespace_at_bottom_of_page (cached_line_details_.back ());
-
- Real cur_height = cur_rod_height + ((ragged_last () || ragged ()) ? cur_spring_height : 0);
- if (!too_few_lines (line_count - cached_line_details_.back ().compressed_nontitle_lines_count_)
- && cur_height > cur_page_height
- /* don't increase the page count if the last page had only one system */
- && cur_rod_height > cached_line_details_.back ().full_height ())
- ret++;
+ if (is_last ())
+ {
+ cur_page_height = page_height (first_page_num + ret - 1, true);
+ cur_page_height -= min_whitespace_at_top_of_page (cached_line_details_[page_starter]);
+ cur_page_height -= min_whitespace_at_bottom_of_page (cached_line_details_.back ());
+
+ Real cur_height = cur_rod_height + ((ragged_last () || ragged ()) ? cur_spring_height : 0);
+ if (!too_few_lines (line_count - cached_line_details_.back ().compressed_nontitle_lines_count_)
+ && cur_height > cur_page_height
+ /* don't increase the page count if the last page had only one system */
+ && cur_rod_height > cached_line_details_.back ().full_height ())
+ ret++;
+ assert (ret <= cached_line_details_.size ());
+ }
- assert (ret <= cached_line_details_.size ());
return ret;
}
Page_spacing_result
Page_breaking::space_systems_on_best_pages (vsize configuration, vsize first_page_num)
{
+ if (systems_per_page_ > 0)
+ return space_systems_with_fixed_number_per_page (configuration, first_page_num);
+
cache_line_details (configuration);
Page_spacer ps (cached_line_details_, first_page_num, this);
{
SCM first_system_spacing = book_->paper_->c_variable ("top-system-spacing");
if (line.title_)
- first_system_spacing = book_->paper_->c_variable ("top-title-spacing");
+ first_system_spacing = book_->paper_->c_variable ("top-markup-spacing");
Real min_distance = -infinity_f;
Real padding = 0;
Real
Page_breaking::min_whitespace_at_bottom_of_page (Line_details const &line) const
{
- SCM last_system_spacing = book_->paper_->c_variable ("bottom-system-spacing");
+ SCM last_system_spacing = book_->paper_->c_variable ("last-bottom-spacing");
Real min_distance = -infinity_f;
Real padding = 0;
projects / lilypond.git / blobdiff