From e93c49566397f1f655f8081cadc4e18feaab8d9b Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Thu, 26 May 2011 21:10:32 +0300 Subject: [PATCH] Fix 1300. --- scm/define-grobs.scm | 5 +++-- scm/output-lib.scm | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index bbb750fbe4..f132b2aa10 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -856,7 +856,7 @@ ;; sync with TextScript (?) (avoid-slur . around) - (cross-staff . ,ly:side-position-interface::calc-cross-staff) + (cross-staff . ,script-or-side-position-cross-staff) (direction . ,ly:script-interface::calc-direction) (font-encoding . fetaText) (font-size . -5) ; don't overlap when next to heads. @@ -1955,6 +1955,7 @@ (StringNumber . ( (avoid-slur . around) + (cross-staff . ,script-or-side-position-cross-staff) (font-encoding . fetaText) (font-size . -5) ; don't overlap when next to heads. (padding . 0.5) @@ -2139,7 +2140,7 @@ (TextScript . ( (avoid-slur . around) - (cross-staff . ,ly:script-interface::calc-cross-staff) + (cross-staff . ,script-or-side-position-cross-staff) (direction . ,DOWN) (extra-spacing-width . (+inf.0 . -inf.0)) (outside-staff-priority . 450) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index e76c46cdb1..5f25784454 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -56,6 +56,15 @@ (ly:text-interface::interpret-markup layout props text))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; cross-staff stuff + +(define-public (script-or-side-position-cross-staff g) + (or + (ly:script-interface::calc-cross-staff g) + (ly:side-position-interface::calc-cross-staff g))) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; note heads -- 2.39.2