Fix 1300.

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index bbb750fbe4f06836638a013cbdfc853e689103f3..f132b2aa1076f63f1f6ebd754a74a8cef28169ab 100644 (file)
--- 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 e76c46cdb18ddbfade41573a913de1b5dd889671..5f257844542297c5924a0f8e12804310c3a6756f 100644 (file)
--- 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