Fix #341.

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 85d48b1394833d7b52c3fe2a11eeb61b7e1ca970..196b5501584c3956287745533d28756d798725b2 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -153,7 +153,6 @@
        (script-priority . 0)
        (side-axis . ,X)
        (staff-position . 0.0)
-       (cross-staff . ,ly:arpeggio::calc-cross-staff)
        (Y-extent . ,ly:arpeggio::height)
        (meta . ((class . Item)
                 (interfaces . (arpeggio-interface
@@ -538,7 +537,6 @@
        (direction . ,RIGHT)
        (positioning-done . ,ly:dot-column::calc-positioning-done) 
        (X-extent . ,ly:axis-group-interface::width)
-       (X-offset . ,ly:dot-column::side-position)
        (meta . ((class . Item)
                 (interfaces . (dot-column-interface
                                axis-group-interface))))))
@@ -613,6 +611,7 @@
 
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
 
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (self-alignment-X . 0)
@@ -687,6 +686,8 @@
        (script-priority . 100)
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
+
        (text . ,fingering::calc-text) 
        (font-encoding . fetaNumber)
        (font-size . -5)                ; don't overlap when next to heads.
@@ -1366,7 +1367,7 @@
        (X-extent . #f)
        (Y-extent . #f)
        (direction . ,ly:tie::calc-direction)
-       (head-direction . ,RIGHT)
+       (head-direction . ,ly:semi-tie-column::calc-head-direction)
        
        (positioning-done . ,ly:semi-tie-column::calc-positioning-done)
        (meta . ((class . Item)
@@ -1402,12 +1403,13 @@
 
        ;; padding set in script definitions.
        (staff-padding . 0.25)
-       (X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
+       (X-offset . ,script-interface::calc-x-offset)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
 
        (stencil . ,ly:script-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
        (font-encoding . fetaMusic)
        (cross-staff . ,ly:script-interface::calc-cross-staff)
        (meta . ((class . Item)
@@ -1802,6 +1804,7 @@
 
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
 
        (outside-staff-priority . 450)
        (avoid-slur . around)