X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=0697085e114b7fb7811c65a71947e6c61052d9c3;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=527a5c7baf726b2a0d04d7e4e1c841777ea9fa0f;hpb=cce6142535a66c88811f7f9f28eba89b8fc3b9a3;p=lilypond.git diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 527a5c7baf..0697085e11 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -137,7 +137,7 @@ Staff_symbol::line_positions (Grob *me) vector Staff_symbol::ledger_positions (Grob *me, int pos, Item const *head) { - // allow the option to override ledger positions via note head grob + // allow override of ledger positions via note head grob... if (head) { SCM posns = head->get_property ("ledger-positions"); @@ -145,6 +145,17 @@ Staff_symbol::ledger_positions (Grob *me, int pos, Item const *head) return ly_scm2floatvector (posns); } + // ...or via custom ledger positions function + SCM lp_function = me->get_property ("ledger-positions-function"); + if (scm_is_pair (lp_function)) + { + SCM func = scm_eval (lp_function, scm_interaction_environment ()); + if (ly_is_procedure (func)) + return ly_scm2floatvector (scm_call_2 (func, + me->self_scm (), + scm_from_int (pos))); + } + SCM ledger_positions = me->get_property ("ledger-positions"); Real ledger_extra = robust_scm2double (me->get_property ("ledger-extra"), 0); vector line_positions = Staff_symbol::line_positions (me); @@ -174,7 +185,7 @@ Staff_symbol::ledger_positions (Grob *me, int pos, Item const *head) Direction dir = (Direction)sign (pos - nearest_line); if (scm_is_pair (ledger_positions)) - // custom ledger line positions + // custom ledger positions via StaffSymbol.ledger-positions { Real min_pos = HUGE_VAL; Real max_pos = -HUGE_VAL; @@ -410,6 +421,7 @@ ADD_INTERFACE (Staff_symbol, "ledger-extra " "ledger-line-thickness " "ledger-positions " + "ledger-positions-function " "line-count " "line-positions " "staff-space "