source file of the GNU LilyPond music typesetter
- (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
TODO:
- add support for different stretch/shrink constants?
*/
-
+#include <stdio.h>
#include <math.h>
#include <libc-extension.hh> // isinf
*/
compression_penalty_b_ = false;
active_count_ = 0;
- force_f_ = 0.;
- indent_f_ =0.0;
- default_space_f_ = 20 PT;
+ force_ = 0.;
+ indent_ =0.0;
+ default_space_ = 20 PT;
}
void
*/
Real total_dist = 0.;
for (int i = l ; i < r; i++)
- total_dist += springs_[i].ideal_f_;
+ total_dist += springs_[i].ideal_;
if (total_dist < dist)
for (int i = l ; i < r; i++)
- springs_[i].ideal_f_ *= dist/total_dist;
+ springs_[i].ideal_ *= dist/total_dist;
return;
}
Real block_stretch = dist - d;
Real block_force = c * block_stretch;
- force_f_ = force_f_ >? block_force;
+ force_ = force_ >? block_force;
for (int i=l; i < r; i++)
- springs_[i].block_force_f_ = block_force >?
- springs_[i].block_force_f_ ;
+ springs_[i].block_force_ = block_force >?
+ springs_[i].block_force_ ;
}
Real
{
Real d =0.;
for (int i=l; i < r; i++)
- d += springs_[i].ideal_f_;
+ d += springs_[i].ideal_;
return d;
}
for (int i=l; i < r; i++)
{
if (springs_[i].active_b_)
- den += 1 / springs_[i].hooke_f_;
+ den += 1 / springs_[i].hooke_;
}
return 1 / den;
for (int i=0; i < springs_.size (); i++)
if (springs_[i].active_b_)
{
- bf = bf >? springs_[i].block_force_f_;
+ bf = bf >? springs_[i].block_force_;
}
return bf;
}
Real
Simple_spacer::active_springs_stiffness () const
{
- Real den = 0.0;
- for (int i=0; i < springs_.size (); i++)
- if (springs_[i].active_b_)
- {
- den += 1 / springs_[i].hooke_f_;
- }
- return 1/den;
+ return range_stiffness (0, springs_.size ());
}
void
/* float comparison is safe, since force is only copied. */
for (int i=0 ; i <springs_.size (); i++)
if (springs_[i].active_b_
- && springs_[i].block_force_f_ >= force_f_)
+ && springs_[i].block_force_ >= force_)
{
springs_[i].active_b_ = false;
active_count_ --;
{
Real l =0.;
for (int i=0; i < springs_.size (); i++)
- l += springs_[i].length (force_f_);
+ l += springs_[i].length (force_);
return l;
}
{
while (active_b ())
{
- force_f_ = active_blocking_force ();
+ force_ = active_blocking_force ();
Real conf = configuration_length ();
- if (conf < line_len_f_)
+ if (conf < line_len_)
{
- force_f_ += (line_len_f_ - conf) * active_springs_stiffness ();
+ force_ += (line_len_ - conf) * active_springs_stiffness ();
break;
}
else
{
while (active_b ())
{
- force_f_ = active_blocking_force () >? 0.0;
+ force_ = active_blocking_force () >? 0.0;
- if (force_f_ < 1e-8) // ugh.,
+ if (force_ < 1e-8) // ugh.,
break;
set_active_states ();
Spring_description desc;
if (spring)
{
- desc.ideal_f_ = spring->distance_f_;
- desc.hooke_f_ = spring->strength_f_;
+ desc.ideal_ = spring->distance_;
+ desc.hooke_ = spring->strength_;
}
else
{
programming_error (_f("No spring between column %d and next one",
- Paper_column::rank_i (cols[i])
+ Paper_column::get_rank (cols[i])
));
- desc.hooke_f_ = 1.0;
- desc.ideal_f_ = default_space_f_;
+ desc.hooke_ = 1.0;
+ desc.ideal_ = default_space_;
continue;
}
{
programming_error ("Insane spring found. Setting to unit spring.");
- desc.hooke_f_ = 1.0;
- desc.ideal_f_ = 1.0;
+ desc.hooke_ = 1.0;
+ desc.ideal_ = 1.0;
}
- if (isinf (desc.hooke_f_))
+ if (isinf (desc.hooke_))
{
desc.active_b_ = false;
springs_.push (desc);
}
else
{
- desc.block_force_f_ = - desc.hooke_f_ * desc.ideal_f_; // block at distance 0
+ desc.block_force_ = - desc.hooke_ * desc.ideal_; // block at distance 0
springs_.push (desc);
active_count_ ++;
gh_pair_p (s); s = ly_cdr (s))
{
Grob * other = unsmob_grob (ly_caar (s));
- int oi = cols.find_i (other);
+ int oi = cols.find_index (other);
if (oi >= 0)
{
add_rod (i, oi, gh_scm2double (ly_cdar (s)));
}
}
+
+}
+
+/*
+
+ TODO: should a add penalty for widely varying spring forces (caused
+ by constraints, eg.
+
+
+ =====
+ | |
+ o|o| x ##x
+
+
+ The ## forces the notes apart; we shouldn't allow the O's to touch
+ this closely.
+
+ */
+void
+Simple_spacer::solve (Column_x_positions *positions, bool ragged)
+{
/*
TODO: should support natural length on only the last line.
*/
- if (line_len_f_ < 0)
+ ragged = ragged || (line_len_ < 0) ;
+ if (ragged)
my_solve_natural_len ();
else
my_solve_linelen ();
-}
-
-#include <stdio.h>
-
-void
-Simple_spacer::solve (Column_x_positions *positions, bool ragged) const
-{
- positions->force_f_ = force_f_;
- if ((force_f_ < 0))
- {
- /*
- We used to have a penalty for compression, no matter what, but that
- fucked up wtk1-fugue2 (taking 3 full pages.)
-
- maybe this should be tunable?
- */
- if (compression_penalty_b_)
- ; // positions->force_f_ *= 2; // hmm.
- }
+ positions->force_ = 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 (indent_f_);
+ positions->config_.push (indent_);
for (int i=0; i <springs_.size (); i++)
{
- Real l = springs_[i].length ((ragged) ? 0.0 : force_f_);
+ Real l = springs_[i].length ((ragged) ? 0.0 : force_);
positions->config_.push (positions->config_.top () + l);
+ /*
+ we have l>= 0 here, up to rounding errors
+ */
+ }
- assert (l >= 0);
+ /*
+ 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 && line_len_ > 0)
+ {
+ Real len = positions->config_.top ();
+ positions->force_ = (line_len_ - len) * active_springs_stiffness ();
}
+
+
positions->cols_ = spaced_cols_;
positions->loose_cols_ = loose_cols_;
-
- positions->satisfies_constraints_b_ = (line_len_f_ < 0) || active_b ();
-
+ positions->satisfies_constraints_b_ = (line_len_ < 0) || active_b ();
/*
Check if breaking constraints are met.
positions->satisfies_constraints_b_ =
positions->satisfies_constraints_b_ && break_satisfy;
+
+ if (ragged && force_ < 0)
+ positions->satisfies_constraints_b_ = false;
}
/****************************************************************/
Spring_description::Spring_description ()
{
- ideal_f_ =0.0;
- hooke_f_ =0.0;
+ ideal_ =0.0;
+ hooke_ =0.0;
active_b_ = true;
- block_force_f_ = 0.0;
+ block_force_ = 0.0;
}
bool
Spring_description::sane_b () const
{
- return (hooke_f_ > 0) && !isinf (ideal_f_) && !isnan (ideal_f_);
+ return (hooke_ > 0) && !isinf (ideal_) && !isnan (ideal_);
}
Real
Spring_description::length (Real f) const
{
if (!active_b_)
- f = block_force_f_;
- return ideal_f_ + f / hooke_f_ ;
+ f = block_force_;
+ return ideal_ + f / hooke_ ;
}
projects / lilypond.git / blobdiff