Doc: fix calculation of global-staff-size in points (3114)

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 9331744168189285df678a5d9bf18de379ba1371..47db681b6a92a0699ec34f7cba7dc8949b05291c 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)
@@ -82,7 +83,6 @@
        (side-axis . ,Y)
        (staff-padding . 0.25)
        (stencil . ,ly:accidental-interface::print)
-       (use-skylines . #t)
        (X-extent . ,ly:accidental-interface::width)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
@@ -217,6 +217,7 @@
 
        (layer . 0)
        (non-musical . #t)
+       (rounded . #f)
        (space-alist . (
                        (time-signature . (extra-space . 0.75))
                        (custos . (minimum-space . 2.0))
@@ -247,6 +248,9 @@
        (font-family . roman)
        (font-size . -2)
        (non-musical . #t)
+       ;; w/o padding, bars numbers are not positioned over the staff as
+       ;; they are slightly to the left. so we add just a bit.
+       (horizon-padding . 0.05)
        (outside-staff-priority . 100)
        (padding . 1.0)
        (self-alignment-X . ,RIGHT)
@@ -284,8 +288,7 @@
        (stacking-dir . ,DOWN)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
-                (object-callbacks . ((full-score-pure-minimum-translations . ,ly:align-interface::full-score-pure-minimum-translations)
-                                     (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
                                      (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
                 (interfaces . (align-interface
                                axis-group-interface
@@ -390,9 +393,11 @@
        ;; only for debugging.
        (font-family . roman)
 
-       (gap . 0.8)
+       (beam-gap . ,ly:beam::calc-beam-gap)
+       (minimum-length . ,ly:beam::calc-minimum-length)
        (neutral-direction . ,DOWN)
        (positions . ,beam::place-broken-parts-individually)
+       (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.
@@ -608,6 +613,7 @@
                        (next-note . (extra-space . 1.0))
                        (right-edge . (extra-space . 0.5))))
        (stencil . ,ly:clef::print)
+       (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                  (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
@@ -757,7 +763,6 @@
        (slur-padding . 0.3)
        (staff-padding . 0.1)
        (vertical-skylines . ,ly:grob::vertical-skylines-from-element-stencils)
-       (use-skylines . #t)
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
@@ -790,7 +795,6 @@
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
        (meta . ((class . Item)
-                (object-callbacks . ((X-colliding-grobs . ,ly:self-alignment-interface::x-colliding-grobs)))
                 (interfaces . (dynamic-interface
                                dynamic-text-interface
                                font-interface
@@ -879,7 +883,7 @@
      . (
 
        ;; sync with TextScript (?)
-
+       (add-stem-support . ,only-if-beamed)
        (avoid-slur . around)
        (cross-staff . ,script-or-side-position-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
@@ -902,6 +906,13 @@
                                text-interface
                                text-script-interface))))))
 
+    (FingeringColumn
+     . (
+       (padding . 0.2)
+       (positioning-done . ,ly:fingering-column::calc-positioning-done)
+       (meta . ((class . Item)
+                (interfaces . (fingering-column-interface))))))
+
     (Flag
      . (
        (glyph-name . ,ly:flag::glyph-name)
@@ -1198,6 +1209,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)
@@ -1233,6 +1245,7 @@
        ;; ugh.  A ligature bracket is totally different from
        ;; a tuplet bracket.
 
+       (bracket-visibility . #t)
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
        (direction . ,UP)
        (edge-height . (0.7 . 0.7))
@@ -1310,6 +1323,24 @@
                                self-alignment-interface
                                text-interface))))))
 
+    (MeasureCounter
+     . (
+        (count-from . 1)
+        (direction . ,UP)
+        (font-encoding . fetaText)
+        (font-size . -2)
+        (outside-staff-horizontal-padding . 0.5)
+        (outside-staff-padding . 0.5)
+        (outside-staff-priority . 750)
+        (self-alignment-X . ,CENTER)
+        (staff-padding . 0.5)
+        (stencil . ,measure-counter-stencil)
+        (meta . ((class . Spanner)
+                 (interfaces . (font-interface
+                                measure-counter-interface
+                                self-alignment-interface
+                                text-interface))))))
+
     (MeasureGrouping
      . (
        (direction . ,UP)
@@ -1332,6 +1363,7 @@
 
     (MensuralLigature
      . (
+       (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (stencil . ,ly:mensural-ligature::print)
        (thickness . 1.3)
        (meta . ((class . Spanner)
@@ -1380,6 +1412,7 @@
        (thick-thickness . 6.6)
        ;; See Wanske pp. 125
        (usable-duration-logs . ,(iota 4 -3))
+       (Y-extent . ,ly:multi-measure-rest::height)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
@@ -1406,6 +1439,7 @@
                        ,(ly:make-simple-closure
                          (list ly:self-alignment-interface::x-centered-on-y-parent)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
                                multi-measure-interface
@@ -1428,6 +1462,7 @@
                        ,(ly:make-simple-closure
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
                                multi-measure-interface
@@ -1481,6 +1516,7 @@
      . (
        (axes . (,X ,Y))
        (bound-alignment-interfaces . (rhythmic-head-interface stem-interface))
+       (cross-staff . ,ly:axis-group-interface::cross-staff)
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
        (skyline-vertical-padding . 0.15)
        (X-extent . ,ly:axis-group-interface::width)
@@ -1551,6 +1587,7 @@
                        ,(ly:make-simple-closure
                          (list ly:self-alignment-interface::centered-on-x-parent)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                octavate-eight-interface
@@ -1765,6 +1802,7 @@
        (X-extent . ,ly:rest::width)
        (Y-extent . ,ly:rest::height)
        (Y-offset . ,ly:rest::y-offset-callback)
+       (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                rest-interface
@@ -1794,7 +1832,6 @@
        (staff-padding . 0.25)
 
        (stencil . ,ly:script-interface::print)
-       (use-skylines . #t)
        (vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
        (X-offset . ,script-interface::calc-x-offset)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
@@ -1854,6 +1891,7 @@
     (SostenutoPedalLineSpanner
      . (
        (axes . (,Y))
+       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (direction . ,DOWN)
        (minimum-space . 1.0)
        (outside-staff-priority . 1000)
@@ -1891,16 +1929,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)
@@ -2005,7 +2033,7 @@
 
        (direction . ,ly:stem::calc-direction)
        (duration-log . ,stem::calc-duration-log)
-        (length . ,stem::length)
+        (length . ,ly:stem::calc-length)
        (neutral-direction . ,DOWN)
        (positioning-done . ,ly:stem::calc-positioning-done)
        (stem-info . ,ly:stem::calc-stem-info)
@@ -2031,6 +2059,7 @@
      . (
        (beam-thickness . 0.48) ; staff-space
        (beam-width . ,ly:stem-tremolo::calc-width) ; staff-space
+       (direction . ,ly:stem-tremolo::calc-direction)
        (slope . ,ly:stem-tremolo::calc-slope)
        (stencil . ,ly:stem-tremolo::print)
        (style . ,ly:stem-tremolo::calc-style)
@@ -2106,6 +2135,7 @@
     (SustainPedalLineSpanner
      . (
        (axes . (,Y))
+       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (direction . ,DOWN)
        (minimum-space . 1.0)
        (outside-staff-priority . 1000)
@@ -2128,7 +2158,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)
@@ -2248,7 +2278,7 @@
        (outside-staff-priority . 450)
 
        ;; sync with Fingering ?
-       (padding . 0.5)
+       (padding . 0.3)
 
        (script-priority . 200)
        (side-axis . ,Y)
@@ -2502,6 +2532,7 @@
     (UnaCordaPedalLineSpanner
      . (
        (axes . (,Y))
+       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (direction . ,DOWN)
        (minimum-space . 1.0)
        (outside-staff-priority . 1000)
@@ -2538,8 +2569,7 @@
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
-                (object-callbacks . ((full-score-pure-minimum-translations . ,ly:align-interface::full-score-pure-minimum-translations)
-                                     (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-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
                 (interfaces . (align-interface
@@ -2599,6 +2629,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)
@@ -2755,7 +2786,13 @@
     (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
     (,ly:beam::rest-collision-callback . ,ly:beam::pure-rest-collision-callback)
     (,ly:flag::calc-y-offset . ,ly:flag::pure-calc-y-offset)
+    (,ly:grob::horizontal-skylines-from-stencil . ,ly:grob::pure-simple-horizontal-skylines-from-extents)
+    (,ly:grob::horizontal-skylines-from-element-stencils . ,ly:grob::pure-simple-horizontal-skylines-from-extents)
+    (,ly:grob::simple-horizontal-skylines-from-extents . ,ly:grob::pure-simple-horizontal-skylines-from-extents)
+    (,ly:grob::simple-vertical-skylines-from-extents . ,ly:grob::pure-simple-vertical-skylines-from-extents)
     (,ly:grob::stencil-height . ,pure-stencil-height)
+    (,ly:grob::vertical-skylines-from-stencil . ,ly:grob::pure-simple-vertical-skylines-from-extents)
+    (,ly:grob::vertical-skylines-from-element-stencils . ,ly:grob::pure-simple-vertical-skylines-from-extents)
     (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
     (,ly:rest-collision::force-shift-callback-rest . ,pure-chain-offset-callback)
     (,ly:rest::height . ,ly:rest::pure-height)
@@ -2765,15 +2802,17 @@
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
     (,ly:stem::calc-stem-begin-position . ,ly:stem::pure-calc-stem-begin-position)
     (,ly:stem::calc-stem-end-position . ,ly:stem::pure-calc-stem-end-position)
-    (,stem::length . ,stem::pure-length)
+    (,ly:stem::calc-length . ,ly:stem::pure-calc-length)
     (,ly:stem::height . ,ly:stem::pure-height)
     (,ly:stem-tremolo::calc-y-offset . ,ly:stem-tremolo::pure-calc-y-offset)
     (,ly:system::height . ,ly:system::calc-pure-height)))
 
 (define pure-functions
   (list
+   ly:accidental-interface::horizontal-skylines
    parenthesize-elements
    laissez-vibrer::print
+   ly:multi-measure-rest::height
    ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))