* VERSION (PATCH_LEVEL): bump version.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d0e0f341bf2147ebae4a9e576af0d31ad2e59733..9ac56f093c70ee8e78ccbf9e386aa53abeec40f4 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -142,7 +142,6 @@
      . (
        (break-align-symbol . staff-bar)
        (glyph . "|")
-       (gap . 0.4)
        (layer . 0)
        (break-visibility . ,all-visible)
        (non-musical . #t)
@@ -194,9 +193,7 @@
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
 
        (self-alignment-X . 1)
-
-;; 
-;;     (break-align-symbol . left-edge)
+       (break-align-symbol . left-edge)
        (meta .
              ((class . Item)
               (interfaces . (side-position-interface
@@ -317,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)
@@ -614,7 +603,6 @@
                                dynamic-text-spanner-interface
                                spanner-interface))))))
 
-                               
     (Fingering
      . (
 
@@ -655,16 +643,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))
@@ -733,20 +711,6 @@
                                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)
@@ -1157,7 +1121,6 @@
        
        (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)
@@ -1298,10 +1261,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)
@@ -1380,15 +1346,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
@@ -1689,7 +1653,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)
@@ -1712,7 +1675,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)
@@ -1770,6 +1732,7 @@
        (stencil . ,ly:accidental-interface::print)
        (meta . ((class . Item)
                 (interfaces . (item-interface
+                               accidental-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1877,7 +1840,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))))))
@@ -1985,8 +1947,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)
@@ -2007,8 +1968,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
@@ -2021,7 +1981,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))