Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 259a4be74f9acb65dcf27adece1126f422663c11..766f2f928af9b60db77781a13dec041640be6d32 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -122,14 +122,13 @@
 
     (AmbitusLine
      . (
-       (join-heads . #t)
-       (stencil . ,ly:ambitus::print)
+       (gap . 0.35)
+       (stencil . ,ambitus::print)
        (thickness . 2)
        (X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
        (meta . ((class . Item)
                 (interfaces . (ambitus-interface
-                               font-interface
-                               staff-symbol-referencer-interface))))))
+                               font-interface))))))
 
     (AmbitusNoteHead
      . (
@@ -216,6 +215,7 @@
 
     (BarNumber
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        ;; want the bar number before the clef at line start.
        (break-align-symbols . (left-edge staff-bar))
 
@@ -257,9 +257,8 @@
      . (
        (axes . (,Y))
        (padding . 0.2)
-       (positioning-done . ,ly:align-interface::calc-positioning-done)
+       (positioning-done . ,ly:align-interface::align-to-minimum-distances)
        (stacking-dir . ,DOWN)
-       (threshold . (2 . 1000))
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
                 (interfaces . (align-interface
@@ -310,6 +309,7 @@
        ;; rather long.
 
        (auto-knee-gap . 5.5)
+       (beam-thickness . 0.48) ; in staff-space
 
        ;; We have some unreferenced problems here.
        ;;
@@ -367,9 +367,6 @@
        (shorten . ,ly:beam::calc-stem-shorten)
        (stencil . ,ly:beam::print)
 
-       ;; TODO: should be in SLT.
-       (thickness . 0.48) ; in staff-space
-
        (meta . ((class . Spanner)
                 (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems)))
                 (interfaces . (beam-interface
@@ -864,8 +861,9 @@
        (padding . 0.3)
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
-       (stencil . ,ly:system-start-text::print)
-       (X-offset . ,ly:side-position-interface::x-aligned-side)
+       (stencil . ,system-start-text::print)
+       (X-offset . ,system-start-text::calc-x-offset)
+       (Y-offset . ,system-start-text::calc-y-offset)
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
                                self-alignment-interface
@@ -1096,6 +1094,7 @@
 
     (MetronomeMark
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 1000)
@@ -1403,6 +1402,7 @@
 
     (RehearsalMark
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (baseline-skip . 2)
        (break-align-symbols . (staff-bar clef))
        (break-visibility . ,end-of-line-invisible)
@@ -1617,6 +1617,13 @@
                                font-interface
                                span-bar-interface))))))
 
+    (StaffGrouper
+     . (
+       (between-staff-spacing . ((space . 9) (minimum-distance . 7)))
+       (after-last-staff-spacing . ((space . 10.5) (minimum-distance . 8)))
+       (meta . ((class . Spanner)
+                (interfaces . (staff-grouper-interface))))))
+
     (StaffSpacing
      . (
        (non-musical . #t)
@@ -1791,7 +1798,6 @@
     (System
      . (
        (axes . (,X ,Y))
-       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
@@ -2158,11 +2164,8 @@
 
     (VerticalAlignment
      . (
-       (after-line-breaking . ,ly:align-interface::stretch-after-break)
        (axes . (,Y))
-       (max-stretch . 0)
-       (padding . 0.5)
-       (positioning-done . ,ly:align-interface::calc-positioning-done)
+       (positioning-done . ,ly:align-interface::align-to-ideal-distances)
        (stacking-dir . -1)
        (vertical-skylines . ,ly:axis-group-interface::combine-skylines)
        (X-extent . ,ly:axis-group-interface::width)
@@ -2176,7 +2179,8 @@
      . (
        (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,Y))
-       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
+       (default-next-staff-spacing . ((space . 9) (minimum-distance . 8)))
+       (next-staff-spacing . ,ly:axis-group-interface::calc-next-staff-spacing)
        (stencil . ,ly:axis-group-interface::print)
        (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
@@ -2229,10 +2233,11 @@
 
     (VoltaBracketSpanner
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (axes . (,Y))
        (direction . ,UP)
        (no-alignment . ,#t)
-       (outside-staff-priority . 100)
+       (outside-staff-priority . 600)
        (padding . 1)
        (side-axis . ,Y)
        (X-extent . ,ly:axis-group-interface::width)