X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=76f578ab4a2a1f0e106da4931fad1540238d8a04;hb=623fac8d645e4078af36758af5d437c5eb39e793;hp=a5c03a52755c7cc3bdfac07960833e799ba7730b;hpb=bebd93c2dd0d7363f311d912ec1ed1f7dfcb36ba;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index a5c03a5275..76f578ab4a 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys +;;;; Copyright (C) 1998--2012 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify @@ -80,6 +80,7 @@ (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 `(,+ @@ -197,6 +198,7 @@ (break-align-anchor . ,ly:bar-line::calc-anchor) (break-align-symbol . staff-bar) (break-visibility . ,bar-line::calc-break-visibility) + (extra-spacing-height . ,pure-from-neighbor-interface::account-for-span-bar) (gap . 0.4) (glyph . "|") (glyph-name . ,bar-line::calc-glyph-name) @@ -224,9 +226,12 @@ (right-edge . (extra-space . 0.0)))) (stencil . ,ly:bar-line::print) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) (interfaces . (bar-line-interface break-aligned-interface - font-interface)))))) + font-interface + pure-from-neighbor-interface)))))) (BarNumber . ( @@ -236,6 +241,7 @@ (break-visibility . ,begin-of-line-visible) (direction . ,UP) + (extra-spacing-width . (+inf.0 . -inf.0)) (font-family . roman) (font-size . -2) (non-musical . #t) @@ -276,7 +282,8 @@ (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) + (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) (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (align-interface axis-group-interface @@ -329,6 +336,7 @@ ;; todo: clean this up a bit: the list is getting ;; rather long. (auto-knee-gap . 5.5) + (beam-segments . ,ly:beam::calc-beam-segments) (beam-thickness . 0.48) ; in staff-space ;; We have some unreferenced problems here. @@ -351,12 +359,12 @@ (clip-edges . #t) (collision-interfaces . (beam-interface clef-interface + flag-interface inline-accidental-interface key-signature-interface note-head-interface stem-interface time-signature-interface)) - (concaveness . ,ly:beam::calc-concaveness) (cross-staff . ,ly:beam::calc-cross-staff) (damping . 1) (details @@ -381,15 +389,8 @@ (gap . 0.8) (neutral-direction . ,DOWN) - (positions . ,(ly:make-simple-closure - (ly:make-simple-closure - (list chain-grob-member-functions - `(,cons 0 0) - ly:beam::calc-least-squares-positions - ly:beam::slope-damping - ly:beam::shift-region-to-valid - ly:beam::quanting - )))) + (positions . ,beam::place-broken-parts-individually) + (X-positions . ,ly:beam::calc-x-positions) ;; this is a hack to set stem lengths, if positions is set. (quantized-positions . ,ly:beam::set-stem-lengths) @@ -506,6 +507,7 @@ (font-size . 1.5) (stencil . ,ly:text-interface::print) (extra-spacing-height . (0.2 . -0.2)) + (extra-spacing-width . (-0.5 . 0.5)) (word-space . 0.0) (meta . ((class . Item) (interfaces . (chord-name-interface @@ -519,6 +521,7 @@ (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (break-align-symbol . clef) (break-visibility . ,begin-of-line-visible) + (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-at-beginning-of-line) (glyph-name . ,ly:clef::calc-glyph-name) (non-musical . #t) (space-alist . ((cue-clef . (extra-space . 2.0)) @@ -527,14 +530,17 @@ (key-signature . (minimum-space . 3.5)) (time-signature . (minimum-space . 4.2)) (first-note . (minimum-fixed-space . 5.0)) - (next-note . (extra-space . 0.5)) + (next-note . (extra-space . 1.0)) (right-edge . (extra-space . 0.5)))) (stencil . ,ly:clef::print) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) (interfaces . (break-aligned-interface clef-interface font-interface + pure-from-neighbor-interface staff-symbol-referencer-interface)))))) (ClusterSpanner @@ -583,6 +589,7 @@ (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (break-align-symbol . cue-clef) (break-visibility . ,begin-of-line-visible) + (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-at-beginning-of-line) (font-size . -4) (glyph-name . ,ly:clef::calc-glyph-name) (non-musical . #t) @@ -593,14 +600,17 @@ (time-signature . (minimum-space . 4.2)) (custos . (minimum-space . 0.0)) (first-note . (minimum-fixed-space . 3.0)) - (next-note . (extra-space . 0.5)) + (next-note . (extra-space . 1.0)) (right-edge . (extra-space . 0.5)))) (stencil . ,ly:clef::print) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) (interfaces . (break-aligned-interface clef-interface font-interface + pure-from-neighbor-interface staff-symbol-referencer-interface)))))) (CueEndClef @@ -609,6 +619,7 @@ (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (break-align-symbol . cue-end-clef) (break-visibility . ,begin-of-line-invisible) + (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-at-beginning-of-line) (font-size . -4) (glyph-name . ,ly:clef::calc-glyph-name) (non-musical . #t) @@ -620,14 +631,17 @@ (key-signature . (minimum-space . 3.5)) (time-signature . (minimum-space . 4.2)) (first-note . (minimum-fixed-space . 5.0)) - (next-note . (extra-space . 0.5)) + (next-note . (extra-space . 1.0)) (right-edge . (extra-space . 0.5)))) (stencil . ,ly:clef::print) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) (interfaces . (break-aligned-interface clef-interface font-interface + pure-from-neighbor-interface staff-symbol-referencer-interface)))))) (Custos @@ -660,6 +674,7 @@ (Dots . ( + (avoid-slur . inside) (dot-count . ,dots::calc-dot-count) (staff-position . ,dots::calc-staff-position) (stencil . ,ly:dots::print) @@ -752,6 +767,8 @@ ;; todo. + (collision-bias . -2.0) + (collision-padding . 0.5) (direction . ,ly:script-interface::calc-direction) (extra-spacing-width . (+inf.0 . -inf.0)) (font-encoding . fetaText) @@ -766,6 +783,7 @@ (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 @@ -855,7 +873,7 @@ ;; sync with TextScript (?) (avoid-slur . around) - (cross-staff . ,ly:side-position-interface::calc-cross-staff) + (cross-staff . ,script-or-side-position-cross-staff) (direction . ,ly:script-interface::calc-direction) (font-encoding . fetaText) (font-size . -5) ; don't overlap when next to heads. @@ -876,14 +894,27 @@ text-interface text-script-interface)))))) + (Flag + . ( + (stencil . ,ly:flag::print) + (X-extent . ,ly:flag::width) + (X-offset . ,ly:flag::calc-x-offset) + (Y-offset . ,ly:flag::calc-y-offset) + (meta . ((class . Item) + (interfaces . (flag-interface + font-interface)))))) + (FootnoteItem . ( (annotation-balloon . #f) (annotation-line . #t) + (automatically-numbered . ,(grob::calc-property-by-copy 'automatically-numbered)) (break-visibility . ,inherit-y-parent-visibility) + (footnote . #t) (footnote-text . ,(grob::calc-property-by-copy 'footnote-text)) (stencil . ,ly:balloon-interface::print) (text . ,(grob::calc-property-by-copy 'text)) + (X-extent . #f) (Y-extent . #f) (X-offset . ,(grob::calc-property-by-copy 'X-offset)) (Y-offset . ,(grob::calc-property-by-copy 'Y-offset)) @@ -897,10 +928,13 @@ . ( (annotation-balloon . #f) (annotation-line . #t) + (automatically-numbered . ,(grob::calc-property-by-copy 'automatically-numbered)) + (footnote . #t) (footnote-text . ,(grob::calc-property-by-copy 'footnote-text)) (spanner-placement . ,LEFT) (stencil . ,ly:balloon-interface::print-spanner) (text . ,(grob::calc-property-by-copy 'text)) + (X-extent . #f) (Y-extent . #f) (X-offset . ,(grob::calc-property-by-copy 'X-offset)) (Y-offset . ,(grob::calc-property-by-copy 'Y-offset)) @@ -917,6 +951,7 @@ (fret-diagram-details . ((finger-code . below-string))) (stencil . ,fret-board::calc-stencil) (extra-spacing-height . (0.2 . -0.2)) + (extra-spacing-width . (-0.5 . 0.5)) (meta . ((class . Item) (interfaces . (chord-name-interface font-interface @@ -927,13 +962,15 @@ (Glissando . ( (after-line-breaking . ,ly:spanner::kill-zero-spanned-time) - (bound-details . ((right . ((attach-dir . ,CENTER) - (padding . 1.5) + (bound-details . ((right . ((attach-dir . ,LEFT) + (end-on-accidental . #t) + (padding . 0.5) )) - (left . ((attach-dir . ,CENTER) - (padding . 1.5) + (left . ((attach-dir . ,RIGHT) + (padding . 0.5) )) )) + (cross-staff . ,ly:line-spanner::calc-cross-staff) (gap . 0.5) (left-bound-info . ,ly:line-spanner::calc-left-bound-info) (normalized-endpoints . ,ly:spanner::calc-normalized-endpoints) @@ -988,6 +1025,7 @@ . ( (after-line-breaking . ,ly:spanner::kill-zero-spanned-time) (bound-padding . 1.0) + (broken-bound-padding . ,ly:hairpin::broken-bound-padding) (circled-tip . #f) (grow-direction . ,hairpin::calc-grow-direction) (height . 0.6666) @@ -1071,13 +1109,17 @@ (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)) + (extra-spacing-width . (0.0 . 1.0)) + (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-including-staff) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) (interfaces . (break-aligned-interface font-interface key-cancellation-interface key-signature-interface + pure-from-neighbor-interface staff-symbol-referencer-interface)))))) (KeySignature @@ -1095,12 +1137,16 @@ (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)) + (extra-spacing-width . (0.0 . 1.0)) + (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-including-staff) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) (interfaces . (break-aligned-interface font-interface key-signature-interface + pure-from-neighbor-interface staff-symbol-referencer-interface)))))) @@ -1169,7 +1215,6 @@ ;; a tuplet bracket. (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors) - (control-points . ,ly:tuplet-bracket::calc-control-points) (direction . ,UP) (edge-height . (0.7 . 0.7)) (padding . 2.0) @@ -1178,6 +1223,7 @@ (staff-padding . 0.25) (stencil . ,ly:tuplet-bracket::print) (thickness . 1.6) + (X-positions . ,ly:tuplet-bracket::calc-x-positions) (meta . ((class . Spanner) (interfaces . (line-interface tuplet-bracket-interface)))))) @@ -1266,7 +1312,7 @@ (MensuralLigature . ( (stencil . ,ly:mensural-ligature::print) - (thickness . 1.4) + (thickness . 1.3) (meta . ((class . Spanner) (interfaces . (font-interface mensural-ligature-interface)))))) @@ -1303,14 +1349,14 @@ . ( (expand-limit . 10) (hair-thickness . 2.0) + (round-up-exceptions . ()) (padding . 1) (spacing-pair . (break-alignment . break-alignment)) (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods) - (staff-position . 0) (stencil . ,ly:multi-measure-rest::print) (thick-thickness . 6.6) ;; See Wanske pp. 125 - (usable-duration-logs . (0 -1 -2 -3)) + (usable-duration-logs . ,(iota 4 -3)) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Spanner) (interfaces . (font-interface @@ -1372,10 +1418,9 @@ (allow-loose-spacing . #t) (axes . (,X)) (before-line-breaking . ,ly:paper-column::before-line-breaking) + (bound-alignment-interfaces . (break-alignment-interface)) (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) (keep-inside-line . #t) @@ -1412,6 +1457,7 @@ (NoteColumn . ( (axes . (,X ,Y)) + (bound-alignment-interfaces . (rhythmic-head-interface stem-interface)) (horizontal-skylines . ,ly:separation-item::calc-skylines) (skyline-vertical-padding . 0.15) (X-extent . ,ly:axis-group-interface::width) @@ -1516,6 +1562,7 @@ (allow-loose-spacing . #t) (axes . (,X)) (before-line-breaking . ,ly:paper-column::before-line-breaking) + (bound-alignment-interfaces . (note-column-interface)) (horizontal-skylines . ,ly:separation-item::calc-skylines) (keep-inside-line . #t) ;; (stencil . ,ly:paper-column::print) @@ -1592,6 +1639,7 @@ (springs-and-rods . ,ly:spanner::set-spacing-rods) (stencil . ,ly:slur::print) (thickness . 1.1) + (vertical-skylines . ,ly:slur::vertical-skylines) (Y-extent . ,ly:slur::height) (meta . ((class . Spanner) (interfaces . (slur-interface)))))) @@ -1710,9 +1758,11 @@ (side-axis . ,Y) ;; padding set in script definitions. + (slur-padding . 0.2) (staff-padding . 0.25) (stencil . ,ly:script-interface::print) + (use-skylines . #t) (X-offset . ,script-interface::calc-x-offset) (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Item) @@ -1747,6 +1797,7 @@ (springs-and-rods . ,ly:spanner::set-spacing-rods) (stencil . ,ly:slur::print) (thickness . 1.2) + (vertical-skylines . ,ly:slur::vertical-skylines) (Y-extent . ,ly:slur::height) (meta . ((class . Spanner) (interfaces . (slur-interface)))))) @@ -1819,14 +1870,22 @@ (non-musical . #t) (stencil . ,ly:span-bar::print) (X-extent . ,ly:span-bar::width) - (Y-extent . ,ly:axis-group-interface::height) + (Y-extent . (+inf.0 . -inf.0)) (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))) (interfaces . (bar-line-interface font-interface span-bar-interface)))))) + (SpanBarStub + . ( + (X-extent . ,grob::x-parent-width) + (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height) + (Y-extent . #f) + (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) + (interfaces . (pure-from-neighbor-interface)))))) + (StaffGrouper . ( (staff-staff-spacing . ((basic-distance . 9) @@ -1911,13 +1970,11 @@ (direction . ,ly:stem::calc-direction) (duration-log . ,stem::calc-duration-log) - (flag . ,ly:stem::calc-flag) - (length . ,ly:stem::calc-length) + (length . ,stem::length) (neutral-direction . ,DOWN) (positioning-done . ,ly:stem::calc-positioning-done) - (stem-begin-position . ,ly:stem::calc-stem-begin-position) - (stem-end-position . ,ly:stem::calc-stem-end-position) (stem-info . ,ly:stem::calc-stem-info) + (stem-begin-position . ,ly:stem::calc-stem-begin-position) (stencil . ,ly:stem::print) (thickness . 1.3) (X-extent . ,ly:stem::width) @@ -1925,8 +1982,15 @@ (Y-extent . ,ly:stem::height) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Item) - (interfaces . (font-interface - stem-interface)))))) + (interfaces . (stem-interface)))))) + + (StemStub + . ( + (X-extent . ,stem-stub::width) + (extra-spacing-height . ,stem-stub::extra-spacing-height) + (Y-extent . ,(ly:make-unpure-pure-container #f stem-stub::pure-height)) + (meta . ((class . Item) + (interfaces . ()))))) (StemTremolo . ( @@ -1936,13 +2000,21 @@ (stencil . ,ly:stem-tremolo::print) (style . ,ly:stem-tremolo::calc-style) (X-extent . ,ly:stem-tremolo::width) - (Y-extent . ,ly:stem-tremolo::height) + (X-offset . ,(ly:make-simple-closure + `(,+ + ,(ly:make-simple-closure + (list ly:self-alignment-interface::centered-on-x-parent)) + ,(ly:make-simple-closure + (list ly:self-alignment-interface::x-aligned-on-self))))) + (Y-offset . ,ly:stem-tremolo::calc-y-offset) (meta . ((class . Item) - (interfaces . (stem-tremolo-interface)))))) + (interfaces . (self-alignment-interface + stem-tremolo-interface)))))) (StringNumber . ( (avoid-slur . around) + (cross-staff . ,script-or-side-position-cross-staff) (font-encoding . fetaText) (font-size . -5) ; don't overlap when next to heads. (padding . 0.5) @@ -2023,7 +2095,9 @@ (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:system::height) (meta . ((class . System) - (object-callbacks . ((pure-relevant-grobs . ,ly:system::calc-pure-relevant-grobs) + (object-callbacks . ((footnotes-before-line-breaking . ,ly:system::footnotes-before-line-breaking) + (footnotes-after-line-breaking . ,ly:system::footnotes-after-line-breaking) + (pure-relevant-grobs . ,ly:system::calc-pure-relevant-grobs) (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common))) (interfaces . (axis-group-interface system-interface)))))) @@ -2127,7 +2201,7 @@ (TextScript . ( (avoid-slur . around) - (cross-staff . ,ly:script-interface::calc-cross-staff) + (cross-staff . ,script-or-side-position-cross-staff) (direction . ,DOWN) (extra-spacing-width . (+inf.0 . -inf.0)) (outside-staff-priority . 450) @@ -2157,7 +2231,7 @@ (padding . 0.25) (attach-dir . ,LEFT) )) - (left-broken . ((end-on-note . #t))) + (left-broken . ((attach-dir . ,RIGHT))) (right . ((Y . 0) (padding . 0.25) )) @@ -2234,7 +2308,8 @@ (break-align-symbol . time-signature) (break-align-anchor-alignment . ,LEFT) (break-visibility . ,all-visible) - (extra-spacing-height . (-1.0 . 1.0)) + (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-including-staff) + (extra-spacing-width . (0.0 . 0.8)) (non-musical . #t) (space-alist . ( (cue-clef . (extra-space . 1.5)) @@ -2244,8 +2319,11 @@ (stencil . ,ly:time-signature::print) (style . C) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs))) (interfaces . (break-aligned-interface font-interface + pure-from-neighbor-interface time-signature-interface)))))) (TrillPitchAccidental @@ -2326,8 +2404,8 @@ (TupletBracket . ( + (avoid-scripts . #t) (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors) - (control-points . ,ly:tuplet-bracket::calc-control-points) (cross-staff . ,ly:tuplet-bracket::calc-cross-staff) (direction . ,ly:tuplet-bracket::calc-direction) (edge-height . (0.7 . 0.7)) @@ -2338,6 +2416,7 @@ (staff-padding . 0.25) (stencil . ,ly:tuplet-bracket::print) (thickness . 1.6) + (X-positions . ,ly:tuplet-bracket::calc-x-positions) (meta . ((class . Spanner) (interfaces . (line-interface @@ -2352,6 +2431,8 @@ (font-size . -2) (stencil . ,ly:tuplet-number::print) (text . ,tuplet-number::calc-denominator-text) + (X-offset . ,ly:tuplet-number::calc-x-offset) + (Y-offset . ,ly:tuplet-number::calc-y-offset) (meta . ((class . Spanner) (interfaces . (font-interface text-interface @@ -2411,7 +2492,8 @@ (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 . ((full-score-pure-minimum-translations . ,ly:align-interface::full-score-pure-minimum-translations) + (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 @@ -2571,6 +2653,14 @@ ly:note-head::print ly:dots::print ly:clef::print + ly:flag::print + ly:time-signature::print + default-flag + normal-flag + mensural-flag + no-flag + modern-straight-flag + old-straight-flag ly:key-signature-interface::print ly:percent-repeat-item-interface::beat-slash ly:text-interface::print @@ -2586,6 +2676,7 @@ (,ly:arpeggio::brew-chord-bracket . ,ly:arpeggio::pure-height) (,ly:arpeggio::brew-chord-slur . ,ly:arpeggio::pure-height) (,ly:hairpin::print . ,ly:hairpin::pure-height) + (,ly:stem-tremolo::print . ,ly:stem-tremolo::pure-height) (,ly:volta-bracket-interface::print . ,volta-bracket-interface::pure-height))) ;; ly:grob::stencil-extent is safe if the print callback is safe too @@ -2611,6 +2702,8 @@ (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height) (,ly:axis-group-interface::calc-staff-staff-spacing . ,ly:axis-group-interface::calc-pure-staff-staff-spacing) (,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::stencil-height . ,pure-stencil-height) (,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) @@ -2619,7 +2712,11 @@ (,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::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::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 @@ -2634,6 +2731,7 @@ (let ((extent-callback (ly:grob-property-data grob 'Y-extent))) (not (eq? #f (or + (ly:unpure-pure-container? extent-callback) (pair? extent-callback) (memq extent-callback pure-functions) (and @@ -2645,16 +2743,29 @@ (assq stencil pure-print-to-height-conversions) (ly:stencil? stencil))))))))) +;; hideous code dup below - to be cleaned up when call pure functino +;; is eliminated and lilypond works entirely from unpure-pure-containers + (define-public (call-pure-function unpure args start end) - (if (ly:simple-closure? unpure) - (ly:eval-simple-closure (car args) unpure start end) - (if (not (procedure? unpure)) - unpure - (if (memq unpure pure-functions) - (apply unpure args) - (let ((pure (assq unpure pure-conversions-alist))) - (if pure - (apply (cdr pure) - (append - (list (car args) start end) - (cdr args))))))))) + (if (ly:unpure-pure-container? unpure) + (let ((unpure (ly:unpure-pure-container-pure-part unpure))) + (if (ly:simple-closure? unpure) + (ly:eval-simple-closure (car args) unpure start end) + (if (not (procedure? unpure)) + unpure + (apply unpure + (append + (list (car args) start end) + (cdr args)))))) + (if (ly:simple-closure? unpure) + (ly:eval-simple-closure (car args) unpure start end) + (if (not (procedure? unpure)) + unpure + (if (memq unpure pure-functions) + (apply unpure args) + (let ((pure (assq unpure pure-conversions-alist))) + (if pure + (apply (cdr pure) + (append + (list (car args) start end) + (cdr args))))))))))