From: Joe Neeman <joeneeman@gmail.com>
Date: Mon, 11 Feb 2008 23:30:05 +0000 (+0100)
Subject: Merge commit 'ce4b499'
X-Git-Tag: release/2.11.40-1~3^2~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9e7b53f94e1e3bd7b3f7a14ba11a6cae6c8e9a73;hp=-c;p=lilypond.git

Merge commit 'ce4b499'
---

9e7b53f94e1e3bd7b3f7a14ba11a6cae6c8e9a73
diff --combined scm/define-grobs.scm
index 8b58b1a57a,187218c617..0800d482d8
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@@ -88,7 -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 +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)
@@@ -518,6 -518,7 +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
@@@ -546,7 -547,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)
@@@ -600,7 -601,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)
@@@ -1122,7 -1123,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)
@@@ -1143,7 -1144,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)
@@@ -1153,7 -1154,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)
@@@ -1241,7 -1242,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)
@@@ -1500,9 -1501,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)
@@@ -1714,9 -1714,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)
@@@ -1730,7 -1729,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)
@@@ -2061,9 -2060,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)
@@@ -2086,7 -2084,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)
@@@ -2101,7 -2099,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)
@@@ -2135,7 -2133,7 +2136,7 @@@
  
      (VoltaBracketSpanner
       . (	
- 	(axes . (1))
+ 	(axes . (,Y))
  	(side-axis . ,Y)
  	(direction . ,UP)
  	(padding . 1)