X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=cf615aae7cffca06e444d374a3361937e4d94dee;hb=e73f6ade4a00c4c002d4b62c90a8d93caa4cb7d2;hp=02f530d54bb4288e9c2fa0387c809288153862e6;hpb=830273ee6930479dbf332731ea5243a364c1bd87;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 02f530d54b..cf615aae7c 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -161,6 +161,7 @@
 	(layer . 0)
 	(break-visibility . ,all-visible)
 	(non-musical . #t)
+	(extra-spacing-width . (-0.3 . 0.3))
 
 	(stencil . ,ly:bar-line::print)
 	(glyph-name . ,bar-line::calc-glyph-name)
@@ -238,6 +239,7 @@
 	(positioning-done . ,ly:align-interface::calc-positioning-done)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(stacking-dir . -1)
+	(padding . 0.2)
 	(meta . ((class . Spanner)
 		 (interfaces . (align-interface
 				bass-figure-alignment-interface
@@ -275,6 +277,7 @@
      . (
 	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(skylines . ,ly:axis-group-interface::calc-skylines)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				))))))
@@ -445,7 +448,8 @@
      . (
 	(Y-extent . ,ly:cluster-beacon::height)
 	(meta . ((class . Item)
-		 (interfaces . (cluster-beacon-interface))))))
+		 (interfaces . (rhythmic-grob-interface
+				cluster-beacon-interface))))))
 
     (ClusterSpanner
      . (
@@ -474,7 +478,7 @@
     (CombineTextScript
      . (
 	(stencil . ,ly:text-interface::print)
-	(no-spacing-rods . #t)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(direction . ,UP)
@@ -600,8 +604,7 @@
 	(font-encoding . fetaDynamic)
 	(font-shape . italic)
 	(avoid-slur . around)
-	(no-spacing-rods . #t)
-	(script-priority . 100)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(outside-staff-priority . 250)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -789,7 +792,8 @@
 	(break-visibility . ,begin-of-line-invisible)
 	(non-musical . #t)
 	(meta . ((class . Item)
-		 (interfaces . (key-signature-interface
+		 (interfaces . (key-cancellation-interface
+				key-signature-interface
 				font-interface
 				break-aligned-interface))))))
     (KeySignature
@@ -1132,9 +1136,6 @@
 	
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(stencil . ,ly:text-interface::print)
-
-	;; no Y dimensions, because of lyrics under tenor clef.
-	(Y-extent . (0 . 0))
 	(font-shape . italic)
 	(padding . 0.6)
 	(staff-padding . 0.2)
@@ -1416,7 +1417,7 @@
 	(stencil . ,ly:text-interface::print)
 	(direction . ,RIGHT)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
-	(no-spacing-rods . #t)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
 	(font-shape . italic)
 	(self-alignment-X . 0)
@@ -1622,7 +1623,7 @@
 
     (SustainPedal
      . (
-	(no-spacing-rods . #t)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(stencil . ,ly:sustain-pedal::print)
 	(self-alignment-X . 0)
 	(direction . ,RIGHT)
@@ -1657,7 +1658,7 @@
 	(axes . (0 1))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
-	(skyline-spacing . #t)
+	(skylines . ,ly:axis-group-interface::calc-skylines)
 	(skyline-horizontal-padding . 1.0)
 	(meta . ((class . System)
 		 (interfaces . (system-interface
@@ -1740,7 +1741,7 @@
 
     (TextScript
      . (
-	(no-spacing-rods . #t)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
@@ -1935,7 +1936,7 @@
      . (
 	(stencil . ,ly:text-interface::print)
 	(font-shape . italic)
-	(no-spacing-rods . #t)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(self-alignment-X . 0)
 	(direction . ,RIGHT)
 	(padding . 0.0)  ;; padding relative to UnaCordaPedalLineSpanner
@@ -1978,7 +1979,8 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(X-extent . ,ly:axis-group-interface::width)
 	(stacking-dir . -1)
-	(padding . 0.1) 
+	(padding . 0.5)
+	(skylines . ,ly:axis-group-interface::combine-skylines)
 	(meta . ((class . Spanner)
 		 (interfaces . (align-interface
 				axis-group-interface))))))
@@ -1988,7 +1990,7 @@
 	(Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
 	(Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
 	(X-extent . ,ly:axis-group-interface::width)
-	(skyline-spacing . #t)
+	(skylines . ,ly:axis-group-interface::calc-skylines);
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				hara-kiri-group-spanner-interface
@@ -2084,6 +2086,7 @@
 
 (define pure-print-callbacks
   (list
+   ly:bar-line::print
    ly:note-head::print
    ly:accidental-interface::print
    ly:dots::print
@@ -2098,7 +2101,6 @@
 	 (ly:stencil? sten)
 	 (memq sten pure-print-callbacks))
 	(ly:grob::stencil-height grob)
-
 	'(0 . 0))))
 
 (define pure-conversions-alist