X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=37277a762ac70a8fec386f0144aaa2f5d5cd4692;hb=a7ef972d7e2275c68089db3e0be3fdb19cb7b458;hp=61edbf6b4a30f9b0a8a60db63350a3f5500bb42a;hpb=1bcba0490ef7ad8671d221844b16b95da22ce9a0;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 61edbf6b4a..37277a762a 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -55,6 +55,10 @@
      . (
 	(left-padding . 0.2)
 
+	;; for horizontally stacked scripts.
+	(script-priority .  -100)
+	(direction .  ,LEFT)
+	
 	(positioning-done . ,ly:accidental-placement::calc-positioning-done)
 	(X-extent . ,ly:axis-group-interface::width)		      
 	
@@ -63,6 +67,7 @@
 	(right-padding . 0.15)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-placement-interface))))))
+    
     (Ambitus
      . (
 	(axes . (0 1))
@@ -130,6 +135,7 @@
 	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(padding . 0.5)
+	(script-priority . 0)
 	(side-axis . ,X)
 	(staff-position . 0.0)
 	(meta . ((class . Item)
@@ -142,6 +148,7 @@
      . (
 	(break-align-symbol . staff-bar)
 	(glyph . "|")
+	(gap . 0.4)
 	(layer . 0)
 	(break-visibility . ,all-visible)
 	(non-musical . #t)
@@ -193,6 +200,8 @@
 			  (list ly:self-alignment-interface::x-aligned-on-self)))))
 
 	(self-alignment-X . 1)
+
+	;; want the bar number before the clef at line start. 
 	(break-align-symbol . left-edge)
 	(meta .
 	      ((class . Item)
@@ -505,7 +514,7 @@
     (Dots
      . (
 	(stencil . ,ly:dots::print)
-	(dot-count . 1)
+	(dot-count . ,dots::calc-dot-count)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
 				staff-symbol-referencer-interface
@@ -627,7 +636,7 @@
 
 	(stencil . ,ly:text-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
-
+	(text . ,fingering::calc-text) 
 	(font-encoding . fetaNumber)
 	(font-size . -5) 		; don't overlap when next to heads.
 	(meta . ((class . Item)
@@ -638,6 +647,14 @@
 				side-position-interface
 				self-alignment-interface
 				item-interface))))))
+    (FretBoard
+     . ((stencil . ,fret-board::calc-stencil)
+	(finger-code . below-string)
+	(meta . ((class . Item)
+		 (interfaces . (fret-diagram-interface
+				font-interface
+				))))
+	      ))
     (Glissando
      . (
 	(style . line)
@@ -689,6 +706,7 @@
 	(stencil . ,ly:hairpin::print)
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(after-line-breaking . ,ly:hairpin::after-line-breaking)
+	(grow-direction . ,hairpin::calc-grow-direction)
 	(circled-tip . #f)
 	(thickness . 1.0)
 	(height . 0.6666)
@@ -708,6 +726,8 @@
 	(thickness . 1.0)
 	(stencil . ,ly:horizontal-bracket::print)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
+	
 	(padding . 0.2)
 	(staff-padding . 0.2)
 	(direction . ,DOWN)
@@ -730,6 +750,20 @@
 				side-position-interface
 				font-interface))))))
 
+    (InstrumentSwitch
+     . (
+	(padding . 0.3)
+	(stencil . ,ly:text-interface::print)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+	(staff-padding . 2)
+	(direction . ,UP)
+	(self-alignment-X . ,CENTER)
+	(meta . ((class . Item)
+		 (interfaces . (system-start-text-interface
+				side-position-interface
+				font-interface))))))
+    
     (KeyCancellation
      . (
 	(stencil . ,ly:key-signature-interface::print)
@@ -881,9 +915,11 @@
 				lyric-hyphen-interface spacing-interface))
 		 ))
 	))
+    
     (LyricText
      . (
-	(stencil . ,ly:text-interface::print)
+	(stencil . ,lyric-text::print)
+	(text . ,lyric-text::calc-text)
 	(X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
 	(self-alignment-X . 0)
 	(word-space . 0.6)
@@ -999,6 +1035,26 @@
 				font-interface
 				text-interface))))))
 
+    (NonMusicalPaperColumn
+     . (
+	(allow-loose-spacing . #t)
+	(axes . (0))
+	(before-line-breaking . ,ly:paper-column::before-line-breaking)
+	(X-extent . ,ly:axis-group-interface::width)
+	;;		      (stencil . ,ly:paper-column::print)
+	
+	(non-musical . #t)
+	(line-break-permission . allow)
+	(page-break-permission . allow)
+
+	;; debugging stuff: print column number.
+	;;		 (font-size . -6) (font-name . "sans")	(Y-extent . #f)
+
+	(meta . ((class . Paper_column)
+		 (interfaces . (paper-column-interface
+				axis-group-interface
+				spaceable-grob-interface))))))
+    
     (NoteCollision
      . (
 	(axes . (0 1))
@@ -1021,6 +1077,7 @@
     (NoteHead
      . (
 	(stencil . ,ly:note-head::print)
+	(duration-log . ,note-head::calc-duration-log)
 	(stem-attachment . ,ly:note-head::calc-stem-attachment)
 	(glyph-name . ,note-head::calc-glyph-name) 
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
@@ -1098,6 +1155,7 @@
     (PaperColumn
      . (
 	(axes . (0))
+	(allow-loose-spacing . #t)
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	;; (stencil . ,ly:paper-column::print)
 	(X-extent . ,ly:axis-group-interface::width)
@@ -1131,23 +1189,7 @@
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
 
-    (NonMusicalPaperColumn
-     . (
-	(axes . (0))
-	(before-line-breaking . ,ly:paper-column::before-line-breaking)
-	(X-extent . ,ly:axis-group-interface::width)
-	;;		      (stencil . ,ly:paper-column::print)
-	
-	(non-musical . #t)
-	(line-break-permission . allow)
 
-	;; debugging stuff: print column number.
-	;;		 (font-size . -6) (font-name . "sans")	(Y-extent . #f)
-
-	(meta . ((class . Paper_column)
-		 (interfaces . (paper-column-interface
-				axis-group-interface
-				spaceable-grob-interface))))))
 
     (PercentRepeat
      . (
@@ -1223,7 +1265,6 @@
 				mark-interface
 				self-alignment-interface))))))
 
-
     (RepeatSlash
      . (
 	(stencil . ,ly:percent-repeat-item-interface::beat-slash)
@@ -1231,6 +1272,7 @@
 	(slope . 1.7)
 	(meta . ((class . Item)
 		 (interfaces . (percent-repeat-interface))))))
+
     (RepeatTie
      . (
 	(stencil  . ,ly:tie::print)
@@ -1258,6 +1300,7 @@
     (Rest
      . (
 	(stencil . ,ly:rest::print)
+	(duration-log . ,note-head::calc-duration-log)
 	(X-extent . ,ly:rest::width)
 	(Y-extent . ,ly:rest::height)
 	(Y-offset . ,ly:rest::y-offset-callback)
@@ -1280,13 +1323,12 @@
      . (
 	;; don't set direction here: it breaks staccato.
 
-	;; This value is sensitive: if too large, staccato dots will move a
-	;; space a away.
-	(padding . 0.20)
+	;; 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)
-	
+	(X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 
 	(stencil . ,ly:script-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
@@ -1301,11 +1343,17 @@
 	(before-line-breaking . ,ly:script-column::before-line-breaking)
 	(meta . ((class . Item)
 		 (interfaces . (script-column-interface))))))
+    (ScriptRow
+     . (
+	(before-line-breaking . ,ly:script-column::row-before-line-breaking)
+	(meta . ((class . Item)
+		 (interfaces . (script-column-interface))))))
 
     (SeparationItem
      . (
-	(X-extent . #f)
-	(Y-extent . #f)
+	(avoid-slur . inside)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (spacing-interface
 				separation-item-interface))))))
@@ -1346,6 +1394,7 @@
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				self-alignment-interface
+				piano-pedal-script-interface
 				font-interface))))))
 
     (SostenutoPedalLineSpanner
@@ -1367,7 +1416,6 @@
 	(springs-and-rods . ,ly:spacing-spanner::set-springs)
 	(common-shortest-duration . ,ly:spacing-spanner::calc-common-shortest-duration)
 	(average-spacing-wishes . #t)
-	(grace-space-factor . 0.6)
 	(shortest-duration-space . 2.0)
 	(spacing-increment . 1.2)
 	
@@ -1440,8 +1488,10 @@
     (Stem
      . (
 	(direction . ,ly:stem::calc-direction)
+	(duration-log . ,note-head::calc-duration-log)
 	(default-direction . ,ly:stem::calc-default-direction)
 	(stem-end-position . ,ly:stem::calc-stem-end-position)
+
 	(neutral-direction . ,DOWN)
 	(stem-info . ,ly:stem::calc-stem-info)
 	(positioning-done . ,ly:stem::calc-positioning-done)
@@ -1502,6 +1552,7 @@
     (StringNumber
      . (
 	(stencil . ,print-circled-text-callback)
+	(text . ,string-number::calc-text)
 	(padding . 0.5)
 	(staff-padding . 0.5)
 	(self-alignment-X . 0)
@@ -1518,6 +1569,28 @@
 				self-alignment-interface
 				item-interface))))))
     
+    (StrokeFinger
+     . (
+	(stencil . ,ly:text-interface::print)
+	(text . ,stroke-finger::calc-text)
+	(digit-names . #("p" "i" "m" "a" "x"))
+	(padding . 0.5)
+	(staff-padding . 0.5)
+	(self-alignment-X . 0)
+	(self-alignment-Y . 0)
+	(script-priority . 100)
+	(font-shape . italic)
+	(font-size . -4) 		; don't overlap when next to heads.
+	(meta . ((class . Item)
+		 (interfaces . (stroke-finger-interface
+				font-interface
+				text-script-interface
+				text-interface
+				side-position-interface
+				self-alignment-interface
+				item-interface))))))
+    
+
     (SustainPedal
      . (
 	(no-spacing-rods . #t)
@@ -1532,6 +1605,7 @@
 				line-spanner-interface
 				text-interface
 				self-alignment-interface
+				piano-pedal-script-interface
 				font-interface))))))
 
     (SustainPedalLineSpanner
@@ -1621,6 +1695,7 @@
      . (
 	(stencil . ,ly:text-interface::print)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(duration-log . ,note-head::calc-duration-log)
 	(font-size . -2)
 	(stem-attachment . (0.0 . 1.35))
 	(font-series . bold)
@@ -1636,6 +1711,8 @@
      . (
 	(no-spacing-rods . #t)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
 	(direction . ,DOWN)
 
 	;; sync with Fingering ?
@@ -1675,6 +1752,7 @@
     (Tie
      . (
 	(control-points . ,ly:tie::calc-control-points)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(avoid-slur . inside)
 	(direction . ,ly:tie::calc-direction)
 	(stencil . ,ly:tie::print)
@@ -1697,6 +1775,7 @@
 		    (outer-tie-vertical-gap . 0.25)
 		    (multi-tie-region-size . 1)
 		    (between-length-limit . 1.0)))
+	
 	(thickness . 1.2)
 	(line-thickness . 0.8)
 	(meta . ((class . Spanner)
@@ -1754,7 +1833,7 @@
 	(stencil . ,ly:accidental-interface::print)
 	(meta . ((class . Item)
 		 (interfaces . (item-interface
-				accidental-interface
+				trill-pitch-accidental-interface
 				side-position-interface
 				font-interface))))))
 
@@ -1827,6 +1906,7 @@
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
+				piano-pedal-script-interface
 				self-alignment-interface
 				font-interface))))))
 
@@ -1862,6 +1942,7 @@
 	(Y-extent . ,ly:axis-group-interface::height)
 	(X-extent . ,ly:axis-group-interface::width)
 	(stacking-dir . -1)
+	(padding . 0.1) 
 	(meta . ((class . Spanner)
 		 (interfaces . (align-interface
 				axis-group-interface))))))
@@ -1869,7 +1950,6 @@
      . (
 	(axes . (1))
 	(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)
 	(meta . ((class . Spanner)
@@ -1964,68 +2044,59 @@
 
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))
 
-
 (define pure-print-callbacks
   (list
-   `(,ly:note-head::print . '())
-   `(,ly:clef::print . '())
-   `(,ly:text-interface::print . '())))
+   ly:note-head::print
+   ly:clef::print
+   ly:text-interface::print
+   ly:script-interface::print))
 
 ;; ly:grob::stencil-extent is safe iff 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)
-	 (pair? (assq sten pure-print-callbacks)))
+	 (memq sten pure-print-callbacks))
 	(ly:grob::stencil-height grob)
 	'(0 . 0))))
 
-(define pure-Y-extents
-  (list
-   `(,ly:staff-symbol::height . ())))
-
-(define Y-extent-conversions
+(define pure-conversions-alist
   (list
+   `(,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
    `(,ly:stem::height . ,ly:stem::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)))
-
-(define pure-Y-offsets
-  (list
-   `(,ly:staff-symbol-referencer::callback . ())))
+   `(,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 Y-offset-conversions
+(define pure-functions
   (list
-   `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
+   ly:staff-symbol-referencer::callback
+   ly:staff-symbol::height))
 
 (define-public (pure-relevant grob)
   (let ((extent-callback (ly:grob-property-data grob 'Y-extent)))
-    (or
-     (pair? (assq extent-callback pure-Y-extents))
-     (and
-      (pair? (assq extent-callback Y-extent-conversions))
-      (or
-       (not (eq? extent-callback ly:grob::stencil-height))
-       (pair? (assq (ly:grob-property-data grob 'stencil) pure-print-callbacks))
-       (ly:stencil? (ly:grob-property-data grob 'stencil)))))))
-
-(define (pure-conversion pures conversions defsymbol defreturn rettype? grob start stop)
-  (let* ((normal-callback (ly:grob-property-data grob defsymbol))
-	 (pure-callback (assq normal-callback conversions)))
-    (if (rettype? normal-callback)
-	normal-callback
-	(if (pair? (assq normal-callback pures))
-	    (normal-callback grob)
-	    (if (pair? pure-callback)
-		((cdr pure-callback) grob start stop)
-		defreturn)))))
-
-(define-public (pure-Y-extent grob start stop)
-  (pure-conversion pure-Y-extents Y-extent-conversions
-		   'Y-extent '(0 . 0) pair? grob start stop))
-
-(define-public (pure-Y-offset grob start stop)
-  (pure-conversion pure-Y-offsets Y-offset-conversions
-		   'Y-offset 0 number? grob start stop))
+    (not (eq? #f
+	      (or
+	       (pair? extent-callback)
+	       (memq extent-callback pure-functions)
+	       (and
+		(pair? (assq extent-callback pure-conversions-alist))
+		(begin
+		  (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))))))))))
+
+(define-public (call-pure-function unpure args start end)
+  (if (ly:simple-closure? unpure)
+      (ly:eval-simple-closure (car args) unpure start end)
+      (if (not (procedure? unpure))
+	  unpure
+	  (if (memq unpure pure-functions)
+	      (apply unpure args)
+	      (let ((pure (assq unpure pure-conversions-alist)))
+		(if pure
+		    (apply (cdr pure) (append (list (car args) start end) (cdr args)))))))))