Rename collision-distance beam detail property to collision-padding.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5b234627439fb10a2f7ef3940712d059ebeb8380..26adbfd471b851b3cf65d475d3a89c4b60f2e4b1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -190,7 +190,6 @@
      . (
        (allow-span-bar . #t)
        (bar-extent . ,ly:bar-line::calc-bar-extent)
-       (bar-size .  ,ly:bar-line::calc-bar-size)
        (break-align-anchor . ,ly:bar-line::calc-anchor)
        (break-align-symbol . staff-bar)
        (break-visibility . ,bar-line::calc-break-visibility)
@@ -361,6 +360,8 @@
            (hint-direction-penalty . 20)
            (musical-direction-factor . 400)
            (ideal-slope-factor . 10)
+          (collision-penalty . 500)
+          (collision-padding . 0.35)
            (round-to-zero-slope . 0.02)))
        (direction . ,ly:beam::calc-direction)
 
@@ -493,6 +494,7 @@
        (font-family . sans)
        (font-size . 1.5)
        (stencil . ,ly:text-interface::print)
+       (extra-spacing-height . (0.2 . -0.2))
        (word-space . 0.0)
        (meta . ((class . Item)
                 (interfaces . (chord-name-interface
@@ -517,7 +519,6 @@
                        (next-note . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))))
        (stencil . ,ly:clef::print)
-       (extra-spacing-height . (-0.5 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
@@ -584,7 +585,6 @@
                        (next-note . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))))
        (stencil . ,ly:clef::print)
-       (extra-spacing-height . (-0.5 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
@@ -612,7 +612,6 @@
                        (next-note . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))))
        (stencil . ,ly:clef::print)
-       (extra-spacing-height . (-0.5 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
@@ -670,7 +669,6 @@
        (slope . 1.0)
        (stencil . ,ly:percent-repeat-item-interface::double-percent)
        (thickness . 0.48)
-       (width . 2.0)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
                                font-interface
@@ -702,6 +700,20 @@
                                side-position-interface
                                text-interface))))))
 
+    (DoubleRepeatSlash
+     . (
+       (dot-negative-kern . 0.75)
+       (font-encoding . fetaMusic)
+       (slash-negative-kern . 1.6)
+       (slope . 1.0)
+       (stencil . ,ly:percent-repeat-item-interface::beat-slash)
+       (thickness . 0.48)
+       (meta . ((class . Item)
+                (interfaces . (font-interface
+                               percent-repeat-interface
+                               percent-repeat-item-interface
+                               rhythmic-grob-interface))))))
+
     (DynamicLineSpanner
      . (
        (axes . (,Y))
@@ -856,6 +868,7 @@
        (after-line-breaking . ,ly:chord-name::after-line-breaking)
        (fret-diagram-details . ((finger-code . below-string)))
        (stencil . ,fret-board::calc-stencil)
+       (extra-spacing-height . (0.2 . -0.2))
        (meta . ((class . Item)
                 (interfaces . (chord-name-interface
                                font-interface
@@ -1008,6 +1021,7 @@
                        (right-edge . (extra-space . 0.5))
                        (first-note . (fixed-space . 2.5))))
        (stencil . ,ly:key-signature-interface::print)
+       (extra-spacing-width . (0.0 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
@@ -1031,6 +1045,7 @@
                        (right-edge . (extra-space . 0.5))
                        (first-note . (fixed-space . 2.5))))
        (stencil . ,ly:key-signature-interface::print)
+       (extra-spacing-width . (0.0 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
@@ -1079,6 +1094,7 @@
        (break-align-symbol . left-edge)
        (break-visibility . ,center-invisible)
        (non-musical . #t)
+       (extra-spacing-height . (+inf.0 . -inf.0))
        (space-alist . (
                        (ambitus . (extra-space . 2.0))
                        (breathing-sign . (minimum-space . 0.0))
@@ -1158,6 +1174,9 @@
     (LyricText
      . (
        (extra-spacing-width . (0.0 . 0.0))
+       ;; Recede in height for purposes of note spacing,
+       ;; so notes in melismata can be freely spaced above lyrics
+       (extra-spacing-height . (0.2 . -0.2))
        (font-series . medium)
        (font-size . 1.0)
        (self-alignment-X . ,CENTER)
@@ -1303,6 +1322,8 @@
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        (full-measure-extra-space . 1.0)
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
+       ;; sufficient padding to prevent ledger lines from moving over/under
+       (skyline-vertical-padding . 0.6)
        ;;                    (stencil . ,ly:paper-column::print)
 
        (line-break-permission . allow)
@@ -1339,6 +1360,7 @@
      . (
        (axes . (,X ,Y))
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
+       (skyline-vertical-padding . 0.15)
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
@@ -1354,7 +1376,7 @@
        (duration-log . ,note-head::calc-duration-log)
        (extra-spacing-height . ,ly:note-head::include-ledger-line-height)
        (glyph-name . ,note-head::calc-glyph-name)
-        (ligature-flexa . #f)
+       (ligature-flexa . #f)
        (stem-attachment . ,ly:note-head::calc-stem-attachment)
        (stencil . ,ly:note-head::print)
        (X-offset . ,ly:note-head::stem-x-shift)
@@ -1566,6 +1588,7 @@
 
     (RepeatSlash
      . (
+       (slash-negative-kern . 0.85)
        (slope . 1.7)
        (stencil . ,ly:percent-repeat-item-interface::beat-slash)
        (thickness . 0.48)
@@ -1721,7 +1744,6 @@
      . (
        (allow-span-bar . #t)
        (bar-extent . ,ly:axis-group-interface::height)
-       (bar-size . ,ly:span-bar::calc-bar-size)
        (before-line-breaking . ,ly:span-bar::before-line-breaking)
        (break-align-symbol . staff-bar)
        (cross-staff . #t)
@@ -2489,6 +2511,7 @@
    ly:note-head::print
    ly:dots::print
    ly:clef::print
+   ly:key-signature-interface::print
    ly:percent-repeat-item-interface::beat-slash
    ly:text-interface::print
    ly:script-interface::print