X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=2860bc3e6aaa0925f6e12136b1e382733c068ca5;hb=177dd05b9f9d5e9ac5e975fa7c9fc9b2e14e51de;hp=7c459a0bca6ed52c278723bd15c5e65fa0ff8b01;hpb=35ea0d996335cbc46c572e920c8515a504047531;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 7c459a0bca..2860bc3e6a 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 1998--2009 Han-Wen Nienhuys +;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify @@ -53,7 +53,6 @@ (AccidentalPlacement . ( (direction . ,LEFT) - (left-padding . 0.2) (positioning-done . ,ly:accidental-placement::calc-positioning-done) ;; this is quite small, but it is very ugly to have @@ -111,6 +110,10 @@ (X-extent . ,ly:axis-group-interface::width) (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))) (interfaces . (ambitus-interface axis-group-interface break-aligned-interface)))))) @@ -270,6 +273,10 @@ (stacking-dir . ,DOWN) (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))) (interfaces . (align-interface axis-group-interface bass-figure-alignment-interface)))))) @@ -284,6 +291,10 @@ (Y-extent . ,ly:axis-group-interface::height) (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))) (interfaces . (axis-group-interface side-position-interface)))))) @@ -309,6 +320,10 @@ (vertical-skylines . ,ly:axis-group-interface::calc-skylines) (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))) (interfaces . (axis-group-interface)))))) @@ -501,6 +516,7 @@ (next-note . (extra-space . 0.5)) (right-edge . (extra-space . 0.5)))) (stencil . ,ly:clef::print) + (extra-spacing-height . (-0.5 . 0.5)) (Y-offset . ,ly:staff-symbol-referencer::callback) (meta . ((class . Item) (interfaces . (break-aligned-interface @@ -533,6 +549,7 @@ (direction . ,UP) (extra-spacing-width . (+inf.0 . -inf.0)) (font-series . bold) + (outside-staff-priority . 450) (padding . 0.5) (script-priority . 200) (side-axis . ,Y) @@ -580,6 +597,7 @@ (dot-count . ,dots::calc-dot-count) (staff-position . ,dots::calc-staff-position) (stencil . ,ly:dots::print) + (extra-spacing-height . (-0.5 . 0.5)) (meta . ((class . Item) (interfaces . (dots-interface font-interface @@ -606,7 +624,7 @@ (DoublePercentRepeatCounter . ( (direction . ,UP) - (font-encoding . fetaNumber) + (font-encoding . fetaText) (font-size . -2) (padding . 0.2) (self-alignment-X . ,CENTER) @@ -643,6 +661,10 @@ (Y-extent . ,ly:axis-group-interface::height) (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))) (interfaces . (axis-group-interface dynamic-interface dynamic-line-spanner-interface @@ -655,11 +677,12 @@ (direction . ,ly:script-interface::calc-direction) (extra-spacing-width . (+inf.0 . -inf.0)) - (font-encoding . fetaDynamic) + (font-encoding . fetaText) (font-series . bold) (font-shape . italic) (outside-staff-priority . 250) (positioning-done . ,ly:script-interface::calc-positioning-done) + (right-padding . 0.5) (self-alignment-X . ,CENTER) (self-alignment-Y . ,CENTER) (stencil . ,ly:text-interface::print) @@ -667,6 +690,7 @@ (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self) (meta . ((class . Item) (interfaces . (dynamic-interface + dynamic-text-interface font-interface script-interface self-alignment-interface @@ -674,6 +698,7 @@ (DynamicTextSpanner . ( + (before-line-breaking . ,dynamic-text-spanner::before-line-breaking) (bound-details . ((right . ((attach-dir . ,LEFT) (Y . 0) (padding . 0.75) @@ -684,8 +709,8 @@ (left . ((attach-dir . ,LEFT) (Y . 0) - (stencil-offset . (0 . -0.5)) - (padding . 0.5) + (stencil-offset . (-0.75 . -0.5)) + (padding . 0.75) )) (left-broken . ((attach-dir . ,RIGHT) )) @@ -718,6 +743,33 @@ text-interface)))))) + (Episema + . ( + (bound-details . ((left . ((Y . 0) + (padding . 0) + (attach-dir . ,LEFT) + )) + (right . ((Y . 0) + (padding . 0) + (attach-dir . ,RIGHT) + )) + )) + (direction . ,UP) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (quantize-position . #t) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) + (side-axis . ,Y) + (stencil . ,ly:line-spanner::print) + (style . line) + (Y-offset . ,ly:side-position-interface::y-aligned-side) + (meta . ((class . Spanner) + (interfaces . (episema-interface + font-interface + line-interface + line-spanner-interface + side-position-interface)))))) + + (Fingering . ( @@ -726,7 +778,7 @@ (avoid-slur . around) (cross-staff . ,ly:side-position-interface::calc-cross-staff) (direction . ,ly:script-interface::calc-direction) - (font-encoding . fetaNumber) + (font-encoding . fetaText) (font-size . -5) ; don't overlap when next to heads. (padding . 0.5) (positioning-done . ,ly:script-interface::calc-positioning-done) @@ -946,14 +998,15 @@ (height-limit . 1.0))) (direction . ,ly:tie::calc-direction) (head-direction . ,LEFT) - (stencil . ,ly:tie::print) + (stencil . ,laissez-vibrer::print) (thickness . 1.0) + (extra-spacing-height . (-0.5 . 0.5)) (meta . ((class . Item) (interfaces . (semi-tie-interface)))))) (LaissezVibrerTieColumn . ( - (head-direction . ,LEFT) + (head-direction . ,ly:semi-tie-column::calc-head-direction) (positioning-done . ,ly:semi-tie-column::calc-positioning-done) (X-extent . #f) (Y-extent . #f) @@ -1120,6 +1173,7 @@ (expand-limit . 10) (hair-thickness . 2.0) (padding . 1) + (spacing-pair . (break-alignment . staff-bar)) (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods) (staff-position . 0) (stencil . ,ly:multi-measure-rest::print) @@ -1136,7 +1190,7 @@ . ( (bound-padding . 2.0) (direction . ,UP) - (font-encoding . fetaNumber) + (font-encoding . fetaText) (padding . 0.4) (self-alignment-X . ,CENTER) (side-axis . ,Y) @@ -1198,6 +1252,10 @@ (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))) (interfaces . (axis-group-interface font-interface paper-column-interface @@ -1212,6 +1270,10 @@ (X-extent . ,ly:axis-group-interface::width) (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))) (interfaces . (axis-group-interface note-collision-interface)))))) @@ -1222,6 +1284,10 @@ (X-extent . ,ly:axis-group-interface::width) (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))) (interfaces . (axis-group-interface note-column-interface separation-item-interface)))))) @@ -1229,6 +1295,7 @@ (NoteHead . ( (duration-log . ,note-head::calc-duration-log) + (extra-spacing-height . ,ly:note-head::include-ledger-line-height) (glyph-name . ,note-head::calc-glyph-name) (stem-attachment . ,ly:note-head::calc-stem-attachment) (stencil . ,ly:note-head::print) @@ -1322,6 +1389,10 @@ ;; debugging ;; (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))) (interfaces . (axis-group-interface font-interface paper-column-interface @@ -1343,6 +1414,7 @@ (dot-negative-kern . 0.75) (font-encoding . fetaMusic) (slope . 1.0) + (spacing-pair . (break-alignment . staff-bar)) (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods) (stencil . ,ly:multi-measure-rest::percent) (thickness . 0.48) @@ -1354,7 +1426,7 @@ (PercentRepeatCounter . ( (direction . ,UP) - (font-encoding . fetaNumber) + (font-encoding . fetaText) (font-size . -2) (padding . 0.2) (self-alignment-X . ,CENTER) @@ -1455,6 +1527,7 @@ (head-direction . ,RIGHT) (stencil . ,ly:tie::print) (thickness . 1.0) + (extra-spacing-height . (-0.5 . 0.5)) (meta . ((class . Item) (interfaces . (semi-tie-interface)))))) @@ -1494,6 +1567,7 @@ (Script . ( + (add-stem-support . #t) (cross-staff . ,ly:script-interface::calc-cross-staff) (direction . ,ly:script-interface::calc-direction) (font-encoding . fetaMusic) @@ -1523,16 +1597,6 @@ (meta . ((class . Item) (interfaces . (script-column-interface)))))) - (SeparationItem - . ( - (avoid-slur . inside) - (horizontal-skylines . ,ly:separation-item::calc-skylines) - (stencil . ,ly:separation-item::print) - (X-extent . ,ly:axis-group-interface::width) - (Y-extent . ,ly:axis-group-interface::height) - (meta . ((class . Item) - (interfaces . (separation-item-interface)))))) - (Slur . ( (avoid-slur . inside) @@ -1579,6 +1643,10 @@ (Y-extent . ,ly:axis-group-interface::height) (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))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) @@ -1620,6 +1688,10 @@ (X-extent . ,ly:span-bar::width) (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))) (interfaces . (bar-line-interface font-interface span-bar-interface)))))) @@ -1737,7 +1809,7 @@ (StringNumber . ( (avoid-slur . around) - (font-encoding . fetaNumber) + (font-encoding . fetaText) (font-size . -5) ; don't overlap when next to heads. (padding . 0.5) (script-priority . 100) @@ -1802,17 +1874,26 @@ (Y-extent . ,ly:axis-group-interface::height) (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))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) (System . ( + (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights) (axes . (,X ,Y)) (vertical-skylines . ,ly:axis-group-interface::calc-skylines) (X-extent . ,ly:axis-group-interface::width) - (Y-extent . ,ly:axis-group-interface::height) + (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)))))) @@ -2073,17 +2154,11 @@ (TrillSpanner . ( (after-line-breaking . ,ly:spanner::kill-zero-spanned-time) - (bound-details . ((left . ((text . ,(make-translate-scaled-markup - '(0.0 . -1.0) - (make-musicglyph-markup "scripts.trill"))) + (bound-details . ((left . ((text . ,(make-musicglyph-markup "scripts.trill")) (Y . 0) - (stencil-offset . (-0.5 . 0)) - (padding . 1.5) + (stencil-offset . (-0.5 . -1)) + (padding . 0.5) (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))) @@ -2166,6 +2241,10 @@ (Y-extent . ,ly:axis-group-interface::height) (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))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) @@ -2189,7 +2268,11 @@ (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Spanner) - (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common))) + (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)))))) @@ -2208,10 +2291,15 @@ (Y-extent . ,ly:hara-kiri-group-spanner::y-extent) (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback) (meta . ((class . Spanner) - (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common))) + (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))) + (interfaces . (axis-group-interface - hara-kiri-group-spanner-interface - vertically-spaceable-interface)))))) + hara-kiri-group-spanner-interface)))))) (VoiceFollower . ( @@ -2239,7 +2327,7 @@ . ( (direction . ,UP) (edge-height . (2.0 . 2.0)) ;; staff-space; - (font-encoding . fetaNumber) + (font-encoding . fetaText) (font-size . -4) (stencil . ,ly:volta-bracket-interface::print) (thickness . 1.6) ;; line-thickness @@ -2266,6 +2354,10 @@ (Y-extent . ,ly:axis-group-interface::height) (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))) (interfaces . (axis-group-interface side-position-interface volta-interface)))))) @@ -2335,14 +2427,17 @@ fret-board::calc-stencil note-head::brew-ez-stencil print-circled-text-callback + laissez-vibrer::print lyric-text::print ly:bar-line::print ly:mensural-ligature::brew-ligature-primitive ly:note-head::print ly:dots::print ly:clef::print + ly:percent-repeat-item-interface::beat-slash ly:text-interface::print - ly:script-interface::print)) + ly:script-interface::print + ly:sustain-pedal::print)) ;; Sometimes we have grobs with (Y-extent . ,ly:grob::stencil-height) ;; and the print function is not pure, but there is a easy way to @@ -2367,23 +2462,31 @@ (else '(0 . 0))))) +;; Sometimes, a pure callback will be chained to a non-pure callback via +;; chain_offset_callback, in which case this provides a default by simply +;; passing through the value from the pure callback. +(define (pure-chain-offset-callback grob start end prev-offset) prev-offset) + (define pure-conversions-alist `( (,ly:accidental-interface::height . ,ly:accidental-interface::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:axis-group-interface::calc-next-staff-spacing . ,ly:axis-group-interface::calc-pure-next-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) + (,ly:rest-collision::force-shift-callback-rest . ,pure-chain-offset-callback) + (,ly:rest::height . ,ly:rest::pure-height) (,ly:self-alignment-interface::y-aligned-on-self . ,ly:self-alignment-interface::pure-y-aligned-on-self) (,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:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback) + (,ly:stem::height . ,ly:stem::pure-height) + (,ly:system::height . ,ly:system::calc-pure-height))) (define pure-functions (list parenthesize-elements + laissez-vibrer::print ly:rest::y-offset-callback ly:staff-symbol-referencer::callback ly:staff-symbol::height))