Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 61edbf6b4a30f9b0a8a60db63350a3f5500bb42a..02bc9cc8ad924c156ab73cf3cfde1ae2d024f3dd 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -67,7 +67,7 @@
      . (
        (axes . (0 1))
        (X-extent . ,ly:axis-group-interface::width)
-       (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::height)
        (space-alist . (
                        (clef . (extra-space . 0.5))
                        (key-signature . (extra-space . 0.0))
@@ -314,14 +314,6 @@
                 (interfaces . (staff-symbol-referencer-interface
                                beam-interface))))))
 
-    (BendAfter
-     . (
-       (stencil . ,fall::print)
-       (thickness . 2.0)
-       (meta . ((class . Spanner)
-                (interfaces . (spanner-interface
-                               bend-after-interface))))))
-
     (BreakAlignment
      . (
        (non-musical . #t)
@@ -606,12 +598,10 @@
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
                                text-interface
-                               line-spanner-interface
                                dynamic-interface
                                dynamic-text-spanner-interface
                                spanner-interface))))))
 
-                               
     (Fingering
      . (
 
@@ -652,16 +642,6 @@
                 (interfaces . (line-interface
                                line-spanner-interface))))))
 
-    (GraceSpacing
-     . (
-       (common-shortest-duration . ,grace-spacing::calc-shortest-duration)
-       (spacing-increment . 0.8)
-       (shortest-duration-space . 1.6)
-       (meta . ((class . Spanner)
-                (interfaces . (grace-spacing-interface
-                               spacing-interface
-                               spacing-options-interface
-                               spanner-interface))))))
     (GridPoint
      . (
        (X-extent . (0 . 0))
@@ -1334,7 +1314,7 @@
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
-    (SostenutoPedal
+ (SostenutoPedal
      . (
        (stencil . ,ly:text-interface::print)
        (direction . ,RIGHT)
@@ -1365,16 +1345,13 @@
     (SpacingSpanner
      . (
        (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)
-       
        (base-shortest-duration . ,(ly:make-moment 3 16))
        (meta . ((class . Spanner)
                 (interfaces . (spacing-interface
-                               spacing-options-interface                               
                                spacing-spanner-interface))))))
 
     (SpanBar
@@ -1529,7 +1506,6 @@
        (meta . ((class . Item)
                 (interfaces . (piano-pedal-interface
                                text-spanner-interface
-                               line-spanner-interface
                                text-interface
                                self-alignment-interface
                                font-interface))))))
@@ -1668,7 +1644,6 @@
        (direction . ,UP)
        (meta . ((class . Spanner)
                 (interfaces . (text-spanner-interface
-                               line-spanner-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1741,7 +1716,6 @@
        (side-axis . ,Y)
        (meta . ((class . Spanner)
                 (interfaces . (text-spanner-interface
-                               line-spanner-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1795,6 +1769,7 @@
        (edge-height . (0.7 . 0.7))
        (shorten-pair . (-0.2 . -0.2))
        (staff-padding . 0.25)
+       
        (direction  . ,ly:tuplet-bracket::calc-direction)
        (positions . ,ly:tuplet-bracket::calc-positions)
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
@@ -1808,7 +1783,6 @@
     (TupletNumber
      . (
        (stencil . ,ly:tuplet-number::print)
-       (text . ,tuplet-number::calc-denominator-text)
        (font-shape . italic)
        (font-size . -2)
        (avoid-slur . inside)
@@ -1964,68 +1938,3 @@
 
 (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: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)))
-       (ly:grob::stencil-height grob)
-       '(0 . 0))))
-
-(define pure-Y-extents
-  (list
-   `(,ly:staff-symbol::height . ())))
-
-(define Y-extent-conversions
-  (list
-   `(,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 . ())))
-
-(define Y-offset-conversions
-  (list
-   `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
-
-(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))