X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=2bc8b98ab4f2339455216a157c00898796411884;hb=fa891b75e895f16fc3871531e244abe78f9d93ff;hp=a10cf1446f3cee6378d278b618615500ec8b457d;hpb=5cfb4ad642561dcb61593b1aeb24717c5eb110da;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index a10cf1446f..2bc8b98ab4 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,134 +3,155 @@ source file of the GNU LilyPond music typesetter - (c) 1996,1997 Han-Wen Nienhuys + (c) 1996, 1997--2000 Han-Wen Nienhuys */ +#include +#include "dimension-cache.hh" #include "debug.hh" #include "spanner.hh" -#include "p-col.hh" -#include "p-score.hh" -#include "outputter.hh" - -IMPLEMENT_IS_TYPE_B1(Spanner,Score_elem); - -void -Spanner::do_print() const -{ -#ifndef NPRINT - DOUT << "Between col "; - if (broken_into_l_arr_.size()) - DOUT << "with broken pieces\n"; -#endif -} +#include "paper-column.hh" +#include "paper-score.hh" +#include "molecule.hh" +#include "paper-outputter.hh" +#include "paper-column.hh" +#include "line-of-score.hh" +#include "break-align-item.hh" void -Spanner::break_into_pieces () +Spanner::do_break_processing() { - if (broken_into_l_arr_.size()) - return; - - Item * left = spanned_drul_[LEFT]; - Item * right = spanned_drul_[RIGHT]; + //break_into_pieces + if (line_l () || broken_b ()) + return; - Link_array break_cols = pscore_l_->broken_col_range (left,right); - Link_array broken_into_l_arr; - - break_cols.insert (left,0); - break_cols.push (right); + Item * left = spanned_drul_[LEFT]; + Item * right = spanned_drul_[RIGHT]; - for (int i=1; i < break_cols.size(); i++) + if (left == right) { - Spanner* span_p = clone()->spanner (); - left = break_cols[i-1]; - right = break_cols[i]; - if (!right->line_l()) - right = right->find_prebroken_piece(-1); - if (!left->line_l()) - left = left->find_prebroken_piece(1); - - assert (left&&right && left->line_l() == right->line_l()); - - span_p->set_bounds(LEFT,left); - span_p->set_bounds(RIGHT,right); - - pscore_l_->typeset_broken_spanner (span_p); - broken_into_l_arr.push (span_p); + warning (_ ("Left spanpoint is right spanpoint")); + + /* + FIXME: this is broken. + */ + /* + If we have a spanner spanning one column, we must break it + anyway because it might provide a parent for another item. */ + Direction d = LEFT; + do + { + Item* bound = left->find_broken_piece (d); + Spanner * span_p = dynamic_cast( clone ()); + span_p->set_bound (LEFT, bound); + span_p->set_bound (RIGHT, bound); + + assert (span_p->line_l ()); + pscore_l_->typeset_element (span_p); + broken_into_l_arr_.push (span_p); + } + while ((flip(&d))!= LEFT); } - - broken_into_l_arr_ = broken_into_l_arr; + else + { + Link_array break_points = pscore_l_->broken_col_range (left,right); + + break_points.insert (left,0); + break_points.push (right); + + for (int i=1; i < break_points.size(); i++) + { + Drul_array bounds; + bounds[LEFT] = break_points[i-1]; + bounds[RIGHT] = break_points[i]; + Direction d = LEFT; + do + { + Item *&pc_l = bounds[d] ; + if (!pc_l->line_l()) + pc_l = pc_l->find_broken_piece(- d); + + assert (pc_l); + } + while ((flip(&d))!= LEFT); + + Spanner *span_p = dynamic_cast(clone ()); + span_p->set_bound(LEFT,bounds[LEFT]); + span_p->set_bound(RIGHT,bounds[RIGHT]); + + pscore_l_->typeset_element (span_p); + broken_into_l_arr_.push (span_p); + } + } + broken_into_l_arr_.sort (Spanner::compare); } void Spanner::set_my_columns() { - Direction i = (Direction)1; + Direction i = (Direction) LEFT; do { if (!spanned_drul_[i]->line_l()) - set_bounds(i,spanned_drul_[i]->find_prebroken_piece(-i)); + set_bound(i,spanned_drul_[i]->find_broken_piece((Direction) -i)); } - while ((i*=-1) != 1); + while (flip(&i) != LEFT); } -void -Spanner::set_bounds(Direction d, Item*i) +Item* +Spanner::get_bound (Direction d) const { - if (spanned_drul_[d]) - spanned_drul_[d]->attached_span_l_arr_.substitute(this,0); - - spanned_drul_[d] =i; - if (i) - i->attached_span_l_arr_.push(this); - - if (spanned_drul_[Direction(-d)] == spanned_drul_[d] - && i) - warning ("Spanner (" + String (name ()) + ") with equal left and right spanpoints."); + return spanned_drul_ [d]; } void -Spanner::do_break_processing() +Spanner::set_bound(Direction d, Item*i) { - if (!line_l()) + spanned_drul_[d] =i; + if (i) { - break_into_pieces (); - for (int i=0; i < broken_into_l_arr_.size(); i++) - broken_into_l_arr_[i]->handle_broken_dependencies(); + i->used_b_ = true; } - else + + /** + Prevent the column -> line_of_score -> column -> line_of_score -> etc situation + */ + if (d== LEFT && !dynamic_cast (this)) { - handle_broken_dependencies(); + set_parent (i, X_AXIS); } + + if (spanned_drul_[Direction(-d)] == spanned_drul_[d] + && i) + warning (_f ("Spanner `%s' has equal left and right spanpoints", classname (this))); } -Spanner::Spanner() +Spanner::Spanner () { spanned_drul_[LEFT]=0; spanned_drul_[RIGHT]=0; } -void -Spanner::do_brew_molecule () +Spanner::Spanner (Spanner const &s) + : Score_element (s) { - if (transparent_b_) - return ; - Molecule *output= brew_molecule_p (); - Offset left_off (spanned_drul_[LEFT]->absolute_coordinate(X_AXIS), 0); - Offset o = absolute_offset() + left_off; - pscore_l_->outputter_l_->output_molecule (output, o); + spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; } -Interval -Spanner::do_width() const -{ - Real l = spanned_drul_[LEFT]->absolute_coordinate (X_AXIS); - Real r = spanned_drul_[RIGHT]->absolute_coordinate (X_AXIS); - assert (r>=l); - - return Interval (0, r-l); + +Real +Spanner::spanner_length() const +{ + Real l = spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS); + Real r = spanned_drul_[RIGHT]->relative_coordinate (0, X_AXIS); + + if (r< l) + programming_error ("spanner with negative length"); + + return r-l; } Line_of_score * @@ -138,20 +159,28 @@ Spanner::line_l() const { if (!spanned_drul_[LEFT] || !spanned_drul_[RIGHT]) return 0; - if (spanned_drul_[LEFT]->line_l() != spanned_drul_[RIGHT]->line_l()) + if (spanned_drul_[LEFT]->line_l () != spanned_drul_[RIGHT]->line_l ()) return 0; return spanned_drul_[LEFT]->line_l(); } -Spanner* +Score_element* Spanner::find_broken_piece (Line_of_score*l) const { - for (int i=0; i < broken_into_l_arr_.size(); i++) - if (broken_into_l_arr_[i]->line_l() == l) - return broken_into_l_arr_[i]; - return 0; - + int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); + + if (idx < 0) + return 0; + else + return broken_into_l_arr_ [idx]; +} + + +int +Spanner::compare (Spanner * const &p1, Spanner * const &p2) +{ + return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; } bool @@ -160,15 +189,62 @@ Spanner::broken_b() const return broken_into_l_arr_.size(); } -void -Spanner::do_unlink() +Array +Spanner::get_rods () const { - set_bounds (LEFT, 0); - set_bounds (RIGHT, 0); + Array r; + return r; +} + +Array +Spanner::get_springs () const +{ + Array s; + return s; } void -Spanner::do_junk_links() +Spanner::do_space_processing () { - spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; + Array rs (get_rods ()); + for (int i=0; i < rs.size (); i++) + { + rs[i].add_to_cols (); + } + + Array ss (get_springs ()); + for (int i=0; i < ss.size (); i++) + { + if (isinf (ss[i].distance_f_)) + programming_error ("weird spring"); + else + ss[i].add_to_cols (); + } +} + +/* + If this is a broken spanner, return the amount the left end is to be + shifted horizontally so that the spanner starts after the initial + clef and key on the staves. This is necessary for ties, slurs, + crescendo and decrescendo signs, for example. +*/ +Real +Spanner::get_broken_left_end_align () const +{ + Paper_column *sc = dynamic_cast (spanned_drul_[LEFT]->column_l()); + + // Relevant only if left span point is first column in line + if(sc != NULL && + sc->break_status_dir () == RIGHT) + { + /* + + We used to do a full search for the Break_align_item. + But that doesn't make a difference, since the Paper_column + is likely to contain only a Break_align_item. + */ + return sc->extent (X_AXIS)[RIGHT]; + } + + return 0.0; }