-/*
+/*
simple-spacer.cc -- implement Simple_spacer
-
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
TODO:
- add support for different stretch/shrink constants?
-
*/
-#include "simple-spacer.hh"
-
#include <cstdio>
-#include <cmath>
-
-#include <libc-extension.hh> // isinf
+#include "column-x-positions.hh"
+#include "dimensions.hh"
+#include "international.hh"
+#include "libc-extension.hh" // isinf
#include "paper-column.hh"
+#include "simple-spacer.hh"
+#include "spaceable-grob.hh"
#include "spring.hh"
#include "warn.hh"
-#include "column-x-positions.hh"
-#include "spaceable-grob.hh"
-#include "dimensions.hh"
/*
- A simple spacing constraint solver. The approach:
+ A simple spacing constraint solver. The approach:
- Stretch the line uniformly until none of the constraints (rods)
- block. It then is very wide.
+ Stretch the line uniformly until none of the constraints (rods)
+ block. It then is very wide.
- Compress until the next constraint blocks,
+ Compress until the next constraint blocks,
- Mark the springs over the constrained part to be non-active.
-
- Repeat with the smaller set of non-active constraints, until all
- constraints blocked, or until the line is as short as desired.
+ Mark the springs over the constrained part to be non-active.
- This is much simpler, and much much faster than full scale
- Constrained QP. On the other hand, a situation like this will not
- be typeset as dense as possible, because
+ Repeat with the smaller set of non-active constraints, until all
+ constraints blocked, or until the line is as short as desired.
- c4 c4 c4 c4
- veryveryverylongsyllable2 veryveryverylongsyllable2
- " "4 veryveryverylongsyllable2 syllable4
+ This is much simpler, and much much faster than full scale
+ Constrained QP. On the other hand, a situation like this will not
+ be typeset as dense as possible, because
+ c4 c4 c4 c4
+ veryveryverylongsyllable2 veryveryverylongsyllable2
+ " "4 veryveryverylongsyllable2 syllable4
- can be further compressed to
+ can be further compressed to
- c4 c4 c4 c4
- veryveryverylongsyllable2 veryveryverylongsyllable2
- " "4 veryveryverylongsyllable2 syllable4
+ c4 c4 c4 c4
+ veryveryverylongsyllable2 veryveryverylongsyllable2
+ " "4 veryveryverylongsyllable2 syllable4
- Perhaps this is not a bad thing, because the 1st looks better anyway. */
+ Perhaps this is not a bad thing, because the 1st looks better anyway. */
/*
-
positive force = expanding, negative force = compressing.
-
*/
Simple_spacer::Simple_spacer ()
{
- /*
- Give an extra penalty for compression. Needed to avoid compressing
- tightly spaced lines.
- */
- active_count_ = 0;
force_ = 0.;
- indent_ =0.0;
- default_space_ = 20 PT;
+ fits_ = true;
+}
+
+Real
+Simple_spacer::force ()
+{
+ return force_;
+}
+
+bool
+Simple_spacer::fits ()
+{
+ return fits_;
+}
+
+Real
+Simple_spacer::rod_force (int l, int r, Real dist)
+{
+ Real c = range_stiffness (l, r);
+ Real d = range_ideal_len (l, r);
+ Real block_stretch = dist - d;
+ return c * block_stretch;
}
void
{
if (isinf (dist) || isnan (dist))
{
- programming_error ("Weird minimum distance. Ignoring");
+ programming_error ("ignoring weird minimum distance");
return;
}
- Real c = range_stiffness (l,r);
- if (isinf (c))
+ Real block_force = rod_force (l, r, dist);
+
+ if (isinf (block_force))
{
- /*
- If a spring is fixed, we have to do something here:
- we let the rod override the spring.
- */
- Real total_dist = 0.;
- for (int i = l ; i < r; i++)
- total_dist += springs_[i].ideal_;
-
- if (total_dist < dist)
- for (int i = l ; i < r; i++)
- springs_[i].ideal_ *= dist/total_dist;
+ Real spring_dist = range_ideal_len (l, r);
+ if (spring_dist < dist)
+ for (int i = l; i < r; i++)
+ springs_[i].ideal_ *= dist / spring_dist;
return;
}
-
- Real d = range_ideal_len (l,r);
- Real block_stretch = dist - d;
-
- Real block_force = c * block_stretch;
- force_ = force_ >? block_force;
-
- for (int i=l; i < r; i++)
- springs_[i].block_force_ = block_force >?
- springs_[i].block_force_ ;
+ force_ = max (force_, block_force);
+ for (int i = l; i < r; i++)
+ springs_[i].block_force_ = max (block_force, springs_[i].block_force_);
}
Real
-Simple_spacer::range_ideal_len (int l, int r) const
+Simple_spacer::range_ideal_len (int l, int r) const
{
- Real d =0.;
- for (int i=l; i < r; i++)
+ Real d = 0.;
+ for (int i = l; i < r; i++)
d += springs_[i].ideal_;
return d;
}
Real
Simple_spacer::range_stiffness (int l, int r) const
{
- Real den =0.0;
- for (int i=l; i < r; i++)
- {
- if (springs_[i].is_active_)
- den += 1 / springs_[i].hooke_;
- }
+ Real den = 0.0;
+ for (int i = l; i < r; i++)
+ den += springs_[i].inverse_hooke_;
return 1 / den;
}
Real
-Simple_spacer::active_blocking_force () const
+Simple_spacer::configuration_length () const
{
- Real bf = - infinity_f;
- for (int i=0; i < springs_.size (); i++)
- if (springs_[i].is_active_)
- {
- bf = bf >? springs_[i].block_force_;
- }
- return bf;
+ Real l = 0.;
+ for (vsize i = 0; i < springs_.size (); i++)
+ l += springs_[i].length (force_);
+
+ return l;
}
-Real
-Simple_spacer::active_springs_stiffness () const
+void
+Simple_spacer::solve (Real line_len, bool ragged)
{
- Real stiff = range_stiffness (0, springs_.size ());
- if (isinf (stiff))
- {
- /*
- all springs are inactive. Take the stiffness of the
- latest spring to block.
- */
-
- Real max_block_force = -infinity_f;
- int max_i = -1;
- for (int i=0; i < springs_.size (); i++)
- {
- if (springs_[i].block_force_ > max_block_force)
- {
- max_i = i;
- max_block_force = springs_[i].block_force_;
- }
- }
+ Real conf = configuration_length ();
- stiff = springs_[max_i].hooke_;
+ ragged_ = ragged;
+ line_len_ = line_len;
+ if (ragged)
+ {
+ force_ = 0;
+ fits_ = configuration_length () <= line_len_;
+ /* we need to calculate a force here to prevent a bunch of short lines */
+ if (fits_)
+ force_ = expand_line ();
}
- return stiff;
+ else if (conf < line_len_)
+ force_ = expand_line ();
+ else if (conf > line_len_)
+ force_ = compress_line ();
}
-void
-Simple_spacer::set_active_states ()
-{
- /* float comparison is safe, since force is only copied. */
- for (int i=0 ; i <springs_.size (); i++)
- if (springs_[i].is_active_
- && springs_[i].block_force_ >= force_)
- {
- springs_[i].is_active_ = false;
- active_count_ --;
- }
-}
-
Real
-Simple_spacer::configuration_length () const
+Simple_spacer::expand_line ()
{
- Real l =0.;
- for (int i=0; i < springs_.size (); i++)
- l += springs_[i].length (force_);
+ double inv_hooke = 0;
+ double cur_len = configuration_length ();
- return l;
-}
+ fits_ = true;
+ for (vsize i=0; i < springs_.size (); i++)
+ inv_hooke += springs_[i].inverse_hooke_;
-bool
-Simple_spacer::is_active () const
-{
- return active_count_;
+ assert (cur_len <= line_len_);
+ return (line_len_ - cur_len) / inv_hooke + force_;
}
-void
-Simple_spacer::my_solve_linelen ()
+Real
+Simple_spacer::compress_line ()
{
- while (is_active ())
- {
- force_ = active_blocking_force ();
- Real conf = configuration_length ();
+ double inv_hooke = 0;
+ double cur_len = configuration_length ();
+ double cur_force = force_;
- if (conf < line_len_)
- {
- force_ += (line_len_ - conf) * active_springs_stiffness ();
- break;
- }
- else
- set_active_states ();
- }
-}
+ fits_ = true;
+ for (vsize i=0; i < springs_.size (); i++)
+ inv_hooke += springs_[i].inverse_hooke_;
+ assert (line_len_ <= cur_len);
-void
-Simple_spacer::my_solve_natural_len ()
-{
- Real line_len_force = 0.0;
-
- while (is_active ())
+ vector<Spring_description> sorted_springs = springs_;
+ sort (sorted_springs.begin (), sorted_springs.end (), greater<Spring_description> ());
+ for (vsize i = 0; i < sorted_springs.size (); i++)
{
- force_ = active_blocking_force () >? 0.0;
- Real conf = configuration_length ();
+ Spring_description sp = sorted_springs[i];
- if (conf < line_len_)
- {
- line_len_force = force_
- + (line_len_ - conf)
- * active_springs_stiffness();
- }
-
- if (force_ < 1e-8) // ugh.,
+ assert (sp.block_force_ <= cur_force);
+ if (isinf (sp.block_force_))
break;
-
- set_active_states ();
+
+ double block_dist = (cur_force - sp.block_force_) * inv_hooke;
+ if (cur_len - block_dist <= line_len_)
+ return cur_force + (line_len_ - cur_len) / inv_hooke;
+ cur_len -= block_dist;
+ inv_hooke -= sp.inverse_hooke_;
+ cur_force = sp.block_force_;
}
- force_ = line_len_force;
+ fits_ = false;
+ return cur_force;
}
-LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
- 4, 1, 0, (SCM springs, SCM rods, SCM length, SCM ragged),
- "Solve a spring and rod problem for @var{count} objects, that "
- "are connected by @var{count-1} springs, and an arbitrary number of rods "
- "Springs have the format (ideal, hooke) and rods (idx1, idx2, distance) "
- "@var{length} is a number, @var{ragged} a boolean "
- "Return: a list containing the force (positive for stretching, "
- "negative for compressing and #f for non-satisfied constraints) "
- "followed by the @var{spring-count}+1 positions of the objects. "
- )
+void
+Simple_spacer::add_spring (Real ideal, Real inverse_hooke)
{
- int len = scm_ilength (springs);
- if (len == 0)
- return scm_list_2 (scm_from_double (0.0), scm_from_double (0.0));
-
- SCM_ASSERT_TYPE (len >= 0, springs, SCM_ARG1, __FUNCTION__, "list of springs");
- SCM_ASSERT_TYPE (scm_ilength (rods) >= 0, rods, SCM_ARG2, __FUNCTION__, "list of rods");
- SCM_ASSERT_TYPE (scm_is_number (length) || length == SCM_BOOL_F,
- length, SCM_ARG3, __FUNCTION__, "number or #f");
-
-
- bool is_ragged = ragged == SCM_BOOL_T;
- Simple_spacer spacer;
- for (SCM s = springs; scm_is_pair (s); s = scm_cdr (s))
- {
- Real ideal = scm_to_double (scm_caar (s));
- Real hooke = scm_to_double (scm_cadar (s));
-
- spacer.add_spring (ideal, hooke);
- }
+ Spring_description desc;
- for (SCM s = rods; scm_is_pair (s); s = scm_cdr (s))
+ desc.ideal_ = ideal;
+ desc.inverse_hooke_ = inverse_hooke;
+ if (!desc.is_sane ())
{
- SCM entry = scm_car (s);
- int l = scm_to_int (scm_car (entry));
- int r = scm_to_int (scm_cadr (entry));
- entry = scm_cddr (entry);
-
- Real distance = scm_to_double (scm_car (entry));
- spacer.add_rod (l, r, distance);
- }
-
- spacer.line_len_ = scm_to_double (length);
-
- if (is_ragged)
- spacer.my_solve_natural_len ();
- else
- spacer.my_solve_linelen ();
+ programming_error ("insane spring found, setting to unit");
- Array<Real> posns;
- posns.push (0.0);
- for (int i = 0; i < spacer.springs_.size(); i++)
- {
- Real l = spacer.springs_[i].length ((is_ragged) ? 0.0 : spacer.force_);
- posns.push (posns.top() + l);
+ desc.inverse_hooke_ = 1.0;
+ desc.ideal_ = 1.0;
}
+ desc.block_force_ = -desc.ideal_ / desc.inverse_hooke_;
+ // block at distance 0
-
- SCM force_return = SCM_BOOL_F;
- if (!isinf (spacer.force_)
- && (spacer.is_active () || is_ragged))
- {
- force_return = scm_from_double (spacer.force_);
- }
-
- if (is_ragged
- && posns.top () > spacer.line_len_)
- {
- force_return = SCM_BOOL_F;
- }
+ springs_.push_back (desc);
+}
- SCM retval= SCM_EOL;
- for (int i = posns.size(); i--;)
- {
- retval = scm_cons (scm_from_double (posns[i]), retval);
- }
+vector<Real>
+Simple_spacer::spring_positions () const
+{
+ vector<Real> ret;
+ ret.push_back (0.);
- retval = scm_cons (force_return, retval);
- return retval;
+ for (vsize i = 0; i < springs_.size (); i++)
+ ret.push_back (ret.back () + springs_[i].length (ragged_ ? 0.0 : force_));
+ return ret;
}
-
-
+
/****************************************************************/
Spring_description::Spring_description ()
{
- ideal_ =0.0;
- hooke_ =0.0;
- is_active_ = true;
+ ideal_ = 0.0;
+ inverse_hooke_ = 0.0;
block_force_ = 0.0;
}
-
bool
Spring_description::is_sane () const
{
- return (hooke_ > 0)
+ return (inverse_hooke_ >= 0)
&& ideal_ > 0
&& !isinf (ideal_) && !isnan (ideal_);
}
Real
Spring_description::length (Real f) const
{
- if (!is_active_)
- f = block_force_;
- return ideal_ + f / hooke_ ;
+ return ideal_ + max (f, block_force_) * inverse_hooke_;
}
-/****************************************************************/
+/****************************************************************/
/*
-
TODO: should a add penalty for widely varying spring forces (caused
by constraints, eg.
- =====
- | |
- o|o| x ##x
-
+ . =====
+ . | |
+ .o|o|x ##x
+ .
The ## forces the notes apart; we shouldn't allow the O's to touch
this closely.
-
- */
-void
-Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged)
+*/
+
+struct Rod_desc
{
- if (ragged)
- spacer_->my_solve_natural_len ();
- else
- spacer_->my_solve_linelen ();
+ vsize r_;
+ Real dist_;
+
+ bool operator< (const Rod_desc r)
+ {
+ return r_ < r.r_;
+ }
+
+ Rod_desc () {}
+ Rod_desc (vsize r, Real d)
+ {
+ r_ = r;
+ dist_ = d;
+ }
+};
+
+struct Column_desc
+{
+ vector<Rod_desc> rods_;
+ vector<Rod_desc> end_rods_; /* use these if they end at the last column of the line */
+ Real ideal_;
+ Real inverse_hooke_;
+ Real end_ideal_;
+ Real end_inverse_hooke_;
+ Interval keep_inside_line_;
+};
+
+static int compare_paper_column_rank (Grob *const &a, Grob *const &b);
+
+static bool
+is_loose (Grob *g)
+{
+ return (scm_is_pair (g->get_object ("between-cols")));
+}
- positions->force_ = spacer_->force_;
-
- /*
- We used to have a penalty for compression, no matter what, but that
- fucked up wtk1-fugue2 (taking 3 full pages.)
- */
- positions->config_.push (spacer_->indent_);
- for (int i=0; i < spacer_->springs_.size (); i++)
- {
- Real l = spacer_->springs_[i].length ((ragged) ? 0.0 : spacer_->force_);
- positions->config_.push (positions->config_.top () + l);
- /*
- we have l>= 0 here, up to rounding errors
- */
- }
+static Grob*
+maybe_find_prebroken_piece (Grob *g, Direction d)
+{
+ Grob *ret = dynamic_cast<Item*> (g)->find_prebroken_piece (d);
+ if (ret)
+ return ret;
+ return g;
+}
- /*
- For raggedright, we must have a measure of music density: this is
- to prevent lots of short lines (which all have force = 0).
- */
- if (ragged)
+static Grob*
+next_spaceable_column (vector<Grob*> const &list, vsize starting)
+{
+ for (vsize i = starting+1; i < list.size (); i++)
+ if (!is_loose (list[i]))
+ return list[i];
+ return 0;
+}
+
+/* this only returns non-NULL if the line-ending column is the next
+ spaceable-or-breakable column */
+static Grob*
+next_line_ending_column (vector<Grob*> const &list, vsize starting)
+{
+ vsize i = starting + 1;
+ for (; i < list.size ()
+ && is_loose (list[i])
+ && !Paper_column::is_breakable (list[i]);
+ i++)
+ ;
+ return dynamic_cast<Item*> (list[i])->find_prebroken_piece (LEFT);
+}
+
+static void
+get_column_spring (Grob *this_col, Grob *next_col, Real *ideal, Real *inv_hooke)
+{
+ Spring_smob *spring = 0;
+
+ for (SCM s = this_col->get_object ("ideal-distances");
+ !spring && scm_is_pair (s);
+ s = scm_cdr (s))
{
- positions->satisfies_constraints_ =
- positions->config_.top () < spacer_->line_len_ ;
+ Spring_smob *sp = unsmob_spring (scm_car (s));
+
+ if (sp->other_ == next_col)
+ spring = sp;
}
+ if (!spring)
+ programming_error (_f ("No spring between column %d and next one",
+ Paper_column::get_rank (this_col)));
- positions->cols_ = spaced_cols_;
- positions->loose_cols_ = loose_cols_;
- positions->satisfies_constraints_ =
- positions->satisfies_constraints_ && spacer_->is_active ();
+ *ideal = (spring) ? spring->distance_ : 5.0;
+ *inv_hooke = (spring) ? spring->inverse_strength_ : 1.0;
+}
- /*
- Check if breaking constraints are met.
- */
- bool break_satisfy = true;
- int sz = positions->cols_.size ();
- for (int i = sz; i--; )
+static Column_desc
+get_column_desc (vector<Grob*> const &cols, vsize col_index, bool line_starter)
+{
+ Grob *col = cols[col_index];
+ if (line_starter)
+ col = maybe_find_prebroken_piece (col, RIGHT);
+
+ Column_desc desc;
+ Grob *next_col = next_spaceable_column (cols, col_index);
+ if (next_col)
+ get_column_spring (col, next_col, &desc.ideal_, &desc.inverse_hooke_);
+ Grob *end_col = next_line_ending_column (cols, col_index);
+ if (end_col)
+ get_column_spring (col, end_col, &desc.end_ideal_, &desc.end_inverse_hooke_);
+
+ for (SCM s = Spaceable_grob::get_minimum_distances (col);
+ scm_is_pair (s); s = scm_cdr (s))
{
- SCM p = positions->cols_[i]->get_property ( "penalty");
- if (scm_is_number (p))
+ Grob *other = unsmob_grob (scm_caar (s));
+ vsize j = binary_search (cols, other, &compare_paper_column_rank, col_index);
+ if (j != VPOS)
{
- if (scm_to_double (p) < -9999)
- break_satisfy = break_satisfy && (i == 0 || i == sz -1);
- if (scm_to_double (p) > 9999)
- break_satisfy = break_satisfy && !(i == 0 || i == sz -1);
+ if (cols[j] == other)
+ desc.rods_.push_back (Rod_desc (j, scm_to_double (scm_cdar (s))));
+ else /* it must end at the LEFT prebroken_piece */
+ desc.end_rods_.push_back (Rod_desc (j, scm_to_double (scm_cdar (s))));
}
-
}
-
- positions->satisfies_constraints_ =
- positions->satisfies_constraints_ && break_satisfy;
+ if (!line_starter && to_boolean (col->get_property ("keep-inside-line")))
+ desc.keep_inside_line_ = col->extent (col, X_AXIS);
+ return desc;
}
-void
-Simple_spacer::add_spring (Real ideal, Real hooke)
+vector<Real>
+get_line_forces (vector<Grob*> const &icols, vector<vsize> breaks,
+ Real line_len, Real indent, bool ragged)
{
- Spring_description desc;
+ vector<Real> force;
+ force.resize (breaks.size () * breaks.size ());
- desc.ideal_ = ideal;
- desc.hooke_ = hooke;
- if (!desc.is_sane ())
+ vector<Column_desc> cols;
+ vsize b = 1;
+ cols.push_back (Column_desc ());
+ for (vsize i = 1; i < icols.size () - 1; i++)
{
- programming_error ("Insane spring found. Setting to unit spring.");
-
- desc.hooke_ = 1.0;
- desc.ideal_ = 1.0;
- }
-
- if (isinf (hooke))
- {
- desc.is_active_ = false;
- }
- else
- {
- /*
- desc.is_active_ ?
- */
- desc.block_force_ = - desc.hooke_ * desc.ideal_; // block at distance 0
-
- active_count_ ++;
+ if (b < breaks.size () && breaks[b] == i)
+ {
+ breaks[b] = cols.size ();
+ b++;
+ }
+ if (!is_loose (icols[i]))
+ cols.push_back (get_column_desc (icols, i, false));
}
- springs_.push (desc);
-}
+ breaks.back () = cols.size () - 1;
-void
-Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
-{
- Link_array<Grob> cols (icols);
-
- for (int i = cols.size (); i--;)
- if (scm_is_pair (cols[i]->get_property ("between-cols")))
- {
- loose_cols_.push (cols[i]);
- cols.del (i);
- }
-
- spaced_cols_ = cols;
- for (int i=0; i < cols.size () - 1; i++)
+ for (vsize b = 0; b < breaks.size () - 1; b++)
{
- Spring_smob *spring = 0;
+ cols[breaks[b]] = get_column_desc (icols, breaks[b], true);
+ vsize st = breaks[b];
- for (SCM s = cols[i]->get_property ("ideal-distances");
- !spring && scm_is_pair (s);
- s = scm_cdr (s))
+ for (vsize c = b+1; c < breaks.size (); c++)
{
- Spring_smob *sp = unsmob_spring (scm_car (s));
-
-
- if (sp->other_ == cols[i+1])
- spring = sp;
- }
+ vsize end = breaks[c];
+ Simple_spacer spacer;
- if (!spring)
- programming_error (_f ("No spring between column %d and next one",
- Paper_column::get_rank (cols[i])
- ));
+ for (vsize i = breaks[b]; i < end - 1; i++)
+ spacer.add_spring (cols[i].ideal_, cols[i].inverse_hooke_);
+ spacer.add_spring (cols[end-1].end_ideal_, cols[end-1].inverse_hooke_);
- Real ideal = (spring) ? spring->distance_ : spacer_->default_space_;
- Real hooke = (spring) ? spring->strength_ : 1.0;
-
- spacer_->add_spring (ideal, hooke);
- }
-
- for (int i=0; i < cols.size () - 1; i++)
- {
- for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
- scm_is_pair (s); s = scm_cdr (s))
- {
- Grob * other = unsmob_grob (scm_caar (s));
- int oi = cols.find_index (other);
- if (oi >= 0)
+
+ for (vsize i = breaks[b]; i < end; i++)
{
- spacer_->add_rod (i, oi, scm_to_double (scm_cdar (s)));
+ for (vsize r = 0; r < cols[i].rods_.size (); r++)
+ if (cols[i].rods_[r].r_ < end)
+ spacer.add_rod (i - st, cols[i].rods_[r].r_ - st, cols[i].rods_[r].dist_);
+ for (vsize r = 0; r < cols[i].end_rods_.size (); r++)
+ if (cols[i].end_rods_[r].r_ == end)
+ spacer.add_rod (i - st, end - st, cols[i].end_rods_[r].dist_);
+ if (!cols[i].keep_inside_line_.is_empty ())
+ {
+ spacer.add_rod (i - st, end - st, cols[i].keep_inside_line_[RIGHT]);
+ spacer.add_rod (0, i - st, cols[i].keep_inside_line_[LEFT]);
+ }
+ }
+ spacer.solve ((b == 0) ? line_len - indent : line_len, ragged);
+ force[b * breaks.size () + c] = spacer.force ();
+ if (!spacer.fits ())
+ {
+ force[b * breaks.size () + c] = infinity_f;
+ break;
}
}
}
+ return force;
}
-Simple_spacer_wrapper::Simple_spacer_wrapper ()
+Column_x_positions
+get_line_configuration (vector<Grob*>const &columns,
+ Real line_len,
+ Real indent,
+ bool ragged)
{
- spacer_ = new Simple_spacer ();
-}
+ vector<Column_desc> cols;
+ Simple_spacer spacer;
+ Column_x_positions ret;
-Simple_spacer_wrapper::~Simple_spacer_wrapper ()
-{
- delete spacer_;
-}
+ ret.cols_.push_back (dynamic_cast<Item*> (columns[0])->find_prebroken_piece (RIGHT));
+ for (vsize i = 1; i < columns.size () - 1; i++)
+ {
+ if (is_loose (columns[i]))
+ ret.loose_cols_.push_back (columns[i]);
+ else
+ ret.cols_.push_back (columns[i]);
+ }
+ ret.cols_.push_back (dynamic_cast<Item*> (columns.back ())->find_prebroken_piece (LEFT));
+ cols.resize (ret.cols_.size () - 1);
+
+ /* since we've already put our line-ending column in the column list, we can ignore
+ the end_XXX_ fields of our column_desc */
+ for (vsize i = 0; i < cols.size (); i++)
+ {
+ cols[i] = get_column_desc (ret.cols_, i, i == 0);
+ spacer.add_spring (cols[i].ideal_, cols[i].inverse_hooke_);
+ }
+ for (vsize i = 0; i < cols.size (); i++)
+ for (vsize r = 0; r < cols[i].rods_.size (); r++)
+ spacer.add_rod (i, cols[i].rods_[r].r_, cols[i].rods_[r].dist_);
+
+ spacer.solve (line_len, ragged);
+ ret.force_ = spacer.force ();
+
+ /*
+ We used to have a penalty for compression, no matter what, but that
+ fucked up wtk1-fugue2 (taking 3 full pages.)
+ */
+ ret.config_ = spacer.spring_positions ();
+ for (vsize i = 0; i < ret.config_.size (); i++)
+ ret.config_[i] += indent;
+
+ ret.satisfies_constraints_ = spacer.fits ();
+
+ /*
+ Check if breaking constraints are met.
+ */
+ for (vsize i = 1; i < ret.cols_.size () - 1; i++)
+ {
+ SCM p = ret.cols_[i]->get_property ("line-break-permission");
+ if (p == ly_symbol2scm ("force"))
+ ret.satisfies_constraints_ = false;
+ }
+
+ return ret;
+}
-Simple_spacer_wrapper::Simple_spacer_wrapper (Simple_spacer_wrapper const&)
+static int
+compare_paper_column_rank (Grob *const &a,
+ Grob *const &b)
{
+ return Paper_column::get_rank (a) - Paper_column::get_rank (b);
}
projects / lilypond.git / blobdiff