X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=187218c6173dc545f627806720a91efee63ede76;hb=153d42aac36f532da14fea117f593a917e8c14e1;hp=ef27cbd1e3bfe4fc845f610a3abc39b56c2de299;hpb=1806f0b1a3ca989203675dc8f44387a076acdffa;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index ef27cbd1e3..187218c617 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -88,7 +88,7 @@
     
     (Ambitus
      . (
-	(axes . (0 1))
+	(axes . (,X ,Y))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(space-alist . (
@@ -410,14 +410,14 @@
 			       staff-bar
 			       time-signature
 			       custos)))
-	(axes . (0))
+	(axes . (,X))
 	(meta . ((class . Item)
 		 (interfaces . (break-alignment-interface
 				axis-group-interface))))))
 
     (BreakAlignGroup
      . (
-	(axes . (0))
+	(axes . (,X))
 	(X-extent . ,ly:axis-group-interface::width)
 	(break-align-anchor . ,ly:break-aligned-interface::calc-average-anchor)
 	(break-visibility . ,ly:break-aligned-interface::calc-break-visibility)
@@ -486,6 +486,7 @@
 	(stencil . ,ly:cluster::print)
 	(minimum-length . 0.0)
 	(padding . 0.25)
+	(cross-staff . ,ly:cluster::calc-cross-staff)
 	(style . ramp)
 	(meta . ((class . Spanner)
 		 (interfaces . (cluster-interface))))))
@@ -517,6 +518,7 @@
 	;; todo: add X self alignment?
 	(baseline-skip . 2)
 	(side-axis . ,Y)
+	(avoid-slur . outside )
 	(font-series . bold)
 	(meta . ((class . Item)
 		 (interfaces . (text-script-interface
@@ -545,7 +547,7 @@
 
     (DotColumn
      . (
-	(axes . (0))
+	(axes . (,X))
 	(direction . ,RIGHT)
 	(positioning-done . ,ly:dot-column::calc-positioning-done) 
 	(X-extent . ,ly:axis-group-interface::width)
@@ -599,7 +601,7 @@
 				text-interface))))))
     (DynamicLineSpanner
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(staff-padding . 0.1)
 	(padding . 0.6)
@@ -1048,6 +1050,7 @@
 	(direction . ,UP)
 	(padding . 0.8)
 	(side-axis . ,Y)
+	(extra-spacing-width . (+inf.0 . -inf.0))
 	(outside-staff-priority . 1000)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
@@ -1109,6 +1112,7 @@
 	(direction . ,UP)
 	(padding . 0.2)
 	(staff-padding . 0.25)
+	(outside-staff-priority . 450)
 	(meta . ((class . Spanner)
 		 (interfaces . (side-position-interface
 				multi-measure-interface
@@ -1119,7 +1123,7 @@
     (NonMusicalPaperColumn
      . (
 	(allow-loose-spacing . #t)
-	(axes . (0))
+	(axes . (,X))
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	(X-extent . ,ly:axis-group-interface::width)
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
@@ -1140,7 +1144,7 @@
     
     (NoteCollision
      . (
-	(axes . (0 1))
+	(axes . (,X ,Y))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(positioning-done . ,ly:note-collision-interface::calc-positioning-done)
@@ -1150,7 +1154,7 @@
 
     (NoteColumn
      . (
-	(axes . (0 1))
+	(axes . (,X ,Y))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
@@ -1223,6 +1227,7 @@
 	(staff-padding . 1.0)
 	(padding . 0.5)
 	(minimum-length . 1.0)
+	(style . dashed-line)
 	(dash-fraction . 0.3)
 	(edge-height . (0 . 1.2))
 	(direction . ,UP)
@@ -1237,7 +1242,7 @@
 
     (PaperColumn
      . (
-	(axes . (0))
+	(axes . (,X))
 	(allow-loose-spacing . #t)
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
@@ -1496,7 +1501,7 @@
 
     (SostenutoPedalLineSpanner
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
@@ -1525,7 +1530,8 @@
     (SpanBar
      . (
 	(break-align-symbol . staff-bar)
-	(Y-extent . ())
+	(Y-extent . ,ly:axis-group-interface::height)
+	(cross-staff . #t)
 	(layer . 0)
 	(non-musical . #t)
 	(stencil . ,ly:span-bar::print)
@@ -1708,7 +1714,7 @@
 
     (SustainPedalLineSpanner
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
@@ -1723,7 +1729,7 @@
 
     (System
      . (
-	(axes . (0 1))
+	(axes . (,X ,Y))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(vertical-skylines . ,ly:axis-group-interface::calc-skylines)
@@ -1828,6 +1834,7 @@
 	(avoid-slur . around)
 	(slur-padding . 0.5)
 	(script-priority . 200)
+	(cross-staff . ,ly:script-interface::calc-cross-staff)
 	;; todo: add X self alignment?
 	(meta . ((class . Item)
 		 (interfaces . (text-script-interface
@@ -2053,7 +2060,7 @@
 
     (UnaCordaPedalLineSpanner
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
@@ -2077,7 +2084,7 @@
 
     (VerticalAlignment
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(positioning-done . ,ly:align-interface::calc-positioning-done)
 	(after-line-breaking . ,ly:align-interface::stretch-after-break)
 	(Y-extent . ,ly:axis-group-interface::height)
@@ -2085,14 +2092,14 @@
 	(stacking-dir . -1)
 	(padding . 0.5)
 	(vertical-skylines . ,ly:axis-group-interface::combine-skylines)
-	(max-stretch . ,ly:align-interface::calc-max-stretch)
+	(max-stretch . 0)
 	(meta . ((class . Spanner)
 		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
 		 (interfaces . (align-interface
 				axis-group-interface))))))
     (VerticalAxisGroup
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(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)
@@ -2126,7 +2133,7 @@
 
     (VoltaBracketSpanner
      . (	
-	(axes . (1))
+	(axes . (,Y))
 	(side-axis . ,Y)
 	(direction . ,UP)
 	(padding . 1)