X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=edd5495a336812cb5f7ba803bdf78ed2081f8a05;hb=9a14a394dfa23b38ab78c3eb09a2d7b5f504fa35;hp=ba600479635ff0e4f28d4c2c14996b720ba53aa7;hpb=28558088e9af7cf017835c03838755499c654d07;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index ba60047963..edd5495a33 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -88,7 +88,7 @@ (Ambitus . ( - (axes . (0 1)) + (axes . (,X ,Y)) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (space-alist . ( @@ -184,6 +184,8 @@ (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)) @@ -408,14 +410,14 @@ staff-bar time-signature custos))) - (axes . (0)) + (axes . (,X)) (meta . ((class . Item) (interfaces . (break-alignment-interface axis-group-interface)))))) (BreakAlignGroup . ( - (axes . (0)) + (axes . (,X)) (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) @@ -484,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)))))) @@ -515,6 +518,7 @@ ;; todo: add X self alignment? (baseline-skip . 2) (side-axis . ,Y) + (avoid-slur . outside ) (font-series . bold) (meta . ((class . Item) (interfaces . (text-script-interface @@ -543,7 +547,7 @@ (DotColumn . ( - (axes . (0)) + (axes . (,X)) (direction . ,RIGHT) (positioning-done . ,ly:dot-column::calc-positioning-done) (X-extent . ,ly:axis-group-interface::width) @@ -597,7 +601,7 @@ text-interface)))))) (DynamicLineSpanner . ( - (axes . (1)) + (axes . (,Y)) (Y-offset . ,ly:side-position-interface::y-aligned-side) (staff-padding . 0.1) (padding . 0.6) @@ -816,6 +820,7 @@ (X-offset . ,ly:side-position-interface::x-aligned-side) (direction . ,LEFT) (self-alignment-Y . ,CENTER) + (self-alignment-X . ,CENTER) (meta . ((class . Spanner) (interfaces . (system-start-text-interface side-position-interface @@ -1046,6 +1051,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 @@ -1107,6 +1113,7 @@ (direction . ,UP) (padding . 0.2) (staff-padding . 0.25) + (outside-staff-priority . 450) (meta . ((class . Spanner) (interfaces . (side-position-interface multi-measure-interface @@ -1117,7 +1124,7 @@ (NonMusicalPaperColumn . ( (allow-loose-spacing . #t) - (axes . (0)) + (axes . (,X)) (before-line-breaking . ,ly:paper-column::before-line-breaking) (X-extent . ,ly:axis-group-interface::width) (horizontal-skylines . ,ly:separation-item::calc-skylines) @@ -1138,7 +1145,7 @@ (NoteCollision . ( - (axes . (0 1)) + (axes . (,X ,Y)) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (positioning-done . ,ly:note-collision-interface::calc-positioning-done) @@ -1148,7 +1155,7 @@ (NoteColumn . ( - (axes . (0 1)) + (axes . (,X ,Y)) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (horizontal-skylines . ,ly:separation-item::calc-skylines) @@ -1221,6 +1228,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) @@ -1235,7 +1243,7 @@ (PaperColumn . ( - (axes . (0)) + (axes . (,X)) (allow-loose-spacing . #t) (before-line-breaking . ,ly:paper-column::before-line-breaking) (horizontal-skylines . ,ly:separation-item::calc-skylines) @@ -1494,9 +1502,11 @@ (SostenutoPedalLineSpanner . ( - (axes . (1)) + (axes . (,Y)) (Y-extent . ,ly:axis-group-interface::height) + (X-extent . ,ly:axis-group-interface::width) (Y-offset . ,ly:side-position-interface::y-aligned-side) + (outside-staff-priority . 1000) (side-axis . ,Y) (staff-padding . 1.0) (padding . 1.2) @@ -1523,14 +1533,17 @@ (SpanBar . ( (break-align-symbol . staff-bar) - (Y-extent . ()) + (Y-extent . ,ly:axis-group-interface::height) + (cross-staff . #t) (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! @@ -1704,9 +1717,11 @@ (SustainPedalLineSpanner . ( - (axes . (1)) + (axes . (,Y)) (Y-extent . ,ly:axis-group-interface::height) + (X-extent . ,ly:axis-group-interface::width) (Y-offset . ,ly:side-position-interface::y-aligned-side) + (outside-staff-priority . 1000) (side-axis . ,Y) (padding . 1.2) (staff-padding . 1.2) @@ -1719,7 +1734,7 @@ (System . ( - (axes . (0 1)) + (axes . (,X ,Y)) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (vertical-skylines . ,ly:axis-group-interface::calc-skylines) @@ -1780,6 +1795,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) @@ -1823,6 +1839,7 @@ (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 @@ -1934,8 +1951,13 @@ (Y . 0) (stencil-offset . (-0.5 . 0)) (padding . 1.5) - (attach-dir . ,LEFT) + (attach-dir . ,CENTER) + ;; this isn't CENTER because the trill glyph's origin + ;; is not centered in its extent; to have the trill + ;; spanner aligned the same as a trill, we need a slight offset + (anchor-alignment . 0.15) )) + (left-broken . ((end-on-note . #t))) (right . ((Y . 0))) )) @@ -2047,9 +2069,11 @@ (UnaCordaPedalLineSpanner . ( - (axes . (1)) + (axes . (,Y)) (Y-extent . ,ly:axis-group-interface::height) + (X-extent . ,ly:axis-group-interface::width) (Y-offset . ,ly:side-position-interface::y-aligned-side) + (outside-staff-priority . 1000) (side-axis . ,Y) (padding . 1.2) (staff-padding . 1.2) @@ -2071,7 +2095,7 @@ (VerticalAlignment . ( - (axes . (1)) + (axes . (,Y)) (positioning-done . ,ly:align-interface::calc-positioning-done) (after-line-breaking . ,ly:align-interface::stretch-after-break) (Y-extent . ,ly:axis-group-interface::height) @@ -2079,14 +2103,14 @@ (stacking-dir . -1) (padding . 0.5) (vertical-skylines . ,ly:axis-group-interface::combine-skylines) - (max-stretch . ,ly:align-interface::calc-max-stretch) + (max-stretch . 0) (meta . ((class . Spanner) (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common))) (interfaces . (align-interface axis-group-interface)))))) (VerticalAxisGroup . ( - (axes . (1)) + (axes . (,Y)) (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) @@ -2120,7 +2144,7 @@ (VoltaBracketSpanner . ( - (axes . (1)) + (axes . (,Y)) (side-axis . ,Y) (direction . ,UP) (padding . 1) @@ -2246,6 +2270,7 @@ (define pure-functions (list + parenthesize-elements ly:staff-symbol-referencer::callback ly:staff-symbol::height))