X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fconstrained-breaking.cc;h=73732ec3ad07a4beea3ce7ac8a6d2f4ed0831494;hb=f018757016404595c92e21346ae0661dafe7ea46;hp=8e08d1fc87dc25d81924b53c6d92692b1612da51;hpb=32b62c4e6932322c82967ea92e86f77b5ed9247f;p=lilypond.git diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc index 8e08d1fc87..73732ec3ad 100644 --- a/lily/constrained-breaking.cc +++ b/lily/constrained-breaking.cc @@ -383,35 +383,56 @@ Constrained_breaking::initialize () /* NOTE: currently, we aren't using the space_ field of a Line_details for anything. That's because the approximations used for scoring a page configuration don't actually space things - properly (for speed reasong) using springs anchored at the staff + properly (for speed reasons) using springs anchored at the staff refpoints. Rather, the "space" is placed between the extent boxes. To get a good result, therefore, the "space" value for page breaking needs to be much smaller than the "space" value for - page layout. Currently, we just make it zero always. + page layout. Currently, we just make it zero always, which means + that we will always prefer a tighter vertical layout. */ - between_system_space_ = 0; - between_system_padding_ = 0; - before_title_padding_ = 0; + system_system_space_ = 0; + system_system_padding_ = 0; + system_system_min_distance_ = 0; + score_system_padding_ = 0; + score_system_min_distance_ = 0; + score_markup_padding_ = 0; + score_markup_min_distance_ = 0; Output_def *l = pscore_->layout (); - SCM spacing_spec = l->c_variable ("between-system-spacing"); - SCM title_spec = l->c_variable ("before-title-spacing"); - SCM page_breaking_spacing_spec = l->c_variable ("page-breaking-between-system-spacing"); + SCM spacing_spec = l->c_variable ("system-system-spacing"); + SCM between_scores_spec = l->c_variable ("score-system-spacing"); + SCM title_spec = l->c_variable ("score-markup-spacing"); + SCM page_breaking_spacing_spec = l->c_variable ("page-breaking-system-system-spacing"); Page_layout_problem::read_spacing_spec (spacing_spec, - &between_system_padding_, + &system_system_padding_, + ly_symbol2scm ("padding")); + Page_layout_problem::read_spacing_spec (between_scores_spec, + &score_system_padding_, ly_symbol2scm ("padding")); Page_layout_problem::read_spacing_spec (page_breaking_spacing_spec, - &between_system_padding_, + &system_system_padding_, ly_symbol2scm ("padding")); Page_layout_problem::read_spacing_spec (title_spec, - &before_title_padding_, + &score_markup_padding_, ly_symbol2scm ("padding")); + Page_layout_problem::read_spacing_spec (between_scores_spec, + &score_system_min_distance_, + ly_symbol2scm ("minimum-distance")); + Page_layout_problem::read_spacing_spec (spacing_spec, + &system_system_min_distance_, + ly_symbol2scm ("minimum-distance")); + Page_layout_problem::read_spacing_spec (page_breaking_spacing_spec, + &system_system_min_distance_, + ly_symbol2scm ("minimum-distance")); + Page_layout_problem::read_spacing_spec (title_spec, + &score_markup_min_distance_, + ly_symbol2scm ("minimum-distance")); Interval first_line = line_dimensions_int (pscore_->layout (), 0); Interval other_lines = line_dimensions_int (pscore_->layout (), 1); /* do all the rod/spring problems */ - breaks_ = pscore_->find_break_indices (); + breaks_ = pscore_->get_break_indices (); all_ = pscore_->root_system ()->used_columns (); lines_.resize (breaks_.size (), breaks_.size (), Line_details ()); vector forces = get_line_forces (all_, @@ -460,6 +481,7 @@ Constrained_breaking::fill_line_details (Line_details *const out, vsize start, v System *sys = pscore_->root_system (); Interval begin_of_line_extent = sys->begin_of_line_pure_height (start_rank, end_rank); Interval rest_of_line_extent = sys->rest_of_line_pure_height (start_rank, end_rank); + bool last = (end == breaks_.size () - 1); Grob *c = all_[breaks_[end]]; out->last_column_ = c; @@ -486,10 +508,12 @@ Constrained_breaking::fill_line_details (Line_details *const out, vsize start, v || isnan (rest_of_line_extent[RIGHT])) ? Interval (0, 0) : rest_of_line_extent; out->shape_ = Line_shape (begin_of_line_extent, rest_of_line_extent); - out->padding_ = between_system_padding_; - out->title_padding_ = before_title_padding_; - out->space_ = between_system_space_; - out->inverse_hooke_ = out->full_height () + between_system_space_; + out->padding_ = last ? score_system_padding_ : system_system_padding_; + out->title_padding_ = score_markup_padding_; + out->min_distance_ = last ? score_system_min_distance_ : system_system_min_distance_; + out->title_min_distance_ = score_markup_min_distance_; + out->space_ = system_system_space_; + out->inverse_hooke_ = out->full_height () + system_system_space_; } Real @@ -503,12 +527,16 @@ Constrained_breaking::combine_demerits (Real force, Real prev_force) Line_details::Line_details (Prob *pb, Output_def *paper) { - SCM spec = paper->c_variable ("after-title-spacing"); - SCM title_spec = paper->c_variable ("between-title-spacing"); + SCM spec = paper->c_variable ("markup-system-spacing"); + SCM title_spec = paper->c_variable ("markup-markup-spacing"); padding_ = 0; title_padding_ = 0; + min_distance_ = 0; + title_min_distance_ = 0; Page_layout_problem::read_spacing_spec (spec, &padding_, ly_symbol2scm ("padding")); Page_layout_problem::read_spacing_spec (title_spec, &title_padding_, ly_symbol2scm ("padding")); + Page_layout_problem::read_spacing_spec (spec, &min_distance_, ly_symbol2scm ("minimum-distance")); + Page_layout_problem::read_spacing_spec (title_spec, &title_min_distance_, ly_symbol2scm ("minimum-distance")); last_column_ = 0; force_ = 0; @@ -532,6 +560,7 @@ Line_details::Line_details (Prob *pb, Output_def *paper) SCM first_scm = pb->get_property ("first-markup-line"); first_markup_line_ = to_boolean (first_scm); tight_spacing_ = to_boolean (pb->get_property ("tight-spacing")); + first_refpoint_offset_ = 0; } Real