X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=0800d482d843f581a46f62421edb29f40c2b3727;hb=9e7b53f94e1e3bd7b3f7a14ba11a6cae6c8e9a73;hp=800362eb92956a1fa0ca853de5633ccad2e1345a;hpb=6b9074b73e68271dd5072bc46d72bacec47efc4b;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 800362eb92..0800d482d8 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)
@@ -1121,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)
@@ -1142,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)
@@ -1152,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)
@@ -1240,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)
@@ -1499,8 +1501,9 @@
 
     (SostenutoPedalLineSpanner
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(staff-padding . 1.0)
@@ -1529,6 +1532,7 @@
      . (
 	(break-align-symbol . staff-bar)
 	(Y-extent . ,ly:axis-group-interface::height)
+	(cross-staff . #t)
 	(layer . 0)
 	(non-musical . #t)
 	(stencil . ,ly:span-bar::print)
@@ -1711,8 +1715,9 @@
 
     (SustainPedalLineSpanner
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
@@ -1726,7 +1731,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)
@@ -2057,8 +2062,9 @@
 
     (UnaCordaPedalLineSpanner
      . (
-	(axes . (1))
+	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
@@ -2081,7 +2087,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)
@@ -2096,7 +2102,7 @@
 				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)
@@ -2130,7 +2136,7 @@
 
     (VoltaBracketSpanner
      . (	
-	(axes . (1))
+	(axes . (,Y))
 	(side-axis . ,Y)
 	(direction . ,UP)
 	(padding . 1)