release: 1.3.150

[lilypond.git] / scm / grob-description.scm

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index ea40dd0cf78df9a5af9f514b2daf545f86ddf3c5..90bbb79a0b62fe5c3d18a32f09d5b3c13ad2d4b4 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -37,7 +37,7 @@
                (break-align-symbol . Staff_bar)
                (glyph . "|")
                (break-glyph-function . ,default-break-barline)
-               (barsize-procedure . ,Bar::get_staff_bar_size)
+               (bar-size-procedure . ,Bar::get_staff_bar_size)
                (molecule-callback . ,Bar::brew_molecule)          
                (visibility-lambda . ,all-visible)
                (breakable . #t)
@@ -80,7 +80,7 @@
                 (thickness . 0.48) ; in staff-space
                 (before-line-breaking-callback . ,Beam::before_line_breaking)
                 (after-line-breaking-callback . ,Beam::after_line_breaking)
-                (default-neutral-direction . 1)
+                (neutral-direction . 1)
                 (dir-function . ,beam-dir-majority)
                 (height-quants .  ,default-beam-dy-quants)
                 (vertical-position-quant-function . ,default-beam-y-quants)
@@ -467,6 +467,7 @@
        (Script . (
                ;; don't set direction here: it breaks staccato.
                (molecule-callback . ,Script::brew_molecule)
+               (padding . 0.3) 
                (X-offset-callbacks . (,Side_position_interface::centered_on_parent))
                (before-line-breaking-callback . ,Script::before_line_breaking)
                (meta . ,(grob-description "Script" script-interface side-position-interface font-interface))
@@ -510,7 +511,7 @@
        ))
        (SpanBar . (
                (break-align-symbol . Staff_bar)
-               (barsize-procedure . ,Span_bar::get_bar_size) 
+               (bar-size-procedure . ,Span_bar::get_bar_size) 
                (molecule-callback . ,Bar::brew_molecule)
                (visibility-lambda . ,begin-of-line-invisible)
                (X-extent-callback . ,Span_bar::width_callback)
@@ -574,7 +575,7 @@
                (lengths . (3.5 3.5 3.5 4.5 5.0))
                (stem-shorten . (0.5))
                ; if stem is on middle line, choose this direction.
-               (default-neutral-direction . 1)
+               (neutral-direction . 1)
                (X-offset-callbacks . (,Stem::off_callback))
                (X-extent-callback . ,Stem::dim_callback)       
                (Y-extent-callback . ,Stem::height)
@@ -730,6 +731,7 @@
                (axes 1)
                (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
                (X-extent-callback . #f)
+
                (stacking-dir . -1)
                (meta . ,(grob-description "VerticalAlignment" align-interface axis-group-interface))
        ))