X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=d016c7a2e2a8416989546def3eaa9697793e2b28;hb=efec448b936bd63d82571cf79f8435768605c66d;hp=5ff4c7f803802e701c096c6bdb07220d03b3f64c;hpb=6e4e69f2735a764eab2e6f70f83546461da0203b;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 5ff4c7f803..d016c7a2e2 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -169,6 +169,7 @@ (direction . ,LEFT) (padding . 0.5) (positions . ,ly:arpeggio::calc-positions) + (protrusion . 0.4) (script-priority . 0) (side-axis . ,X) (staff-position . 0.0) @@ -373,11 +374,11 @@ (clip-edges . #t) (collision-interfaces . (beam-interface clef-interface + clef-modifier-interface flag-interface inline-accidental-interface key-signature-interface note-head-interface - octavate-eight-interface stem-interface time-signature-interface)) (cross-staff . ,ly:beam::calc-cross-staff) @@ -481,8 +482,8 @@ clef key-cancellation key-signature - staff-bar time-signature + staff-bar cue-clef custos))) (non-musical . #t) @@ -539,6 +540,7 @@ . ( (avoid-slur . inside) (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) + (break-align-anchor-alignment . ,RIGHT) (break-align-symbol . clef) (break-visibility . ,begin-of-line-visible) (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-at-beginning-of-line) @@ -565,6 +567,31 @@ pure-from-neighbor-interface staff-symbol-referencer-interface)))))) + (ClefModifier + . ( + (break-visibility . ,(grob::inherit-parent-property + X 'break-visibility)) + (font-shape . italic) + (font-size . -4) + (self-alignment-X . ,CENTER) + (staff-padding . 0.2) + (stencil . ,ly:text-interface::print) + (X-offset . ,(ly:make-simple-closure + `(,+ + ,(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))))) + (Y-offset . ,side-position-interface::y-aligned-side) + (vertical-skylines . ,grob::always-vertical-skylines-from-stencil) + (Y-extent . ,grob::always-Y-extent-from-stencil) + (meta . ((class . Item) + (interfaces . (clef-modifier-interface + font-interface + self-alignment-interface + side-position-interface + text-interface)))))) + (ClusterSpanner . ( (cross-staff . ,ly:cluster::calc-cross-staff) @@ -691,7 +718,6 @@ (DotColumn . ( (axes . (,X)) - (chord-dots . #t) (direction . ,RIGHT) (positioning-done . ,ly:dot-column::calc-positioning-done) (X-extent . ,ly:axis-group-interface::width) @@ -778,6 +804,7 @@ (direction . ,DOWN) (minimum-space . 1.2) (outside-staff-priority . 250) + (outside-staff-padding . 0.6) (padding . 0.6) (side-axis . ,Y) (slur-padding . 0.3) @@ -859,6 +886,7 @@ (minimum-Y-extent . (-1 . 1)) (right-bound-info . ,ly:line-spanner::calc-right-bound-info) + (skyline-horizontal-padding . 0.2) (springs-and-rods . ,ly:spanner::set-spacing-rods) (stencil . ,ly:line-spanner::print) (style . dashed-line) @@ -932,6 +960,7 @@ . ( (padding . 0.2) (positioning-done . ,ly:fingering-column::calc-positioning-done) + (snap-radius . 0.3) (meta . ((class . Item) (interfaces . (fingering-column-interface)))))) @@ -953,7 +982,8 @@ (annotation-balloon . #f) (annotation-line . #t) (automatically-numbered . ,(grob::calc-property-by-copy 'automatically-numbered)) - (break-visibility . ,inherit-y-parent-visibility) + (break-visibility . ,(grob::inherit-parent-property + X 'break-visibility)) (footnote . #t) (footnote-text . ,(grob::calc-property-by-copy 'footnote-text)) (stencil . ,ly:balloon-interface::print) @@ -1179,6 +1209,7 @@ . ( (avoid-slur . inside) (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) + (break-align-anchor-alignment . ,RIGHT) (break-align-symbol . key-signature) (break-visibility . ,begin-of-line-visible) (glyph-name-alist . ,standard-alteration-glyph-name-alist) @@ -1218,6 +1249,7 @@ (LaissezVibrerTie . ( (control-points . ,ly:semi-tie::calc-control-points) + (cross-staff . ,semi-tie::calc-cross-staff) (details . ((ratio . 0.333) (height-limit . 1.0))) (direction . ,ly:tie::calc-direction) @@ -1420,6 +1452,7 @@ (outside-staff-priority . 1000) (padding . 0.8) (side-axis . ,Y) + (skyline-horizontal-padding . 0.2) (stencil . ,ly:text-interface::print) (vertical-skylines . ,grob::always-vertical-skylines-from-stencil) (Y-offset . ,side-position-interface::y-aligned-side) @@ -1431,7 +1464,7 @@ (list ly:self-alignment-interface::x-aligned-on-self))))) (self-alignment-X . ,LEFT) (break-align-symbols . (time-signature)) - (non-break-align-symbols . (multi-measure-rest-interface)) + (non-break-align-symbols . (paper-column-interface)) (Y-extent . ,grob::always-Y-extent-from-stencil) (meta . ((class . Item) (interfaces . (break-alignable-interface @@ -1495,6 +1528,7 @@ (outside-staff-priority . 450) (padding . 0.2) (self-alignment-X . ,CENTER) + (skyline-horizontal-padding . 0.2) (staff-padding . 0.25) (stencil . ,ly:text-interface::print) (X-offset . ,(ly:make-simple-closure @@ -1616,31 +1650,6 @@ (interfaces . (note-spacing-interface spacing-interface)))))) - - (OctavateEight - . ( - (break-visibility . ,inherit-x-parent-visibility) - (font-shape . italic) - (font-size . -4) - (self-alignment-X . ,CENTER) - (staff-padding . 0.2) - (stencil . ,ly:text-interface::print) - (X-offset . ,(ly:make-simple-closure - `(,+ - ,(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))))) - (Y-offset . ,side-position-interface::y-aligned-side) - (vertical-skylines . ,grob::always-vertical-skylines-from-stencil) - (Y-extent . ,grob::always-Y-extent-from-stencil) - (meta . ((class . Item) - (interfaces . (font-interface - octavate-eight-interface - self-alignment-interface - side-position-interface - text-interface)))))) - (OttavaBracket . ( (dash-fraction . 0.3) @@ -1778,7 +1787,7 @@ . ( (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff) (baseline-skip . 2) - (break-align-symbols . (staff-bar clef)) + (break-align-symbols . (staff-bar key-signature clef)) (break-visibility . ,end-of-line-invisible) (direction . ,UP) (extra-spacing-width . (+inf.0 . -inf.0)) @@ -1820,6 +1829,7 @@ (RepeatTie . ( + (cross-staff . ,semi-tie::calc-cross-staff) (control-points . ,ly:semi-tie::calc-control-points) (details . ((ratio . 0.333) (height-limit . 1.0))) @@ -1993,7 +2003,8 @@ (SpanBarStub . ( - (X-extent . ,grob::x-parent-width) + (X-extent . ,(grob::inherit-parent-property + X 'X-extent)) (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height) ; we want this to be ignored, so empty, but the extra spacing height ; should preserve the span bar's presence for horizontal spacing @@ -2039,14 +2050,12 @@ (direction . ,LEFT) (font-series . bold) (padding . 1.0) - (self-alignment-X . ,RIGHT) (side-axis . ,X) (stencil . ,ly:text-interface::print) - (X-offset . ,stanza-number::calc-x-offset) + (X-offset . ,ly:side-position-interface::x-aligned-side) (Y-extent . ,grob::always-Y-extent-from-stencil) (meta . ((class . Item) (interfaces . (font-interface - self-alignment-interface side-position-interface stanza-number-interface text-interface)))))) @@ -2455,7 +2464,7 @@ (cue-clef . (extra-space . 1.5)) (first-note . (fixed-space . 2.0)) (right-edge . (extra-space . 0.5)) - (staff-bar . (minimum-space . 2.0)))) + (staff-bar . (extra-space . 1.0)))) (stencil . ,ly:time-signature::print) (Y-extent . ,grob::always-Y-extent-from-stencil) (style . C)