X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=a82741dc6937a61eb774541fdaaf4fdc6d2389a5;hb=b9cf2b8d12373c3c4dd59e3192bccba694d2ceb1;hp=6c91ae31592530df22df76d2f6933600645acf35;hpb=e864a61c53a13b5b53843dc702f6ba4e54a8fc6b;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 6c91ae3159..a82741dc69 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2006 Han-Wen Nienhuys +;;;; (c) 1998--2006 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; distances are given in line-thickness (thicknesses) and @@ -142,6 +142,7 @@ . ( (break-align-symbol . staff-bar) (glyph . "|") + (gap . 0.4) (layer . 0) (break-visibility . ,all-visible) (non-musical . #t) @@ -193,6 +194,8 @@ (list ly:self-alignment-interface::x-aligned-on-self))))) (self-alignment-X . 1) + + ;; want the bar number before the clef at line start. (break-align-symbol . left-edge) (meta . ((class . Item) @@ -320,7 +323,7 @@ (thickness . 2.0) (meta . ((class . Spanner) (interfaces . (spanner-interface - fall-interface)))))) + bend-after-interface)))))) (BreakAlignment . ( @@ -505,7 +508,7 @@ (Dots . ( (stencil . ,ly:dots::print) - (dot-count . 1) + (dot-count . ,dots::calc-dot-count) (meta . ((class . Item) (interfaces . (font-interface staff-symbol-referencer-interface @@ -627,7 +630,7 @@ (stencil . ,ly:text-interface::print) (direction . ,ly:script-interface::calc-direction) - + (text . ,fingering::calc-text) (font-encoding . fetaNumber) (font-size . -5) ; don't overlap when next to heads. (meta . ((class . Item) @@ -652,6 +655,16 @@ (interfaces . (line-interface line-spanner-interface)))))) + (GraceSpacing + . ( + (common-shortest-duration . ,grace-spacing::calc-shortest-duration) + (spacing-increment . 0.8) + (shortest-duration-space . 1.6) + (meta . ((class . Spanner) + (interfaces . (grace-spacing-interface + spacing-interface + spacing-options-interface + spanner-interface)))))) (GridPoint . ( (X-extent . (0 . 0)) @@ -679,6 +692,7 @@ (stencil . ,ly:hairpin::print) (springs-and-rods . ,ly:spanner::set-spacing-rods) (after-line-breaking . ,ly:hairpin::after-line-breaking) + (grow-direction . ,hairpin::calc-grow-direction) (circled-tip . #f) (thickness . 1.0) (height . 0.6666) @@ -720,6 +734,20 @@ side-position-interface font-interface)))))) + (InstrumentSwitch + . ( + (padding . 0.3) + (stencil . ,ly:text-interface::print) + (Y-offset . ,ly:side-position-interface::y-aligned-side) + (X-offset . ,ly:self-alignment-interface::x-aligned-on-self) + (staff-padding . 2) + (direction . ,UP) + (self-alignment-X . ,CENTER) + (meta . ((class . Item) + (interfaces . (system-start-text-interface + side-position-interface + font-interface)))))) + (KeyCancellation . ( (stencil . ,ly:key-signature-interface::print) @@ -1011,6 +1039,7 @@ (NoteHead . ( (stencil . ,ly:note-head::print) + (duration-log . ,note-head::calc-duration-log) (stem-attachment . ,ly:note-head::calc-stem-attachment) (glyph-name . ,note-head::calc-glyph-name) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -1130,6 +1159,7 @@ (non-musical . #t) (line-break-permission . allow) + (page-break-permission . allow) ;; debugging stuff: print column number. ;; (font-size . -6) (font-name . "sans") (Y-extent . #f) @@ -1248,6 +1278,7 @@ (Rest . ( (stencil . ,ly:rest::print) + (duration-log . ,note-head::calc-duration-log) (X-extent . ,ly:rest::width) (Y-extent . ,ly:rest::height) (Y-offset . ,ly:rest::y-offset-callback) @@ -1270,13 +1301,10 @@ . ( ;; don't set direction here: it breaks staccato. - ;; This value is sensitive: if too large, staccato dots will move a - ;; space a away. - (padding . 0.20) + ;; padding set in script definitions. (staff-padding . 0.25) ;; (script-priority . 0) priorities for scripts, see script.scm (X-offset . , ly:self-alignment-interface::centered-on-x-parent) - (stencil . ,ly:script-interface::print) (direction . ,ly:script-interface::calc-direction) @@ -1355,13 +1383,15 @@ (SpacingSpanner . ( (springs-and-rods . ,ly:spacing-spanner::set-springs) + (common-shortest-duration . ,ly:spacing-spanner::calc-common-shortest-duration) (average-spacing-wishes . #t) - (grace-space-factor . 0.6) (shortest-duration-space . 2.0) (spacing-increment . 1.2) + (base-shortest-duration . ,(ly:make-moment 3 16)) (meta . ((class . Spanner) (interfaces . (spacing-interface + spacing-options-interface spacing-spanner-interface)))))) (SpanBar @@ -1427,6 +1457,7 @@ (Stem . ( (direction . ,ly:stem::calc-direction) + (duration-log . ,note-head::calc-duration-log) (default-direction . ,ly:stem::calc-default-direction) (stem-end-position . ,ly:stem::calc-stem-end-position) (neutral-direction . ,DOWN) @@ -1489,6 +1520,7 @@ (StringNumber . ( (stencil . ,print-circled-text-callback) + (text . ,string-number::calc-text) (padding . 0.5) (staff-padding . 0.5) (self-alignment-X . 0) @@ -1608,6 +1640,7 @@ . ( (stencil . ,ly:text-interface::print) (Y-offset . ,ly:staff-symbol-referencer::callback) + (duration-log . ,note-head::calc-duration-log) (font-size . -2) (stem-attachment . (0.0 . 1.35)) (font-series . bold) @@ -1662,6 +1695,7 @@ (Tie . ( (control-points . ,ly:tie::calc-control-points) + (springs-and-rods . ,ly:spanner::set-spacing-rods) (avoid-slur . inside) (direction . ,ly:tie::calc-direction) (stencil . ,ly:tie::print) @@ -1684,6 +1718,7 @@ (outer-tie-vertical-gap . 0.25) (multi-tie-region-size . 1) (between-length-limit . 1.0))) + (thickness . 1.2) (line-thickness . 0.8) (meta . ((class . Spanner) @@ -1741,7 +1776,6 @@ (stencil . ,ly:accidental-interface::print) (meta . ((class . Item) (interfaces . (item-interface - accidental-interface side-position-interface font-interface)))))) @@ -1849,6 +1883,7 @@ (Y-extent . ,ly:axis-group-interface::height) (X-extent . ,ly:axis-group-interface::width) (stacking-dir . -1) + (padding . 0.1) (meta . ((class . Spanner) (interfaces . (align-interface axis-group-interface)))))) @@ -1951,12 +1986,12 @@ (set! all-grob-descriptions (sort all-grob-descriptions alist