X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=bc3aee5e9359e7082468cb764c03c45f586ed737;hb=8a11decb30733f20ade0deb0c9890eb076f15052;hp=97de2fd69f997fb9dc903193bcd6faa1d1be7a49;hpb=34b09edda9458e5edb83599a90d976cd8c0cb9f4;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 97de2fd69f..bc3aee5e93 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@xs4all.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -194,8 +194,6 @@
 			  (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)
@@ -508,7 +506,7 @@
     (Dots
      . (
 	(stencil . ,ly:dots::print)
-	(dot-count . ,dots::calc-dot-count)
+	(dot-count . 1)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
 				staff-symbol-referencer-interface
@@ -630,7 +628,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)
@@ -692,7 +690,6 @@
 	(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)
@@ -1039,7 +1036,6 @@
     (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)
@@ -1278,7 +1274,6 @@
     (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)
@@ -1301,10 +1296,13 @@
      . (
 	;; don't set direction here: it breaks staccato.
 
-	;; padding set in script definitions.
+	;; This value is sensitive: if too large, staccato dots will move a
+	;; space a away.
+	(padding . 0.20)
 	(staff-padding . 0.25)
 	;; (script-priority . 0) priorities for scripts, see script.scm
 	(X-offset . , ly:self-alignment-interface::centered-on-x-parent)
+	
 
 	(stencil . ,ly:script-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
@@ -1457,7 +1455,6 @@
     (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)
@@ -1520,7 +1517,6 @@
     (StringNumber
      . (
 	(stencil . ,print-circled-text-callback)
-	(text . ,string-number::calc-text)
 	(padding . 0.5)
 	(staff-padding . 0.5)
 	(self-alignment-X . 0)
@@ -1640,7 +1636,6 @@
      . (
 	(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)
@@ -1695,7 +1690,6 @@
     (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)
@@ -1718,7 +1712,6 @@
 		    (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)
@@ -1883,7 +1876,6 @@
 	(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))))))
@@ -1991,8 +1983,7 @@
   (list
    `(,ly:note-head::print . '())
    `(,ly:clef::print . '())
-   `(,ly:text-interface::print . '())
-   `(,ly:script-interface::print . '())))
+   `(,ly:text-interface::print . '())))
 
 ;; ly:grob::stencil-extent is safe iff the print callback is safe too
 (define (pure-stencil-height grob start stop)
@@ -2013,8 +2004,7 @@
    `(,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:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)))
 
 (define pure-Y-offsets
   (list
@@ -2027,7 +2017,6 @@
 (define-public (pure-relevant grob)
   (let ((extent-callback (ly:grob-property-data grob 'Y-extent)))
     (or
-     (pair? extent-callback)
      (pair? (assq extent-callback pure-Y-extents))
      (and
       (pair? (assq extent-callback Y-extent-conversions))