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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 02f530d54b..1b0ec25293 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)
@@ -201,6 +202,7 @@
 	(font-size . -2)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
+	(outside-staff-priority . 100)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+
 			,(ly:make-simple-closure
@@ -238,6 +240,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 +278,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 +449,8 @@
      . (
 	(Y-extent . ,ly:cluster-beacon::height)
 	(meta . ((class . Item)
-		 (interfaces . (cluster-beacon-interface))))))
+		 (interfaces . (rhythmic-grob-interface
+				cluster-beacon-interface))))))
 
     (ClusterSpanner
      . (
@@ -474,7 +479,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 +605,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 +793,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
@@ -981,6 +986,7 @@
 	(direction . ,UP)
 	(padding . 0.8)
 	(side-axis . ,Y)
+	(outside-staff-priority . 1000)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
@@ -1132,11 +1138,7 @@
 	
 	(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)
 	(font-size . -4)
 	(meta . ((class . Item)
@@ -1278,9 +1280,9 @@
 	(font-size . 2)
 	(baseline-skip . 2)
 	(break-visibility . ,end-of-line-invisible)
-	(break-align-symbol . staff-bar)
+	(break-align-symbol . clef)
 	(padding . 0.8)
-	(outside-staff-priority . 1000)
+	(outside-staff-priority . 1500)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
@@ -1416,7 +1418,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 +1624,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 +1659,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 +1742,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 +1937,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 +1980,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 +1991,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 +2087,7 @@
 
 (define pure-print-callbacks
   (list
+   ly:bar-line::print
    ly:note-head::print
    ly:accidental-interface::print
    ly:dots::print
@@ -2098,7 +2102,6 @@
 	 (ly:stencil? sten)
 	 (memq sten pure-print-callbacks))
 	(ly:grob::stencil-height grob)
-
 	'(0 . 0))))
 
 (define pure-conversions-alist