source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include <math.h>
+#include <libc-extension.hh>
+#include "side-position-interface.hh"
+#include "warn.hh"
#include "dimension-cache.hh"
#include "lily-guile.hh"
#include "break-align-item.hh"
#include "paper-score.hh"
#include "paper-def.hh"
#include "paper-column.hh"
-
-/*
- Handle spacing for prefatory matter.
-
- TODO: rewrite this. It is kludgy
-*/
+#include "group-interface.hh"
+#include "align-interface.hh"
void
-Break_align_item::do_pre_processing()
+Break_align_item::before_line_breaking ()
{
if (break_status_dir() == LEFT)
- align_dir_ = LEFT;
+ {
+ set_elt_property ("self-alignment-X", gh_int2scm (RIGHT));
+ }
else
- align_dir_ = RIGHT;
+ {
+ add_offset_callback (Align_interface::center_on_element, X_AXIS);
+ }
- flip (&align_dir_);
+
Real interline= paper_l ()->get_var ("interline");
-
Link_array<Score_element> elems;
- Link_array<Score_element> all_elems (elem_l_arr ());
+ Link_array<Score_element> all_elems
+ = Pointer_group_interface__extract_elements (this, (Score_element*)0,
+ "elements");
for (int i=0; i < all_elems.size(); i++)
{
- Interval y = all_elems[i]->extent(axis ());
+ Interval y = all_elems[i]->extent(X_AXIS);
if (!y.empty_b())
elems.push (dynamic_cast<Score_element*> (all_elems[i]));
}
SCM symbol_list = SCM_EOL;
Array<Real> dists;
- SCM current_origin = ly_str02scm ("");
+ SCM current_origin = ly_symbol2scm ("none");
for (int i=0; i <= elems.size (); i++)
{
Score_element *next_elt = i < elems.size ()
if (next_elt)
{
- next_origin = next_elt->get_elt_property ("origin");
+ next_origin = next_elt->get_elt_property ("break-align-symbol");
next_origin =
(next_origin == SCM_UNDEFINED)
- ? ly_str02scm ("")
+ ? ly_symbol2scm ("none")
: next_origin;
}
else
- next_origin = ly_str02scm ("begin-of-note");
+ next_origin = ly_symbol2scm ("begin-of-note");
- SCM extra_space
- = scm_eval (scm_listify (ly_symbol2scm ("break-align-spacer"),
- current_origin, next_origin, SCM_UNDEFINED));
+ SCM e = scm_assoc (scm_listify (current_origin,
+ next_origin,
+ SCM_UNDEFINED),
+ scm_eval (ly_symbol2scm ("space-alist")));
+
+ SCM extra_space;
+ if (e != SCM_BOOL_F)
+ {
+ extra_space = gh_cdr (e);
+ }
+ else
+ {
+ warning (_f ("unknown spacing pair `%s', `%s'",
+ ly_symbol2string (current_origin),
+ ly_symbol2string (next_origin)));
+ extra_space = scm_listify (ly_symbol2scm ("minimum-space"), gh_double2scm (0.0), SCM_UNDEFINED);
+ }
+
SCM symbol = gh_car (extra_space);
- Real spc = gh_scm2double (SCM_CADR(extra_space));
+ Real spc = gh_scm2double (gh_cadr(extra_space));
spc *= interline;
dists.push(spc);
symbol_list = gh_cdr (scm_reverse (symbol_list));
for (int i=0; i <elems.size()-1; i++)
{
- String sym_str = ly_scm2string (gh_car (symbol_list));
+ String sym_str = ly_symbol2string (gh_car (symbol_list));
elems[i]->set_elt_property (sym_str,
scm_cons (gh_double2scm (0),
gh_double2scm (dists[i+1])));
// urg
SCM first_pair = elems[0]->get_elt_property ("minimum-space");
- if (first_pair == SCM_UNDEFINED)
- first_pair = gh_cons (gh_double2scm (0.0), gh_double2scm (0.0));
- else
+ if (gh_pair_p (first_pair))
first_pair = first_pair;
+ else
+ first_pair = gh_cons (gh_double2scm (0.0), gh_double2scm (0.0));
scm_set_car_x (first_pair, gh_double2scm (-dists[0]));
elems[0]->set_elt_property ("minimum-space", first_pair);
-
- Axis_align_item::do_pre_processing();
- Real pre_space = elems[0]->extent (X_AXIS)[LEFT]
- + elems[0]->relative_coordinate (column_l (), X_AXIS);
- Real spring_len = elems.top ()->extent (X_AXIS)[RIGHT]
- + elems.top ()->relative_coordinate (column_l (), X_AXIS);
+ /*
+ Force callbacks for alignment to be called
+ */
+ Real unused = elems[0]->relative_coordinate (this, X_AXIS);
+ Real pre_space = elems[0]->relative_coordinate (column_l (), X_AXIS);
+
+ Real xl = elems[0]->extent (X_AXIS)[LEFT];
+ if (!isinf (xl))
+ pre_space += xl;
+ else
+ programming_error ("Infinity reached. ");
+
+ Real xr = elems.top ()->extent (X_AXIS)[RIGHT];
+ Real spring_len = elems.top ()->relative_coordinate (column_l (), X_AXIS);
+ if (!isinf (xr))
+ spring_len += xr;
+ else
+ programming_error ("Infinity reached.");
Real stretch_distance =0.;
/*
Hint the spacing engine how much space to put in.
-
The pairs are in the format of an interval (ie. CAR < CDR).
*/
column_l ()->set_elt_property ("extra-space",
}
-Break_align_item::Break_align_item ()
+Break_align_item::Break_align_item (SCM s)
+ : Item (s)
{
- stacking_dir_ = RIGHT;
- set_axis (X_AXIS);
+ set_elt_property ("stacking-dir" , gh_int2scm (RIGHT));
+
+ Align_interface (this).set_interface ();
+ Align_interface (this).set_axis (X_AXIS);
+
+ add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
}
projects / lilypond.git / blobdiff