Finish fixing 97.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 8b32b4c6b956659a4ebf36f6de73b39253e73f38..15d59483a8ffc9ead9c561241c01d4061544fb79 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -226,7 +226,7 @@
        (self-alignment-X . 1)
 
        ;; want the bar number before the clef at line start. 
-       (break-align-symbol . left-edge)
+       (break-align-symbols . (left-edge staff-bar))
        (meta .
              ((class . Item)
               (interfaces . (side-position-interface
@@ -411,7 +411,8 @@
      . (
        (axes . (0))
        (X-extent . ,ly:axis-group-interface::width)
-       (break-align-anchor . ,ly:break-aligned-interface::calc-anchor)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-average-anchor)
+       (break-visibility . ,ly:break-aligned-interface::calc-break-visibility)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
                                axis-group-interface))))))
@@ -447,6 +448,7 @@
        (avoid-slur . inside)
        (font-family . music)
        (break-align-symbol . clef)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,begin-of-line-visible)
        (space-alist . ((ambitus . (extra-space . 2.0))
                        (staff-bar . (extra-space . 0.7))
@@ -857,6 +859,7 @@
                        (first-note . (fixed-space . 2.5))))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (break-align-symbol . key-signature)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,begin-of-line-visible)
        (non-musical . #t)
        (meta . ((class . Item)
@@ -905,6 +908,7 @@
     (LeftEdge
      . (
        (break-align-symbol . left-edge)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (X-extent . (0 . 0))
        (non-musical . #t)
        (break-visibility . ,center-invisible)
@@ -1330,7 +1334,7 @@
        (font-size . 2)
        (baseline-skip . 2)
        (break-visibility . ,end-of-line-invisible)
-       (break-align-symbol . clef)
+       (break-align-symbols . (staff-bar clef))
        (padding . 0.8)
        (outside-staff-priority . 1500)
        (meta . ((class . Item)
@@ -1897,6 +1901,7 @@
      . (
        (stencil . ,ly:time-signature::print)
        (break-align-symbol . time-signature)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,all-visible)
        (avoid-slur . inside)
        (space-alist . (