New bar line interface

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5083b5053d6220d30224515054c8090a2dfc6a90..28bc6d04d4199d2f0528b3b5ecce554f7ff93f68 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -33,6 +33,7 @@
        (glyph-name . ,accidental-interface::glyph-name)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)
        (stencil . ,ly:accidental-interface::print)
+       (horizontal-skylines . ,ly:accidental-interface::horizontal-skylines)
        (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (X-extent . ,ly:accidental-interface::width)
        (Y-extent . ,ly:accidental-interface::height)
@@ -217,6 +218,7 @@
 
        (layer . 0)
        (non-musical . #t)
+       (rounded . #f)
        (space-alist . (
                        (time-signature . (extra-space . 0.75))
                        (custos . (minimum-space . 2.0))
@@ -392,12 +394,12 @@
        (beam-gap . ,ly:beam::calc-beam-gap)
        (minimum-length . ,ly:beam::calc-minimum-length)
        (neutral-direction . ,DOWN)
-       (positions . ,beam::place-broken-parts-individually)
+       (positions . ,beam::get-positions)
        (springs-and-rods . ,ly:beam::calc-springs-and-rods)
        (X-positions . ,ly:beam::calc-x-positions)
 
        ;; this is a hack to set stem lengths, if positions is set.
-       (quantized-positions . ,ly:beam::set-stem-lengths)
+       (quantized-positions . ,beam::get-quantized-positions)
 
        (shorten . ,ly:beam::calc-stem-shorten)
        (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
@@ -1206,6 +1208,7 @@
        (minimum-length-fraction . 0.25)
        (springs-and-rods . ,ly:ledger-line-spanner::set-spacing-rods)
        (stencil . ,ly:ledger-line-spanner::print)
+       (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (X-extent . #f)
        (Y-extent . #f)
        (meta . ((class . Spanner)
@@ -1899,16 +1902,6 @@
        (break-align-symbol . staff-bar)
        (cross-staff . #t)
        (glyph-name . ,ly:span-bar::calc-glyph-name)
-
-       ;; ugh duplication! (these 4 properties were copied from Barline)
-       ;;
-       ;; Ross. page 151 lists other values, we opt for a leaner look
-       ;;
-       (kern . 3.0)
-       (thin-kern . 3.0)
-       (hair-thickness . 1.6)
-       (thick-thickness . 6.0)
-
        (layer . 0)
        (non-musical . #t)
        (stencil . ,ly:span-bar::print)
@@ -2137,7 +2130,7 @@
        (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,X ,Y))
        (outside-staff-placement-directive . left-to-right-polite)
-       (skyline-horizontal-padding . 0.5)
+       (skyline-horizontal-padding . 1.0)
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:system::height)
@@ -2607,6 +2600,7 @@
        (edge-height . (2.0 . 2.0)) ;; staff-space;
        (font-encoding . fetaText)
        (font-size . -4)
+       (shorten-pair . ,ly:volta-bracket::calc-shorten-pair)
        (stencil . ,ly:volta-bracket-interface::print)
        (thickness . 1.6) ;; line-thickness
        (word-space . 0.6)