X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=4545e5bd9f6f7c130267397d3947812e31c82881;hb=54b02666750062788185bd3f99e644d621e348c2;hp=3d2af32d47b501d64731c7ed6d960b13646732d6;hpb=8fbc1ac88d969b8ce2338fc1cefbf9708b7434f3;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3d2af32d47..4545e5bd9f 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
@@ -36,6 +36,7 @@
 	(Y-extent . ,ly:accidental-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
+				inline-accidental-interface
 				font-interface))))))
 
     (AccidentalCautionary
@@ -48,6 +49,7 @@
 	(Y-extent . ,ly:accidental-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
+				inline-accidental-interface
 				font-interface))))))
 
     (AccidentalPlacement
@@ -102,7 +104,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))
@@ -175,6 +179,8 @@
 
     (BalloonTextItem
      . (
+	(annotation-balloon . #t)
+	(annotation-line . #t)
 	(stencil . ,ly:balloon-interface::print)
 	(text . ,(grob::calc-property-by-copy 'text))
 	(X-offset . ,(grob::calc-property-by-copy 'X-offset))
@@ -188,7 +194,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)
@@ -323,7 +328,6 @@
      . (
 	;; todo: clean this up a bit: the list is getting
 	;; rather long.
-
 	(auto-knee-gap . 5.5)
 	(beam-thickness . 0.48) ; in staff-space
 
@@ -345,6 +349,13 @@
 
 	(beaming . ,ly:beam::calc-beaming)
 	(clip-edges . #t)
+	(collision-interfaces . (beam-interface
+				 clef-interface
+				 inline-accidental-interface
+				 key-signature-interface
+				 note-head-interface
+				 stem-interface
+				 time-signature-interface))
 	(concaveness . ,ly:beam::calc-concaveness)
 	(cross-staff . ,ly:beam::calc-cross-staff)
 	(damping . 1)
@@ -359,9 +370,12 @@
            (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)
 
+	(normalized-endpoints . ,ly:spanner::calc-normalized-endpoints)
 	;; only for debugging.
 	(font-family . roman)
 
@@ -415,9 +429,11 @@
 	(break-align-orders . ;; end of line
 			    #((
 			       left-edge
+			       cue-end-clef
 			       ambitus
 			       breathing-sign
 			       clef
+			       cue-clef
 			       staff-bar
 			       key-cancellation
 			       key-signature
@@ -427,9 +443,11 @@
 			      ;; unbroken
 			      (
 			       left-edge
+			       cue-end-clef
 			       ambitus
 			       breathing-sign
 			       clef
+			       cue-clef
 			       staff-bar
 			       key-cancellation
 			       key-signature
@@ -446,6 +464,7 @@
 			       key-signature
 			       staff-bar
 			       time-signature
+			       cue-clef
 			       custos)))
 	(non-musical . #t)
 	(positioning-done . ,ly:break-alignment-interface::calc-positioning-done)
@@ -467,6 +486,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)
@@ -484,6 +505,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
@@ -499,7 +521,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))
@@ -508,7 +530,6 @@
 			(next-note . (extra-space . 0.5))
 			(right-edge . (extra-space . 0.5))))
 	(stencil . ,ly:clef::print)
-	(extra-spacing-height . (-0.5 . 0.5))
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
@@ -556,6 +577,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)
@@ -606,7 +680,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
@@ -638,6 +711,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))
@@ -717,10 +804,12 @@
 
 	(left-bound-info . ,ly:line-spanner::calc-left-bound-info-and-text)
 
+	(minimum-length . 2.0)
 	;; make sure the spanner doesn't get too close to notes
 	(minimum-Y-extent . (-1 . 1))
 
 	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:line-spanner::print)
 	(style . dashed-line)
 	(meta . ((class . Spanner)
@@ -787,11 +876,49 @@
 				text-interface
 				text-script-interface))))))
 
+    (FootnoteItem
+     . (
+	(annotation-balloon . #f)
+	(annotation-line . #t)
+	(break-visibility . ,inherit-y-parent-visibility)
+	(footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
+	(stencil . ,ly:balloon-interface::print)
+	(text . ,(grob::calc-property-by-copy 'text))
+	(X-extent . #f)
+	(Y-extent . #f)
+	(X-offset . ,(grob::calc-property-by-copy 'X-offset))
+	(Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
+	(meta . ((class . Item)
+		 (interfaces . (balloon-interface
+				footnote-interface
+				font-interface
+				text-interface))))))
+
+    (FootnoteSpanner
+     . (
+	(annotation-balloon . #f)
+	(annotation-line . #t)
+	(footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
+	(spanner-placement . ,LEFT)
+	(stencil . ,ly:balloon-interface::print-spanner)
+	(text . ,(grob::calc-property-by-copy 'text))
+	(X-extent . #f)
+	(Y-extent . #f)
+	(X-offset . ,(grob::calc-property-by-copy 'X-offset))
+	(Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
+	(meta . ((class . Spanner)
+		 (interfaces . (balloon-interface
+                                footnote-interface
+				footnote-spanner-interface
+				font-interface
+				text-interface))))))
+
     (FretBoard
      . (
 	(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
@@ -811,14 +938,17 @@
 			  ))
 	(gap . 0.5)
 	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+	(normalized-endpoints . ,ly:spanner::calc-normalized-endpoints)
 	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+	(simple-Y . #t)
 	(stencil . ,ly:line-spanner::print)
 	(style . line)
 	(X-extent . #f)
 	(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 +1007,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))
@@ -948,9 +1069,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
@@ -970,9 +1093,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
@@ -1021,17 +1146,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)
@@ -1068,6 +1196,7 @@
 
     (LyricHyphen
      . (
+	(after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
 	(dash-period . 10.0)
 	(height . 0.42)
 	(length . 0.66)
@@ -1098,7 +1227,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)
@@ -1135,7 +1267,6 @@
 
     (MensuralLigature
      . (
-	(flexa-width . 2.0)
 	(stencil . ,ly:mensural-ligature::print)
 	(thickness . 1.4)
 	(meta . ((class . Spanner)
@@ -1162,7 +1293,6 @@
 	(self-alignment-X . ,LEFT)
 	(break-align-symbols . (time-signature))
 	(non-break-align-symbols . (multi-measure-rest-interface))
-	(non-musical . #t)
 	(meta . ((class . Item)
 		 (interfaces . (break-alignable-interface
 				font-interface
@@ -1181,6 +1311,8 @@
 	(staff-position . 0)
 	(stencil . ,ly:multi-measure-rest::print)
 	(thick-thickness . 6.6)
+	;; See Wanske pp. 125
+	(usable-duration-logs . (0 -1 -2 -3))
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
@@ -1244,8 +1376,11 @@
 	(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)
 
+	(keep-inside-line . #t)
 	(line-break-permission . allow)
 	(non-musical . #t)
 	(page-break-permission . allow)
@@ -1280,6 +1415,7 @@
      . (
 	(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)
@@ -1291,9 +1427,11 @@
 
     (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)
@@ -1302,6 +1440,7 @@
 		 (interfaces . (font-interface
 				gregorian-ligature-interface
 				ledgered-interface
+                                ligature-head-interface
 				mensural-ligature-interface
 				note-head-interface
 				rhythmic-grob-interface
@@ -1332,7 +1471,7 @@
 
     (OctavateEight
      . (
-	(break-visibility . ,begin-of-line-visible)
+	(break-visibility . ,inherit-x-parent-visibility)
 	(font-shape . italic)
 	(font-size . -4)
 	(self-alignment-X . ,CENTER)
@@ -1380,6 +1519,7 @@
 	(axes . (,X))
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
+	(keep-inside-line . #t)
 	;; (stencil . ,ly:paper-column::print)
 	(X-extent . ,ly:axis-group-interface::width)
 
@@ -1450,6 +1590,7 @@
 	(height-limit . 2.0)
 	(minimum-length . 1.5)
 	(ratio . 0.333)
+	(spanner-id . "")
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:slur::print)
 	(thickness . 1.1)
@@ -1505,6 +1646,7 @@
 
     (RepeatSlash
      . (
+	(slash-negative-kern . 0.85)
 	(slope . 1.7)
 	(stencil . ,ly:percent-repeat-item-interface::beat-slash)
 	(thickness . 0.48)
@@ -1603,6 +1745,7 @@
 	(line-thickness . 0.8)
 	(minimum-length . 1.5)
 	(ratio . 0.25)
+	(spanner-id . "")
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:slur::print)
 	(thickness . 1.2)
@@ -1660,7 +1803,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)
@@ -1689,12 +1831,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))))))
 
@@ -1740,7 +1884,7 @@
 	 . (
 	    ;; 3.5 (or 3 measured from note head) is standard length
 	    ;; 32nd, 64th, 128th flagged stems should be longer
-	    (lengths . (3.5 3.5 3.5 4.5 5.0 6.0))
+	    (lengths . (3.5 3.5 3.5 4.25 5.0 6.0))
 
 	    ;; FIXME.  3.5 yields too long beams (according to Ross and
 	    ;; looking at Baerenreiter examples) for a number of common
@@ -1773,6 +1917,7 @@
 	(length . ,ly:stem::calc-length)
 	(neutral-direction . ,DOWN)
 	(positioning-done . ,ly:stem::calc-positioning-done)
+	(stem-begin-position . ,ly:stem::calc-stem-begin-position)
 	(stem-end-position . ,ly:stem::calc-stem-end-position)
 	(stem-info . ,ly:stem::calc-stem-info)
 	(stencil . ,ly:stem::print)
@@ -1793,7 +1938,6 @@
 	(stencil . ,ly:stem-tremolo::print)
 	(style . ,ly:stem-tremolo::calc-style)
 	(X-extent . ,ly:stem-tremolo::width)
-	(Y-extent . ,ly:stem-tremolo::height)
 	(meta . ((class . Item)
 		 (interfaces . (stem-tremolo-interface))))))
 
@@ -1875,6 +2019,7 @@
      . (
 	(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:system::height)
@@ -1946,16 +2091,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)
@@ -1973,14 +2130,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)
@@ -2083,6 +2238,7 @@
 	(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))))
@@ -2106,6 +2262,7 @@
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface
+				inline-accidental-interface
 				side-position-interface
 				trill-pitch-accidental-interface))))))
 
@@ -2191,6 +2348,7 @@
      . (
 	(avoid-slur . inside)
 	(cross-staff . ,ly:tuplet-number::calc-cross-staff)
+	(direction . ,tuplet-number::calc-direction)
 	(font-shape . italic)
 	(font-size . -2)
 	(stencil . ,ly:tuplet-number::print)
@@ -2264,11 +2422,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)
@@ -2414,6 +2572,7 @@
    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
@@ -2426,7 +2585,9 @@
   `(
     (,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:stem-tremolo::print . ,ly:stem-tremolo::pure-height)
     (,ly:volta-bracket-interface::print . ,volta-bracket-interface::pure-height)))
 
 ;; ly:grob::stencil-extent is safe if the print callback is safe too
@@ -2450,7 +2611,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)