Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

diff --combined scm/define-grobs.scm
index 64f32c62724513692c05bb0b9fe45af9f919f82f,0c76b85e5c590bf527fc26d51897083e87c5fc04..e8fc167d87c12fea2fa374aa878e9c052bd8607e
--- 1/scm/define-grobs.scm
--- 2/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@@ -23,7 -23,6 +23,7 @@@
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)
        (alteration . ,accidental-interface::calc-alteration) 
        (stencil . ,ly:accidental-interface::print)
 +      (Y-extent . ,ly:accidental-interface::height)
        (after-line-breaking
         . ,ly:accidental-interface::after-line-breaking)
        (meta . ((class . Item)
@@@ -36,7 -35,6 +36,7 @@@
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)
        (alteration . ,accidental-interface::calc-alteration) 
        (stencil . ,ly:accidental-interface::print)
 +      (Y-extent . ,ly:accidental-interface::height)
        (after-line-breaking
         . ,ly:accidental-interface::after-line-breaking)
        (meta . ((class . Item)
@@@ -47,7 -45,6 +47,7 @@@
      (AccidentalSuggestion
       . (
        (stencil . ,ly:accidental-interface::print)
 +      (Y-extent . ,ly:accidental-interface::height)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
                        ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
@@@ -123,7 -120,6 +123,7 @@@
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
        (stencil . ,ly:accidental-interface::print)
 +      (Y-extent . ,ly:accidental-interface::height)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)      
        (after-line-breaking . ,ly:accidental-interface::after-line-breaking)
        (side-axis . ,X)
@@@ -180,8 -176,6 +180,6 @@@
        (layer . 0)
        (break-visibility . ,all-visible)
        (non-musical . #t)
-       (extra-spacing-width . (-0.3 . 0.3))
- 
        (stencil . ,ly:bar-line::print)
        (glyph-name . ,bar-line::calc-glyph-name)
        (bar-size .  ,ly:bar-line::calc-bar-size)
@@@ -193,7 -187,7 +191,7 @@@
                        (key-signature . (extra-space . 1.0))
                        (key-cancellation . (extra-space . 1.0))
                        (first-note . (fixed-space . 1.3))
-                       (next-note . (semi-fixed-space . 1.3))
+                       (next-note . (semi-fixed-space . 0.9))
                        (right-edge . (extra-space . 0.0))))
  
        ;;
@@@ -1892,7 -1886,6 +1890,7 @@@
        (font-size . -4)
        (side-axis . ,X)
        (stencil . ,ly:accidental-interface::print)
 +      (Y-extent . ,ly:accidental-interface::height)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)
        (meta . ((class . Item)
                 (interfaces . (trill-pitch-accidental-interface
@@@ -2118,6 -2111,7 +2116,6 @@@
    (list
     ly:bar-line::print
     ly:note-head::print
 -   ly:accidental-interface::print
     ly:dots::print
     ly:clef::print
     ly:text-interface::print
@@@ -2133,17 -2127,16 +2131,17 @@@
        '(0 . 0))))
  
  (define pure-conversions-alist
 -  (list
 -   `(,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
 -   `(,ly:stem::height . ,ly:stem::pure-height)
 -   `(,ly:rest::height . ,ly:rest::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)
 -   `(,ly:slur::height . ,ly:slur::pure-height)
 -   `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
 +  `(
 +    (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
 +    (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
 +    (,ly:stem::height . ,ly:stem::pure-height)
 +    (,ly:rest::height . ,ly:rest::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)
 +    (,ly:slur::height . ,ly:slur::pure-height)
 +    (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
  
  (define pure-functions
    (list