X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=d9abade41bf7e23fb80ad3bff5b1bc4f89eb568f;hb=fa891b75e895f16fc3871531e244abe78f9d93ff;hp=6ff6400b9925cd378dae57d01f375d1577b060bf;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index 6ff6400b99..d9abade41b 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -3,77 +3,57 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ -#include "p-score.hh" +#include "dimension-cache.hh" +#include "paper-score.hh" #include "debug.hh" #include "item.hh" -#include "p-col.hh" +#include "paper-column.hh" #include "spanner.hh" +#include "lily-guile.hh" Item::Item () { - unbroken_original_l_ =0; - break_priority_i_ = 0; - breakable_b_ = false; - break_status_dir_ = CENTER; broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0; } bool Item::breakable_b () const { - return !unbroken_original_l_ - && dynamic_cast (parent_l (X_AXIS))->breakable_b (); -} - -void -Item::do_print() const -{ -#ifndef NPRINT - DOUT << "breakable_b_: " << breakable_b_ << - " break_status_dir_: " << break_status_dir_; -#endif + if (original_l_ ) + return false; + + Item * i =dynamic_cast (parent_l (X_AXIS)); + return (i) ? i->breakable_b () : to_boolean (get_elt_property( "breakable")); } - Real Item::hpos_f() const { - return absolute_coordinate (X_AXIS); + return relative_coordinate (0, X_AXIS); } Line_of_score * Item::line_l() const { - Graphical_element *g = parent_l (X_AXIS); + Score_element *g = parent_l (X_AXIS); if (!g) return 0; return dynamic_cast (g)-> line_l (); } -Direction -Item::break_status_dir() const -{ - return break_status_dir_; -} void Item::copy_breakable_items() { - if (broken_to_drul_[LEFT] || broken_to_drul_[RIGHT] - || ! breakable_b ()) - return; - Drul_array new_copies; Direction i=LEFT; do { Score_element * dolly = clone(); Item * item_p = dynamic_cast(dolly); - item_p->unbroken_original_l_ = this; - item_p->break_status_dir_ = i; pscore_l_->typeset_element (item_p); new_copies[i] =item_p; } @@ -86,115 +66,95 @@ Item::copy_breakable_items() broken_to_drul_[i]->try_visibility_lambda(); } while (flip(&i) != LEFT); - try_visibility_lambda (); } void Item::try_visibility_lambda () { - if (visibility_lambda_) + SCM vis = remove_elt_property ("visibility-lambda"); + if (gh_procedure_p (vis)) { - SCM args = scm_listify (gh_int2scm (break_status_dir_), SCM_UNDEFINED); - SCM result = gh_apply (visibility_lambda_, args); - int trans = gh_scm2bool (gh_car (result)); - int empty = gh_scm2bool (gh_cdr (result)); + SCM args = scm_listify (gh_int2scm (break_status_dir ()), SCM_UNDEFINED); + SCM result = gh_apply (vis, args); + bool trans = gh_scm2bool (gh_car (result)); + bool empty = gh_scm2bool (gh_cdr (result)); if (empty) - set_empty (true); + { + set_empty (X_AXIS); + set_empty ( Y_AXIS); + } if (trans) - transparent_b_ = true; + set_elt_property ("transparent", SCM_BOOL_T); } } +bool +Item::broken_b () const +{ + return broken_to_drul_[LEFT] || broken_to_drul_[RIGHT]; +} + void Item::do_break () { - copy_breakable_items(); - handle_prebroken_dependencies(); + if (broken_b ()) + return; + + if (breakable_b ()) + { + copy_breakable_items(); + handle_prebroken_dependencies(); - /* + /* Otherwise the broken items won't be pre_process()'ed. */ - add_dependency (broken_to_drul_[LEFT]); - add_dependency (broken_to_drul_[RIGHT]); + + if (broken_to_drul_[LEFT]) + { + add_dependency (broken_to_drul_[LEFT]); + add_dependency (broken_to_drul_[RIGHT]); + } + } + try_visibility_lambda (); // ugh. } void Item::do_breakable_col_processing() { - if (breakable_b ()) - do_break (); - + do_break (); } -Item* -Item::find_prebroken_piece (Line_of_score*l) const + +Score_element* +Item::find_broken_piece (Line_of_score*l) const { if (line_l() == l) return (Item*)(this); - else if (broken_to_drul_[LEFT] && broken_to_drul_[LEFT]->line_l() == l) - return broken_to_drul_[LEFT]; - else if (broken_to_drul_[RIGHT] && broken_to_drul_[RIGHT]->line_l() == l) - return broken_to_drul_[RIGHT]; + + Direction d = LEFT; + do { + Score_element *s = find_broken_piece (d); + if (s && s->line_l () == l) + return s; + } + while (flip (&d) != LEFT); return 0; } Item* -Item::find_prebroken_piece (Direction d) const +Item::find_broken_piece (Direction d) const { + Item * me = (Item *) (this); if (!d) - return (Item *) (this); // ugh - else - return dynamic_cast (broken_to_drul_[d]); -} - -void -Item::handle_prebroken_dependencies() -{ - if (breakable_b_) - Score_element::handle_prebroken_dependencies(); -} - -int -Item::left_right_compare(Item const *l, Item const *r) -{ - Paper_column *p1 = l->column_l (); - Paper_column* p2 = r->column_l (); - return p1->rank_i () - p2->rank_i (); -} - - -bool -Item::linked_b() const -{ - return Score_element::linked_b() || attached_span_l_arr_.size(); -} - -void -Item::do_junk_links() -{ - attached_span_l_arr_.set_size(0); -} - -void -Item::do_unlink() -{ - Link_array attached=attached_span_l_arr_; - for (int i=0; i < attached.size (); i++) + return me; + else if (breakable_b ()) { - Spanner *s= attached[i]; - - Direction d= LEFT; - do { - if (s->spanned_drul_[d] == this) - s->set_bounds (d, 0); - if (unbroken_original_l_ - && unbroken_original_l_-> broken_to_drul_[d] == this) - unbroken_original_l_->broken_to_drul_[d] = 0; - } while (flip (&d) != LEFT); + me->do_break (); + return dynamic_cast (broken_to_drul_[d]); } - assert (!attached_span_l_arr_.size ()); - unbroken_original_l_ =0; + else + return 0; } Paper_column * @@ -206,33 +166,20 @@ Item::column_l () const Item::Item (Item const &s) : Score_element (s) { - unbroken_original_l_ = 0; - /* do not copy attached_span_l_arr_ */ - breakable_b_ = s.breakable_b_; - visibility_lambda_ = s.visibility_lambda_; broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0; - break_status_dir_ = s.break_status_dir_; - break_priority_i_ = s.break_priority_i_; } - -void -Item::handle_prebroken_dependents () +Direction +Item::break_status_dir () const { - Item * parent = dynamic_cast (parent_l( X_AXIS)); - if (breakable_b () && parent) + if (original_l_) { - if(!(broken_to_drul_[LEFT] || broken_to_drul_[RIGHT])) - do_break (); + Item * i = dynamic_cast (original_l_); - Direction d = LEFT; - do - { - broken_to_drul_[d]->dim_cache_[X_AXIS].parent_l_ = - &parent->broken_to_drul_[d]->dim_cache_[X_AXIS]; - parent->broken_to_drul_[d]->add_dependency (broken_to_drul_[d]); - } - while ((flip (&d))!=LEFT); + return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT; } + else + return CENTER; } +