X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=scm%2Fdefine-grobs.scm;h=d68a2452f0bdbcee4136bc56b39ed06182fbab9b;hb=bf4298556820ead4deff2d667c362c2d7d045e67;hp=d4e3863c03692cdb9001d11759b90d96adb36b52;hpb=113845a5b62c77f7ba2d035c15694287077f00ce;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index d4e3863c03..d68a2452f0 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -111,9 +111,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (ambitus-interface axis-group-interface break-aligned-interface)))))) @@ -274,9 +272,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (align-interface axis-group-interface bass-figure-alignment-interface)))))) @@ -292,9 +288,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface side-position-interface)))))) @@ -321,9 +315,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface)))))) @@ -662,9 +654,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface dynamic-interface dynamic-line-spanner-interface @@ -1108,7 +1098,7 @@ (LyricText . ( (extra-spacing-width . (0.0 . 0.0)) - (font-series . bold-narrow) + (font-series . medium) (font-size . 1.0) (self-alignment-X . ,CENTER) (stencil . ,lyric-text::print) @@ -1169,15 +1159,16 @@ (list ly:break-alignable-interface::self-align-callback)) ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self))))) - (self-alignment-X . -1) - (break-align-symbol . time-signature) + (self-alignment-X . ,LEFT) (break-align-symbols . (time-signature)) - (non-break-align-symbols . (MultiMeasureRest)) + (non-break-align-symbols . (multi-measure-rest-interface)) + (non-musical . #t) (meta . ((class . Item) - (interfaces . (font-interface + (interfaces . (break-alignable-interface + font-interface metronome-mark-interface + self-alignment-interface side-position-interface - break-alignable-interface text-interface)))))) (MultiMeasureRest @@ -1185,7 +1176,7 @@ (expand-limit . 10) (hair-thickness . 2.0) (padding . 1) - (spacing-pair . (break-alignment . staff-bar)) + (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) @@ -1265,9 +1256,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface font-interface paper-column-interface @@ -1283,9 +1272,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface note-collision-interface)))))) @@ -1297,9 +1284,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface note-column-interface separation-item-interface)))))) @@ -1402,9 +1387,7 @@ ;; (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface font-interface paper-column-interface @@ -1656,9 +1639,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) @@ -1701,19 +1682,19 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (bar-line-interface font-interface span-bar-interface)))))) (StaffGrouper . ( - (between-staff-spacing . ((space . 9) - (minimum-distance . 7) - (padding . 1))) - (after-last-staff-spacing . ((space . 10.5) + (staff-staff-spacing . ((space . 9) + (stretchability . 5) + (minimum-distance . 7) + (padding . 1))) + (staffgroup-staff-spacing . ((space . 10.5) + (stretchability . 9) (minimum-distance . 8) (padding . 1))) (meta . ((class . Spanner) @@ -1887,9 +1868,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) @@ -1903,8 +1882,6 @@ (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)))))) @@ -1998,14 +1975,12 @@ (avoid-slur . around) (cross-staff . ,ly:script-interface::calc-cross-staff) (direction . ,DOWN) - (direction . ,ly:script-interface::calc-direction) (extra-spacing-width . (+inf.0 . -inf.0)) (outside-staff-priority . 450) ;; sync with Fingering ? (padding . 0.5) - (positioning-done . ,ly:script-interface::calc-positioning-done) (script-priority . 200) (side-axis . ,Y) (slur-padding . 0.5) @@ -2255,9 +2230,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) @@ -2283,8 +2256,6 @@ (meta . ((class . Spanner) (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)))))) @@ -2293,11 +2264,11 @@ . ( (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights) (axes . (,Y)) - (default-next-staff-spacing . ((space . 9) - (minimum-distance . 8) - (padding . 1))) - (next-staff-spacing . ,ly:axis-group-interface::calc-next-staff-spacing) - (non-affinity-spacing . ((padding . 0.5))) + (default-staff-staff-spacing . ((space . 9) + (minimum-distance . 8) + (padding . 1))) + (nonstaff-unrelatedstaff-spacing . ((padding . 0.5))) + (staff-staff-spacing . ,ly:axis-group-interface::calc-staff-staff-spacing) (stencil . ,ly:axis-group-interface::print) (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines) (X-extent . ,ly:axis-group-interface::width) @@ -2307,9 +2278,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface hara-kiri-group-spanner-interface)))))) @@ -2368,9 +2337,7 @@ (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))) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs))) (interfaces . (axis-group-interface side-position-interface volta-interface)))))) @@ -2483,7 +2450,7 @@ (define pure-conversions-alist `( (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height) - (,ly:axis-group-interface::calc-next-staff-spacing . ,ly:axis-group-interface::calc-pure-next-staff-spacing) + (,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:grob::stencil-height . ,pure-stencil-height) (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)