X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=1af6d212831ccf819ba9697a3862cbac99993b09;hb=74ee52246b9a7571a2d697df7aeaf3aa3bd09f45;hp=0a1a74e5bd09c62a67acc44958a1c111fd8da743;hpb=f5d88b8b3b09ac724d7f2234b25fcbde4bc1b072;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 0a1a74e5bd..1af6d21283 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,161 +3,127 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1998 Han-Wen Nienhuys + (c) 1996, 1997--1999 Han-Wen Nienhuys */ +#include "dimension-cache.hh" #include "debug.hh" #include "spanner.hh" -#include "p-col.hh" -#include "p-score.hh" -#include "tex-outputter.hh" +#include "paper-column.hh" +#include "paper-score.hh" #include "molecule.hh" - -IMPLEMENT_IS_TYPE_B1(Spanner,Score_element); +#include "paper-outputter.hh" +#include "paper-column.hh" +#include "line-of-score.hh" +#include "break-align-item.hh" void -Spanner::do_print() const -{ -#ifndef NPRINT - DOUT << "Between " << spanned_drul_[LEFT]->name () - << " and " << spanned_drul_[RIGHT]->name() << '\n'; - if (broken_into_l_arr_.size()) - { - DOUT << "with broken pieces:\n"; - for (int i=0; i < broken_into_l_arr_.size (); i++) - broken_into_l_arr_[i]->print (); - } -#endif -} - -void -Spanner::break_into_pieces () +Spanner::do_break_processing() { - if (broken_into_l_arr_.size()) - return; - + //break_into_pieces + + if (line_l () || broken_b ()) + return; + Item * left = spanned_drul_[LEFT]; Item * right = spanned_drul_[RIGHT]; - + if (left == right) { - warning (_ ("left spanpoint is right spanpoint\n")); + warning (_ ("Left spanpoint is right spanpoint")); return; } - Link_array break_cols = pscore_l_->broken_col_range (left,right); - Link_array broken_into_l_arr; + Link_array break_points = pscore_l_->broken_col_range (left,right); - break_cols.insert (left,0); - break_cols.push (right); + break_points.insert (left,0); + break_points.push (right); - for (int i=1; i < break_cols.size(); i++) + for (int i=1; i < break_points.size(); i++) { - Spanner* span_p = clone()->access_Spanner (); - Item *left = break_cols[i-1]; - Item *right = break_cols[i]; - if (!right->line_l()) - right = right->find_prebroken_piece(LEFT); - if (!left->line_l()) - left = left->find_prebroken_piece(RIGHT); - - 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); + 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_bounds(LEFT,bounds[LEFT]); + span_p->set_bounds(RIGHT,bounds[RIGHT]); + + pscore_l_->typeset_element (span_p); + broken_into_l_arr_.push (span_p); } - - broken_into_l_arr_ = broken_into_l_arr; + + 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((Direction)-i)); + set_bounds(i,spanned_drul_[i]->find_broken_piece((Direction) -i)); } - while (flip(&i) != 1); + while (flip(&i) != LEFT); } - void Spanner::set_bounds(Direction d, Item*i) { - 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 (_f ("Spanner `%s\' with equal left and right spanpoints", name ())); -} - -void -Spanner::do_break_processing() -{ - if (!line_l()) { - 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::access_Spanner () -{ - return this; -} Spanner::Spanner () { - unbroken_original_l_ =0; spanned_drul_[LEFT]=0; spanned_drul_[RIGHT]=0; } Spanner::Spanner (Spanner const &s) - :Score_element (s) + : Score_element (s) { spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; - unbroken_original_l_ = &s; } -void -Spanner::do_brew_molecule () -{ - 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, name ()); - delete output; -} -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 * @@ -165,45 +131,34 @@ 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]; } -bool -Spanner::broken_b() const -{ - return broken_into_l_arr_.size(); -} -void -Spanner::do_unlink() +int +Spanner::compare (Spanner * const &p1, Spanner * const &p2) { - set_bounds (LEFT, 0); - set_bounds (RIGHT, 0); - - if (unbroken_original_l_) - { - unbroken_original_l_->broken_into_l_arr_.substitute (this, 0); - unbroken_original_l_ =0; - } + return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; } -void -Spanner::do_junk_links() +bool +Spanner::broken_b() const { - spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; + return broken_into_l_arr_.size(); } Array @@ -213,6 +168,13 @@ Spanner::get_rods () const return r; } +Array +Spanner::get_springs () const +{ + Array s; + return s; +} + void Spanner::do_space_processing () { @@ -221,4 +183,37 @@ Spanner::do_space_processing () { rs[i].add_to_cols (); } + + Array ss (get_springs ()); + for (int i=0; i < ss.size (); i++) + { + 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; }