Fix note spacing with melismata

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 14e7212a0b4a692f73710e7bfdf4414d016d31c7..59f756e8a0ccb709b0db7f39230f5a9d4c1550a0 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -492,6 +492,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
@@ -516,7 +517,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
@@ -583,7 +583,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
@@ -611,7 +610,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
@@ -855,6 +853,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
@@ -1078,6 +1077,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))
@@ -1157,6 +1157,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)
@@ -1302,6 +1305,7 @@
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        (full-measure-extra-space . 1.0)
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
+       (skyline-vertical-padding . 0.15)
        ;;                    (stencil . ,ly:paper-column::print)
 
        (line-break-permission . allow)
@@ -1338,6 +1342,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)
@@ -1353,7 +1358,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)