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 8ae81d7f65d2100100a949be25d03e573f2bb968..0f66726b474a564c163d2e8e79ccb6e397bcc40a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -53,7 +53,6 @@
     (AccidentalPlacement
      . (
        (direction .  ,LEFT)
-       (left-padding . 0.2)
        (positioning-done . ,ly:accidental-placement::calc-positioning-done)
 
        ;; this is quite small, but it is very ugly to have
@@ -112,9 +111,7 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (ambitus-interface
                                axis-group-interface
                                break-aligned-interface))))))
@@ -275,9 +272,7 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (align-interface
                                axis-group-interface
                                bass-figure-alignment-interface))))))
@@ -293,9 +288,7 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                side-position-interface))))))
 
@@ -322,9 +315,7 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface))))))
 
 
@@ -663,9 +654,7 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                dynamic-interface
                                dynamic-line-spanner-interface
@@ -829,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))))))
 
@@ -888,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))
@@ -1109,7 +1090,7 @@
     (LyricText
      . (
        (extra-spacing-width . (0.0 . 0.0))
-       (font-series . bold-narrow)
+       (font-series . medium)
        (font-size . 1.0)
        (self-alignment-X . ,CENTER)
        (stencil . ,lyric-text::print)
@@ -1156,6 +1137,7 @@
     (MetronomeMark
      . (
        (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
+       (break-visibility . ,end-of-line-invisible)
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 1000)
@@ -1163,9 +1145,21 @@
        (side-axis . ,Y)
        (stencil . ,ly:text-interface::print)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+
+                       ,(ly:make-simple-closure
+                         (list ly:break-alignable-interface::self-align-callback))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::x-aligned-on-self)))))
+       (self-alignment-X . ,LEFT)
+       (break-align-symbols . (time-signature))
+       (non-break-align-symbols . (multi-measure-rest-interface))
+       (non-musical . #t)
        (meta . ((class . Item)
-                (interfaces . (font-interface
+                (interfaces . (break-alignable-interface
+                               font-interface
                                metronome-mark-interface
+                               self-alignment-interface
                                side-position-interface
                                text-interface))))))
 
@@ -1174,6 +1168,7 @@
        (expand-limit . 10)
        (hair-thickness . 2.0)
        (padding . 1)
+       (spacing-pair . (break-alignment . break-alignment))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
        (staff-position . 0)
        (stencil . ,ly:multi-measure-rest::print)
@@ -1253,9 +1248,7 @@
        (X-extent . ,ly:axis-group-interface::width)
        (meta . ((class . Paper_column)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                font-interface
                                paper-column-interface
@@ -1271,9 +1264,7 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                note-collision-interface))))))
 
@@ -1285,9 +1276,7 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                note-column-interface
                                separation-item-interface))))))
@@ -1295,6 +1284,7 @@
     (NoteHead
      . (
        (duration-log . ,note-head::calc-duration-log)
+       (extra-spacing-height . ,ly:note-head::include-ledger-line-height)
        (glyph-name . ,note-head::calc-glyph-name)
        (stem-attachment . ,ly:note-head::calc-stem-attachment)
        (stencil . ,ly:note-head::print)
@@ -1389,9 +1379,7 @@
        ;;                       (font-size . -6) (font-name . "sans") (Y-extent . #f)
        (meta . ((class . Paper_column)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                font-interface
                                paper-column-interface
@@ -1413,6 +1401,7 @@
        (dot-negative-kern . 0.75)
        (font-encoding . fetaMusic)
        (slope . 1.0)
+       (spacing-pair . (break-alignment . staff-bar))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
        (stencil . ,ly:multi-measure-rest::percent)
        (thickness . 0.48)
@@ -1565,6 +1554,7 @@
 
     (Script
      . (
+       (add-stem-support . #t)
        (cross-staff . ,ly:script-interface::calc-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
        (font-encoding . fetaMusic)
@@ -1641,9 +1631,7 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                piano-pedal-interface
                                side-position-interface))))))
@@ -1686,21 +1674,21 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (bar-line-interface
                                font-interface
                                span-bar-interface))))))
 
     (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))))))
 
@@ -1872,9 +1860,7 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                piano-pedal-interface
                                side-position-interface))))))
@@ -1885,11 +1871,9 @@
        (axes . (,X ,Y))
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
-       (Y-extent . ,ly:axis-group-interface::height)
+       (Y-extent . ,ly:system::height)
        (meta . ((class . System)
-                (object-callbacks . ((pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)
+                (object-callbacks . ((pure-relevant-grobs . ,ly:system::calc-pure-relevant-grobs)
                                      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
                 (interfaces . (axis-group-interface
                                system-interface))))))
@@ -1956,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)
@@ -1983,14 +1979,12 @@
        (avoid-slur . around)
        (cross-staff . ,ly:script-interface::calc-cross-staff)
        (direction . ,DOWN)
-       (direction . ,ly:script-interface::calc-direction)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 450)
 
        ;; sync with Fingering ?
        (padding . 0.5)
 
-       (positioning-done . ,ly:script-interface::calc-positioning-done)
        (script-priority . 200)
        (side-axis . ,Y)
        (slur-padding . 0.5)
@@ -2088,6 +2082,7 @@
        (break-align-anchor
         . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-align-symbol . time-signature)
+       (break-align-anchor-alignment . ,LEFT)
        (break-visibility . ,all-visible)
        (extra-spacing-height . (-1.0 . 1.0))
        (non-musical . #t)
@@ -2239,9 +2234,7 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                piano-pedal-interface
                                side-position-interface))))))
@@ -2267,8 +2260,6 @@
        (meta . ((class . Spanner)
                 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)
                                      (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)
                                      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
                 (interfaces . (align-interface
                                axis-group-interface))))))
@@ -2277,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)
@@ -2291,13 +2282,10 @@
                 (object-callbacks . (
                                      (X-common . ,ly:axis-group-interface::calc-x-common)
                                      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
 
                 (interfaces . (axis-group-interface
-                               hara-kiri-group-spanner-interface
-                               vertically-spaceable-interface))))))
+                               hara-kiri-group-spanner-interface))))))
 
     (VoiceFollower
      . (
@@ -2353,9 +2341,7 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
                 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
-                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
-                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
-                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (axis-group-interface
                                side-position-interface
                                volta-interface))))))
@@ -2434,7 +2420,8 @@
    ly:clef::print
    ly:percent-repeat-item-interface::beat-slash
    ly:text-interface::print
-   ly:script-interface::print))
+   ly:script-interface::print
+   ly:sustain-pedal::print))
 
 ;; Sometimes we have grobs with (Y-extent . ,ly:grob::stencil-height)
 ;; and the print function is not pure, but there is a easy way to
@@ -2443,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)))
 
@@ -2467,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)
@@ -2475,10 +2463,10 @@
     (,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:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
     (,ly:slur::height . ,ly:slur::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
-    (,ly:stem::height . ,ly:stem::pure-height)))
+    (,ly:stem::height . ,ly:stem::pure-height)
+    (,ly:system::height . ,ly:system::calc-pure-height)))
 
 (define pure-functions
   (list