X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=0dc2235031de89d58a5383b643363889cfabde56;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=4d06aa3a03bb2172c55acda651343e35bf6837fb;hpb=721ad807e30b69eca0e82fd1b1cf6de2b2fe0a39;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 4d06aa3a03..0dc2235031 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -23,8 +23,7 @@
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(alteration . ,accidental-interface::calc-alteration) 
 	(stencil . ,ly:accidental-interface::print)
-	(after-line-breaking
-	 . ,ly:accidental-interface::after-line-breaking)
+	(Y-extent . ,ly:accidental-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface))))))
@@ -35,8 +34,7 @@
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(alteration . ,accidental-interface::calc-alteration) 
 	(stencil . ,ly:accidental-interface::print)
-	(after-line-breaking
-	 . ,ly:accidental-interface::after-line-breaking)
+	(Y-extent . ,ly:accidental-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface))))))
@@ -45,6 +43,7 @@
     (AccidentalSuggestion
      . (
 	(stencil . ,ly:accidental-interface::print)
+	(Y-extent . ,ly:accidental-interface::height)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+
 			,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
@@ -120,8 +119,8 @@
 	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(stencil . ,ly:accidental-interface::print)
+	(Y-extent . ,ly:accidental-interface::height)
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)	
-	(after-line-breaking . ,ly:accidental-interface::after-line-breaking)
 	(side-axis . ,X)
 	(meta . ((class . Item)
 		 (interfaces . (
@@ -176,8 +175,6 @@
 	(layer . 0)
 	(break-visibility . ,all-visible)
 	(non-musical . #t)
-	(extra-spacing-width . (-0.3 . 0.3))
-
 	(stencil . ,ly:bar-line::print)
 	(glyph-name . ,bar-line::calc-glyph-name)
 	(bar-size .  ,ly:bar-line::calc-bar-size)
@@ -189,7 +186,7 @@
 			(key-signature . (extra-space . 1.0))
 			(key-cancellation . (extra-space . 1.0))
 			(first-note . (fixed-space . 1.3))
-			(next-note . (semi-fixed-space . 1.3))
+			(next-note . (semi-fixed-space . 0.9))
 			(right-edge . (extra-space . 0.0))))
 
 	;;
@@ -548,6 +545,7 @@
      . (
 	(stencil . ,ly:dots::print)
 	(dot-count . ,dots::calc-dot-count)
+	(staff-position . ,dots::calc-staff-position)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
 				staff-symbol-referencer-interface
@@ -709,7 +707,7 @@
 	(shortest-duration-space . 1.6)
 	(meta . ((class . Spanner)
 		 (interfaces . (grace-spacing-interface
-				spacing-interface
+				
 				spacing-options-interface
 				spanner-interface))))))
     (GridPoint
@@ -950,7 +948,7 @@
 	(X-extent . #f)
 	(meta . ((class . Spanner)
 		 (interfaces . (spanner-interface
-				lyric-hyphen-interface spacing-interface))
+				lyric-hyphen-interface ))
 		 ))
 	))
     
@@ -989,7 +987,7 @@
      . (
 	(neutral-direction . ,DOWN)
 	(meta . ((class . Item)
-		 (interfaces . (melody-spanner-interface spacing-interface))))))
+		 (interfaces . (melody-spanner-interface ))))))
     (MensuralLigature
      . (
 	(thickness . 1.4)
@@ -1137,7 +1135,7 @@
 	;; If you ever change this back, please document! --hwn
 	(knee-spacing-correction . 1.0)
 	(meta . ((class . Item)
-		 (interfaces . (spacing-interface
+		 (interfaces . (
 				note-spacing-interface))))))
 
     (NoteName
@@ -1405,7 +1403,7 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(skylines . ,ly:separation-item::calc-skylines)
 	(meta . ((class . Item)
-		 (interfaces . (spacing-interface
+		 (interfaces . (
 				separation-item-interface))))))
 
     (SeparatingGroupSpanner
@@ -1413,7 +1411,7 @@
 	(springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods)
 	(meta . ((class . Spanner)
 		 (interfaces . (only-prebreak-interface
-				spacing-interface
+				
 				separating-group-spanner-interface))))))
 
     (Slur
@@ -1471,7 +1469,7 @@
 	
 	(base-shortest-duration . ,(ly:make-moment 3 16))
 	(meta . ((class . Spanner)
-		 (interfaces . (spacing-interface
+		 (interfaces . (
 				spacing-options-interface				
 				spacing-spanner-interface))))))
 
@@ -1521,8 +1519,7 @@
 	(non-musical . #t)
 	(stem-spacing-correction . 0.4)
 	(meta . ((class . Item)
-		 (interfaces . (spacing-interface
-				staff-spacing-interface))))))
+		 (interfaces . (staff-spacing-interface))))))
 
    
     (StaffSymbol
@@ -1820,14 +1817,17 @@
 		    (stem-gap . 0.35)
 		    (height-limit . 1.0)
 		    (horizontal-distance-penalty-factor . 10)
-		    (min-length-penalty-factor . 20)
+		    (same-dir-as-stem-penalty . 8)
+		    (min-length-penalty-factor . 26)
 		    (tie-tie-collision-distance . 0.45) 
 		    (tie-tie-collision-penalty . 25.0)
 		    (intra-space-threshold . 1.25)
 		    (outer-tie-vertical-distance-symmetry-penalty-factor . 10)
 		    (outer-tie-length-symmetry-penalty-factor . 10)
+		    (vertical-distance-penalty-factor . 7)
 		    (outer-tie-vertical-gap . 0.25)
 		    (multi-tie-region-size . 1)
+		    (single-tie-region-size . 4)
 		    (between-length-limit . 1.0)))
 	
 	(thickness . 1.2)
@@ -1887,6 +1887,7 @@
 	(font-size . -4)
 	(side-axis . ,X)
 	(stencil . ,ly:accidental-interface::print)
+	(Y-extent . ,ly:accidental-interface::height)
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(meta . ((class . Item)
 		 (interfaces . (trill-pitch-accidental-interface
@@ -2112,7 +2113,6 @@
   (list
    ly:bar-line::print
    ly:note-head::print
-   ly:accidental-interface::print
    ly:dots::print
    ly:clef::print
    ly:text-interface::print
@@ -2128,16 +2128,17 @@
 	'(0 . 0))))
 
 (define pure-conversions-alist
-  (list
-   `(,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)
-   `(,ly:grob::stencil-height . ,pure-stencil-height)
-   `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
-   `(,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
-   `(,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
-   `(,ly:slur::height . ,ly:slur::pure-height)
-   `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
+  `(
+    (,ly:accidental-interface::height . ,ly:accidental-interface::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)
+    (,ly:grob::stencil-height . ,pure-stencil-height)
+    (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
+    (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
+    (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
+    (,ly:slur::height . ,ly:slur::pure-height)
+    (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
 
 (define pure-functions
   (list