X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-spacer.cc;h=8e3de2cf766105bc90212fd99d2c465f003e7c61;hb=7e7a2bf8bde2353decd68a9c4ac7a68d815e8185;hp=8261f702fa12d12bc286740f186f362d5909a14e;hpb=faaee71fb44c8e1040239797aad336f4e46c2c21;p=lilypond.git diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 8261f702fa..8e3de2cf76 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -9,20 +9,21 @@ - add support for different stretch/shrink constants? */ -#include + +#include "simple-spacer.hh" + +#include #include + #include // isinf -#include "simple-spacer.hh" #include "paper-column.hh" #include "spring.hh" -#include "rod.hh" #include "warn.hh" #include "column-x-positions.hh" #include "spaceable-grob.hh" #include "dimensions.hh" - /* A simple spacing constraint solver. The approach: @@ -56,6 +57,12 @@ Perhaps this is not a bad thing, because the 1st looks better anyway. */ +/* + + positive force = expanding, negative force = compressing. + +*/ + Simple_spacer::Simple_spacer () { /* @@ -64,7 +71,7 @@ Simple_spacer::Simple_spacer () */ active_count_ = 0; force_ = 0.; - indent_ =0.0; + indent_ = 0.0; default_space_ = 20 PT; } @@ -101,7 +108,7 @@ Simple_spacer::add_rod (int l, int r, Real dist) Real block_force = c * block_stretch; force_ = force_ >? block_force; - for (int i=l; i < r; i++) + for (int i = l; i < r; i++) springs_[i].block_force_ = block_force >? springs_[i].block_force_ ; } @@ -109,8 +116,8 @@ Simple_spacer::add_rod (int l, int r, Real dist) Real 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; } @@ -118,8 +125,8 @@ Simple_spacer::range_ideal_len (int l, int r) const Real Simple_spacer::range_stiffness (int l, int r) const { - Real den =0.0; - for (int i=l; i < r; i++) + Real den = 0.0; + for (int i = l; i < r; i++) { if (springs_[i].is_active_) den += 1 / springs_[i].hooke_; @@ -132,7 +139,7 @@ Real Simple_spacer::active_blocking_force () const { Real bf = - infinity_f; - for (int i=0; i < springs_.size (); i++) + for (int i = 0; i < springs_.size (); i++) if (springs_[i].is_active_) { bf = bf >? springs_[i].block_force_; @@ -153,7 +160,7 @@ Simple_spacer::active_springs_stiffness () const Real max_block_force = -infinity_f; int max_i = -1; - for (int i=0; i < springs_.size (); i++) + for (int i = 0; i < springs_.size (); i++) { if (springs_[i].block_force_ > max_block_force) { @@ -171,7 +178,7 @@ void Simple_spacer::set_active_states () { /* float comparison is safe, since force is only copied. */ - for (int i=0 ; i = force_) { @@ -183,8 +190,8 @@ Simple_spacer::set_active_states () Real Simple_spacer::configuration_length () const { - Real l =0.; - for (int i=0; i < springs_.size (); i++) + Real l = 0.; + for (int i = 0; i < springs_.size (); i++) l += springs_[i].length (force_); return l; @@ -218,15 +225,27 @@ Simple_spacer::my_solve_linelen () void Simple_spacer::my_solve_natural_len () { + Real line_len_force = 0.0; + while (is_active ()) { force_ = active_blocking_force () >? 0.0; + Real conf = configuration_length (); + if (conf < line_len_) + { + line_len_force = force_ + + (line_len_ - conf) + * active_springs_stiffness(); + } + if (force_ < 1e-8) // ugh., break; set_active_states (); } + + force_ = line_len_force; } LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem", @@ -235,7 +254,8 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem", "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 (#f for non-satisfied constraints) " + "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. " ) { @@ -249,24 +269,24 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem", length, SCM_ARG3, __FUNCTION__, "number or #f"); - bool is_ragged = ragged == SCM_BOOL_T; + bool is_ragged = ragged == SCM_BOOL_T; Simple_spacer spacer; - for (SCM s = springs; ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = springs; scm_is_pair (s); s = scm_cdr (s)) { - Real ideal = scm_to_double (ly_caar (s)); - Real hooke = scm_to_double (ly_cadar (s)); + Real ideal = scm_to_double (scm_caar (s)); + Real hooke = scm_to_double (scm_cadar (s)); spacer.add_spring (ideal, hooke); } - for (SCM s = rods; ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = rods; scm_is_pair (s); s = scm_cdr (s)) { - SCM entry = ly_car (s); - int l = scm_to_int (ly_car (entry)); - int r = scm_to_int (ly_cadr (entry)); - entry = ly_cddr (entry); + 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 (ly_car (entry)); + Real distance = scm_to_double (scm_car (entry)); spacer.add_rod (l, r, distance); } @@ -285,21 +305,22 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem", posns.push (posns.top() + l); } + + SCM force_return = SCM_BOOL_F; - if (is_ragged) + if (!isinf (spacer.force_) + && (spacer.is_active () || is_ragged)) { - Real len = posns.top (); - if (spacer.line_len_ - len >= 0) - force_return = scm_from_double ((spacer.line_len_ - len) - * spacer.active_springs_stiffness ()); + force_return = scm_from_double (spacer.force_); } - else if (not isinf (spacer.force_) - && spacer.is_active ()) + + if (is_ragged + && posns.top () > spacer.line_len_) { - force_return = scm_from_double (spacer.force_); + force_return = SCM_BOOL_F; } - - SCM retval= SCM_EOL; + + SCM retval = SCM_EOL; for (int i = posns.size(); i--;) { retval = scm_cons (scm_from_double (posns[i]), retval); @@ -314,8 +335,8 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem", Spring_description::Spring_description () { - ideal_ =0.0; - hooke_ =0.0; + ideal_ = 0.0; + hooke_ = 0.0; is_active_ = true; block_force_ = 0.0; } @@ -369,7 +390,7 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged) fucked up wtk1-fugue2 (taking 3 full pages.) */ positions->config_.push (spacer_->indent_); - for (int i=0; i < spacer_->springs_.size (); i++) + 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); @@ -384,25 +405,14 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged) */ if (ragged) { - Real len = positions->config_.top (); - if (spacer_->line_len_ - len >= 0) - positions->force_ = ((spacer_->line_len_ - len) - * spacer_->active_springs_stiffness ()); - else - { - positions->force_ = 0.0; - /* - Don't go past end-of-line in ragged right. - */ - positions->satisfies_constraints_ = false; - } + positions->satisfies_constraints_ = + positions->config_.top () < spacer_->line_len_ ; } - + else + positions->satisfies_constraints_ = spacer_->is_active (); positions->cols_ = spaced_cols_; positions->loose_cols_ = loose_cols_; - positions->satisfies_constraints_ = - positions->satisfies_constraints_ && spacer_->is_active (); /* Check if breaking constraints are met. @@ -412,7 +422,7 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged) for (int i = sz; i--; ) { SCM p = positions->cols_[i]->get_property ( "penalty"); - if (ly_c_number_p (p)) + if (scm_is_number (p)) { if (scm_to_double (p) < -9999) break_satisfy = break_satisfy && (i == 0 || i == sz -1); @@ -457,28 +467,35 @@ Simple_spacer::add_spring (Real ideal, Real hooke) springs_.push (desc); } +static int +compare_paper_column_rank (Grob *const &a, + Grob *const &b) +{ + return Paper_column::get_rank (a) - Paper_column::get_rank (b); +} + void Simple_spacer_wrapper::add_columns (Link_array const &icols) { Link_array cols (icols); for (int i = cols.size (); i--;) - if (ly_c_pair_p (cols[i]->get_property ("between-cols"))) + 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 (int i = 0; i < cols.size () - 1; i++) { Spring_smob *spring = 0; for (SCM s = cols[i]->get_property ("ideal-distances"); - !spring && ly_c_pair_p (s); - s = ly_cdr (s)) + !spring && scm_is_pair (s); + s = scm_cdr (s)) { - Spring_smob *sp = unsmob_spring (ly_car (s)); + Spring_smob *sp = unsmob_spring (scm_car (s)); if (sp->other_ == cols[i+1]) @@ -496,16 +513,27 @@ Simple_spacer_wrapper::add_columns (Link_array const &icols) spacer_->add_spring (ideal, hooke); } - for (int i=0; i < cols.size () - 1; i++) + for (int i = 0; i < cols.size () - 1; i++) { for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]); - ly_c_pair_p (s); s = ly_cdr (s)) + scm_is_pair (s); s = scm_cdr (s)) { - Grob * other = unsmob_grob (ly_caar (s)); - int oi = cols.find_index (other); + Grob * other = unsmob_grob (scm_caar (s)); + int oi = binsearch_links (cols, other, &compare_paper_column_rank); if (oi >= 0) { - spacer_->add_rod (i, oi, scm_to_double (ly_cdar (s))); + spacer_->add_rod (i, oi, scm_to_double (scm_cdar (s))); + } + } + + if (i + && !to_boolean (cols[i]->get_property ("allow-outside-line"))) + { + Interval e = cols[i]->extent (cols[i], X_AXIS); + if (!e.is_empty()) + { + spacer_->add_rod (i, cols.size()-1, e[RIGHT]); + spacer_->add_rod (0, i, e[LEFT]); } } }