X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=cd40632eb825a93a8093a714e3e7fe636b97e9df;hb=8fc0065379238f46977a22a90559a25833b5a75b;hp=5bb8c333588317dc1524ffae831cea2c19bdf78f;hpb=cf33d3709d3b5028fa9c208aa490ce066960ad5c;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 5bb8c33358..cd40632eb8 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2002 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ @@ -12,20 +12,20 @@ #include "group-interface.hh" #include "axis-group-interface.hh" #include "hara-kiri-group-spanner.hh" -#include "paper-def.hh" +#include "output-def.hh" MAKE_SCHEME_CALLBACK (Align_interface,alignment_callback,2); SCM Align_interface::alignment_callback (SCM element_smob, SCM axis) { Grob * me = unsmob_grob (element_smob); - Axis ax = (Axis)gh_scm2int (axis); + Axis ax = (Axis)scm_to_int (axis); Grob * par = me->get_parent (ax); - if (par && !to_boolean (par->get_grob_property ("alignment-done"))) + if (par && !to_boolean (par->get_property ("positioning-done"))) { Align_interface::align_elements_to_extents (par, ax); } - return gh_double2scm (0.0); + return scm_make_real (0.0); } MAKE_SCHEME_CALLBACK (Align_interface,fixed_distance_alignment_callback,2); @@ -33,13 +33,13 @@ SCM Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis) { Grob * me = unsmob_grob (element_smob); - Axis ax = (Axis)gh_scm2int (axis); + Axis ax = (Axis)scm_to_int (axis); Grob * par = me->get_parent (ax); - if (par && !to_boolean (par->get_grob_property ("alignment-done"))) + if (par && !to_boolean (par->get_property ("positioning-done"))) { Align_interface::align_to_fixed_distance (par, ax); } - return gh_double2scm (0.0); + return scm_make_real (0.0); } /* @@ -48,21 +48,15 @@ Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis) void Align_interface::align_to_fixed_distance (Grob *me , Axis a) { - me->set_grob_property ("alignment-done", SCM_BOOL_T); + me->set_property ("positioning-done", SCM_BOOL_T); - SCM d = me->get_grob_property ("stacking-dir"); + SCM d = me->get_property ("stacking-dir"); - Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER; + Direction stacking_dir = scm_is_number (d) ? to_dir (d) : CENTER; if (!stacking_dir) stacking_dir = DOWN; - SCM force = me->get_grob_property ("forced-distance"); - - Real dy = 0.0; - if (gh_number_p (force)) - { - dy = gh_scm2double (force); - } + Real dy = robust_scm2double (me->get_property ("forced-distance"),0.0); Link_array elems = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements"); @@ -77,10 +71,10 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) { /* This is not very elegant, in that we need special support for - hara kiri. Unfortunately, the generic wiring of + hara-kiri. Unfortunately, the generic wiring of force_hara_kiri_callback () (extent and offset callback) is - such that we might get into a loop if we call extent() or - offset() the elements. + such that we might get into a loop if we call extent () or + offset () the elements. */ @@ -88,8 +82,8 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) && Hara_kiri_group_spanner::has_interface (elems[j])) Hara_kiri_group_spanner::consider_suicide (elems[j]); - if (!elems[j]-> live()) - elems.del(j); + if (!elems[j]->is_live ()) + elems.del (j); } for (int j =0; j < elems.size (); j++) @@ -121,27 +115,21 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) TODO: maybe we should rethink and throw out thresholding altogether. The original function has been taken over by - align_to_fixed_distance(). + align_to_fixed_distance (). */ void Align_interface::align_elements_to_extents (Grob * me, Axis a) { - me->set_grob_property ("alignment-done", SCM_BOOL_T); + me->set_property ("positioning-done", SCM_BOOL_T); - SCM d = me->get_grob_property ("stacking-dir"); + SCM d = me->get_property ("stacking-dir"); - Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER; + Direction stacking_dir = scm_is_number (d) ? to_dir (d) : CENTER; if (!stacking_dir) stacking_dir = DOWN; - Interval threshold = Interval (0, Interval::infinity ()); - SCM thr = me->get_grob_property ("threshold"); - if (gh_pair_p (thr)) - { - threshold[SMALLER] = gh_scm2double (ly_car (thr)); - threshold[BIGGER] = gh_scm2double (ly_cdr (thr)); - } - + Interval threshold = robust_scm2interval (me->get_property ("threshold"), + Interval (0, Interval::infinity ())); Array dims; @@ -151,7 +139,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) for (int i=0; i < all_grobs.size (); i++) { Interval y = all_grobs[i]->extent (me, a); - if (!y.empty_b ()) + if (!y.is_empty ()) { Grob *e =dynamic_cast (all_grobs[i]); @@ -175,7 +163,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) prop_syms[Y_AXIS] = ly_symbol2scm ("self-alignment-Y"); } - SCM align (me->internal_get_grob_property (prop_syms[a])); + SCM align (me->internal_get_property (prop_syms[a])); Array translates ; Interval total; @@ -204,12 +192,10 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) } - Grob * align_center = unsmob_grob (align); Real center_offset = 0.0; - /* also move the grobs that were empty, to maintain spatial order. - */ + */ Array all_translates; if (translates.size ()) { @@ -222,9 +208,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) { w = translates[i++]; } - if (all_grobs[j] == align_center) - center_offset = w; - all_translates .push (w); + all_translates.push (w); j++; } @@ -233,10 +217,8 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) FIXME: uncommenting freaks out the Y-alignment of line-of-score. */ - // Real align_param = ly_dir_p (align) ? gh_scm2double (align) : 0.0; - - if (gh_number_p (align)) - center_offset = total.linear_combination (gh_scm2double (align)); + if (scm_is_number (align)) + center_offset = total.linear_combination (scm_to_double (align)); for (int j = 0 ; j < all_grobs.size (); j++) all_grobs[j]->translate_axis (all_translates[j] - center_offset, a); @@ -245,7 +227,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) Axis Align_interface::axis (Grob*me) { - return Axis (gh_scm2int (ly_car (me->get_grob_property ("axes")))); + return Axis (scm_to_int (scm_car (me->get_property ("axes")))); } void @@ -262,13 +244,38 @@ Align_interface::set_axis (Grob*me,Axis a) } +/* + Find Y-axis parent of G that has a #'forced-distance property. This + has the effect of finding the piano-staff given an object in that + piano staff. + */ +Grob * +find_fixed_alignment_parent (Grob *g) +{ + while (g) + { + if (scm_is_number (g->get_property ("forced-distance"))) + return g; + + g = g->get_parent (Y_AXIS); + } + + return 0; +} + + + ADD_INTERFACE (Align_interface, "align-interface", - " Order grobs top to bottom/left to right/right to left etc.", - "forced-distance stacking-dir align-dir threshold alignment-done center-element elements axes"); + "Order grobs from top to bottom, left to right, right to left or bottom" + "to top." + , + "forced-distance stacking-dir align-dir threshold positioning-done " + "center-element elements axes"); struct Foobar { bool has_interface (Grob*); }; +