X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=d81c37d3c9c9d7fa2bc90f6d9cc68d3f79110967;hb=621fe2a06e3c2c2276ae588b6f16ecef463c7454;hp=658d2dfeb0c8ae5a2c615b08beeefa29fba62989;hpb=70cc70f3a6183472b93fc4c2b4c60cc0375b6d64;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 658d2dfeb0..d81c37d3c9 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 . ( @@ -410,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) @@ -518,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 @@ -546,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) @@ -600,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) @@ -819,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 @@ -832,6 +834,7 @@ (X-offset . ,ly:self-alignment-interface::x-aligned-on-self) (staff-padding . 2) (direction . ,UP) + (side-axis . ,Y) (self-alignment-X . ,CENTER) (meta . ((class . Item) (interfaces . (side-position-interface @@ -1122,7 +1125,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) @@ -1143,9 +1146,10 @@ (NoteCollision . ( - (axes . (0 1)) + (axes . (,X ,Y)) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) + (prefer-dotted-right . #t) (positioning-done . ,ly:note-collision-interface::calc-positioning-done) (meta . ((class . Item) (interfaces . (note-collision-interface @@ -1153,7 +1157,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) @@ -1241,7 +1245,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) @@ -1500,9 +1504,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) @@ -1530,6 +1536,7 @@ . ( (break-align-symbol . staff-bar) (Y-extent . ,ly:axis-group-interface::height) + (cross-staff . #t) (layer . 0) (non-musical . #t) (stencil . ,ly:span-bar::print) @@ -1712,9 +1719,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) @@ -1727,7 +1736,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) @@ -1944,7 +1953,11 @@ (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))) @@ -2058,9 +2071,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) @@ -2082,7 +2097,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) @@ -2097,7 +2112,7 @@ 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) @@ -2131,7 +2146,7 @@ (VoltaBracketSpanner . ( - (axes . (1)) + (axes . (,Y)) (side-axis . ,Y) (direction . ,UP) (padding . 1) @@ -2258,6 +2273,7 @@ (define pure-functions (list parenthesize-elements + ly:rest::y-offset-callback ly:staff-symbol-referencer::callback ly:staff-symbol::height))