X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-interface.cc;h=7c1d1ff2199b0b3ad2469830ae35f7b265d76a8b;hb=7de4eefd86a8413d032e64ebd6304bfb9aa2645d;hp=a7b0e718c1c1e0927a7e5cc6fb53031b1b819bf4;hpb=ba858880848d6aca1de4401d185860eb2017a01c;p=lilypond.git diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index a7b0e718c1..7c1d1ff219 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -3,32 +3,29 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ - #include -#include // isinf + +#include "break-align-interface.hh" +#include "libc-extension.hh" // isinf #include "self-alignment-interface.hh" #include "side-position-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 "output-def.hh" #include "paper-column.hh" -#include "group-interface.hh" #include "align-interface.hh" -MAKE_SCHEME_CALLBACK (Break_align_interface,alignment_callback,2); - +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) ly_scm2int (axis); + Axis a = (Axis) scm_to_int (axis); assert (a == X_AXIS); Grob *par = me->get_parent (a); @@ -37,19 +34,19 @@ Break_align_interface::alignment_callback (SCM element_smob, SCM axis) par->set_property ("positioning-done", SCM_BOOL_T); Break_align_interface::do_alignment (par); } - + return scm_make_real (0); } -MAKE_SCHEME_CALLBACK (Break_align_interface,self_align_callback,2); +MAKE_SCHEME_CALLBACK (Break_align_interface, self_align_callback, 2); SCM Break_align_interface::self_align_callback (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) ly_scm2int (axis); - assert (a == X_AXIS); - - Item* item = dynamic_cast (me); + (void) axis; + assert (scm_to_int (axis) == X_AXIS); + + Item *item = dynamic_cast (me); Direction bsd = item->break_status_dir (); if (bsd == LEFT) { @@ -58,47 +55,44 @@ 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 (element_smob, axis); } - /* 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. - */ +*/ Link_array Break_align_interface::ordered_elements (Grob *grob) { - Item *me = dynamic_cast (grob); + Item *me = dynamic_cast (grob); SCM elts = me->get_property ("elements"); SCM order_vec = me->get_property ("break-align-orders"); - if (!is_vector (order_vec) - || ly_vector_length (order_vec) < 3) - return Pointer_group_interface__extract_grobs (me, (Grob*)0, - "elements"); + if (!scm_is_vector (order_vec) + || scm_c_vector_length (order_vec) < 3) + return extract_grob_array (me, ly_symbol2scm ("elements")); SCM order = scm_vector_ref (order_vec, - scm_int2num (me->break_status_dir() + 1)); - + scm_int2num (me->break_status_dir () + 1)); /* Copy in order specified in BREAK-ALIGN-ORDER. */ Link_array new_elts; - for (; ly_c_pair_p (order); order = ly_cdr (order)) + for (; scm_is_pair (order); order = scm_cdr (order)) { - SCM sym = ly_car (order); - - for (SCM s =elts; ly_c_pair_p (s); s = ly_cdr (s)) + SCM sym = scm_car (order); + + for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s)) { - Grob *g = unsmob_grob (ly_car (s)); + Grob *g = unsmob_grob (scm_car (s)); if (g && sym == g->get_property ("break-align-symbol")) { new_elts.push (g); - elts = scm_delq (g->self_scm (), elts); + elts = scm_delq (g->self_scm (), elts); } } } @@ -106,7 +100,7 @@ Break_align_interface::ordered_elements (Grob *grob) } 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); } @@ -114,40 +108,38 @@ Break_align_interface::add_element (Grob*me, Grob *toadd) void Break_align_interface::do_alignment (Grob *grob) { - Item * me = dynamic_cast (grob); + Item *me = dynamic_cast (grob); - Link_array elems = ordered_elements (me); Array extents; - int last_nonempty = -1; - for (int i=0; i < elems.size (); i++) + int last_nonempty = -1; + for (int i = 0; i < elems.size (); i++) { Interval y = elems[i]->extent (elems[i], X_AXIS); extents.push (y); if (!y.is_empty ()) - last_nonempty = i; + last_nonempty = i; } - int idx = 0; - while (idx < extents.size () && extents[idx].is_empty ()) + int 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 ++) + for (int i = 0; i < offsets.size ();i++) offsets[i] = 0.0; - Real extra_right_space = 0.0; int edge_idx = -1; while (idx < elems.size ()) { - int next_idx = idx+1; - while (next_idx < elems.size () && - extents[next_idx].is_empty () ) + int next_idx = idx + 1; + while (next_idx < elems.size () + && extents[next_idx].is_empty ()) next_idx++; - + Grob *l = elems[idx]; Grob *r = 0; @@ -156,27 +148,26 @@ Break_align_interface::do_alignment (Grob *grob) SCM alist = SCM_EOL; - /* Find the first grob with a space-alist entry. - */ + */ for (SCM s = l->get_property ("elements"); - ly_c_pair_p (s) ; s = ly_cdr (s)) - { - Grob *elt = unsmob_grob (ly_car (s)); - - if (edge_idx < 0 - && elt->get_property ("break-align-symbol") - == ly_symbol2scm ( "left-edge")) - edge_idx = idx; - - SCM l =elt->get_property ("space-alist"); - if (ly_c_pair_p (l)) - { - alist= l; - break; - } - } + scm_is_pair (s); s = scm_cdr (s)) + { + Grob *elt = unsmob_grob (scm_car (s)); + + if (edge_idx < 0 + && 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"); @@ -186,45 +177,45 @@ Break_align_interface::do_alignment (Grob *grob) reason. */ for (SCM s = r ? r->get_property ("elements") : SCM_EOL; - !is_symbol (rsym) && ly_c_pair_p (s); s = ly_cdr (s)) + !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s)) { - Grob * elt =unsmob_grob (ly_car (s)); + Grob *elt = unsmob_grob (scm_car (s)); 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 (is_symbol (rsym)) + if (scm_is_symbol (rsym)) entry = scm_assq (rsym, alist); - bool entry_found = ly_c_pair_p (entry); + bool entry_found = scm_is_pair (entry); if (!entry_found) { String sym_string; - if (is_symbol (rsym)) + 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.to_str0 (), + sym_string.to_str0 ())); } Real distance = 1.0; SCM type = ly_symbol2scm ("extra-space"); - + if (entry_found) { - entry = ly_cdr (entry); - - distance = ly_scm2double (ly_cdr (entry)); - type = ly_car (entry) ; + entry = scm_cdr (entry); + + distance = scm_to_double (scm_cdr (entry)); + type = scm_car (entry); } if (r) @@ -238,41 +229,42 @@ Break_align_interface::do_alignment (Grob *grob) } else { - extra_right_space = distance; + extra_right_space = 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 (int 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 ; + if (me->break_status_dir () == LEFT) { - alignment_off = - total_extent[RIGHT] - extra_right_space; + alignment_off = -total_extent[RIGHT] - extra_right_space; } else if (edge_idx < 0) alignment_off = -total_extent[LEFT]; here = alignment_off; - for (int i =0 ; i < offsets.size (); i++) + for (int i = 0; i < offsets.size (); i++) { here += offsets[i]; elems[i]->translate_axis (here, X_AXIS); } } - ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface", "Items that are aligned in prefatory matter.\n" "\n" @@ -283,7 +275,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" @@ -302,5 +294,3 @@ ADD_INTERFACE (Break_align_interface, "break-alignment-interface", "The object that performs break aligment. See @ref{break-aligned-interface}.", "positioning-done break-align-orders"); - -