X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=381647b94554ea6ddb3e073536b7a8d607dac6a4;hb=b1e87575d7dbce73e74c7e6eb1b64dbfc82e65a4;hp=1c46854c5ce0d12eea616f4286f82abc4f102ccb;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 1c46854c5c..381647b945 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,28 +1,28 @@ -/* - separation-item.cc -- implement Separation_item - +/* + separation-item.cc -- implement Separation_item + source file of the GNU LilyPond music typesetter - - (c) 1998--2003 Han-Wen Nienhuys - - */ + + (c) 1998--2005 Han-Wen Nienhuys +*/ #include "separation-item.hh" + #include "paper-column.hh" #include "warn.hh" #include "group-interface.hh" #include "accidental-placement.hh" void -Separation_item::add_item (Grob*s,Item* i) +Separation_item::add_item (Grob *s, Item *i) { assert (i); - Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"),i); + Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"), i); s->add_dependency (i); } void -Separation_item::add_conditional_item (Grob* me , Grob *e) +Separation_item::add_conditional_item (Grob *me, Grob *e) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e); } @@ -30,31 +30,30 @@ Separation_item::add_conditional_item (Grob* me , Grob *e) /* Return the width of ME given that we are considering the object on the LEFT. - */ +*/ Interval -Separation_item::conditional_width (Grob * me, Grob * left) +Separation_item::conditional_width (Grob *me, Grob *left) { Interval w = width (me); - - Item *item = dynamic_cast (me); - Paper_column * pc = item->get_column (); - - - for (SCM s = me->get_grob_property ("conditional-elements"); gh_pair_p (s); s = ly_cdr (s)) + + Item *item = dynamic_cast (me); + Paper_column *pc = item->get_column (); + + for (SCM s = me->get_property ("conditional-elements"); scm_is_pair (s); s = scm_cdr (s)) { - SCM elt = ly_car (s); + SCM elt = scm_car (s); if (!unsmob_grob (elt)) continue; - + Item *il = unsmob_item (elt); if (pc != il->get_column ()) { /* this shouldn't happen, but let's continue anyway. */ - programming_error (_ ("Separation_item: I've been drinking too much")); - continue; /*UGH UGH*/ + programming_error ("Separation_item: I've been drinking too much"); + continue; /*UGH UGH*/ } - if (to_boolean (il->get_grob_property ("no-spacing-rods"))) + if (to_boolean (il->get_property ("no-spacing-rods"))) { continue; } @@ -65,32 +64,28 @@ Separation_item::conditional_width (Grob * me, Grob * left) } } - SCM pad = me->get_grob_property ("padding"); + SCM pad = me->get_property ("padding"); - if (gh_number_p (pad)) - { - w[RIGHT] += gh_scm2double (pad)/2; - w[LEFT] -= gh_scm2double (pad)/2; - } + w.widen (robust_scm2double (pad, 0.0)); return w; } Interval Separation_item::width (Grob *me) { - SCM sw = me->get_grob_property ("X-extent"); - if (ly_number_pair_p (sw)) + SCM sw = me->get_property ("X-extent"); + if (is_number_pair (sw)) { return ly_scm2interval (sw); } - Item *item = dynamic_cast (me); - Paper_column * pc = item->get_column (); + Item *item = dynamic_cast (me); + Paper_column *pc = item->get_column (); Interval w; - - for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s)) + + for (SCM s = me->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s)) { - SCM elt = ly_car (s); + SCM elt = scm_car (s); if (!unsmob_grob (elt)) continue; @@ -98,47 +93,74 @@ Separation_item::width (Grob *me) if (pc != il->get_column ()) { /* this shouldn't happen, but let's continue anyway. */ - programming_error (_ ("Separation_item: I've been drinking too much")); - continue; /*UGH UGH*/ + programming_error ("Separation_item: I've been drinking too much"); + continue; /*UGH UGH*/ } - if (to_boolean (il->get_grob_property ("no-spacing-rods"))) + if (to_boolean (il->get_property ("no-spacing-rods"))) { continue; } Interval iv (il->extent (pc, X_AXIS)); - if (!iv.empty_b ()) + if (!iv.is_empty ()) { w.unite (iv); } } - SCM pad = me->get_grob_property ("padding"); + SCM pad = me->get_property ("padding"); - if (gh_number_p (pad)) - { - w[RIGHT] += gh_scm2double (pad)/2; - w[LEFT] -= gh_scm2double (pad)/2; - } + w.widen (robust_scm2double (pad, 0.0)); + me->set_property ("X-extent", ly_interval2scm (w)); - me->set_grob_property ("X-extent", ly_interval2scm (w)); - - return w; - // add this->offset_ ? this-> relative_coordinate ()? } +Interval +Separation_item::relative_width (Grob *me, Grob *common) +{ + Interval iv = width (me); + + return dynamic_cast (me)->get_column ()->relative_coordinate (common, X_AXIS) + iv; +} + +/* + Try to find the break-aligned symbol in SEPARATION_ITEM that is + sticking out at direction D. The x size is put in LAST_EXT +*/ +Grob * +Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d, + Interval *last_ext) +{ + Grob *col = dynamic_cast (separation_item)->get_column (); + last_ext->set_empty (); + Grob *last_grob = 0; + for (SCM s = separation_item->get_property ("elements"); + scm_is_pair (s); s = scm_cdr (s)) + { + Grob *break_item = unsmob_grob (scm_car (s)); + if (!scm_is_symbol (break_item->get_property ("break-align-symbol"))) + continue; + Interval ext = break_item->extent (col, X_AXIS); + if (ext.is_empty ()) + continue; + if (!last_grob + || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0)) + { + *last_ext = ext; + last_grob = break_item; + } + } -ADD_INTERFACE (Separation_item,"separation-item-interface", - "Item that computes widths to generate spacing rods. + return last_grob; +} -Calc dimensions for the Separating_group_spanner; this has to be -an item to get dependencies correct. It can't be an grob_group -since these usually are in a different X_group -", - "X-extent conditional-elements elements"); +ADD_INTERFACE (Separation_item, "separation-item-interface", + "Item that computes widths to generate spacing rods. " + "This is done in concert with @ref{separation-spanner-interface}.", + "padding X-extent conditional-elements elements");