X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=994b5e11d88ba4b25ee5713a17f7afb6825bda05;hb=79147c54b1c704b8c5dab7df13892ef5be521fda;hp=5e9910276107d97093f0766463db8b7a16506fe6;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5e99102761..994b5e11d8 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -334,7 +334,7 @@
 
     (BendAfter
      . (
-	(stencil . ,fall::print)
+	(stencil . ,bend::print)
 	(thickness . 2.0)
 	(meta . ((class . Spanner)
 		 (interfaces . (spanner-interface
@@ -575,6 +575,7 @@
 	(minimum-space . 1.2)
 	(direction . ,DOWN)
 	(side-axis . ,Y)
+	(outside-staff-priority . 250)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(X-extent . ,ly:axis-group-interface::width)
 	(meta . ((class . Spanner)
@@ -601,6 +602,7 @@
 	(avoid-slur . around)
 	(no-spacing-rods . #t)
 	(script-priority . 100)
+	(outside-staff-priority . 250)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
 				text-interface
@@ -670,7 +672,6 @@
 	(style . line)
 	(gap . 0.5)
 	(zigzag-width . 0.75)
-	(non-musical . #t)
 	(X-extent . #f)
 	(Y-extent . #f)
 	(stencil . ,ly:line-spanner::print)
@@ -1156,6 +1157,7 @@
 	(dash-fraction . 0.3)
 	(edge-height . (0 . 1.2))
 	(direction . ,UP)
+	(outside-staff-priority . 400)
 	(meta . ((class . Spanner)
 		 (interfaces . (ottava-bracket-interface
 				horizontal-bracket-interface
@@ -1181,11 +1183,20 @@
 
     (ParenthesesItem
      . ((stencil . ,parentheses-item::print)
+	(stencils . ,parentheses-item::calc-parenthesis-stencils)
 	(font-size . -6)
 	(padding . 0.2)
 	(meta . ((class . Item)
 		 (interfaces . (parentheses-interface font-interface))))
 	))
+
+    (HarmonicParenthesesItem
+     . ((stencil . ,parentheses-item::print)
+	(padding . 0)
+	(stencils . ,parentheses-item::calc-angled-bracket-stencils)
+	(meta . ((class . Item)
+		 (interfaces . (parentheses-interface font-interface))))
+	))
     
     (PhrasingSlur
      . ((details . ,default-slur-details)
@@ -1269,6 +1280,7 @@
 	(break-visibility . ,end-of-line-invisible)
 	(break-align-symbol . staff-bar)
 	(padding . 0.8)
+	(outside-staff-priority . 1000)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
@@ -1369,6 +1381,7 @@
 	(avoid-slur . inside)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
+	(skylines . ,ly:separation-item::calc-skylines)
 	(meta . ((class . Item)
 		 (interfaces . (spacing-interface
 				separation-item-interface))))))
@@ -1644,6 +1657,7 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(skyline-spacing . #t)
+	(skyline-horizontal-padding . 1.0)
 	(meta . ((class . System)
 		 (interfaces . (system-interface
 				axis-group-interface))))))
@@ -1706,11 +1720,12 @@
 		 (interfaces . (side-position-interface
 				system-start-delimiter-interface))))))
 
-
     (TabNoteHead
      . (
 	(stencil . ,ly:text-interface::print)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+	(direction . 0)
 	(font-size . -2)
 	(stem-attachment . (0.0 . 1.35))
 	(font-series . bold)
@@ -1737,6 +1752,7 @@
 	(stencil . ,ly:text-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
 
+	(outside-staff-priority . 450)
 	(avoid-slur . around)
 	(slur-padding . 0.5)
 	(script-priority . 200)
@@ -1758,6 +1774,7 @@
 	(dash-period . 3.0)
 	(side-axis . ,Y)
 	(direction . ,UP)
+	(outside-staff-priority . 350)
 	(meta . ((class . Spanner)
 		 (interfaces . (text-spanner-interface
 				line-spanner-interface
@@ -1773,7 +1790,7 @@
 	(stencil . ,ly:tie::print)
 	(font-size . -6)
 	(details . (
-		    ;; for a full list, see tie-helper.cc
+		    ;; for a full list, see tie-details.cc
 		    (ratio . 0.333)
 		    (center-staff-line-clearance . 0.6)
 		    (tip-staff-line-clearance . 0.45)
@@ -1834,6 +1851,7 @@
 	(direction . ,UP)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
+	(outside-staff-priority . 50)
 	(meta . ((class . Spanner)
 		 (interfaces . (text-spanner-interface
 				line-spanner-interface
@@ -1858,6 +1876,7 @@
 	(axes . (,X))
 	(font-size . -4)
 	(stencil . ,parenthesize-elements)
+	(stencils . ,parentheses-item::calc-parenthesis-stencils)
 	(direction . ,RIGHT)
 	(side-axis . ,X)
 	(padding . 0.3)
@@ -1987,6 +2006,7 @@
 	(edge-height . (2.0 . 2.0)) ;; staff-space;
 	(minimum-space . 5)
 	(font-size . -4)
+	(outside-staff-priority . 100)
 	(meta . ((class . Spanner)
 		 (interfaces . (volta-bracket-interface
 				horizontal-bracket-interface				
@@ -2064,6 +2084,8 @@
 (define pure-print-callbacks
   (list
    ly:note-head::print
+   ly:accidental-interface::print
+   ly:dots::print
    ly:clef::print
    ly:text-interface::print
    ly:script-interface::print))
@@ -2075,6 +2097,7 @@
 	 (ly:stencil? sten)
 	 (memq sten pure-print-callbacks))
 	(ly:grob::stencil-height grob)
+
 	'(0 . 0))))
 
 (define pure-conversions-alist