Change space to basic-distance in spacing alists.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2b572bc7e134999d75e98cef0d006d33ecfe0416..0f66726b474a564c163d2e8e79ccb6e397bcc40a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -818,7 +818,8 @@
        (Y-extent . #f)
        (zigzag-width . 0.75)
        (meta . ((class . Spanner)
-                (interfaces . (line-interface
+                (interfaces . (glissando-interface
+                               line-interface
                                line-spanner-interface
                                unbreakable-spanner-interface))))))
 
@@ -877,15 +878,6 @@
                                self-alignment-interface
                                spanner-interface))))))
 
-    (HarmonicParenthesesItem
-     . (
-       (padding . 0)
-       (stencil . ,parentheses-item::print)
-       (stencils . ,parentheses-item::calc-angled-bracket-stencils)
-       (meta . ((class . Item)
-                (interfaces . (font-interface
-                               parentheses-interface))))))
-
     (HorizontalBracket
      . (
        (bracket-flare . (0.5 . 0.5))
@@ -1689,12 +1681,14 @@
 
     (StaffGrouper
      . (
-       (between-staff-spacing . ((space . 9)
-                                 (minimum-distance . 7)
-                                 (padding . 1)))
-       (after-last-staff-spacing . ((space . 10.5)
+       (staff-staff-spacing . ((basic-distance . 9)
+                               (minimum-distance . 7)
+                               (padding . 1)
+                                (stretchability . 5)))
+       (staffgroup-staff-spacing . ((basic-distance . 10.5)
                                     (minimum-distance . 8)
-                                    (padding . 1)))
+                                    (padding . 1)
+                                     (stretchability . 9)))
        (meta . ((class . Spanner)
                 (interfaces . (staff-grouper-interface))))))
 
@@ -1946,16 +1940,28 @@
 
     (TabNoteHead
      . (
-       (details . ((tied-properties . ((break-visibility . ,begin-of-line-visible)
-                                       (parenthesize . #t)))
+       (details . ((cautionary-properties . ((angularity . 0.4)
+                                             (half-thickness . 0.075)
+                                             (padding . 0)
+                                             (procedure . ,parenthesize-stencil)
+                                             (width . 0.25)))
+                   (head-offset . 3/5)
+                   (harmonic-properties . ((angularity . 2)
+                                           (half-thickness . 0.075)
+                                           (padding . 0)
+                                           (procedure . ,parenthesize-stencil)
+                                           (width . 0.25)))
                    (repeat-tied-properties . ((note-head-visible . #t)
-                                              (parenthesize . #t)))))
+                                              (parenthesize . #t)))
+                   (tied-properties . ((break-visibility . ,begin-of-line-visible)
+                                       (parenthesize . #t)))))
+
        (direction . ,CENTER)
        (duration-log . ,note-head::calc-duration-log)
        (font-series . bold)
        (font-size . -2)
        (stem-attachment . (0.0 . 1.35))
-       (stencil . ,ly:text-interface::print)
+       (stencil . ,tab-note-head::print)
        (whiteout . #t)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
@@ -2262,11 +2268,11 @@
      . (
        (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,Y))
-       (default-next-staff-spacing . ((space . 9)
-                                      (minimum-distance . 8)
-                                      (padding . 1)))
-       (next-staff-spacing . ,ly:axis-group-interface::calc-next-staff-spacing)
-       (non-affinity-spacing . ((padding . 0.5)))
+       (default-staff-staff-spacing . ((basic-distance . 9)
+                                       (minimum-distance . 8)
+                                       (padding . 1)))
+       (nonstaff-unrelatedstaff-spacing . ((padding . 0.5)))
+       (staff-staff-spacing . ,ly:axis-group-interface::calc-staff-staff-spacing)
        (stencil . ,ly:axis-group-interface::print)
        (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
@@ -2424,6 +2430,7 @@
   `(
     (,ly:arpeggio::print . ,ly:arpeggio::pure-height)
     (,ly:arpeggio::brew-chord-bracket . ,ly:arpeggio::pure-height)
+    (,ly:arpeggio::brew-chord-slur . ,ly:arpeggio::pure-height)
     (,ly:hairpin::print . ,ly:hairpin::pure-height)
     (,ly:volta-bracket-interface::print . ,volta-bracket-interface::pure-height)))
 
@@ -2448,7 +2455,7 @@
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
-    (,ly:axis-group-interface::calc-next-staff-spacing . ,ly:axis-group-interface::calc-pure-next-staff-spacing)
+    (,ly:axis-group-interface::calc-staff-staff-spacing . ,ly:axis-group-interface::calc-pure-staff-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)