X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=47ef19a696235f613e50a13b3d06eb7c7dfc0dd2;hb=a3bb260f7e9420412dc1fa05afc92eeb1dbed32f;hp=7aad372102825fbbe3882e3a7d255cfc7b6cfed1;hpb=8d905755acd00880fe10f4a4a2c82f77ebd4ca01;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7aad372102..47ef19a696 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -275,6 +275,7 @@
      . (
 	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(skylines . ,ly:axis-group-interface::calc-skylines)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				))))))
@@ -601,7 +602,6 @@
 	(font-shape . italic)
 	(avoid-slur . around)
 	(no-spacing-rods . #t)
-	(script-priority . 100)
 	(outside-staff-priority . 250)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -1132,9 +1132,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)
@@ -1656,7 +1653,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
@@ -1977,7 +1974,8 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(X-extent . ,ly:axis-group-interface::width)
 	(stacking-dir . -1)
-	(padding . 0.1) 
+	(padding . 0.1)
+	(skylines . ,ly:axis-group-interface::combine-skylines)
 	(meta . ((class . Spanner)
 		 (interfaces . (align-interface
 				axis-group-interface))))))
@@ -1987,7 +1985,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
@@ -2083,6 +2081,7 @@
 
 (define pure-print-callbacks
   (list
+   ly:bar-line::print
    ly:note-head::print
    ly:accidental-interface::print
    ly:dots::print
@@ -2097,7 +2096,6 @@
 	 (ly:stencil? sten)
 	 (memq sten pure-print-callbacks))
 	(ly:grob::stencil-height grob)
-
 	'(0 . 0))))
 
 (define pure-conversions-alist