#include <math.h>
+
+#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);
Break_align_interface::alignment_callback (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) scm_to_int (axis);
assert (a == X_AXIS);
Grob *par = me->get_parent (a);
Break_align_interface::do_alignment (par);
}
- return gh_double2scm (0);
+ return scm_make_real (0);
}
MAKE_SCHEME_CALLBACK (Break_align_interface,self_align_callback,2);
Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) scm_to_int (axis);
assert (a == X_AXIS);
Item* item = dynamic_cast<Item*> (me);
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");
+ SCM order_vec = me->get_property ("break-align-orders");
+ if (!ly_c_vector_p (order_vec)
+ || ly_vector_length (order_vec) < 3)
+ return Pointer_group_interface__extract_grobs (me, (Grob*)0,
+ "elements");
+ SCM order = scm_vector_ref (order_vec,
+ scm_int2num (me->break_status_dir() + 1));
+
+
+ /*
+ Copy in order specified in BREAK-ALIGN-ORDER.
+ */
+ Link_array<Grob> new_elts;
+ for (; scm_is_pair (order); order = scm_cdr (order))
+ {
+ SCM sym = scm_car (order);
+
+ for (SCM s = elts; scm_is_pair (s); s = scm_cdr (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);
+ }
+ }
+ }
+ return new_elts;
+}
+
void
Break_align_interface::add_element (Grob*me, Grob *toadd)
{
}
void
-Break_align_interface::do_alignment (Grob *me)
+Break_align_interface::do_alignment (Grob *grob)
{
- Item * item = dynamic_cast<Item*> (me);
- Link_array<Grob> elems
- = Pointer_group_interface__extract_grobs (me, (Grob*)0,
- "elements");
+ Item * me = dynamic_cast<Item*> (grob);
+
+
+ Link_array<Grob> elems = ordered_elements (me);
Array<Interval> extents;
int last_nonempty = -1;
- for (int i=0; i < elems.size (); i++)
+ for (int i = 0; i < elems.size (); i++)
{
Interval y = elems[i]->extent (elems[i], X_AXIS);
extents.push (y);
idx++;
Array<Real> offsets;
- offsets.set_size (elems.size());
- for (int i= 0; i < offsets.size();i ++)
+ offsets.set_size (elems.size ());
+ 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())
+ while (idx < elems.size ())
{
int next_idx = idx+1;
- while (next_idx < elems.size() &&
+ 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_property ("elements");
- gh_pair_p (s) ; s = gh_cdr (s))
+ for (SCM s = l->get_property ("elements");
+ scm_is_pair (s) ; s = scm_cdr (s))
{
- Grob *elt = unsmob_grob (gh_car (s));
+ Grob *elt = unsmob_grob (scm_car (s));
if (edge_idx < 0
&& elt->get_property ("break-align-symbol")
- == ly_symbol2scm( "left-edge"))
+ == ly_symbol2scm ( "left-edge"))
edge_idx = idx;
- SCM l =elt->get_property ("space-alist");
- if (gh_pair_p(l))
+ SCM l = elt->get_property ("space-alist");
+ if (scm_is_pair (l))
{
- alist= l;
+ alist = l;
break;
}
}
reason.
*/
for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
- !gh_symbol_p (rsym) && gh_pair_p (s); s = gh_cdr (s))
+ !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
{
- Grob * elt =unsmob_grob(gh_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 (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))
+ if (scm_is_symbol (rsym))
sym_string = ly_symbol2string (rsym);
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'",
+ programming_error (_f ("No spacing entry from %s to `%s'",
orig_string.to_str0 (),
sym_string.to_str0 ()));
}
if (entry_found)
{
- entry = gh_cdr (entry);
+ entry = scm_cdr (entry);
- distance = gh_scm2double (gh_cdr (entry));
- type = gh_car (entry) ;
+ distance = scm_to_double (scm_cdr (entry));
+ type = scm_car (entry) ;
}
if (r)
offsets[next_idx] = extents[idx][RIGHT] + distance
- extents[next_idx][LEFT];
/* should probably junk minimum-space */
- else if (type == ly_symbol2scm("minimum-space"))
+ else if (type == ly_symbol2scm ("minimum-space"))
offsets[next_idx] = extents[idx][RIGHT] >? distance;
}
else
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)
}
- if (item->break_status_dir () == LEFT)
+ if (me->break_status_dir () == LEFT)
{
alignment_off = - total_extent[RIGHT] - extra_right_space;
}
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_align_interface, "break-alignment-interface",
"The object that performs break aligment. See @ref{break-aligned-interface}.",
- "positioning-done");
+ "positioning-done break-align-orders");
projects / lilypond.git / blobdiff