source file of the GNU LilyPond music typesetter
- (c) 2006 Joe Neeman <joeneeman@gmail.com>
+ (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
*/
#include "constrained-breaking.hh"
#include "warn.hh"
/*
- We use the following optimal substructure. Let W(A) be our weight function.
+ We use the following optimal substructure. Let W (A) be our weight function.
- Let A_{k,n} = (a_{k,n,1}, ... a_{k,n,k}) be the optimal set of line breaks
- for k systems and n potential breakpoints. a_{k,n,k} = n (it is the end of
+ Let A_{k, n} = (a_{k, n,1}, ... a_{k, n, k}) be the optimal set of line breaks
+ for k systems and n potential breakpoints. a_{k, n, k} = n (it is the end of
the piece)
Then A_{k+1, m} is contructed from
- min_ {k < j < m} ( W(A_{k,j} :: m) )
+ min_ {k < j < m} ( W (A_{k, j} :: m) )
where by A::m we denote appending m to the list A
Indices in the code:
The above algorithm makes it easy to end at a point before the end of the
- score (just find A_{k,m} for some m < breaks_.size () - 1). However, we must
+ score (just find A_{k, m} for some m < breaks_.size () - 1). However, we must
add information for starting at a point after the beginning. One constructor
allows the specification of a list of starting columns, start_. We then have
start_.size () different solution arrays. state_[i] is the array for the
. . . .
. . . .
where the X's mark invalid solutions (can't have more systems than
- breakpoints). Note that each value is of the form a_{x,n,x}. This is because
- a breakpoint of the form a_{x,n,x-1} will also be called a_{x-1,m,x-1} for
+ breakpoints). Note that each value is of the form a_{x, n, x}. This is because
+ a breakpoint of the form a_{x, n, x-1} will also be called a_{x-1, m, x-1} for
some m < n. Each cell in the array stores the value of its m (ie. the
ending breakpoint of the previous line) as "prev_".
- For finding A_{sys, brk}, let "me" be the (sys_count,brk) cell in our
+ For finding A_{sys, brk}, let "me" be the (sys_count, brk) cell in our
solution array (state_[start][sys * rank + brk]).
Then A_{sys, brk} = A_{sys - 1, me.prev_} :: me
return found_something;
}
-vector<Column_x_positions>
-Constrained_breaking::solve ()
-{
- if (!systems_)
- return get_best_solution (0, VPOS);
-
- resize (systems_);
- return get_solution(0, VPOS, systems_);
-}
Column_x_positions
Constrained_breaking::space_line (vsize i, vsize j)
Column_x_positions col;
vector<Grob*> line (all_.begin () + breaks_[i],
- all_.begin() + breaks_[j] + 1);
+ all_.begin () + breaks_[j] + 1);
Interval line_dims = line_dimensions_int (pscore_->layout (), i);
bool last = j == breaks_.size () - 1;
bool ragged = ragged_right || (last && ragged_last);
}
vector<Column_x_positions>
-Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count)
+Constrained_breaking::solve (vsize start, vsize end, vsize sys_count)
{
vsize start_brk = starting_breakpoints_[start];
vsize end_brk = prepare_solution (start, end, sys_count);
}
}
/* if we get to here, just put everything on one line */
- warning (_ ("cannot find line breaking that satisfies constraints" ));
+ warning (_ ("cannot find line breaking that satisfies constraints"));
ret.push_back (space_line (0, end_brk));
return ret;
}
vector<Column_x_positions>
-Constrained_breaking::get_best_solution (vsize start, vsize end)
+Constrained_breaking::best_solution (vsize start, vsize end)
{
- vsize min_systems = get_min_systems (start, end);
- vsize max_systems = get_max_systems (start, end);
+ vsize min_systems = min_system_count (start, end);
+ vsize max_systems = max_system_count (start, end);
Real best_demerits = infinity_f;
vector<Column_x_positions> best_so_far;
if (dem < best_demerits)
{
best_demerits = dem;
- best_so_far = get_solution (start, end, i);
+ best_so_far = solve (start, end, i);
}
else
{
- vector<Column_x_positions> cur = get_solution (start, end, i);
+ vector<Column_x_positions> cur = solve (start, end, i);
bool too_many_lines = true;
for (vsize j = 0; j < cur.size (); j++)
}
if (best_so_far.size ())
return best_so_far;
- return get_solution (start, end, max_systems);
+ return solve (start, end, max_systems);
}
std::vector<Line_details>
-Constrained_breaking::get_details (vsize start, vsize end, vsize sys_count)
+Constrained_breaking::line_details (vsize start, vsize end, vsize sys_count)
{
vsize brk = prepare_solution (start, end, sys_count);
Matrix<Constrained_break_node> const &st = state_[start];
}
int
-Constrained_breaking::get_min_systems (vsize start, vsize end)
+Constrained_breaking::min_system_count (vsize start, vsize end)
{
vsize sys_count;
vsize brk = prepare_solution (start, end, 1);
}
int
-Constrained_breaking::get_max_systems (vsize start, vsize end)
+Constrained_breaking::max_system_count (vsize start, vsize end)
{
- vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : starting_breakpoints_[end];
+ vsize brk = (end >= start_.size ()) ? breaks_.size () : starting_breakpoints_[end];
return brk - starting_breakpoints_[start];
}
Output_def *l = pscore_->layout ();
System *sys = pscore_->root_system ();
- Real padding = robust_scm2double (l->c_variable ("page-breaking-between-system-padding"), 0);
Real space = robust_scm2double (l->c_variable ("ideal-system-space"), 0);
+ SCM padding_scm = l->c_variable ("page-breaking-between-system-padding");
+ if (!scm_is_number (padding_scm))
+ padding_scm = l->c_variable ("between-system-padding");
+ Real padding = robust_scm2double (padding_scm, 0.0);
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 ();
- all_ = pscore_->root_system ()->columns ();
+ all_ = pscore_->root_system ()->used_columns ();
lines_.resize (breaks_.size (), breaks_.size (), Line_details ());
vector<Real> forces = get_line_forces (all_,
other_lines.length (),
other_lines.length () - first_line.length (),
ragged_right_);
- for (vsize i = 0; i < breaks_.size () - 1; i++)
+ for (vsize i = 0; i + 1 < breaks_.size (); i++)
{
Real max_ext = 0;
for (vsize j = i + 1; j < breaks_.size (); j++)
line.force_ = forces[i*breaks_.size () + j];
if (ragged && last && !isinf (line.force_))
- line.force_ = 0;
+ line.force_ = (line.force_ < 0) ? infinity_f : 0;
if (isinf (line.force_))
break;
for (vsize i = 0; i < start_.size (); i++)
{
vsize j;
- for (j = 0; j < breaks_.size () - 1 && breaks_[j] < start_[i]; j++)
+ for (j = 0; j + 1 < breaks_.size () && breaks_[j] < start_[i]; j++)
;
starting_breakpoints_.push_back (j);
start_[i] = breaks_[j];