X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=26adbfd471b851b3cf65d475d3a89c4b60f2e4b1;hb=e3a15ec3c1951dd16f6ee71fbd79870d9e2fb3a0;hp=aa761fce54ca5a3b51ea76ed390fbc0039f466b0;hpb=8860a7700be8348848bba7972ad86ef46721c544;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index aa761fce54..26adbfd471 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -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
@@ -103,7 +102,9 @@
 	(break-visibility . ,begin-of-line-visible)
 	(non-musical . #t)
 	(space-alist . (
+			(cue-end-clef . (extra-space . 0.5))
 			(clef . (extra-space . 0.5))
+			(cue-clef . (extra-space . 0.5))
 			(key-signature . (extra-space . 0.0))
 			(staff-bar . (extra-space . 0.0))
 			(time-signature . (extra-space . 0.0))
@@ -111,6 +112,8 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(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)))
 		 (interfaces . (ambitus-interface
 				axis-group-interface
 				break-aligned-interface))))))
@@ -187,7 +190,6 @@
      . (
 	(allow-span-bar . #t)
 	(bar-extent . ,ly:bar-line::calc-bar-extent)
-	(bar-size .  ,ly:bar-line::calc-bar-size)
 	(break-align-anchor . ,ly:bar-line::calc-anchor)
 	(break-align-symbol . staff-bar)
 	(break-visibility . ,bar-line::calc-break-visibility)
@@ -270,6 +272,8 @@
 	(stacking-dir . ,DOWN)
 	(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)))
 		 (interfaces . (align-interface
 				axis-group-interface
 				bass-figure-alignment-interface))))))
@@ -284,6 +288,8 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(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)))
 		 (interfaces . (axis-group-interface
 				side-position-interface))))))
 
@@ -309,6 +315,8 @@
 	(vertical-skylines . ,ly:axis-group-interface::calc-skylines)
 	(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)))
 		 (interfaces . (axis-group-interface))))))
 
 
@@ -352,6 +360,8 @@
            (hint-direction-penalty . 20)
            (musical-direction-factor . 400)
            (ideal-slope-factor . 10)
+	   (collision-penalty . 500)
+	   (collision-padding . 0.35)
            (round-to-zero-slope . 0.02)))
 	(direction . ,ly:beam::calc-direction)
 
@@ -408,9 +418,11 @@
 	(break-align-orders . ;; end of line
 			    #((
 			       left-edge
+			       cue-end-clef
 			       ambitus
 			       breathing-sign
 			       clef
+			       cue-clef
 			       staff-bar
 			       key-cancellation
 			       key-signature
@@ -420,9 +432,11 @@
 			      ;; unbroken
 			      (
 			       left-edge
+			       cue-end-clef
 			       ambitus
 			       breathing-sign
 			       clef
+			       cue-clef
 			       staff-bar
 			       key-cancellation
 			       key-signature
@@ -439,6 +453,7 @@
 			       key-signature
 			       staff-bar
 			       time-signature
+			       cue-clef
 			       custos)))
 	(non-musical . #t)
 	(positioning-done . ,ly:break-alignment-interface::calc-positioning-done)
@@ -460,6 +475,8 @@
 			(time-signature . (minimum-space . 1.5))
 			(staff-bar . (minimum-space . 1.5))
 			(clef . (minimum-space . 2.0))
+			(cue-clef . (minimum-space . 2.0))
+			(cue-end-clef . (minimum-space . 2.0))
 			(first-note . (fixed-space . 1.0)) ;huh?
 			(right-edge . (extra-space . 0.1))))
 	(stencil . ,ly:text-interface::print)
@@ -477,6 +494,7 @@
 	(font-family . sans)
 	(font-size . 1.5)
 	(stencil . ,ly:text-interface::print)
+	(extra-spacing-height . (0.2 . -0.2))
 	(word-space . 0.0)
 	(meta . ((class . Item)
 		 (interfaces . (chord-name-interface
@@ -492,7 +510,7 @@
 	(break-visibility . ,begin-of-line-visible)
 	(glyph-name . ,ly:clef::calc-glyph-name)
 	(non-musical . #t)
-	(space-alist . ((ambitus . (extra-space . 2.0))
+	(space-alist . ((cue-clef . (extra-space . 2.0))
 			(staff-bar . (extra-space . 0.7))
 			(key-cancellation . (minimum-space . 3.5))
 			(key-signature . (minimum-space . 3.5))
@@ -548,6 +566,59 @@
 				text-interface
 				text-script-interface))))))
 
+    (CueClef
+     . (
+	(avoid-slur . inside)
+	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
+	(break-align-symbol . cue-clef)
+	(break-visibility . ,begin-of-line-visible)
+	(font-size . -4)
+	(glyph-name . ,ly:clef::calc-glyph-name)
+	(non-musical . #t)
+	(full-size-change . #t)
+	(space-alist . ((staff-bar . (minimum-space . 2.7))
+			(key-cancellation . (minimum-space . 3.5))
+			(key-signature . (minimum-space . 3.5))
+			(time-signature . (minimum-space . 4.2))
+			(custos . (minimum-space . 0.0))
+			(first-note . (minimum-fixed-space . 3.0))
+			(next-note . (extra-space . 0.5))
+			(right-edge . (extra-space . 0.5))))
+	(stencil . ,ly:clef::print)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(meta . ((class . Item)
+		 (interfaces . (break-aligned-interface
+				clef-interface
+				font-interface
+				staff-symbol-referencer-interface))))))
+
+    (CueEndClef
+     . (
+	(avoid-slur . inside)
+	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
+	(break-align-symbol . cue-end-clef)
+	(break-visibility . ,begin-of-line-invisible)
+	(font-size . -4)
+	(glyph-name . ,ly:clef::calc-glyph-name)
+	(non-musical . #t)
+	(full-size-change . #t)
+	(space-alist . ((clef . (extra-space . 0.7))
+			(cue-clef . (extra-space . 0.7))
+			(staff-bar . (extra-space . 0.7))
+			(key-cancellation . (minimum-space . 3.5))
+			(key-signature . (minimum-space . 3.5))
+			(time-signature . (minimum-space . 4.2))
+			(first-note . (minimum-fixed-space . 5.0))
+			(next-note . (extra-space . 0.5))
+			(right-edge . (extra-space . 0.5))))
+	(stencil . ,ly:clef::print)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(meta . ((class . Item)
+		 (interfaces . (break-aligned-interface
+				clef-interface
+				font-interface
+				staff-symbol-referencer-interface))))))
+
     (Custos
      . (
 	(break-align-symbol . custos)
@@ -581,6 +652,7 @@
 	(dot-count . ,dots::calc-dot-count)
 	(staff-position . ,dots::calc-staff-position)
 	(stencil . ,ly:dots::print)
+	(extra-spacing-height . (-0.5 . 0.5))
 	(meta . ((class . Item)
 		 (interfaces . (dots-interface
 				font-interface
@@ -597,7 +669,6 @@
 	(slope . 1.0)
 	(stencil . ,ly:percent-repeat-item-interface::double-percent)
 	(thickness . 0.48)
-	(width . 2.0)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
 				font-interface
@@ -629,6 +700,20 @@
 				side-position-interface
 				text-interface))))))
 
+    (DoubleRepeatSlash
+     . (
+	(dot-negative-kern . 0.75)
+	(font-encoding . fetaMusic)
+	(slash-negative-kern . 1.6)
+	(slope . 1.0)
+	(stencil . ,ly:percent-repeat-item-interface::beat-slash)
+	(thickness . 0.48)
+	(meta . ((class . Item)
+		 (interfaces . (font-interface
+				percent-repeat-interface
+				percent-repeat-item-interface
+				rhythmic-grob-interface))))))
+
     (DynamicLineSpanner
      . (
 	(axes . (,Y))
@@ -644,6 +729,8 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(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)))
 		 (interfaces . (axis-group-interface
 				dynamic-interface
 				dynamic-line-spanner-interface
@@ -781,6 +868,7 @@
 	(after-line-breaking . ,ly:chord-name::after-line-breaking)
 	(fret-diagram-details . ((finger-code . below-string)))
 	(stencil . ,fret-board::calc-stencil)
+	(extra-spacing-height . (0.2 . -0.2))
 	(meta . ((class . Item)
 		 (interfaces . (chord-name-interface
 				font-interface
@@ -807,7 +895,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))))))
 
@@ -866,15 +955,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))
@@ -937,9 +1017,11 @@
 			(time-signature . (extra-space . 1.25))
 			(staff-bar . (extra-space . 0.6))
 			(key-signature . (extra-space . 0.5))
+			(cue-clef . (extra-space . 0.5))
 			(right-edge . (extra-space . 0.5))
 			(first-note . (fixed-space . 2.5))))
 	(stencil . ,ly:key-signature-interface::print)
+	(extra-spacing-width . (0.0 . 0.5))
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
@@ -959,9 +1041,11 @@
 	(space-alist . (
 			(time-signature . (extra-space . 1.15))
 			(staff-bar . (extra-space . 1.1))
+			(cue-clef . (extra-space . 0.5))
 			(right-edge . (extra-space . 0.5))
 			(first-note . (fixed-space . 2.5))))
 	(stencil . ,ly:key-signature-interface::print)
+	(extra-spacing-width . (0.0 . 0.5))
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
@@ -979,6 +1063,7 @@
 	(head-direction . ,LEFT)
 	(stencil  . ,laissez-vibrer::print)
 	(thickness . 1.0)
+	(extra-spacing-height . (-0.5 . 0.5))
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-interface))))))
 
@@ -1009,17 +1094,20 @@
 	(break-align-symbol . left-edge)
 	(break-visibility . ,center-invisible)
 	(non-musical . #t)
+	(extra-spacing-height . (+inf.0 . -inf.0))
 	(space-alist . (
-			(custos . (extra-space . 0.0))
 			(ambitus . (extra-space . 2.0))
-			(time-signature . (extra-space . 1.0))
-			(staff-bar . (extra-space . 0.0))
 			(breathing-sign . (minimum-space . 0.0))
+			(cue-end-clef . (extra-space . 0.8))
 			(clef . (extra-space . 0.8))
+			(cue-clef . (extra-space . 0.8))
+			(staff-bar . (extra-space . 0.0))
+			(key-cancellation . (extra-space . 0.0))
+			(key-signature . (extra-space . 0.8))
+			(time-signature . (extra-space . 1.0))
+			(custos . (extra-space . 0.0))
 			(first-note . (fixed-space . 2.0))
 			(right-edge . (extra-space . 0.0))
-			(key-signature . (extra-space . 0.8))
-			(key-cancellation . (extra-space . 0.0))
 			))
 	(X-extent . (0 . 0))
 	(meta . ((class . Item)
@@ -1086,7 +1174,10 @@
     (LyricText
      . (
 	(extra-spacing-width . (0.0 . 0.0))
-	(font-series . bold-narrow)
+	;; Recede in height for purposes of note spacing,
+	;; so notes in melismata can be freely spaced above lyrics
+	(extra-spacing-height . (0.2 . -0.2))
+	(font-series . medium)
 	(font-size . 1.0)
 	(self-alignment-X . ,CENTER)
 	(stencil . ,lyric-text::print)
@@ -1123,7 +1214,6 @@
 
     (MensuralLigature
      . (
-	(flexa-width . 2.0)
 	(stencil . ,ly:mensural-ligature::print)
 	(thickness . 1.4)
 	(meta . ((class . Spanner)
@@ -1133,6 +1223,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)
@@ -1140,9 +1231,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))))))
 
@@ -1151,6 +1254,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)
@@ -1218,6 +1322,8 @@
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	(full-measure-extra-space . 1.0)
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
+	;; sufficient padding to prevent ledger lines from moving over/under
+	(skyline-vertical-padding . 0.6)
 	;;		      (stencil . ,ly:paper-column::print)
 
 	(line-break-permission . allow)
@@ -1229,6 +1335,8 @@
 
 	(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)))
 		 (interfaces . (axis-group-interface
 				font-interface
 				paper-column-interface
@@ -1243,6 +1351,8 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(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)))
 		 (interfaces . (axis-group-interface
 				note-collision-interface))))))
 
@@ -1250,17 +1360,23 @@
      . (
 	(axes . (,X ,Y))
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
+	(skyline-vertical-padding . 0.15)
 	(X-extent . ,ly:axis-group-interface::width)
 	(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)))
 		 (interfaces . (axis-group-interface
 				note-column-interface
 				separation-item-interface))))))
 
     (NoteHead
      . (
+	(flexa-width . 2.0)
 	(duration-log . ,note-head::calc-duration-log)
+	(extra-spacing-height . ,ly:note-head::include-ledger-line-height)
 	(glyph-name . ,note-head::calc-glyph-name)
+	(ligature-flexa . #f)
 	(stem-attachment . ,ly:note-head::calc-stem-attachment)
 	(stencil . ,ly:note-head::print)
 	(X-offset . ,ly:note-head::stem-x-shift)
@@ -1299,7 +1415,7 @@
 
     (OctavateEight
      . (
-	(break-visibility . ,begin-of-line-visible)
+	(break-visibility . ,inherit-x-parent-visibility)
 	(font-shape . italic)
 	(font-size . -4)
 	(self-alignment-X . ,CENTER)
@@ -1353,6 +1469,8 @@
 	;; debugging
 	;;		         (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)))
 		 (interfaces . (axis-group-interface
 				font-interface
 				paper-column-interface
@@ -1374,6 +1492,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)
@@ -1469,6 +1588,7 @@
 
     (RepeatSlash
      . (
+	(slash-negative-kern . 0.85)
 	(slope . 1.7)
 	(stencil . ,ly:percent-repeat-item-interface::beat-slash)
 	(thickness . 0.48)
@@ -1486,6 +1606,7 @@
 	(head-direction . ,RIGHT)
 	(stencil  . ,ly:tie::print)
 	(thickness . 1.0)
+	(extra-spacing-height . (-0.5 . 0.5))
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-interface))))))
 
@@ -1525,6 +1646,7 @@
 
     (Script
      . (
+	(add-stem-support . #t)
 	(cross-staff . ,ly:script-interface::calc-cross-staff)
 	(direction . ,ly:script-interface::calc-direction)
 	(font-encoding . fetaMusic)
@@ -1600,6 +1722,8 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(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)))
 		 (interfaces . (axis-group-interface
 				piano-pedal-interface
 				side-position-interface))))))
@@ -1620,7 +1744,6 @@
      . (
 	(allow-span-bar . #t)
 	(bar-extent . ,ly:axis-group-interface::height)
-	(bar-size . ,ly:span-bar::calc-bar-size)
 	(before-line-breaking . ,ly:span-bar::before-line-breaking)
 	(break-align-symbol . staff-bar)
 	(cross-staff . #t)
@@ -1641,18 +1764,22 @@
 	(X-extent . ,ly:span-bar::width)
 	(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)))
 		 (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))))))
 
@@ -1823,17 +1950,23 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(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)))
 		 (interfaces . (axis-group-interface
 				piano-pedal-interface
 				side-position-interface))))))
 
     (System
      . (
+	(adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
 	(axes . (,X ,Y))
+	(skyline-horizontal-padding . 0.5)
 	(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:system::calc-pure-relevant-grobs)
+				      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
 		 (interfaces . (axis-group-interface
 				system-interface))))))
 
@@ -1899,16 +2032,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)
@@ -1926,14 +2071,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)
@@ -2031,10 +2174,12 @@
 	(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)
 	(space-alist . (
+			(cue-clef . (extra-space . 1.5))
 			(first-note . (fixed-space . 2.0))
 			(right-edge . (extra-space . 0.5))
 			(staff-bar . (minimum-space . 2.0))))
@@ -2181,6 +2326,8 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(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)))
 		 (interfaces . (axis-group-interface
 				piano-pedal-interface
 				side-position-interface))))))
@@ -2204,7 +2351,9 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(meta . ((class . Spanner)
-		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
+		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)
+				      (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+				      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
 		 (interfaces . (align-interface
 				axis-group-interface))))))
 
@@ -2212,21 +2361,24 @@
      . (
 	(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)
 	(Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
 	(Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
 	(meta . ((class . Spanner)
-		 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
+		 (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)))
+
 		 (interfaces . (axis-group-interface
-				hara-kiri-group-spanner-interface
-				vertically-spaceable-interface))))))
+				hara-kiri-group-spanner-interface))))))
 
     (VoiceFollower
      . (
@@ -2281,6 +2433,8 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(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)))
 		 (interfaces . (axis-group-interface
 				side-position-interface
 				volta-interface))))))
@@ -2357,8 +2511,11 @@
    ly:note-head::print
    ly:dots::print
    ly:clef::print
+   ly:key-signature-interface::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
@@ -2367,6 +2524,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)))
 
@@ -2383,20 +2541,26 @@
 	  (else
 	   '(0 . 0)))))
 
+;; Sometimes, a pure callback will be chained to a non-pure callback via
+;; chain_offset_callback, in which case this provides a default by simply
+;; passing through the value from the pure callback.
+(define (pure-chain-offset-callback grob start end prev-offset) prev-offset)
+
 (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)
+    (,ly:rest-collision::force-shift-callback-rest . ,pure-chain-offset-callback)
     (,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