X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-align-item.cc;h=e4467a9e3fe1bb0a6fe6d2af12f18fcdf9362cac;hb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;hp=0ddf8481b7476d78f75d3879d4bb4932b1768e49;hpb=dd36ce6e97590323a7b6a61eb4a3f08d265c5b6e;p=lilypond.git diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc index 0ddf8481b7..e4467a9e3f 100644 --- a/lily/grace-align-item.cc +++ b/lily/grace-align-item.cc @@ -8,20 +8,27 @@ */ #include "grace-align-item.hh" +#include "align-interface.hh" #include "lookup.hh" #include "paper-column.hh" #include "paper-def.hh" -Grace_align_item::Grace_align_item () +Grace_align_item::Grace_align_item (SCM s) + : Item (s) { set_elt_property ("stacking-dir", gh_int2scm (RIGHT)); - set_axis (X_AXIS); + Align_interface (this).set_interface(); + Align_interface (this).set_axis (X_AXIS); } - -void -Grace_align_item::before_line_breaking () + +/* + TODO: cfg-able + */ +GLUE_SCORE_ELEMENT(Grace_align_item,before_line_breaking); +SCM +Grace_align_item::member_before_line_breaking () { - Real nhw = // lookup_l ()->notehead (2, "").dim_[X_AXIS].length(); + Real nhw = // lookup_l ()->notehead (2, "")..extent (X_AXIS).length(); paper_l ()->get_var ("quartwidth"); set_elt_property ("threshold", @@ -29,9 +36,8 @@ Grace_align_item::before_line_breaking () gh_double2scm (infinity_f))); column_l ()->set_elt_property ("contains-grace", SCM_BOOL_T); - - Axis_align_item::before_line_breaking (); - // translate_axis (-0.5* nhw, X_AXIS); // ugh. + return SCM_UNDEFINED; + }