(pure-conversion): move pure-callback

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 07971e2f91bcfbf5da139b56bf60c007124d51f8..a82741dc6937a61eb774541fdaaf4fdc6d2389a5 100644 (file)
--- 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
@@ -194,6 +194,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)
@@ -506,7 +508,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
@@ -628,7 +630,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)
@@ -690,6 +692,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)
@@ -1036,6 +1039,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)
@@ -1274,6 +1278,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)
@@ -1296,13 +1301,10 @@
      . (
        ;; 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)
-       
 
        (stencil . ,ly:script-interface::print)
        (direction . ,ly:script-interface::calc-direction)
@@ -1455,6 +1457,7 @@
     (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)
@@ -1517,6 +1520,7 @@
     (StringNumber
      . (
        (stencil . ,print-circled-text-callback)
+       (text . ,string-number::calc-text)
        (padding . 0.5)
        (staff-padding . 0.5)
        (self-alignment-X . 0)
@@ -1636,6 +1640,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)
@@ -1690,6 +1695,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)
@@ -1712,6 +1718,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)
@@ -1876,6 +1883,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))))))
@@ -1978,7 +1986,6 @@
 
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))
 
-
 (define pure-print-callbacks
   (list
    `(,ly:note-head::print . '())
@@ -2030,14 +2037,18 @@
 
 (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)))))
+           (let
+               ((pure-callback (assq normal-callback conversions)))
+
+             (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