Avoid collisions with ledger lines.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index a76dd3165582fdb28763dfc450982464cd90e361..92a62bfcef39a24f0f74231c67d855478d57a6bc 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -111,6 +111,10 @@
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (ambitus-interface
                                axis-group-interface
                                break-aligned-interface))))))
@@ -270,6 +274,10 @@
        (stacking-dir . ,DOWN)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (align-interface
                                axis-group-interface
                                bass-figure-alignment-interface))))))
@@ -284,6 +292,10 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                side-position-interface))))))
 
@@ -309,6 +321,10 @@
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface))))))
 
 
@@ -646,6 +662,10 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                dynamic-interface
                                dynamic-line-spanner-interface
@@ -1232,6 +1252,10 @@
 
        (X-extent . ,ly:axis-group-interface::width)
        (meta . ((class . Paper_column)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                font-interface
                                paper-column-interface
@@ -1246,6 +1270,10 @@
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                note-collision-interface))))))
 
@@ -1256,6 +1284,10 @@
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                note-column-interface
                                separation-item-interface))))))
@@ -1263,6 +1295,7 @@
     (NoteHead
      . (
        (duration-log . ,note-head::calc-duration-log)
+       (extra-spacing-height . ,ly:note-head::include-ledger-line-height)
        (glyph-name . ,note-head::calc-glyph-name)
        (stem-attachment . ,ly:note-head::calc-stem-attachment)
        (stencil . ,ly:note-head::print)
@@ -1356,6 +1389,10 @@
        ;; debugging
        ;;                       (font-size . -6) (font-name . "sans") (Y-extent . #f)
        (meta . ((class . Paper_column)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                font-interface
                                paper-column-interface
@@ -1529,6 +1566,7 @@
 
     (Script
      . (
+       (add-stem-support . #t)
        (cross-staff . ,ly:script-interface::calc-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
        (font-encoding . fetaMusic)
@@ -1604,6 +1642,10 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                piano-pedal-interface
                                side-position-interface))))))
@@ -1645,6 +1687,10 @@
        (X-extent . ,ly:span-bar::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (bar-line-interface
                                font-interface
                                span-bar-interface))))))
@@ -1827,17 +1873,26 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                piano-pedal-interface
                                side-position-interface))))))
 
     (System
      . (
+       (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,X ,Y))
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
-       (Y-extent . ,ly:axis-group-interface::height)
+       (Y-extent . ,ly:system::height)
        (meta . ((class . System)
+                (object-callbacks . ((pure-relevant-grobs . ,ly:system::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)
+                                     (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
                 (interfaces . (axis-group-interface
                                system-interface))))))
 
@@ -2185,6 +2240,10 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                piano-pedal-interface
                                side-position-interface))))))
@@ -2208,7 +2267,11 @@
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
-                (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
+                (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)
+                                     (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
                 (interfaces . (align-interface
                                axis-group-interface))))))
 
@@ -2227,7 +2290,13 @@
        (Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (meta . ((class . Spanner)
-                (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
+                (object-callbacks . (
+                                     (X-common . ,ly:axis-group-interface::calc-x-common)
+                                     (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+
                 (interfaces . (axis-group-interface
                                hara-kiri-group-spanner-interface
                                vertically-spaceable-interface))))))
@@ -2285,6 +2354,10 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                side-position-interface
                                volta-interface))))))
@@ -2407,7 +2480,8 @@
     (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
     (,ly:slur::height . ,ly:slur::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
-    (,ly:stem::height . ,ly:stem::pure-height)))
+    (,ly:stem::height . ,ly:stem::pure-height)
+    (,ly:system::height . ,ly:system::calc-pure-height)))
 
 (define pure-functions
   (list