X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=85d48b1394833d7b52c3fe2a11eeb61b7e1ca970;hb=dc3017bfda1b00bc3853ce46b846ff0bba2b8a2c;hp=93dfbba0e6b128570cf018bbe0f8781e1b70c21d;hpb=a8788479bdc2c76340c65de5e05fe442fb1b022b;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 93dfbba0e6..85d48b1394 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -153,6 +153,8 @@
 	(script-priority . 0)
 	(side-axis . ,X)
 	(staff-position . 0.0)
+	(cross-staff . ,ly:arpeggio::calc-cross-staff)
+	(Y-extent . ,ly:arpeggio::height)
 	(meta . ((class . Item)
 		 (interfaces . (arpeggio-interface
 				staff-symbol-referencer-interface
@@ -214,7 +216,6 @@
 	(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
@@ -290,7 +291,7 @@
      . (
 	(axes . (,Y))
 	(Y-extent . ,ly:axis-group-interface::height)
-	(skylines . ,ly:axis-group-interface::calc-skylines)
+	(vertical-skylines . ,ly:axis-group-interface::calc-skylines)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				))))))
@@ -319,6 +320,7 @@
 	(beaming . ,ly:beam::calc-beaming)
 	(stencil . ,ly:beam::print)
 	(clip-edges . #t)
+	(cross-staff . ,ly:beam::calc-cross-staff)
 
 	(details .  ((hint-direction-penalty . 20)))
 	;; TODO: should be in SLT.
@@ -591,7 +593,6 @@
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(staff-padding . 0.1)
 	(padding . 0.6)
-	(avoid-slur . outside)
 	(slur-padding . 0.3)
 	(minimum-space . 1.2)
 	(direction . ,DOWN)
@@ -620,7 +621,6 @@
 	(font-series . bold)
 	(font-encoding . fetaDynamic)
 	(font-shape . italic)
-	(avoid-slur . around)
 	(extra-spacing-width . (+inf.0 . -inf.0))
 	(outside-staff-priority . 250)
 	(meta . ((class . Item)
@@ -655,9 +655,9 @@
 			  (left-broken . ((attach-dir .  ,RIGHT)
 				   ))
 			  ))
-	(stencil . ,ly:new-line-spanner::print)
-	(left-bound-info . ,ly:new-line-spanner::calc-left-bound-info-and-text)
-	(right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+	(stencil . ,ly:line-spanner::print)
+	(left-bound-info . ,ly:line-spanner::calc-left-bound-info-and-text)
+	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 
 	;; need to blend with dynamic texts.
 	(font-size . 1)
@@ -666,7 +666,7 @@
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
 				text-interface
-				new-line-spanner-interface
+				line-spanner-interface
 				line-interface
 				dynamic-interface
 				dynamic-text-spanner-interface
@@ -720,13 +720,13 @@
 				   (padding . 1.5)
 				      ))
 			  ))
-	(stencil . ,ly:new-line-spanner::print)
-	(left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
-	(right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+	(stencil . ,ly:line-spanner::print)
+	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 	(meta . ((class . Spanner)
 		 (interfaces . (line-interface
 				unbreakable-spanner-interface
-				new-line-spanner-interface))))))
+				line-spanner-interface))))))
 
     (GraceSpacing
      . (
@@ -1257,6 +1257,7 @@
 	(minimum-length . 1.5)
 	(height-limit . 2.0)
 	(ratio . 0.333)
+	(cross-staff . ,ly:slur::calc-cross-staff)
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
 
@@ -1408,6 +1409,7 @@
 	(stencil . ,ly:script-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
 	(font-encoding . fetaMusic)
+	(cross-staff . ,ly:script-interface::calc-cross-staff)
 	(meta . ((class . Item)
 		 (interfaces . (script-interface
 				side-position-interface
@@ -1429,7 +1431,8 @@
 	(avoid-slur . inside)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
-	(skylines . ,ly:separation-item::calc-skylines)
+	(horizontal-skylines . ,ly:separation-item::calc-skylines)
+	(stencil . ,ly:separation-item::print)
 	(meta . ((class . Item)
 		 (interfaces . (
 				separation-item-interface))))))
@@ -1455,6 +1458,7 @@
 	(height-limit . 2.0)
 	(ratio . 0.25)
 	(avoid-slur . inside)
+	(cross-staff . ,ly:slur::calc-cross-staff)
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
 
@@ -1575,6 +1579,7 @@
 	(Y-extent . ,ly:stem::height)
 	(length . ,ly:stem::calc-length)
 	(thickness . 1.3)
+	(cross-staff . ,ly:stem::calc-cross-staff)
 	(details
 	 . (
 	    ;; 3.5 (or 3 measured from note head) is standard length
@@ -1701,7 +1706,8 @@
 	(axes . (0 1))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
-	(skylines . ,ly:axis-group-interface::calc-skylines)
+	(vertical-skylines . ,ly:axis-group-interface::calc-skylines)
+	(max-stretch . ,ly:axis-group-interface::calc-max-stretch)
 	(skyline-horizontal-padding . 1.0)
 	(meta . ((class . System)
 		 (interfaces . (system-interface
@@ -1820,8 +1826,8 @@
 	(direction . ,UP)
 	(outside-staff-priority . 350)
 
-	(left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
-	(right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 	(bound-details . ((left . ((Y . 0)
 				   (padding . 0.25)
 				   (attach-dir . ,LEFT)
@@ -1830,10 +1836,10 @@
 				    (padding . 0.25)
 				   ))
 			  ))
-	(stencil . ,ly:new-line-spanner::print)
+	(stencil . ,ly:line-spanner::print)
 
 	(meta . ((class . Spanner)
-		 (interfaces . (new-line-spanner-interface
+		 (interfaces . (line-spanner-interface
 				side-position-interface
 				font-interface))))))
 
@@ -1901,8 +1907,8 @@
 
     (TrillSpanner
      . (
-	(left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
-	(right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 
 	(bound-details . ((left . ((text . ,(make-translate-scaled-markup
 					     '(0.5 . -0.6)
@@ -1914,7 +1920,7 @@
 			  (right . ((Y . 0)))
 			  ))
 	
-	(stencil . ,ly:new-line-spanner::print)
+	(stencil . ,ly:line-spanner::print)
 
 	(style . trill)
 	(staff-padding . 1.0)
@@ -1924,7 +1930,7 @@
 	(side-axis . ,Y)
 	(outside-staff-priority . 50)
 	(meta . ((class . Spanner)
-		 (interfaces . (new-line-spanner-interface
+		 (interfaces . (line-spanner-interface
 				line-interface
 				trill-spanner-interface
 				side-position-interface
@@ -1987,6 +1993,7 @@
 	(connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
 	(control-points . ,ly:tuplet-bracket::calc-control-points)
 	(stencil . ,ly:tuplet-bracket::print)
+	(cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
 	
 	(meta . ((class . Spanner)
 		 (interfaces . (line-interface
@@ -1999,6 +2006,7 @@
 	(font-shape . italic)
 	(font-size . -2)
 	(avoid-slur . inside)
+	(cross-staff . ,ly:tuplet-number::calc-cross-staff)
 	(meta . ((class . Spanner)
 		 (interfaces . (text-interface tuplet-number-interface
 				font-interface))))))
@@ -2051,7 +2059,8 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(stacking-dir . -1)
 	(padding . 0.5)
-	(skylines . ,ly:axis-group-interface::combine-skylines)
+	(vertical-skylines . ,ly:axis-group-interface::combine-skylines)
+	(max-stretch . ,ly:align-interface::calc-max-stretch)
 	(meta . ((class . Spanner)
 		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
 		 (interfaces . (align-interface
@@ -2062,7 +2071,9 @@
 	(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)
-	(skylines . ,ly:axis-group-interface::calc-skylines);
+	(vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
+	(max-stretch . ,ly:axis-group-interface::calc-max-stretch)
+	(stencil . ,ly:axis-group-interface::print)
 	(meta . ((class . Spanner)
 		 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
 		 (interfaces . (axis-group-interface
@@ -2076,6 +2087,7 @@
 	(direction . ,UP)
 	(padding . 1)
 	(font-encoding . fetaNumber)
+	(minimum-Y-extent . (0 . 2))
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(thickness . 1.6)  ;;  line-thickness
@@ -2107,11 +2119,11 @@
 				   (padding . 1.5)
 				      ))
 			  ))
-	(stencil . ,ly:new-line-spanner::print)
-	(left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
-	(right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+	(stencil . ,ly:line-spanner::print)
+	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 	(meta . ((class . Spanner)
-		 (interfaces . (new-line-spanner-interface
+		 (interfaces . (line-spanner-interface
 				line-interface))))
 	))
 
@@ -2169,6 +2181,10 @@
 
 (define pure-print-callbacks
   (list
+   print-circled-text-callback
+   lyric-text::print
+   ly:arpeggio::print
+   ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
    ly:note-head::print
    ly:dots::print
@@ -2188,6 +2204,7 @@
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
+    (,ly:arpeggio::height . ,ly:arpeggio::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
     (,ly:stem::height . ,ly:stem::pure-height)
     (,ly:rest::height . ,ly:rest::pure-height)