X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-interface.cc;h=f78ea4ef480dd0ce8e0941add866e135a6fdbd09;hb=6f664e0e318a1651f6fe9317a842bf9c7f476f08;hp=970be7cbe8f3a33820135e2ea909d1f2ad14ee63;hpb=eb72c0f066957c3e71d336db0f72814e34d3964d;p=lilypond.git diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index 970be7cbe8..f78ea4ef48 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -3,47 +3,29 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "break-align-interface.hh" -#include "pointer-group-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 "dimensions.hh" +#include "international.hh" #include "output-def.hh" #include "paper-column.hh" -#include "align-interface.hh" - -MAKE_SCHEME_CALLBACK (Break_align_interface, alignment_callback, 2); -SCM -Break_align_interface::alignment_callback (SCM element_smob, SCM axis) -{ - Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - - assert (a == X_AXIS); - Grob *par = me->get_parent (a); - if (par && !to_boolean (par->get_property ("positioning-done"))) - { - par->set_property ("positioning-done", SCM_BOOL_T); - Break_align_interface::do_alignment (par); - } +#include "pointer-group-interface.hh" +#include "self-alignment-interface.hh" +#include "side-position-interface.hh" +#include "warn.hh" - return scm_from_double (0); -} -MAKE_SCHEME_CALLBACK (Break_align_interface, self_align_callback, 2); +MAKE_SCHEME_CALLBACK (Break_align_interface, self_align_callback, 1); SCM -Break_align_interface::self_align_callback (SCM element_smob, SCM axis) +Break_align_interface::self_align_callback (SCM smob) { - Grob *me = unsmob_grob (element_smob); - (void) axis; - assert (scm_to_int (axis) == X_AXIS); + Grob *me = unsmob_grob (smob); Item *item = dynamic_cast (me); Direction bsd = item->break_status_dir (); @@ -53,7 +35,7 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis) /* Force break alignment itself to be done first, in the case */ - return Self_alignment_interface::aligned_on_self (element_smob, axis); + return Self_alignment_interface::aligned_on_self (me, X_AXIS); } /* @@ -63,36 +45,50 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis) So we return the correct order as an array. */ -Link_array -Break_align_interface::ordered_elements (Grob *grob) +SCM +Break_align_interface::break_align_order (Item *me) { - Item *me = dynamic_cast (grob); - extract_grob_set (me, "elements", elts); - SCM order_vec = me->get_property ("break-align-orders"); if (!scm_is_vector (order_vec) || scm_c_vector_length (order_vec) < 3) - return elts; + return SCM_BOOL_F; - Link_array writable_elts (elts); SCM order = scm_vector_ref (order_vec, scm_from_int (me->break_status_dir () + 1)); - /* + + return order; +} + + +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. */ - Link_array new_elts; + vector new_elts; for (; scm_is_pair (order); order = scm_cdr (order)) { SCM sym = scm_car (order); - for (int i = writable_elts.size (); i--;) + for (vsize i = writable_elts.size (); i--;) { Grob *g = writable_elts[i]; if (g && sym == g->get_property ("break-align-symbol")) { - new_elts.push (g); - writable_elts.del (i); + new_elts.push_back (g); + writable_elts.erase (writable_elts.begin () + i); } } } @@ -103,40 +99,42 @@ Break_align_interface::ordered_elements (Grob *grob) void 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 *grob) +MAKE_SCHEME_CALLBACK(Break_align_interface, calc_positioning_done, 1) +SCM +Break_align_interface::calc_positioning_done (SCM smob) { + Grob *grob = unsmob_grob (smob); Item *me = dynamic_cast (grob); - Link_array elems = ordered_elements (me); - Array extents; + vector elems = ordered_elements (me); + vector extents; int last_nonempty = -1; - for (int i = 0; i < elems.size (); i++) + 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; } - int idx = 0; + 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++) + 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; + vsize edge_idx = VPOS; while (idx < elems.size ()) { - int next_idx = idx + 1; + vsize next_idx = idx + 1; while (next_idx < elems.size () && extents[next_idx].is_empty ()) next_idx++; @@ -154,13 +152,13 @@ Break_align_interface::do_alignment (Grob *grob) */ extract_grob_set (l, "elements", elts); - for (int i = elts.size (); i--;) + for (vsize i = elts.size (); i--;) { Grob *elt = elts[i]; - if (edge_idx < 0 - && elt->get_property ("break-align-symbol") - == ly_symbol2scm ("left-edge")) + if (edge_idx == VPOS + && (elt->get_property ("break-align-symbol") + == ly_symbol2scm ("left-edge"))) edge_idx = idx; SCM l = elt->get_property ("space-alist"); @@ -181,7 +179,7 @@ Break_align_interface::do_alignment (Grob *grob) if (r) { extract_grob_set (r, "elements", elts); - for (int i = elts.size (); + for (vsize i = elts.size (); !scm_is_symbol (rsym) && i--;) { Grob *elt = elts[i]; @@ -199,17 +197,17 @@ Break_align_interface::do_alignment (Grob *grob) bool entry_found = scm_is_pair (entry); if (!entry_found) { - String sym_string; + string sym_string; if (scm_is_symbol (rsym)) sym_string = ly_symbol2string (rsym); - String orig_string; + 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.to_str0 (), - sym_string.to_str0 ())); + orig_string.c_str (), + sym_string.c_str ())); } Real distance = 1.0; @@ -233,7 +231,11 @@ Break_align_interface::do_alignment (Grob *grob) 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; } @@ -242,7 +244,7 @@ Break_align_interface::do_alignment (Grob *grob) Interval total_extent; Real alignment_off = 0.0; - for (int i = 0; i < offsets.size (); i++) + for (vsize i = 0; i < offsets.size (); i++) { here += offsets[i]; if (i == edge_idx) @@ -251,19 +253,21 @@ Break_align_interface::do_alignment (Grob *grob) } if (total_extent.is_empty ()) - return; + return SCM_BOOL_T; if (me->break_status_dir () == LEFT) alignment_off = -total_extent[RIGHT] - extra_right_space; - else if (edge_idx < 0) + 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", @@ -289,9 +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 break-align-orders"); + + /* 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 " + ) +