X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=e41b08d34c8e52216840c638bdd8d4625eb862bd;hb=c5bf34be054141c1b2ebd354630ada56db1dfc76;hp=af306ed01df8af47f2c32cc27e76ac904cf6c81d;hpb=03ce3667568361ee7433032988a4089c64de2ec7;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index af306ed01d..e41b08d34c 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -20,13 +20,27 @@
     (Accidental
      . (
 	(avoid-slur . inside)
-	(cautionary-style . parentheses)
+	(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)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface))))))
+    (AccidentalCautionary
+     . (
+	(avoid-slur . inside)
+	(parenthesized . #t)
+	(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)
+	(meta . ((class . Item)
+		 (interfaces . (accidental-interface
+				font-interface))))))
+
     
     (AccidentalSuggestion
      . (
@@ -36,12 +50,13 @@
 			,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
 			,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
 	(self-alignment-X . ,CENTER)
-	(cautionary . #t)
-	(cautionary-style . smaller)
+	(font-size . -2)
+	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
+	(alteration . ,accidental-interface::calc-alteration)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
-	(cautionary-style . parentheses)
 	(direction . ,UP)
 	(staff-padding . 0.25)
+	(outside-staff-priority . 0)
 	(script-priority . 0)
 	(side-axis . ,X)
 	(meta . ((class . Item)
@@ -104,12 +119,12 @@
 	(padding . 0.5)
 	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
-	(cautionary-style . parentheses)
 	(stencil . ,ly:accidental-interface::print)
+	(glyph-name-alist . ,standard-alteration-glyph-name-alist)	
 	(after-line-breaking . ,ly:accidental-interface::after-line-breaking)
 	(side-axis . ,X)
 	(meta . ((class . Item)
-		 (interfaces . (item-interface
+		 (interfaces . (
 				accidental-interface
 				break-aligned-interface
 				side-position-interface
@@ -307,7 +322,8 @@
 	(beaming . ,ly:beam::calc-beaming)
 	(stencil . ,ly:beam::print)
 	(clip-edges . #t)
-	
+
+	(details .  ((hint-direction-penalty . 20)))
 	;; TODO: should be in SLT.
 	(thickness . 0.48) ; in staff-space
 	(neutral-direction . ,DOWN)
@@ -333,6 +349,7 @@
 	;; only for debugging.
 	(font-family . roman)
 	(meta . ((class . Spanner)
+		 (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems))) 
 		 (interfaces . (staff-symbol-referencer-interface
 				beam-interface))))))
 
@@ -474,7 +491,7 @@
 				rhythmic-grob-interface
 				text-interface
 				chord-name-interface
-				item-interface))))))
+				))))))
 
     (CombineTextScript
      . (
@@ -649,7 +666,6 @@
 	(self-alignment-X . 0)
 	(self-alignment-Y . 0)
 	(script-priority . 100)
-
 	(stencil . ,ly:text-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
 	(text . ,fingering::calc-text) 
@@ -662,7 +678,7 @@
 				text-interface
 				side-position-interface
 				self-alignment-interface
-				item-interface))))))
+				))))))
     (FretBoard
      . ((stencil . ,fret-board::calc-stencil)
 	(finger-code . below-string)
@@ -682,6 +698,7 @@
 	(after-line-breaking . ,ly:line-spanner::after-line-breaking)
 	(meta . ((class . Spanner)
 		 (interfaces . (line-interface
+				unbreakable-spanner-interface
 				line-spanner-interface))))))
 
     (GraceSpacing
@@ -782,6 +799,7 @@
     (KeyCancellation
      . (
 	(stencil . ,ly:key-signature-interface::print)
+	(glyph-name-alist . ,cancellation-glyph-name-alist)
 	(space-alist . (
 			(time-signature . (extra-space . 1.25))
 			(staff-bar . (extra-space . 0.6))
@@ -801,6 +819,7 @@
      . (
 	(stencil . ,ly:key-signature-interface::print)
 	(avoid-slur . inside)
+	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(space-alist . (
 			(time-signature . (extra-space . 1.15))
 			(staff-bar . (extra-space . 1.1))
@@ -1139,7 +1158,6 @@
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(stencil . ,ly:text-interface::print)
 	(font-shape . italic)
-	(padding . 0.6)
 	(staff-padding . 0.2)
 	(font-size . -4)
 	(meta . ((class . Item)
@@ -1281,7 +1299,7 @@
 	(font-size . 2)
 	(baseline-skip . 2)
 	(break-visibility . ,end-of-line-invisible)
-	(break-align-symbol . staff-bar)
+	(break-align-symbol . clef)
 	(padding . 0.8)
 	(outside-staff-priority . 1500)
 	(meta . ((class . Item)
@@ -1356,7 +1374,6 @@
 
 	;; padding set in script definitions.
 	(staff-padding . 0.25)
-	;; (script-priority . 0) priorities for scripts, see script.scm
 	(X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
@@ -1599,7 +1616,7 @@
 				text-interface
 				side-position-interface
 				self-alignment-interface
-				item-interface))))))
+				))))))
     
     (StrokeFinger
      . (
@@ -1620,7 +1637,7 @@
 				text-interface
 				side-position-interface
 				self-alignment-interface
-				item-interface))))))
+				))))))
     
 
     (SustainPedal
@@ -1869,9 +1886,9 @@
 	(font-size . -4)
 	(side-axis . ,X)
 	(stencil . ,ly:accidental-interface::print)
+	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(meta . ((class . Item)
-		 (interfaces . (item-interface
-				trill-pitch-accidental-interface
+		 (interfaces . (trill-pitch-accidental-interface
 				side-position-interface
 				font-interface))))))
 
@@ -1889,7 +1906,6 @@
 				note-head-interface
 				rhythmic-head-interface
 				font-interface
-				accidental-interface
 				axis-group-interface))))))
 
     (TrillPitchHead
@@ -1899,8 +1915,7 @@
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(font-size . -4)
 	(meta . ((class . Item)
-		 (interfaces . (item-interface
-				rhythmic-head-interface
+		 (interfaces . (rhythmic-head-interface
 				font-interface
 				pitched-trill-interface
 				ledgered-interface
@@ -1984,6 +1999,7 @@
 	(padding . 0.5)
 	(skylines . ,ly:axis-group-interface::combine-skylines)
 	(meta . ((class . Spanner)
+		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
 		 (interfaces . (align-interface
 				axis-group-interface))))))
     (VerticalAxisGroup
@@ -1994,6 +2010,7 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(skylines . ,ly:axis-group-interface::calc-skylines);
 	(meta . ((class . Spanner)
+		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
 		 (interfaces . (axis-group-interface
 				hara-kiri-group-spanner-interface
 				vertically-spaceable-interface))))))
@@ -2063,6 +2080,8 @@
 			       (cons 'spanner-interface ifaces-entry))))
      (else
       (ly:warning "Unknown class ~a" class)))
+
+    (set! ifaces-entry (uniq-list (sort ifaces-entry symbol<?)))
     (set! ifaces-entry (cons 'grob-interface ifaces-entry))
 
     (set! meta-entry (assoc-set! meta-entry 'name name-sym))
@@ -2109,6 +2128,7 @@
   (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)
@@ -2121,7 +2141,7 @@
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))
 
-(define-public (pure-relevant grob)
+(define-public (pure-relevant? grob)
   (let ((extent-callback (ly:grob-property-data grob 'Y-extent)))
     (not (eq? #f
 	      (or
@@ -2133,7 +2153,9 @@
 		  (or
 		   (not (eq? extent-callback ly:grob::stencil-height))
 		   (memq (ly:grob-property-data grob 'stencil) pure-print-callbacks)
-		   (ly:stencil? (ly:grob-property-data grob 'stencil))))))))))
+		   (ly:stencil? (ly:grob-property-data grob 'stencil))
+
+		   ))))))))
 
 (define-public (call-pure-function unpure args start end)
   (if (ly:simple-closure? unpure)