source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
TODO:
- add support for different stretch/shrink constants?
*/
#include <math.h>
-#include <libc-extension.hh>
+#include <libc-extension.hh> // isinf
#include "simple-spacer.hh"
#include "paper-column.hh"
#include "rod.hh"
#include "warn.hh"
#include "column-x-positions.hh"
-#include "spaceable-element.hh"
+#include "spaceable-grob.hh"
#include "dimensions.hh"
Simple_spacer::Simple_spacer ()
{
+ active_count_ = 0;
force_f_ = 0.;
indent_f_ =0.0;
default_space_f_ = 20 PT;
// safe, since
// force is only copied.
for (int i=0 ; i <springs_.size (); i++)
- if (springs_[i].block_force_f_ >= force_f_)
- springs_[i].active_b_ = false;
+ if (springs_[i].active_b_
+ && springs_[i].block_force_f_ >= force_f_)
+ {
+ springs_[i].active_b_ = false;
+ active_count_ --;
+ }
}
Real
bool
Simple_spacer::active_b () const
{
- for (int i=0; i < springs_.size (); i++)
- if (springs_[i].active_b_)
- return true;
- return false;
+ return active_count_;
}
void
if (conf < line_len_f_)
{
- force_f_ += (line_len_f_ - conf) * active_springs_stiffness ();
+ force_f_ += (line_len_f_ - conf) * active_springs_stiffness ();
break;
}
else
void
Simple_spacer::add_columns (Link_array<Grob> cols)
{
+ for (int i = cols.size (); i--;)
+ if (gh_pair_p (cols[i]->get_grob_property ("between-cols")))
+ {
+ loose_cols_.push (cols[i]);
+ cols.del (i);
+ }
+
+ spaced_cols_ = cols;
for (int i=0; i < cols.size () - 1; i++)
{
- SCM spring_params = SCM_UNDEFINED;
- for (SCM s = Spaceable_element::get_ideal_distances (cols[i]);
- spring_params == SCM_UNDEFINED && gh_pair_p (s);
- s = gh_cdr (s))
+ SCM spring_params = SCM_EOL;
+ for (SCM s = cols[i]->get_grob_property ("ideal-distances");
+ !gh_pair_p (spring_params) && gh_pair_p (s);
+ s = ly_cdr (s))
{
- Grob *other = unsmob_grob (gh_caar (s));
+ Grob *other = unsmob_grob (ly_caar (s));
if (other != cols[i+1])
continue;
- spring_params = gh_cdar (s);
+ spring_params = ly_cdar (s);
}
Spring_description desc;
- if (spring_params != SCM_UNDEFINED)
+ if (gh_pair_p (spring_params))
{
- desc.ideal_f_ = gh_scm2double (gh_car (spring_params));
- desc.hooke_f_ = gh_scm2double (gh_cdr (spring_params));
+ desc.ideal_f_ = gh_scm2double (ly_car (spring_params));
+ desc.hooke_f_ = gh_scm2double (ly_cdr (spring_params));
}
else
{
- programming_error ("No spring between adjacent columns");
+ programming_error (_f("No spring between column %d and next one",
+ Paper_column::rank_i (cols[i])
+ ));
desc.hooke_f_ = 1.0;
desc.ideal_f_ = default_space_f_;
}
if (!desc.sane_b ())
{
programming_error ("Insane spring found. Setting to unit spring.");
+
+ cout << "columns " << Paper_column::rank_i (cols[i])
+ << " " << Paper_column::rank_i (cols[i+1]) << endl;
desc.hooke_f_ = 1.0;
desc.ideal_f_ = 1.0;
}
desc.block_force_f_ = - desc.hooke_f_ * desc.ideal_f_; // block at distance 0
- springs_.push (desc);
+ springs_.push (desc);
+ active_count_ ++;
}
for (int i=0; i < cols.size () - 1; i++)
{
- for (SCM s = Spaceable_element::get_minimum_distances (cols[i]);
- gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
+ gh_pair_p (s); s = ly_cdr (s))
{
- Grob * other = unsmob_grob (gh_caar (s));
+ Grob * other = unsmob_grob (ly_caar (s));
int oi = cols.find_i (other);
if (oi >= 0)
{
- add_rod (i, oi, gh_scm2double (gh_cdar (s)));
+ add_rod (i, oi, gh_scm2double (ly_cdar (s)));
}
}
}
{
positions->config_.push (positions->config_.top () + springs_[i].length (force_f_));
}
+ positions->cols_ = spaced_cols_;
+ positions->loose_cols_ = loose_cols_;
+
+ positions->satisfies_constraints_b_ = (line_len_f_ < 0) || active_b ();
+
+
+ /*
+ Check if breaking constraints are met.
+ */
+ bool break_satisfy = true;
+ int sz = positions->cols_.size ();
+ for (int i = sz; i--; )
+ {
+ SCM p = positions->cols_[i]->get_grob_property( "penalty");
+ if (gh_number_p (p))
+ {
+ if (gh_scm2double (p) < -9999)
+ break_satisfy = break_satisfy && (i == 0 || i == sz -1);
+ if (gh_scm2double (p) > 9999)
+ break_satisfy = break_satisfy && !(i == 0 || i == sz -1);
+ }
+
+ }
- positions->satisfies_constraints_b_ = (line_len_f_ < 0) || active_b ();
+ positions->satisfies_constraints_b_ =
+ positions->satisfies_constraints_b_ && break_satisfy;
}
-Spring_description::Spring_description( )
+
+
+
+Spring_description::Spring_description ()
{
ideal_f_ =0.0;
hooke_f_ =0.0;