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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f6f778b150..1b0ec25293 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -202,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
@@ -792,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
@@ -984,6 +986,7 @@
 	(direction . ,UP)
 	(padding . 0.8)
 	(side-axis . ,Y)
+	(outside-staff-priority . 1000)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
@@ -1136,7 +1139,6 @@
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(stencil . ,ly:text-interface::print)
 	(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