X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=b1cfb63becec318a08b5f48732e75e193c800f04;hb=899823d9d23688ae24bd8b9efccf3ac7d0a86f9e;hp=3bad280e12fa39cac2733b238f08076899d2b0a0;hpb=3128487939b2bfd363a4fd48c289727fe6dbc61b;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3bad280e12..b1cfb63bec 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1,9 +1,20 @@
-;;;; define-grobs.scm --
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;;
-;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;;; distances are given in line-thickness (thicknesses) and
 ;;;; staff-space (distances)
@@ -107,7 +118,6 @@
     (AmbitusAccidental
      . (
 	(direction . ,LEFT)
-	(font-family . music)
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(padding . 0.5)
 	(side-axis . ,X)
@@ -155,7 +165,6 @@
 	(stencil . ,ly:arpeggio::print)
 	(X-extent . ,ly:arpeggio::width)
 	(X-offset . ,ly:side-position-interface::x-aligned-side)
-	(Y-extent . ,ly:arpeggio::height)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (arpeggio-interface
@@ -481,7 +490,6 @@
 	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
-	(font-family . music)
 	(glyph-name . ,ly:clef::calc-glyph-name)
 	(non-musical . #t)
 	(space-alist . ((ambitus . (extra-space . 2.0))
@@ -525,6 +533,7 @@
 	(direction . ,UP)
 	(extra-spacing-width . (+inf.0 . -inf.0))
 	(font-series . bold)
+	(outside-staff-priority . 450)
 	(padding . 0.5)
 	(script-priority . 200)
 	(side-axis . ,Y)
@@ -652,6 +661,7 @@
 	(font-shape . italic)
 	(outside-staff-priority . 250)
 	(positioning-done . ,ly:script-interface::calc-positioning-done)
+	(right-padding . 0.5)
 	(self-alignment-X . ,CENTER)
 	(self-alignment-Y . ,CENTER)
 	(stencil . ,ly:text-interface::print)
@@ -659,6 +669,7 @@
 	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (dynamic-interface
+				dynamic-text-interface
 				font-interface
 				script-interface
 				self-alignment-interface
@@ -666,6 +677,7 @@
 
     (DynamicTextSpanner
      . (
+	(before-line-breaking . ,dynamic-text-spanner::before-line-breaking)
 	(bound-details . ((right . ((attach-dir .  ,LEFT)
 				    (Y . 0)
 				    (padding . 0.75)
@@ -676,8 +688,8 @@
 
 			  (left . ((attach-dir .  ,LEFT)
 				   (Y . 0)
-				   (stencil-offset . (0 . -0.5))
-				   (padding . 0.5)
+				   (stencil-offset . (-0.75 . -0.5))
+				   (padding . 0.75)
 				   ))
 			  (left-broken . ((attach-dir .  ,RIGHT)
 				   ))
@@ -819,7 +831,6 @@
 	(stencil . ,ly:hairpin::print)
 	(thickness . 1.0)
 	(to-barline . #t)
-	(Y-extent . ,ly:hairpin::height)
 	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(meta . ((class . Spanner)
 		 (interfaces . (dynamic-interface
@@ -980,7 +991,7 @@
 			(clef . (extra-space . 0.8))
 			(first-note . (fixed-space . 2.0))
 			(right-edge . (extra-space . 0.0))
-			(key-signature . (extra-space . 0.0))
+			(key-signature . (extra-space . 0.8))
 			(key-cancellation . (extra-space . 0.0))
 			))
 	(X-extent . (0 . 0))
@@ -1619,8 +1630,12 @@
 
     (StaffGrouper
      . (
-	(between-staff-spacing . ((space . 9) (minimum-distance . 7)))
-	(after-last-staff-spacing . ((space . 10.5) (minimum-distance . 8)))
+	(between-staff-spacing . ((space . 9)
+				  (minimum-distance . 7)
+				  (padding . 1)))
+	(after-last-staff-spacing . ((space . 10.5)
+				     (minimum-distance . 8)
+				     (padding . 1)))
 	(meta . ((class . Spanner)
 		 (interfaces . (staff-grouper-interface))))))
 
@@ -1877,6 +1892,7 @@
 	(font-size . -2)
 	(stem-attachment . (0.0 . 1.35))
 	(stencil . ,ly:text-interface::print)
+	(whiteout . #t)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
@@ -1923,6 +1939,7 @@
 				   (padding . 0.25)
 				   (attach-dir . ,LEFT)
 				   ))
+			  (left-broken . ((end-on-note . #t)))
 			  (right . ((Y . 0)
 				    (padding . 0.25)
 				    ))
@@ -2060,17 +2077,11 @@
     (TrillSpanner
      . (
 	(after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
-	(bound-details . ((left . ((text . ,(make-translate-scaled-markup
-					     '(0.0 . -1.0)
-					     (make-musicglyph-markup "scripts.trill")))
+	(bound-details . ((left . ((text . ,(make-musicglyph-markup "scripts.trill"))
 				   (Y . 0)
-				   (stencil-offset . (-0.5 . 0))
-				   (padding . 1.5)
+				   (stencil-offset . (-0.5 . -1))
+				   (padding . 0.5)
 				   (attach-dir . ,CENTER)
-				   ;; this isn't CENTER because the trill glyph's origin
-				   ;; is not centered in its extent; to have the trill
-				   ;; spanner aligned the same as a trill, we need a slight offset
-				   (anchor-alignment . 0.15)
 				   ))
 			  (left-broken . ((end-on-note . #t)))
 			  (right . ((Y . 0)))
@@ -2184,7 +2195,9 @@
      . (
 	(adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
 	(axes . (,Y))
-	(default-next-staff-spacing . ((space . 9) (minimum-distance . 8)))
+	(default-next-staff-spacing . ((space . 9)
+				       (minimum-distance . 8)
+				       (padding . 1)))
 	(next-staff-spacing . ,ly:axis-group-interface::calc-next-staff-spacing)
 	(non-affinity-spacing . ((padding . 0.5)))
 	(stencil . ,ly:axis-group-interface::print)
@@ -2227,7 +2240,7 @@
 	(font-encoding . fetaNumber)
 	(font-size . -4)
 	(stencil . ,ly:volta-bracket-interface::print)
-	(thickness . 1.6)  ;;  line-thickness
+	(thickness . 1.6) ;; line-thickness
 	(word-space . 0.6)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
@@ -2235,14 +2248,15 @@
 				line-interface
 				side-position-interface
 				text-interface
-				volta-bracket-interface))))))
+				volta-bracket-interface
+				volta-interface))))))
 
     (VoltaBracketSpanner
      . (
 	(after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
 	(axes . (,Y))
 	(direction . ,UP)
-	(no-alignment . ,#t)
+	(no-alignment . #t)
 	(outside-staff-priority . 600)
 	(padding . 1)
 	(side-axis . ,Y)
@@ -2251,7 +2265,8 @@
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
-				side-position-interface))))))
+				side-position-interface
+				volta-interface))))))
 
 ))
 
@@ -2305,13 +2320,20 @@
 
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))
 
+(define (volta-bracket-interface::pure-height grob start end)
+  (let ((edge-height (ly:grob-property grob 'edge-height)))
+    (if (number-pair? edge-height)
+	(let ((smaller (min (car edge-height) (cdr edge-height)))
+	      (larger (max (car edge-height) (cdr edge-height))))
+	  (interval-union '(0 . 0) (cons smaller larger)))
+	'(0 . 0))))
+
 (define pure-print-callbacks
   (list
    fret-board::calc-stencil
+   note-head::brew-ez-stencil
    print-circled-text-callback
    lyric-text::print
-   ly:arpeggio::print
-   ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
    ly:mensural-ligature::brew-ligature-primitive
    ly:note-head::print
@@ -2320,21 +2342,33 @@
    ly:text-interface::print
    ly:script-interface::print))
 
-;; ly:grob::stencil-extent is safe iff the print callback is safe too
+;; Sometimes we have grobs with (Y-extent . ,ly:grob::stencil-height)
+;; and the print function is not pure, but there is a easy way to
+;; figure out the Y-extent from the print function.
+(define pure-print-to-height-conversions
+  `(
+    (,ly:arpeggio::print . ,ly:arpeggio::pure-height)
+    (,ly:arpeggio::brew-chord-bracket . ,ly:arpeggio::pure-height)
+    (,ly:hairpin::print . ,ly:hairpin::pure-height)
+    (,ly:volta-bracket-interface::print . ,volta-bracket-interface::pure-height)))
+
+;; ly:grob::stencil-extent is safe if the print callback is safe too
 (define (pure-stencil-height grob start stop)
-  (let ((sten (ly:grob-property-data grob 'stencil)))
-    (if (or
-	 (ly:stencil? sten)
-	 (memq sten pure-print-callbacks))
-	(ly:grob::stencil-height grob)
-	'(0 . 0))))
+  (let* ((sten (ly:grob-property-data grob 'stencil))
+	 (pure-height-callback (assoc-get sten pure-print-to-height-conversions)))
+    (cond ((or
+	    (ly:stencil? sten)
+	    (memq sten pure-print-callbacks))
+	   (ly:grob::stencil-height grob))
+	  ((procedure? pure-height-callback)
+	   (pure-height-callback grob start stop))
+	  (else
+	   '(0 . 0)))))
 
 (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:hairpin::height . ,ly:hairpin::pure-height)
     (,ly:stem::height . ,ly:stem::pure-height)
     (,ly:rest::height . ,ly:rest::pure-height)
     (,ly:grob::stencil-height . ,pure-stencil-height)
@@ -2360,13 +2394,12 @@
 	       (memq extent-callback pure-functions)
 	       (and
 		(pair? (assq extent-callback pure-conversions-alist))
-		(begin
+		(let ((stencil (ly:grob-property-data grob 'stencil)))
 		  (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))
-
-		   ))))))))
+		   (memq stencil pure-print-callbacks)
+		   (assq stencil pure-print-to-height-conversions)
+		   (ly:stencil? stencil)))))))))
 
 (define-public (call-pure-function unpure args start end)
   (if (ly:simple-closure? unpure)