(c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
#include <math.h>
#include "break-align-interface.hh"
-#include "libc-extension.hh" // isinf
+#include "libc-extension.hh" // isinf
+#include "pointer-group-interface.hh"
#include "self-alignment-interface.hh"
#include "side-position-interface.hh"
#include "axis-group-interface.hh"
Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) scm_to_int (axis);
- assert (a == X_AXIS);
+ (void) axis;
+ assert (scm_to_int (axis) == X_AXIS);
- Item* item = dynamic_cast<Item*> (me);
+ Item *item = dynamic_cast<Item *> (me);
Direction bsd = item->break_status_dir ();
if (bsd == LEFT)
{
/*
Force break alignment itself to be done first, in the case
- */
+ */
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<Grob>
Break_align_interface::ordered_elements (Grob *grob)
{
- Item *me = dynamic_cast<Item*> (grob);
- SCM elts = me->get_property ("elements");
+ Item *me = dynamic_cast<Item *> (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 extract_grob_array (me, ly_symbol2scm ("elements"));
+ return elts;
+
+ Link_array<Grob> writable_elts (elts);
SCM order = scm_vector_ref (order_vec,
scm_int2num (me->break_status_dir () + 1));
-
/*
Copy in order specified in BREAK-ALIGN-ORDER.
*/
{
SCM sym = scm_car (order);
- for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
+ for (int i = writable_elts.size(); i --; )
{
- Grob *g = unsmob_grob (scm_car (s));
+ Grob *g = writable_elts[i];
if (g && sym == g->get_property ("break-align-symbol"))
{
new_elts.push (g);
- elts = scm_delq (g->self_scm (), elts);
+ writable_elts.del (i);
}
}
}
+
return new_elts;
}
void
Break_align_interface::do_alignment (Grob *grob)
{
- Item * me = dynamic_cast<Item*> (grob);
-
+ Item *me = dynamic_cast<Item *> (grob);
Link_array<Grob> elems = ordered_elements (me);
Array<Interval> extents;
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<Real> 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];
SCM alist = SCM_EOL;
-
/*
Find the first grob with a space-alist entry.
- */
- for (SCM s = l->get_property ("elements");
- 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;
- }
- }
+ */
+ extract_grob_set (l, "elements", elts);
+
+ for (int i = elts.size(); i--; )
+ {
+ Grob *elt = elts[i];
+
+ 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");
table, but that gets icky when that grob is suicided for some
reason.
*/
- for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
- !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
+ if (r)
{
- Grob * elt = unsmob_grob (scm_car (s));
-
- rsym = elt->get_property ("break-align-symbol");
+ extract_grob_set (r, "elements", elts);
+ for (int 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 (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;
entry = scm_cdr (entry);
distance = scm_to_double (scm_cdr (entry));
- type = scm_car (entry) ;
+ type = scm_car (entry);
}
if (r)
- extents[next_idx][LEFT];
/* should probably junk minimum-space */
else if (type == ly_symbol2scm ("minimum-space"))
- offsets[next_idx] = extents[idx][RIGHT] >? distance;
+ offsets[next_idx] = max (extents[idx][RIGHT], distance);
}
else
{
Interval total_extent;
Real alignment_off = 0.0;
- for (int i = 0 ; i < offsets.size (); i++)
+ for (int i = 0; i < offsets.size (); i++)
{
here += offsets[i];
if (i == edge_idx)
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"
"The object that performs break aligment. See @ref{break-aligned-interface}.",
"positioning-done break-align-orders");
-
-
projects / lilypond.git / blobdiff