X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=abae1689a6ad828a82430caa84b59435ad395cff;hb=22d7891f2b9ddbe39118ff24f26b3a6eb302178e;hp=5417dae3d4fe6c51e3580aade0061ad01e521009;hpb=fd7e615444cf58b38283a59b56d3457c07778397;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index 5417dae3d4..abae1689a6 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -3,91 +3,81 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ -#include "dimension-cache.hh" + #include "paper-score.hh" #include "debug.hh" #include "item.hh" #include "paper-column.hh" #include "spanner.hh" #include "lily-guile.hh" +#include "system.hh" +#include "group-interface.hh" -Item::Item () +Item::Item (SCM s) + : Grob (s) { broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0; + Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("item-interface")); + +} + +/** + Item copy ctor. Copy nothing: everything should be a elt property + or a special purpose pointer (such as broken_to_drul_[]) */ +Item::Item (Item const &s) + : Grob (s) +{ + broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0; } + bool -Item::breakable_b () const +Item::breakable_b (Grob*me) { - if (original_l_ ) + if (me->original_l_) return false; + + if (!dynamic_cast (me)) + programming_error ("only items can be breakable."); - Item * i =dynamic_cast (parent_l (X_AXIS)); - return (i) ? i->breakable_b () : get_elt_property( "breakable") != SCM_UNDEFINED; + Item * i =dynamic_cast (me->get_parent (X_AXIS)); + return (i) ? Item::breakable_b (i) : to_boolean (me->get_grob_property ("breakable")); } -Real -Item::hpos_f() const +Paper_column * +Item::column_l () const { - return relative_coordinate (0, X_AXIS); + Item *parent = dynamic_cast (get_parent (X_AXIS)); + return parent ? parent->column_l () : 0; } -Line_of_score * -Item::line_l() const +System * +Item::line_l () const { - Score_element *g = parent_l (X_AXIS); - if (!g) - return 0; - return dynamic_cast (g)-> line_l (); + Grob *g = get_parent (X_AXIS); + return g ? g->line_l () : 0; } void -Item::copy_breakable_items() +Item::copy_breakable_items () { Drul_array new_copies; Direction i=LEFT; do { - Score_element * dolly = clone(); - Item * item_p = dynamic_cast(dolly); - pscore_l_->typeset_element (item_p); + Grob * dolly = clone (); + Item * item_p = dynamic_cast (dolly); + pscore_l_->line_l_->typeset_grob (item_p); new_copies[i] =item_p; } - while (flip(&i) != LEFT); + while (flip (&i) != LEFT); broken_to_drul_= new_copies; - - do - { - broken_to_drul_[i]->handle_prebroken_dependencies(); - broken_to_drul_[i]->try_visibility_lambda(); - } - while (flip(&i) != LEFT); } -void -Item::try_visibility_lambda () -{ - SCM vis = remove_elt_property ("visibility-lambda"); - if (vis != SCM_UNDEFINED) - { - SCM args = scm_listify (gh_int2scm (break_status_dir ()), SCM_UNDEFINED); - SCM result = gh_apply (vis, args); - int trans = gh_scm2bool (gh_car (result)); - int empty = gh_scm2bool (gh_cdr (result)); - - if (empty) - { - set_empty (X_AXIS); - set_empty ( Y_AXIS); - } - if (trans) - set_elt_property ("transparent", SCM_BOOL_T); - } -} bool Item::broken_b () const @@ -95,45 +85,29 @@ Item::broken_b () const return broken_to_drul_[LEFT] || broken_to_drul_[RIGHT]; } + +/* + Generate items for begin and end-of line. + */ void -Item::do_break () +Item::discretionary_processing () { if (broken_b ()) return; - if (breakable_b ()) - { - copy_breakable_items(); - handle_prebroken_dependencies(); - - /* - Otherwise the broken items won't be pre_process()'ed. - */ - - 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() -{ - do_break (); + if (Item::breakable_b (this)) + copy_breakable_items (); } -Score_element* -Item::find_broken_piece (Line_of_score*l) const +Grob* +Item::find_broken_piece (System*l) const { - if (line_l() == l) - return (Item*)(this); + if (line_l () == l) + return (Item*) (this); Direction d = LEFT; do { - Score_element *s = find_broken_piece (d); + Grob *s = broken_to_drul_[d]; if (s && s->line_l () == l) return s; } @@ -142,46 +116,16 @@ Item::find_broken_piece (Line_of_score*l) const return 0; } + Item* -Item::find_broken_piece (Direction d) const +Item::find_prebroken_piece (Direction d) const { Item * me = (Item *) (this); if (!d) return me; - else - { - me->do_break (); - return dynamic_cast (broken_to_drul_[d]); - } -} - - - -bool -Item::broken_original_b () const -{ - return broken_to_drul_[LEFT] || broken_to_drul_[RIGHT]; + return dynamic_cast (broken_to_drul_[d]); } -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 (); -} - -Paper_column * -Item::column_l () const -{ - return dynamic_cast (parent_l (X_AXIS))->column_l (); -} - -Item::Item (Item const &s) - : Score_element (s) -{ - broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0; -} Direction Item::break_status_dir () const @@ -196,4 +140,65 @@ Item::break_status_dir () const return CENTER; } +void +Item::handle_prebroken_dependencies () +{ + if (original_l_) + { + mutable_property_alist_ + = handle_broken_grobs(original_l_->mutable_property_alist_, + gh_int2scm (break_status_dir ())); + } + + /* + Can't do this earlier, because try_visibility_lambda () might set + the elt property transparent, which would then be copied. + + TODO: + + handle visibility-lambda the item itself iso. breakstatusdir, so + the function can do more complicated things. + + */ + SCM vis = get_grob_property ("visibility-lambda"); + if (gh_procedure_p (vis)) + { + SCM args = scm_list_n (gh_int2scm (break_status_dir ()), SCM_UNDEFINED); + SCM result = gh_apply (vis, args); + bool trans = gh_scm2bool (ly_car (result)); + bool empty = gh_scm2bool (ly_cdr (result)); + + if (empty && trans) + suicide (); + else if (empty) + { + set_extent (SCM_EOL, X_AXIS); + set_extent (SCM_EOL, Y_AXIS); + } + else if (trans) + set_grob_property ("molecule-callback", SCM_EOL); + } +} + +SCM +Item::do_derived_mark () +{ + if (broken_to_drul_[LEFT]) + scm_gc_mark (broken_to_drul_[LEFT]->self_scm ()); + if (broken_to_drul_[RIGHT]) + scm_gc_mark (broken_to_drul_[RIGHT]->self_scm ()); + return SCM_EOL; +} + +Item* +unsmob_item (SCM s ) +{ + return dynamic_cast (unsmob_grob (s)); +} + + +ADD_INTERFACE(Item, + "item-interface", + "", + "no-spacing-rods visibility-lambda breakable")