Make a pure version of calc_next_staff_spacing.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 8251fec8192086a91a9bd347105376c4de17856f..aa761fce54ca5a3b51ea76ed390fbc0039f466b0 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -977,14 +977,14 @@
                    (height-limit . 1.0)))
        (direction . ,ly:tie::calc-direction)
        (head-direction . ,LEFT)
-       (stencil  . ,ly:tie::print)
+       (stencil  . ,laissez-vibrer::print)
        (thickness . 1.0)
        (meta . ((class . Item)
                 (interfaces . (semi-tie-interface))))))
 
     (LaissezVibrerTieColumn
      . (
-       (head-direction . ,LEFT)
+       (head-direction . ,ly:semi-tie-column::calc-head-direction)
        (positioning-done . ,ly:semi-tie-column::calc-positioning-done)
        (X-extent . #f)
        (Y-extent . #f)
@@ -1554,16 +1554,6 @@
        (meta . ((class . Item)
                 (interfaces . (script-column-interface))))))
 
-    (SeparationItem
-     . (
-       (avoid-slur . inside)
-       (horizontal-skylines . ,ly:separation-item::calc-skylines)
-       (stencil . ,ly:separation-item::print)
-       (X-extent . ,ly:axis-group-interface::width)
-       (Y-extent . ,ly:axis-group-interface::height)
-       (meta . ((class . Item)
-                (interfaces . (separation-item-interface))))))
-
     (Slur
      . (
        (avoid-slur . inside)
@@ -2360,6 +2350,7 @@
    fret-board::calc-stencil
    note-head::brew-ez-stencil
    print-circled-text-callback
+   laissez-vibrer::print
    lyric-text::print
    ly:bar-line::print
    ly:mensural-ligature::brew-ligature-primitive
@@ -2395,20 +2386,22 @@
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
-    (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
-    (,ly:stem::height . ,ly:stem::pure-height)
-    (,ly:rest::height . ,ly:rest::pure-height)
+    (,ly:axis-group-interface::calc-next-staff-spacing . ,ly:axis-group-interface::calc-pure-next-staff-spacing)
+    (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
     (,ly:grob::stencil-height . ,pure-stencil-height)
+    (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
+    (,ly:rest::height . ,ly:rest::pure-height)
     (,ly:self-alignment-interface::y-aligned-on-self . ,ly:self-alignment-interface::pure-y-aligned-on-self)
     (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
-    (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
-    (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
+    (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
     (,ly:slur::height . ,ly:slur::pure-height)
-    (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
+    (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
+    (,ly:stem::height . ,ly:stem::pure-height)))
 
 (define pure-functions
   (list
    parenthesize-elements
+   laissez-vibrer::print
    ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))