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

diff --combined scm/define-grobs.scm
index f258856924849a94c50d4be736b6966310e1fd99,a3d1df686407f632eb15362606469e4895fca1f7..a794f75470ba16e892353429638d2b6c955b8598
--- 1/scm/define-grobs.scm
--- 2/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@@ -161,7 -161,6 +161,7 @@@
        (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)
@@@ -276,7 -275,6 +276,7 @@@
       . (
        (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
 +      (skylines . ,ly:axis-group-interface::calc-skylines)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                ))))))
@@@ -447,7 -445,8 +447,8 @@@
       . (
        (Y-extent . ,ly:cluster-beacon::height)
        (meta . ((class . Item)
-                (interfaces . (cluster-beacon-interface))))))
+                (interfaces . (rhythmic-grob-interface
+                               cluster-beacon-interface))))))
  
      (ClusterSpanner
       . (
@@@ -476,7 -475,7 +477,7 @@@
      (CombineTextScript
       . (
        (stencil . ,ly:text-interface::print)
 -      (no-spacing-rods . #t)
 +      (extra-spacing-width . (+inf.0 . -inf.0))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (direction . ,UP)
@@@ -602,7 -601,8 +603,7 @@@
        (font-encoding . fetaDynamic)
        (font-shape . italic)
        (avoid-slur . around)
 -      (no-spacing-rods . #t)
 -      (script-priority . 100)
 +      (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 250)
        (meta . ((class . Item)
                 (interfaces . (font-interface
@@@ -1133,6 -1133,9 +1134,6 @@@
        
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (stencil . ,ly:text-interface::print)
 -
 -      ;; no Y dimensions, because of lyrics under tenor clef.
 -      (Y-extent . (0 . 0))
        (font-shape . italic)
        (padding . 0.6)
        (staff-padding . 0.2)
@@@ -1293,7 -1296,8 +1294,8 @@@
        (thickness . 0.48)
        (slope . 1.7)
        (meta . ((class . Item)
-                (interfaces . (percent-repeat-item-interface))))))
+                (interfaces . (rhythmic-grob-interface
+                               percent-repeat-item-interface))))))
  
      (RepeatTie
       . (
@@@ -1413,7 -1417,7 +1415,7 @@@
        (stencil . ,ly:text-interface::print)
        (direction . ,RIGHT)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 -      (no-spacing-rods . #t)
 +      (extra-spacing-width . (+inf.0 . -inf.0))
        (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
        (font-shape . italic)
        (self-alignment-X . 0)
@@@ -1619,7 -1623,7 +1621,7 @@@
  
      (SustainPedal
       . (
 -      (no-spacing-rods . #t)
 +      (extra-spacing-width . (+inf.0 . -inf.0))
        (stencil . ,ly:sustain-pedal::print)
        (self-alignment-X . 0)
        (direction . ,RIGHT)
@@@ -1654,7 -1658,7 +1656,7 @@@
        (axes . (0 1))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
 -      (skyline-spacing . #t)
 +      (skylines . ,ly:axis-group-interface::calc-skylines)
        (skyline-horizontal-padding . 1.0)
        (meta . ((class . System)
                 (interfaces . (system-interface
@@@ -1737,7 -1741,7 +1739,7 @@@
  
      (TextScript
       . (
 -      (no-spacing-rods . #t)
 +      (extra-spacing-width . (+inf.0 . -inf.0))
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
@@@ -1932,7 -1936,7 +1934,7 @@@
       . (
        (stencil . ,ly:text-interface::print)
        (font-shape . italic)
 -      (no-spacing-rods . #t)
 +      (extra-spacing-width . (+inf.0 . -inf.0))
        (self-alignment-X . 0)
        (direction . ,RIGHT)
        (padding . 0.0)  ;; padding relative to UnaCordaPedalLineSpanner
@@@ -1975,8 -1979,7 +1977,8 @@@
        (Y-extent . ,ly:axis-group-interface::height)
        (X-extent . ,ly:axis-group-interface::width)
        (stacking-dir . -1)
 -      (padding . 0.1) 
 +      (padding . 0.1)
 +      (skylines . ,ly:axis-group-interface::combine-skylines)
        (meta . ((class . Spanner)
                 (interfaces . (align-interface
                                axis-group-interface))))))
@@@ -1986,7 -1989,7 +1988,7 @@@
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
        (X-extent . ,ly:axis-group-interface::width)
 -      (skyline-spacing . #t)
 +      (skylines . ,ly:axis-group-interface::calc-skylines);
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                hara-kiri-group-spanner-interface
@@@ -2082,7 -2085,6 +2084,7 @@@
  
  (define pure-print-callbacks
    (list
 +   ly:bar-line::print
     ly:note-head::print
     ly:accidental-interface::print
     ly:dots::print
@@@ -2097,6 -2099,7 +2099,6 @@@
         (ly:stencil? sten)
         (memq sten pure-print-callbacks))
        (ly:grob::stencil-height grob)
 -
        '(0 . 0))))
  
  (define pure-conversions-alist