X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=6db959113e846e182fb0d724956b8dc62a0ffa25;hb=679bd1056a71f376af7ee6975d6dc6784cfbafb0;hp=ff77193f179def3ba646fcdb507993a7036cf942;hpb=ade2bb7da653fbd9d670590afd67376fe69c59dd;p=lilypond.git diff --git a/lily/script-interface.cc b/lily/script-interface.cc index ff77193f17..6db959113e 100644 --- a/lily/script-interface.cc +++ b/lily/script-interface.cc @@ -42,6 +42,20 @@ Script_interface::get_stencil (Grob *me, Direction d) return Stencil (); } +MAKE_SCHEME_CALLBACK (Script_interface, calc_positioning_done, 1); +SCM +Script_interface::calc_positioning_done (SCM smob) +{ + Grob *me = unsmob_grob (smob); + if (Grob *par = me->get_parent (X_AXIS)) + { + Grob *stem = Note_column::get_stem (par); + if (stem && Stem::first_head (stem)) + me->set_parent (Stem::first_head (stem), X_AXIS); + } + return SCM_BOOL_T; +} + MAKE_SCHEME_CALLBACK (Script_interface, calc_direction, 1); SCM Script_interface::calc_direction (SCM smob) @@ -55,16 +69,19 @@ Script_interface::calc_direction (SCM smob) d = DOWN; } - if (Grob *par = me->get_parent (X_AXIS)) - { - Grob *stem = Note_column::get_stem (par); - if (stem && Stem::first_head (stem)) - me->set_parent (Stem::first_head (stem), X_AXIS); - } - + (void) me->get_property ("positioning-done"); return scm_from_int (d); } +MAKE_SCHEME_CALLBACK (Script_interface, calc_cross_staff, 1); +SCM +Script_interface::calc_cross_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Grob *stem = Note_column::get_stem (me->get_parent (X_AXIS)); + return scm_from_bool (stem && to_boolean (stem->get_property ("cross-staff"))); +} + MAKE_SCHEME_CALLBACK (Script_interface, print, 1); SCM @@ -99,6 +116,7 @@ ADD_INTERFACE (Script_interface, "An object that is put above or below a note", "add-stem-support " "avoid-slur " + "positioning-done " "script-priority " "script-stencil " "slur "