X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-item.cc;h=2c9e705117786d907d3eeac253729f83deb809e9;hb=fd1bf2a820fe005734e06e5424183823eed95cda;hp=c3f9b05ca5ba7ba28415bc5bc2d15b97c767bf82;hpb=4bbc3761de1012c805f55bc957cb9c7c35ef3ddc;p=lilypond.git diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index c3f9b05ca5..2c9e705117 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -3,43 +3,80 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ -#include "dimension-cache.hh" + +#include +#include + +#include "side-position-interface.hh" +#include "axis-group-interface.hh" +#include "warn.hh" #include "lily-guile.hh" #include "break-align-item.hh" #include "dimensions.hh" -#include "paper-score.hh" #include "paper-def.hh" #include "paper-column.hh" +#include "group-interface.hh" +#include "align-interface.hh" -/* - Handle spacing for prefatory matter. +MAKE_SCHEME_CALLBACK(Break_align_item,before_line_breaking); +SCM +Break_align_item::before_line_breaking (SCM smob) +{ + Score_element* me = unsmob_element (smob); + do_alignment (me); + return SCM_UNSPECIFIED; +} +Real +Break_align_item::alignment_callback (Score_element*c, Axis a) +{ + assert (a == X_AXIS); + Score_element *par = c->parent_l (a); + if (par && !to_boolean (par->get_elt_property ("break-alignment-done")))\ + { + par->set_elt_property ("break-alignment-done", SCM_BOOL_T); + Break_align_item::do_alignment (par); + } + + return 0.0; +} - TODO: rewrite this. It is kludgy -*/ +void +Break_align_item::add_element (Score_element*me, Score_element *toadd) +{ + toadd->add_offset_callback (alignment_callback, X_AXIS); + Axis_group_interface::add_element (me, toadd); +} void -Break_align_item::do_pre_processing() +Break_align_item::do_alignment (Score_element *me) { - if (break_status_dir() == LEFT) - align_dir_ = LEFT; + Item * item = dynamic_cast (me); + Item *column = item->column_l (); + if (item->break_status_dir() == LEFT) + { + me->set_elt_property ("self-alignment-X", gh_int2scm (RIGHT)); + } else - align_dir_ = RIGHT; - - flip (&align_dir_); - sort_elements (); - Real interline= paper_l ()->get_realvar (interline_scm_sym); - + { + me->add_offset_callback (Align_interface::center_on_element, X_AXIS); + } + + Real interline= me->paper_l ()->get_var ("interline"); Link_array elems; - for (int i=0; i < elem_l_arr_.size(); i++) + Link_array all_elems + = Pointer_group_interface__extract_elements (me, (Score_element*)0, + "elements"); + + for (int i=0; i < all_elems.size(); i++) { - Interval y = elem_l_arr_[i]->extent(axis ()); + Interval y = all_elems[i]->extent(X_AXIS); if (!y.empty_b()) - elems.push (dynamic_cast (elem_l_arr_[i])); + elems.push (dynamic_cast (all_elems[i])); } if (!elems.size ()) @@ -47,7 +84,7 @@ Break_align_item::do_pre_processing() SCM symbol_list = SCM_EOL; Array dists; - SCM current_origin = ly_ch_C_to_scm (""); + SCM current_origin = ly_symbol2scm ("none"); for (int i=0; i <= elems.size (); i++) { Score_element *next_elt = i < elems.size () @@ -58,20 +95,35 @@ Break_align_item::do_pre_processing() if (next_elt) { - next_origin = next_elt->get_elt_property (origin_scm_sym); + next_origin = next_elt->get_elt_property ("break-align-symbol"); next_origin = - (next_origin == SCM_BOOL_F) - ? ly_ch_C_to_scm ("") - : SCM_CDR (next_origin); + gh_symbol_p (next_origin)? + next_origin : ly_symbol2scm ("none") +; } else - next_origin = ly_ch_C_to_scm ("begin-of-note"); + next_origin = ly_symbol2scm ("begin-of-note"); - SCM extra_space - = scm_eval (scm_listify (ly_symbol ("break-align-spacer"), - current_origin, next_origin, SCM_UNDEFINED)); - SCM symbol = SCM_CAR (extra_space); - Real spc = gh_scm2double (SCM_CADR(extra_space)); + 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 (gh_cadr(extra_space)); spc *= interline; dists.push(spc); @@ -81,43 +133,56 @@ Break_align_item::do_pre_processing() // skip the first sym. - symbol_list = SCM_CDR (scm_reverse (symbol_list)); + symbol_list = gh_cdr (scm_reverse (symbol_list)); for (int i=0; i set_elt_property (SCM_CAR (symbol_list), + elems[i]->set_elt_property (gh_car (symbol_list), scm_cons (gh_double2scm (0), gh_double2scm (dists[i+1]))); - symbol_list = SCM_CDR (symbol_list); + symbol_list = gh_cdr (symbol_list); } // urg - SCM first_pair = elems[0]->get_elt_property (minimum_space_scm_sym); - if (first_pair == SCM_BOOL_F) - first_pair = gh_cons (gh_double2scm (0.0), gh_double2scm (0.0)); + SCM first_pair = elems[0]->get_elt_property ("minimum-space"); + if (gh_pair_p (first_pair)) + first_pair = first_pair; else - first_pair = SCM_CDR (first_pair); + 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_scm_sym, first_pair); - - Axis_align_item::do_pre_processing(); + elems[0]->set_elt_property ("minimum-space", first_pair); + + + /* + Force callbacks for alignment to be called + */ + Align_interface::do_side_processing (me, X_AXIS); + + Real pre_space = elems[0]->relative_coordinate (column, X_AXIS); + Real xl = elems[0]->extent (X_AXIS)[LEFT]; + if (!isinf (xl)) + pre_space += xl; + else + programming_error ("Infinity reached. "); - Real pre_space = elems[0]->extent (X_AXIS)[LEFT] - + elems[0]->relative_coordinate (column_l ()->dim_cache_[X_AXIS], X_AXIS); - Real spring_len = elems.top ()->extent (X_AXIS)[RIGHT] - + elems.top ()->relative_coordinate (column_l ()->dim_cache_[X_AXIS], X_AXIS); + Real xr = elems.top ()->extent (X_AXIS)[RIGHT]; + Real spring_len = elems.top ()->relative_coordinate (column, X_AXIS); + if (!isinf (xr)) + spring_len += xr; + else + programming_error ("Infinity reached."); Real stretch_distance =0.; - if (SCM_CAR (symbol_list) == extra_space_scm_sym) + if (gh_car (symbol_list) == ly_symbol2scm ("extra-space")) { spring_len += dists.top (); stretch_distance = dists.top (); } - else if (SCM_CAR (symbol_list) == minimum_space_scm_sym) + else if (gh_car (symbol_list) == ly_symbol2scm ("minimum-space")) { spring_len = spring_len >? dists.top (); stretch_distance = spring_len; @@ -126,61 +191,25 @@ Break_align_item::do_pre_processing() /* 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_scm_sym, - scm_cons (gh_double2scm (pre_space), - gh_double2scm (spring_len))); - - column_l ()->set_elt_property (stretch_distance_scm_sym, - gh_cons (gh_double2scm (-dists[0]), - gh_double2scm (stretch_distance))); - -} + column->set_elt_property ("extra-space", + scm_cons (gh_double2scm (pre_space), + gh_double2scm (spring_len))); + column->set_elt_property ("stretch-distance", + gh_cons (gh_double2scm (-dists[0]), + gh_double2scm (stretch_distance))); -Break_align_item::Break_align_item () -{ - stacking_dir_ = RIGHT; - set_axis (X_AXIS); } + void -Break_align_item::add_breakable_item (Item *it) +Break_align_item::set_interface (Score_element*me) { - SCM pr = it->remove_elt_property (break_priority_scm_sym); - - if (pr == SCM_BOOL_F) - return; - - int priority = gh_scm2int (SCM_CDR (pr)); + Align_interface::set_interface (me); + Align_interface::set_axis (me,X_AXIS); - Score_element * column_l = get_elt_by_priority (priority); - Axis_group_item * hg=0; - if (column_l) - { - hg = dynamic_cast (column_l); - } - else - { - hg = new Axis_group_item; - hg->set_axes (X_AXIS,X_AXIS); - - /* - this is quite ridiculous, but we do this anyway, to ensure that no - warning bells about missing Y refpoints go off later on. - */ - hg->dim_cache_[Y_AXIS]->parent_l_ = dim_cache_[Y_AXIS]; - hg->set_elt_property (ly_symbol ("origin"), ly_ch_C_to_scm (it->name ())); - - pscore_l_->typeset_element (hg); - add_element_priority (hg, priority); - - if (priority == 0) - center_l_ = hg; - } - - hg->add_element (it); + me->add_offset_callback (Side_position::aligned_on_self, X_AXIS); }