X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fseparation-item.cc;h=b990ad61fbcf147aa81c9126b15ef98ee43ac2e8;hb=6e227b10eed0ebe522ca7512eb7d2cc1d9561e64;hp=0b8776eeadcc6a67055f2fd74e413e9d05f21a0c;hpb=b2a8b42e57aefbf1119ef2809950a35b81dc7d43;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 0b8776eead..b990ad61fb 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,28 +1,27 @@ -/* - 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 "pointer-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); - s->add_dependency (i); + Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"), 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 +29,27 @@ 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 (); + + extract_grob_set (me, "conditional-elements", elts); + for (int i = 0; i < elts.size (); i++) { - SCM elt = ly_car (s); - if (!unsmob_grob (elt)) - continue; - - Item *il = unsmob_item (elt); + Item *il = dynamic_cast (elts[i]); 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,79 +60,102 @@ 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)) - { - SCM elt = ly_car (s); - if (!unsmob_grob (elt)) - continue; - Item *il = unsmob_item (elt); + extract_grob_set (me, "elements", elts); + for (int i = 0; i < elts.size (); i++) + { + Item *il = dynamic_cast (elts[i]); 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 *me, + Direction d, + Interval *last_ext) +{ + Grob *col = dynamic_cast (me)->get_column (); + last_ext->set_empty (); + Grob *last_grob = 0; + + extract_grob_set (me, "elements", elts); + for (int i = elts.size (); i--; ) + { + Grob *break_item = elts[i]; + 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; + } + } + return last_grob; +} -ADD_INTERFACE (Separation_item,"separation-item-interface", - "Item that computes widths to generate spacing rods.\n" -"\n" -"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");