X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=9b75b09afe1cb8c3048fb512542c6a1ac025139d;hb=70cc70f3a6183472b93fc4c2b4c60cc0375b6d64;hp=34618b9b774d0bb65719ca1722618fb8c89b1844;hpb=711cf44d0ab28f3159230c84d63c0b19199408b0;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 34618b9b77..658d2dfeb0 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2006 Han-Wen Nienhuys +;;;; (c) 1998--2007 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; distances are given in line-thickness (thicknesses) and @@ -23,8 +23,8 @@ (glyph-name-alist . ,standard-alteration-glyph-name-alist) (alteration . ,accidental-interface::calc-alteration) (stencil . ,ly:accidental-interface::print) - (after-line-breaking - . ,ly:accidental-interface::after-line-breaking) + (Y-extent . ,ly:accidental-interface::height) + (X-extent . ,ly:accidental-interface::width) (meta . ((class . Item) (interfaces . (accidental-interface font-interface)))))) @@ -35,8 +35,7 @@ (glyph-name-alist . ,standard-alteration-glyph-name-alist) (alteration . ,accidental-interface::calc-alteration) (stencil . ,ly:accidental-interface::print) - (after-line-breaking - . ,ly:accidental-interface::after-line-breaking) + (Y-extent . ,ly:accidental-interface::height) (meta . ((class . Item) (interfaces . (accidental-interface font-interface)))))) @@ -45,10 +44,13 @@ (AccidentalSuggestion . ( (stencil . ,ly:accidental-interface::print) + (Y-extent . ,ly:accidental-interface::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))))) + ,(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))))) (self-alignment-X . ,CENTER) (font-size . -2) (glyph-name-alist . ,standard-alteration-glyph-name-alist) @@ -120,8 +122,8 @@ (X-offset . ,ly:side-position-interface::x-aligned-side) (direction . ,LEFT) (stencil . ,ly:accidental-interface::print) + (Y-extent . ,ly:accidental-interface::height) (glyph-name-alist . ,standard-alteration-glyph-name-alist) - (after-line-breaking . ,ly:accidental-interface::after-line-breaking) (side-axis . ,X) (meta . ((class . Item) (interfaces . ( @@ -150,10 +152,12 @@ (Y-offset . ,ly:staff-symbol-referencer::callback) (X-offset . ,ly:side-position-interface::x-aligned-side) (direction . ,LEFT) + (positions . ,ly:arpeggio::calc-positions) (padding . 0.5) (script-priority . 0) (side-axis . ,X) (staff-position . 0.0) + (Y-extent . ,ly:arpeggio::height) (meta . ((class . Item) (interfaces . (arpeggio-interface staff-symbol-referencer-interface @@ -171,16 +175,17 @@ (BarLine . ( (break-align-symbol . staff-bar) + (break-align-anchor . ,ly:bar-line::calc-anchor) (glyph . "|") (gap . 0.4) (layer . 0) - (break-visibility . ,all-visible) + (break-visibility . ,bar-line::calc-break-visibility) (non-musical . #t) - (extra-spacing-width . (-0.3 . 0.3)) - (stencil . ,ly:bar-line::print) (glyph-name . ,bar-line::calc-glyph-name) (bar-size . ,ly:bar-line::calc-bar-size) + (bar-extent . ,ly:bar-line::calc-bar-extent) + (allow-span-bar . #t) (space-alist . ( (time-signature . (extra-space . 0.75)) @@ -189,7 +194,7 @@ (key-signature . (extra-space . 1.0)) (key-cancellation . (extra-space . 1.0)) (first-note . (fixed-space . 1.3)) - (next-note . (semi-fixed-space . 1.3)) + (next-note . (semi-fixed-space . 0.9)) (right-edge . (extra-space . 0.0)))) ;; @@ -228,7 +233,7 @@ (self-alignment-X . 1) ;; want the bar number before the clef at line start. - (break-align-symbol . left-edge) + (break-align-symbols . (left-edge staff-bar)) (meta . ((class . Item) (interfaces . (side-position-interface @@ -293,7 +298,8 @@ . ( (axes . (,Y)) (Y-extent . ,ly:axis-group-interface::height) - (skylines . ,ly:axis-group-interface::calc-skylines) + (vertical-skylines . ,ly:axis-group-interface::calc-skylines) + (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights) (meta . ((class . Spanner) (interfaces . (axis-group-interface )))))) @@ -322,6 +328,7 @@ (beaming . ,ly:beam::calc-beaming) (stencil . ,ly:beam::print) (clip-edges . #t) + (cross-staff . ,ly:beam::calc-cross-staff) (details . ((hint-direction-penalty . 20))) ;; TODO: should be in SLT. @@ -351,6 +358,7 @@ (meta . ((class . Spanner) (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems))) (interfaces . (staff-symbol-referencer-interface + unbreakable-spanner-interface beam-interface)))))) (BendAfter @@ -411,6 +419,8 @@ . ( (axes . (0)) (X-extent . ,ly:axis-group-interface::width) + (break-align-anchor . ,ly:break-aligned-interface::calc-average-anchor) + (break-visibility . ,ly:break-aligned-interface::calc-break-visibility) (meta . ((class . Item) (interfaces . (break-aligned-interface axis-group-interface)))))) @@ -446,6 +456,7 @@ (avoid-slur . inside) (font-family . music) (break-align-symbol . clef) + (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (break-visibility . ,begin-of-line-visible) (space-alist . ((ambitus . (extra-space . 2.0)) (staff-bar . (extra-space . 0.7)) @@ -475,6 +486,7 @@ (stencil . ,ly:cluster::print) (minimum-length . 0.0) (padding . 0.25) + (cross-staff . ,ly:cluster::calc-cross-staff) (style . ramp) (meta . ((class . Spanner) (interfaces . (cluster-interface)))))) @@ -538,7 +550,6 @@ (direction . ,RIGHT) (positioning-done . ,ly:dot-column::calc-positioning-done) (X-extent . ,ly:axis-group-interface::width) - (X-offset . ,ly:dot-column::side-position) (meta . ((class . Item) (interfaces . (dot-column-interface axis-group-interface)))))) @@ -547,6 +558,7 @@ . ( (stencil . ,ly:dots::print) (dot-count . ,dots::calc-dot-count) + (staff-position . ,dots::calc-staff-position) (meta . ((class . Item) (interfaces . (font-interface staff-symbol-referencer-interface @@ -592,7 +604,6 @@ (Y-offset . ,ly:side-position-interface::y-aligned-side) (staff-padding . 0.1) (padding . 0.6) - (avoid-slur . outside) (slur-padding . 0.3) (minimum-space . 1.2) (direction . ,DOWN) @@ -600,6 +611,7 @@ (outside-staff-priority . 250) (Y-extent . ,ly:axis-group-interface::height) (X-extent . ,ly:axis-group-interface::width) + (cross-staff . ,ly:side-position-interface::calc-cross-staff) (meta . ((class . Spanner) (interfaces . (axis-group-interface dynamic-interface @@ -613,6 +625,7 @@ (stencil . ,ly:text-interface::print) (direction . ,ly:script-interface::calc-direction) + (positioning-done . ,ly:script-interface::calc-positioning-done) (X-offset . ,ly:self-alignment-interface::x-aligned-on-self) (self-alignment-X . 0) @@ -621,7 +634,6 @@ (font-series . bold) (font-encoding . fetaDynamic) (font-shape . italic) - (avoid-slur . around) (extra-spacing-width . (+inf.0 . -inf.0)) (outside-staff-priority . 250) (meta . ((class . Item) @@ -633,22 +645,42 @@ (DynamicTextSpanner . ( - (stencil . ,ly:dynamic-text-spanner::print) - ;; rather ugh with NCSB ;; (font-series . bold) (font-shape . italic) (style . dashed-line) + ;; make sure the spanner doesn't get too close to notes + (minimum-Y-extent . (-1 . 1)) + (bound-details . ((right . ((attach-dir . ,LEFT) + (Y . 0) + (padding . 0.75) + )) + (right-broken . ((attach-dir . ,RIGHT) + (padding . 0.0) + )) + + (left . ((attach-dir . ,LEFT) + (Y . 0) + (stencil-offset . (0 . -0.5)) + (padding . 0.5) + )) + (left-broken . ((attach-dir . ,RIGHT) + )) + )) + (stencil . ,ly:line-spanner::print) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info-and-text) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) + ;; need to blend with dynamic texts. (font-size . 1) - (bound-padding . 0.75) (dash-fraction . 0.2) (dash-period . 3.0) (meta . ((class . Spanner) (interfaces . (font-interface text-interface line-spanner-interface + line-interface dynamic-interface dynamic-text-spanner-interface spanner-interface)))))) @@ -668,6 +700,8 @@ (script-priority . 100) (stencil . ,ly:text-interface::print) (direction . ,ly:script-interface::calc-direction) + (positioning-done . ,ly:script-interface::calc-positioning-done) + (text . ,fingering::calc-text) (font-encoding . fetaNumber) (font-size . -5) ; don't overlap when next to heads. @@ -694,10 +728,19 @@ (zigzag-width . 0.75) (X-extent . #f) (Y-extent . #f) + (bound-details . ((right . ((attach-dir . ,CENTER) + (padding . 1.5) + )) + (left . ((attach-dir . ,CENTER) + (padding . 1.5) + )) + )) (stencil . ,ly:line-spanner::print) - (after-line-breaking . ,ly:line-spanner::after-line-breaking) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) (meta . ((class . Spanner) (interfaces . (line-interface + unbreakable-spanner-interface line-spanner-interface)))))) (GraceSpacing @@ -707,7 +750,7 @@ (shortest-duration-space . 1.6) (meta . ((class . Spanner) (interfaces . (grace-spacing-interface - spacing-interface + spacing-options-interface spanner-interface)))))) (GridPoint @@ -791,8 +834,7 @@ (direction . ,UP) (self-alignment-X . ,CENTER) (meta . ((class . Item) - (interfaces . (system-start-text-interface - side-position-interface + (interfaces . (side-position-interface font-interface)))))) (KeyCancellation @@ -826,6 +868,7 @@ (first-note . (fixed-space . 2.5)))) (Y-offset . ,ly:staff-symbol-referencer::callback) (break-align-symbol . key-signature) + (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (break-visibility . ,begin-of-line-visible) (non-musical . #t) (meta . ((class . Item) @@ -874,6 +917,7 @@ (LeftEdge . ( (break-align-symbol . left-edge) + (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (X-extent . (0 . 0)) (non-musical . #t) (break-visibility . ,center-invisible) @@ -948,7 +992,7 @@ (X-extent . #f) (meta . ((class . Spanner) (interfaces . (spanner-interface - lyric-hyphen-interface spacing-interface)) + lyric-hyphen-interface )) )) )) @@ -961,6 +1005,7 @@ (word-space . 0.6) (font-series . bold-narrow) (font-size . 1.0) + (extra-spacing-width . (0.0 . 0.0)) (meta . ((class . Item) (interfaces . (rhythmic-grob-interface lyric-syllable-interface @@ -987,7 +1032,7 @@ . ( (neutral-direction . ,DOWN) (meta . ((class . Item) - (interfaces . (melody-spanner-interface spacing-interface)))))) + (interfaces . (melody-spanner-interface )))))) (MensuralLigature . ( (thickness . 1.4) @@ -1004,6 +1049,7 @@ (direction . ,UP) (padding . 0.8) (side-axis . ,Y) + (extra-spacing-width . (+inf.0 . -inf.0)) (outside-staff-priority . 1000) (meta . ((class . Item) (interfaces . (text-interface @@ -1065,6 +1111,7 @@ (direction . ,UP) (padding . 0.2) (staff-padding . 0.25) + (outside-staff-priority . 450) (meta . ((class . Spanner) (interfaces . (side-position-interface multi-measure-interface @@ -1078,6 +1125,7 @@ (axes . (0)) (before-line-breaking . ,ly:paper-column::before-line-breaking) (X-extent . ,ly:axis-group-interface::width) + (horizontal-skylines . ,ly:separation-item::calc-skylines) ;; (stencil . ,ly:paper-column::print) (non-musical . #t) @@ -1090,6 +1138,7 @@ (meta . ((class . Paper_column) (interfaces . (paper-column-interface axis-group-interface + separation-item-interface spaceable-grob-interface)))))) (NoteCollision @@ -1107,8 +1156,10 @@ (axes . (0 1)) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) + (horizontal-skylines . ,ly:separation-item::calc-skylines) (meta . ((class . Item) (interfaces . (axis-group-interface + separation-item-interface note-column-interface)))))) (NoteHead @@ -1131,6 +1182,7 @@ . ( (stem-spacing-correction . 0.5) (same-direction-correction . 0.25) + (space-to-barline . #t) ;; Changed this from 0.75. ;; If you ever change this back, please document! --hwn (knee-spacing-correction . 1.0) @@ -1174,6 +1226,7 @@ (staff-padding . 1.0) (padding . 0.5) (minimum-length . 1.0) + (style . dashed-line) (dash-fraction . 0.3) (edge-height . (0 . 1.2)) (direction . ,UP) @@ -1191,6 +1244,7 @@ (axes . (0)) (allow-loose-spacing . #t) (before-line-breaking . ,ly:paper-column::before-line-breaking) + (horizontal-skylines . ,ly:separation-item::calc-skylines) ;; (stencil . ,ly:paper-column::print) (X-extent . ,ly:axis-group-interface::width) @@ -1198,6 +1252,7 @@ ;; (font-size . -6) (font-name . "sans") (Y-extent . #f) (meta . ((class . Paper_column) (interfaces . (paper-column-interface + separation-item-interface axis-group-interface spaceable-grob-interface)))))) @@ -1229,6 +1284,7 @@ (minimum-length . 1.5) (height-limit . 2.0) (ratio . 0.333) + (cross-staff . ,ly:slur::calc-cross-staff) (meta . ((class . Spanner) (interfaces . (slur-interface)))))) @@ -1292,13 +1348,14 @@ (list ly:self-alignment-interface::x-aligned-on-self))))) (Y-offset . ,ly:side-position-interface::y-aligned-side) + (extra-spacing-width . (+inf.0 . -inf.0)) (self-alignment-X . 0) (direction . ,UP) (non-musical . #t) (font-size . 2) (baseline-skip . 2) (break-visibility . ,end-of-line-invisible) - (break-align-symbol . clef) + (break-align-symbols . (staff-bar clef)) (padding . 0.8) (outside-staff-priority . 1500) (meta . ((class . Item) @@ -1337,7 +1394,7 @@ (X-extent . #f) (Y-extent . #f) (direction . ,ly:tie::calc-direction) - (head-direction . ,RIGHT) + (head-direction . ,ly:semi-tie-column::calc-head-direction) (positioning-done . ,ly:semi-tie-column::calc-positioning-done) (meta . ((class . Item) @@ -1373,13 +1430,15 @@ ;; padding set in script definitions. (staff-padding . 0.25) - (X-offset . ,ly:self-alignment-interface::centered-on-x-parent) + (X-offset . ,script-interface::calc-x-offset) (Y-offset . ,ly:side-position-interface::y-aligned-side) (side-axis . ,Y) (stencil . ,ly:script-interface::print) (direction . ,ly:script-interface::calc-direction) + (positioning-done . ,ly:script-interface::calc-positioning-done) (font-encoding . fetaMusic) + (cross-staff . ,ly:script-interface::calc-cross-staff) (meta . ((class . Item) (interfaces . (script-interface side-position-interface @@ -1401,19 +1460,12 @@ (avoid-slur . inside) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) - (skylines . ,ly:separation-item::calc-skylines) + (horizontal-skylines . ,ly:separation-item::calc-skylines) + (stencil . ,ly:separation-item::print) (meta . ((class . Item) - (interfaces . (spacing-interface + (interfaces . ( separation-item-interface)))))) - (SeparatingGroupSpanner - . ( - (springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods) - (meta . ((class . Spanner) - (interfaces . (only-prebreak-interface - spacing-interface - separating-group-spanner-interface)))))) - (Slur . ((details . ,default-slur-details) (control-points . ,ly:slur::calc-control-points) @@ -1427,6 +1479,7 @@ (height-limit . 2.0) (ratio . 0.25) (avoid-slur . inside) + (cross-staff . ,ly:slur::calc-cross-staff) (meta . ((class . Spanner) (interfaces . (slur-interface)))))) @@ -1469,21 +1522,23 @@ (base-shortest-duration . ,(ly:make-moment 3 16)) (meta . ((class . Spanner) - (interfaces . (spacing-interface + (interfaces . ( spacing-options-interface spacing-spanner-interface)))))) (SpanBar . ( (break-align-symbol . staff-bar) - (Y-extent . ()) + (Y-extent . ,ly:axis-group-interface::height) (layer . 0) (non-musical . #t) (stencil . ,ly:span-bar::print) (bar-size . ,ly:span-bar::calc-bar-size) + (bar-extent . ,ly:axis-group-interface::height) (X-extent . ,ly:span-bar::width) (glyph-name . ,ly:span-bar::calc-glyph-name) (before-line-breaking . ,ly:span-bar::before-line-breaking) + (allow-span-bar . #t) ;; ugh duplication! @@ -1548,6 +1603,7 @@ (Y-extent . ,ly:stem::height) (length . ,ly:stem::calc-length) (thickness . 1.3) + (cross-staff . ,ly:stem::calc-cross-staff) (details . ( ;; 3.5 (or 3 measured from note head) is standard length @@ -1588,8 +1644,8 @@ (StemTremolo . ( (Y-extent . ,ly:stem-tremolo::height) + (X-extent . ,ly:stem-tremolo::width) (stencil . ,ly:stem-tremolo::print) - (X-extent . #f) (slope . ,ly:stem-tremolo::calc-slope) (beam-width . ,ly:stem-tremolo::calc-width) ; staff-space (style . ,ly:stem-tremolo::calc-style) @@ -1649,8 +1705,6 @@ (X-offset . ,ly:self-alignment-interface::x-aligned-on-self) (meta . ((class . Item) (interfaces . (piano-pedal-interface - text-spanner-interface - line-spanner-interface text-interface self-alignment-interface piano-pedal-script-interface @@ -1676,8 +1730,8 @@ (axes . (0 1)) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) - (skylines . ,ly:axis-group-interface::calc-skylines) - (skyline-horizontal-padding . 1.0) + (vertical-skylines . ,ly:axis-group-interface::calc-skylines) + (max-stretch . ,ly:axis-group-interface::calc-max-stretch) (meta . ((class . System) (interfaces . (system-interface axis-group-interface)))))) @@ -1734,6 +1788,7 @@ (X-offset . ,ly:side-position-interface::x-aligned-side) (direction . ,LEFT) (style . bar-line) + (collapse-height . 5.0) (thickness . 1.6) (stencil . ,ly:system-start-delimiter::print) (meta . ((class . Spanner) @@ -1771,11 +1826,13 @@ (stencil . ,ly:text-interface::print) (direction . ,ly:script-interface::calc-direction) + (positioning-done . ,ly:script-interface::calc-positioning-done) (outside-staff-priority . 450) (avoid-slur . around) (slur-padding . 0.5) (script-priority . 200) + (cross-staff . ,ly:script-interface::calc-cross-staff) ;; todo: add X self alignment? (meta . ((class . Item) (interfaces . (text-script-interface @@ -1785,7 +1842,6 @@ (TextSpanner . ( - (stencil . ,ly:text-spanner::print) (Y-offset . ,ly:side-position-interface::y-aligned-side) (font-shape . italic) (style . dashed-line) @@ -1795,9 +1851,21 @@ (side-axis . ,Y) (direction . ,UP) (outside-staff-priority . 350) + + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) + (bound-details . ((left . ((Y . 0) + (padding . 0.25) + (attach-dir . ,LEFT) + )) + (right . ((Y . 0) + (padding . 0.25) + )) + )) + (stencil . ,ly:line-spanner::print) + (meta . ((class . Spanner) - (interfaces . (text-spanner-interface - line-spanner-interface + (interfaces . (line-spanner-interface side-position-interface font-interface)))))) @@ -1818,14 +1886,17 @@ (stem-gap . 0.35) (height-limit . 1.0) (horizontal-distance-penalty-factor . 10) - (min-length-penalty-factor . 20) + (same-dir-as-stem-penalty . 8) + (min-length-penalty-factor . 26) (tie-tie-collision-distance . 0.45) (tie-tie-collision-penalty . 25.0) (intra-space-threshold . 1.25) (outer-tie-vertical-distance-symmetry-penalty-factor . 10) (outer-tie-length-symmetry-penalty-factor . 10) + (vertical-distance-penalty-factor . 7) (outer-tie-vertical-gap . 0.25) (multi-tie-region-size . 1) + (single-tie-region-size . 4) (between-length-limit . 1.0))) (thickness . 1.2) @@ -1847,6 +1918,8 @@ . ( (stencil . ,ly:time-signature::print) (break-align-symbol . time-signature) + (break-align-anchor + . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (break-visibility . ,all-visible) (avoid-slur . inside) (space-alist . ( @@ -1862,9 +1935,23 @@ (TrillSpanner . ( - (stencil . ,ly:dynamic-text-spanner::print) - (edge-text . ,(cons (make-musicglyph-markup "scripts.trill") - "")) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) + + (bound-details . ((left . ((text . ,(make-translate-scaled-markup + '(0.0 . -1.0) + (make-musicglyph-markup "scripts.trill"))) + (Y . 0) + (stencil-offset . (-0.5 . 0)) + (padding . 1.5) + (attach-dir . ,LEFT) + )) + (left-broken . ((end-on-note . #t))) + (right . ((Y . 0))) + )) + + (stencil . ,ly:line-spanner::print) + (style . trill) (staff-padding . 1.0) (padding . 0.5) @@ -1873,8 +1960,9 @@ (side-axis . ,Y) (outside-staff-priority . 50) (meta . ((class . Spanner) - (interfaces . (text-spanner-interface - line-spanner-interface + (interfaces . (line-spanner-interface + line-interface + trill-spanner-interface side-position-interface font-interface)))))) @@ -1885,9 +1973,11 @@ (font-size . -4) (side-axis . ,X) (stencil . ,ly:accidental-interface::print) + (Y-extent . ,ly:accidental-interface::height) (glyph-name-alist . ,standard-alteration-glyph-name-alist) (meta . ((class . Item) (interfaces . (trill-pitch-accidental-interface + accidental-interface side-position-interface font-interface)))))) @@ -1902,6 +1992,7 @@ (padding . 0.3) (meta . ((class . Item) (interfaces . (side-position-interface + parentheses-interface note-head-interface rhythmic-head-interface font-interface @@ -1932,6 +2023,7 @@ (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors) (control-points . ,ly:tuplet-bracket::calc-control-points) (stencil . ,ly:tuplet-bracket::print) + (cross-staff . ,ly:tuplet-bracket::calc-cross-staff) (meta . ((class . Spanner) (interfaces . (line-interface @@ -1944,6 +2036,7 @@ (font-shape . italic) (font-size . -2) (avoid-slur . inside) + (cross-staff . ,ly:tuplet-number::calc-cross-staff) (meta . ((class . Spanner) (interfaces . (text-interface tuplet-number-interface font-interface)))))) @@ -1996,8 +2089,10 @@ (X-extent . ,ly:axis-group-interface::width) (stacking-dir . -1) (padding . 0.5) - (skylines . ,ly:axis-group-interface::combine-skylines) + (vertical-skylines . ,ly:axis-group-interface::combine-skylines) + (max-stretch . 0) (meta . ((class . Spanner) + (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common))) (interfaces . (align-interface axis-group-interface)))))) (VerticalAxisGroup @@ -2006,8 +2101,12 @@ (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback) (Y-extent . ,ly:hara-kiri-group-spanner::y-extent) (X-extent . ,ly:axis-group-interface::width) - (skylines . ,ly:axis-group-interface::calc-skylines); + (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines) + (max-stretch . ,ly:axis-group-interface::calc-max-stretch) + (stencil . ,ly:axis-group-interface::print) + (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights) (meta . ((class . Spanner) + (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common))) (interfaces . (axis-group-interface hara-kiri-group-spanner-interface vertically-spaceable-interface)))))) @@ -2016,16 +2115,11 @@ (VoltaBracket . ( (stencil . ,ly:volta-bracket-interface::print) - (direction . ,UP) - (padding . 1) (font-encoding . fetaNumber) - (Y-offset . ,ly:side-position-interface::y-aligned-side) - (side-axis . ,Y) (thickness . 1.6) ;; line-thickness (edge-height . (2.0 . 2.0)) ;; staff-space; - (minimum-space . 5) (font-size . -4) - (outside-staff-priority . 100) + (direction . ,UP) (meta . ((class . Spanner) (interfaces . (volta-bracket-interface horizontal-bracket-interface @@ -2035,6 +2129,21 @@ font-interface))) ))) + (VoltaBracketSpanner + . ( + (axes . (1)) + (side-axis . ,Y) + (direction . ,UP) + (padding . 1) + (Y-offset . ,ly:side-position-interface::y-aligned-side) + (outside-staff-priority . 100) + (Y-extent . ,ly:axis-group-interface::height) + (X-extent . ,ly:axis-group-interface::width) + (no-alignment . ,#t) + (meta . ((class . Spanner) + (interfaces . (side-position-interface + axis-group-interface))) + ))) (VoiceFollower . ( @@ -2043,8 +2152,16 @@ (non-musical . #t) (X-extent . #f) (Y-extent . #f) + (bound-details . ((right . ((attach-dir . ,CENTER) + (padding . 1.5) + )) + (left . ((attach-dir . ,CENTER) + (padding . 1.5) + )) + )) (stencil . ,ly:line-spanner::print) - (after-line-breaking . ,ly:line-spanner::after-line-breaking) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) (meta . ((class . Spanner) (interfaces . (line-spanner-interface line-interface)))) @@ -2104,9 +2221,12 @@ (define pure-print-callbacks (list + print-circled-text-callback + lyric-text::print + ly:arpeggio::print + ly:arpeggio::brew-chord-bracket ly:bar-line::print ly:note-head::print - ly:accidental-interface::print ly:dots::print ly:clef::print ly:text-interface::print @@ -2122,19 +2242,22 @@ '(0 . 0)))) (define pure-conversions-alist - (list - `(,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback) - `(,ly:stem::height . ,ly:stem::pure-height) - `(,ly:rest::height . ,ly:rest::pure-height) - `(,ly:grob::stencil-height . ,pure-stencil-height) - `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side) - `(,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height) - `(,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height) - `(,ly:slur::height . ,ly:slur::pure-height) - `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side))) + `( + (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height) + (,ly:arpeggio::height . ,ly:arpeggio::pure-height) + (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback) + (,ly:stem::height . ,ly:stem::pure-height) + (,ly:rest::height . ,ly:rest::pure-height) + (,ly:grob::stencil-height . ,pure-stencil-height) + (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side) + (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height) + (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height) + (,ly:slur::height . ,ly:slur::pure-height) + (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side))) (define pure-functions (list + parenthesize-elements ly:staff-symbol-referencer::callback ly:staff-symbol::height))