X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-interface.cc;h=f78ea4ef480dd0ce8e0941add866e135a6fdbd09;hb=730c54a571ab3b6c30e02be5f93c876abee0f9a7;hp=91cf8a87455664e3a229fa8d93b5df166678e64b;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index 91cf8a8745..f78ea4ef48 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -3,137 +3,171 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include -#include // isinf +#include "break-align-interface.hh" -#include "self-alignment-interface.hh" -#include "side-position-interface.hh" +#include "align-interface.hh" #include "axis-group-interface.hh" -#include "warn.hh" -#include "lily-guile.hh" -#include "break-align-interface.hh" #include "dimensions.hh" -#include "paper-def.hh" +#include "international.hh" +#include "output-def.hh" #include "paper-column.hh" -#include "group-interface.hh" -#include "align-interface.hh" +#include "pointer-group-interface.hh" +#include "self-alignment-interface.hh" +#include "side-position-interface.hh" +#include "warn.hh" -MAKE_SCHEME_CALLBACK (Break_align_interface,alignment_callback,2); +MAKE_SCHEME_CALLBACK (Break_align_interface, self_align_callback, 1); SCM -Break_align_interface::alignment_callback (SCM element_smob, SCM axis) +Break_align_interface::self_align_callback (SCM smob) { - Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) gh_scm2int (axis); + Grob *me = unsmob_grob (smob); - assert (a == X_AXIS); - Grob *par = me->get_parent (a); - if (par && !to_boolean (par->get_grob_property ("positioning-done"))) - { - par->set_grob_property ("positioning-done", SCM_BOOL_T); - Break_align_interface::do_alignment (par); - } - - return gh_double2scm (0); + Item *item = dynamic_cast (me); + Direction bsd = item->break_status_dir (); + if (bsd == LEFT) + me->set_property ("self-alignment-X", scm_from_int (RIGHT)); + + /* + Force break alignment itself to be done first, in the case + */ + return Self_alignment_interface::aligned_on_self (me, X_AXIS); } -MAKE_SCHEME_CALLBACK (Break_align_interface,self_align_callback,2); +/* + This is tricky: we cannot modify 'elements, since callers are + iterating the same list. Reordering the list in-place, or resetting + 'elements will skip elements in the loops of callers. + + So we return the correct order as an array. +*/ SCM -Break_align_interface::self_align_callback (SCM element_smob, SCM axis) +Break_align_interface::break_align_order (Item *me) { - Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) gh_scm2int (axis); - assert (a == X_AXIS); + SCM order_vec = me->get_property ("break-align-orders"); + if (!scm_is_vector (order_vec) + || scm_c_vector_length (order_vec) < 3) + return SCM_BOOL_F; + + SCM order = scm_vector_ref (order_vec, + scm_from_int (me->break_status_dir () + 1)); + + + return order; +} + - Item* item = dynamic_cast (me); - Direction bsd = item->break_status_dir (); - if (bsd == LEFT) +vector +Break_align_interface::ordered_elements (Grob *grob) +{ + Item *me = dynamic_cast (grob); + extract_grob_set (me, "elements", elts); + + + SCM order = break_align_order (me); + + if (order == SCM_BOOL_F) + return elts; + + vector writable_elts (elts); + /* + Copy in order specified in BREAK-ALIGN-ORDER. + */ + vector new_elts; + for (; scm_is_pair (order); order = scm_cdr (order)) { - me->set_grob_property ("self-alignment-X", scm_int2num (RIGHT)); + SCM sym = scm_car (order); + + for (vsize i = writable_elts.size (); i--;) + { + Grob *g = writable_elts[i]; + if (g && sym == g->get_property ("break-align-symbol")) + { + new_elts.push_back (g); + writable_elts.erase (writable_elts.begin () + i); + } + } } - /* - Force break alignment itself to be done first, in the case - */ - return Self_alignment_interface::aligned_on_self (element_smob, axis); + return new_elts; } void -Break_align_interface::add_element (Grob*me, Grob *toadd) +Break_align_interface::add_element (Grob *me, Grob *toadd) { - Axis_group_interface::add_element (me, toadd); + Align_interface::add_element (me, toadd); } -void -Break_align_interface::do_alignment (Grob *me) +MAKE_SCHEME_CALLBACK(Break_align_interface, calc_positioning_done, 1) +SCM +Break_align_interface::calc_positioning_done (SCM smob) { - Item * item = dynamic_cast (me); - Link_array elems - = Pointer_group_interface__extract_grobs (me, (Grob*)0, - "elements"); - Array extents; - - int last_nonempty = -1; - for (int i=0; i < elems.size (); i++) + Grob *grob = unsmob_grob (smob); + Item *me = dynamic_cast (grob); + + vector elems = ordered_elements (me); + vector extents; + + int last_nonempty = -1; + for (vsize i = 0; i < elems.size (); i++) { Interval y = elems[i]->extent (elems[i], X_AXIS); - extents.push (y); + extents.push_back (y); if (!y.is_empty ()) - last_nonempty = i; + last_nonempty = i; } - int idx = 0; - while (idx < extents.size () && extents[idx].is_empty ()) + vsize idx = 0; + while (idx < extents.size () && extents[idx].is_empty ()) idx++; - - Array offsets; - offsets.set_size (elems.size()); - for (int i= 0; i < offsets.size();i ++) - offsets[i] = 0.0; + vector offsets; + offsets.resize (elems.size ()); + for (vsize i = 0; i < offsets.size ();i++) + offsets[i] = 0.0; Real extra_right_space = 0.0; - int edge_idx = -1; - while (idx < elems.size()) + vsize edge_idx = VPOS; + while (idx < elems.size ()) { - int next_idx = idx+1; - while (next_idx < elems.size() && - extents[next_idx].is_empty () ) + vsize next_idx = idx + 1; + while (next_idx < elems.size () + && extents[next_idx].is_empty ()) next_idx++; - + Grob *l = elems[idx]; Grob *r = 0; - if (next_idx < elems.size()) + if (next_idx < elems.size ()) r = elems[next_idx]; SCM alist = SCM_EOL; - /* Find the first grob with a space-alist entry. - */ - for (SCM s= l->get_grob_property ("elements"); - gh_pair_p (s) ; s = gh_cdr (s)) - { - Grob *elt = unsmob_grob (gh_car (s)); - - if (edge_idx < 0 - && elt->get_grob_property ("break-align-symbol") - == ly_symbol2scm( "left-edge")) - edge_idx = idx; - - SCM l =elt->get_grob_property ("space-alist"); - if (gh_pair_p(l)) - { - alist= l; - break; - } - } + */ + extract_grob_set (l, "elements", elts); + + for (vsize i = elts.size (); i--;) + { + Grob *elt = elts[i]; + + if (edge_idx == VPOS + && (elt->get_property ("break-align-symbol") + == ly_symbol2scm ("left-edge"))) + edge_idx = idx; + + SCM l = elt->get_property ("space-alist"); + if (scm_is_pair (l)) + { + alist = l; + break; + } + } SCM rsym = r ? SCM_EOL : ly_symbol2scm ("right-edge"); @@ -142,46 +176,49 @@ Break_align_interface::do_alignment (Grob *me) table, but that gets icky when that grob is suicided for some reason. */ - for (SCM s = r ? r->get_grob_property ("elements") : SCM_EOL; - !gh_symbol_p (rsym) && gh_pair_p (s); s = gh_cdr (s)) + if (r) { - Grob * elt =unsmob_grob(gh_car (s)); - - rsym = elt->get_grob_property ("break-align-symbol"); + extract_grob_set (r, "elements", elts); + for (vsize i = elts.size (); + !scm_is_symbol (rsym) && i--;) + { + Grob *elt = elts[i]; + rsym = elt->get_property ("break-align-symbol"); + } } - - if (rsym == ly_symbol2scm("left-edge")) + + if (rsym == ly_symbol2scm ("left-edge")) edge_idx = next_idx; SCM entry = SCM_EOL; - if (gh_symbol_p (rsym)) + if (scm_is_symbol (rsym)) entry = scm_assq (rsym, alist); - bool entry_found = gh_pair_p (entry); + bool entry_found = scm_is_pair (entry); if (!entry_found) { - String sym_string; - if(gh_symbol_p (rsym)) + string sym_string; + if (scm_is_symbol (rsym)) sym_string = ly_symbol2string (rsym); - String orig_string ; - if (unsmob_grob (l->get_grob_property ("cause"))) - orig_string = unsmob_grob (l->get_grob_property ("cause"))->name (); - - programming_error (_f("No spacing entry from %s to `%s'", - orig_string.to_str0 (), - sym_string.to_str0 ())); + string orig_string; + if (unsmob_grob (l->get_property ("cause"))) + orig_string = unsmob_grob (l->get_property ("cause"))->name (); + + programming_error (_f ("No spacing entry from %s to `%s'", + orig_string.c_str (), + sym_string.c_str ())); } Real distance = 1.0; SCM type = ly_symbol2scm ("extra-space"); - + if (entry_found) { - entry = gh_cdr (entry); - - distance = gh_scm2double (gh_cdr (entry)); - type = gh_car (entry) ; + entry = scm_cdr (entry); + + distance = scm_to_double (scm_cdr (entry)); + type = scm_car (entry); } if (r) @@ -190,45 +227,48 @@ Break_align_interface::do_alignment (Grob *me) offsets[next_idx] = extents[idx][RIGHT] + distance - extents[next_idx][LEFT]; /* should probably junk minimum-space */ - else if (type == ly_symbol2scm("minimum-space")) - offsets[next_idx] = extents[idx][RIGHT] >? distance; + else if (type == ly_symbol2scm ("minimum-space")) + offsets[next_idx] = max (extents[idx][RIGHT], distance); } else { - extra_right_space = distance; + extra_right_space = distance; + if (idx < offsets.size() - 1) + offsets[idx+1] = extents[idx][RIGHT] + distance; } - + idx = next_idx; } Real here = 0.0; Interval total_extent; - Real alignment_off =0.0; - for (int i =0 ; i < offsets.size(); i++) + Real alignment_off = 0.0; + for (vsize i = 0; i < offsets.size (); i++) { here += offsets[i]; if (i == edge_idx) - alignment_off = -here; + alignment_off = -here; total_extent.unite (extents[i] + here); } + if (total_extent.is_empty ()) + return SCM_BOOL_T; - if (item->break_status_dir () == LEFT) - { - alignment_off = - total_extent[RIGHT] - extra_right_space; - } - else if (edge_idx < 0) + if (me->break_status_dir () == LEFT) + alignment_off = -total_extent[RIGHT] - extra_right_space; + else if (edge_idx == VPOS) alignment_off = -total_extent[LEFT]; here = alignment_off; - for (int i =0 ; i < offsets.size(); i++) + for (vsize i = 0; i < offsets.size (); i++) { here += offsets[i]; elems[i]->translate_axis (here, X_AXIS); } -} + return SCM_BOOL_T; +} ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface", "Items that are aligned in prefatory matter.\n" @@ -240,7 +280,7 @@ ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface", "@item (minimum-space . @var{spc}))\n" " Pad space until the distance is @var{spc}\n" "@item (fixed-space . @var{spc})\n" - " Set a fixed space\n" + " Set a fixed space\n" "@item (semi-fixed-space . @var{spc})\n" " Set a space. Half of it is fixed and half is stretchable. \n" "(does not work at start of line. fixme)\n" @@ -253,11 +293,68 @@ ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface", "\n" "Rules for this spacing are much more complicated than this. \n" "See [Wanske] page 126 -- 134, [Ross] pg 143 -- 147\n", - "break-align-symbol space-alist"); + + /* properties */ + "break-align-symbol " + "space-alist " + ); ADD_INTERFACE (Break_align_interface, "break-alignment-interface", "The object that performs break aligment. See @ref{break-aligned-interface}.", - "positioning-done"); + /* properties */ + "positioning-done " + "break-align-orders"); + + +MAKE_SCHEME_CALLBACK(Break_alignment_align_interface, self_align_callback, 1) +SCM +Break_alignment_align_interface::self_align_callback (SCM grob) +{ + Grob *me = unsmob_grob (grob); + Item *alignment = dynamic_cast (me->get_parent (X_AXIS)); + if (!Break_align_interface::has_interface (alignment)) + return scm_from_int (0); + + SCM my_align = me->get_property ("break-align-symbol"); + SCM order = Break_align_interface::break_align_order (alignment); + + vector elements = Break_align_interface::ordered_elements (alignment); + if (elements.size () == 0) + return scm_from_int (0); + + int last_idx_found = -1; + vsize i = 0; + for (SCM s = order; scm_is_pair (s); s = scm_cdr (s)) + { + if (i < elements.size () + && elements[i]->get_property ("break-align-symbol") == scm_car (s)) + { + last_idx_found = i; + i ++; + } + + if (scm_car (s) == my_align) + break ; + } + + Direction which_edge = LEFT; + if (vsize (last_idx_found + 1) < elements.size()) + last_idx_found ++; + else + which_edge = RIGHT; + + Grob *common = me->common_refpoint (elements[last_idx_found], X_AXIS); + + return scm_from_double (robust_relative_extent (elements[last_idx_found], common, X_AXIS)[which_edge] + - me->relative_coordinate (common, X_AXIS)); +} + +ADD_INTERFACE (Break_alignment_align_interface, "break-alignment-align-interface", + "Object that is aligned on a break aligment. ", + + /* properties */ + "break-align-symbol " + )