Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 15d59483a8ffc9ead9c561241c01d4061544fb79..c3315a3b42c77d830d9b858ca5a1d0f21f35688f 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -175,7 +175,7 @@
        (glyph . "|")
        (gap . 0.4)
        (layer . 0)
-       (break-visibility . ,all-visible)
+       (break-visibility . ,bar-line::calc-break-visibility)
        (non-musical . #t)
        (stencil . ,ly:bar-line::print)
        (glyph-name . ,bar-line::calc-glyph-name)
@@ -292,6 +292,7 @@
        (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
+       (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                ))))))
@@ -2084,6 +2085,7 @@
        (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
        (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
        (stencil . ,ly:axis-group-interface::print)
+       (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (meta . ((class . Spanner)
                 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
                 (interfaces . (axis-group-interface