X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=e32cd6a7218ce47a3cdb4ee2f37ce7f428a8f365;hb=eeec992b7029d0982bf4ed0eb3995e9ca99c10e9;hp=89eecc2e04ce66d002cc448c42e57554eda72a4f;hpb=d5f72b53d15b0f461ecafecc4d7139fb2d7d95b9;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 89eecc2e04..e32cd6a721 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--2007 Han-Wen Nienhuys +;;;; (c) 1998--2008 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; distances are given in line-thickness (thicknesses) and @@ -171,7 +171,8 @@ (X-offset . ,(grob::calc-property-by-copy 'X-offset)) (Y-offset . ,(grob::calc-property-by-copy 'Y-offset)) (meta . ((class . Item) - (interfaces . (text-interface + (interfaces . (balloon-interface + text-interface font-interface)))))) (BarLine . ( @@ -231,7 +232,7 @@ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self))))) - (self-alignment-X . 1) + (self-alignment-X . ,RIGHT) ;; want the bar number before the clef at line start. (break-align-symbols . (left-edge staff-bar)) @@ -356,7 +357,8 @@ (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems))) (interfaces . (staff-symbol-referencer-interface unbreakable-spanner-interface - beam-interface)))))) + beam-interface + font-interface)))))) (BendAfter . ( @@ -535,11 +537,10 @@ (first-note . (minimum-fixed-space . 0.0)) (right-edge . (extra-space . 0.1)))) (meta . ((class . Item) - (interfaces - . (custos-interface - staff-symbol-referencer-interface - font-interface - break-aligned-interface)))))) + (interfaces . (custos-interface + staff-symbol-referencer-interface + font-interface + break-aligned-interface)))))) (DotColumn . ( @@ -566,6 +567,8 @@ (stencil . ,ly:percent-repeat-item-interface::double-percent) (non-musical . #t) (slope . 1.0) + (dot-negative-kern . 0.75) + (slash-negative-kern . 1.6) (font-encoding . fetaMusic) (width . 2.0) (thickness . 0.48) @@ -755,9 +758,9 @@ (shortest-duration-space . 1.6) (meta . ((class . Spanner) (interfaces . (grace-spacing-interface - spacing-options-interface spanner-interface)))))) + (GridPoint . ( (X-extent . (0 . 0)) @@ -833,6 +836,7 @@ (meta . ((class . Spanner) (interfaces . (system-start-text-interface side-position-interface + self-alignment-interface font-interface)))))) (InstrumentSwitch @@ -846,9 +850,11 @@ (side-axis . ,Y) (self-alignment-X . ,LEFT) (outside-staff-priority . 500) - (extra-spacing-width . '(+inf.0 . -inf.0)) + (extra-spacing-width . (+inf.0 . -inf.0)) (meta . ((class . Item) (interfaces . (side-position-interface + self-alignment-interface + text-interface font-interface)))))) @@ -869,6 +875,7 @@ (meta . ((class . Item) (interfaces . (key-cancellation-interface key-signature-interface + staff-symbol-referencer-interface font-interface break-aligned-interface)))))) @@ -889,6 +896,7 @@ (non-musical . #t) (meta . ((class . Item) (interfaces . (key-signature-interface + staff-symbol-referencer-interface font-interface break-aligned-interface)))))) @@ -1152,7 +1160,8 @@ (interfaces . (paper-column-interface axis-group-interface separation-item-interface - spaceable-grob-interface)))))) + spaceable-grob-interface + font-interface)))))) (NoteCollision . ( @@ -1190,7 +1199,10 @@ font-interface note-head-interface ledgered-interface - staff-symbol-referencer-interface)))))) + staff-symbol-referencer-interface + gregorian-ligature-interface + mensural-ligature-interface + vaticana-ligature-interface)))))) (NoteSpacing . ( @@ -1272,7 +1284,8 @@ (interfaces . (paper-column-interface separation-item-interface axis-group-interface - spaceable-grob-interface)))))) + spaceable-grob-interface + font-interface)))))) (ParenthesesItem . ((stencil . ,parentheses-item::print) @@ -1310,12 +1323,12 @@ (stencil . ,ly:multi-measure-rest::percent) (slope . 1.0) (thickness . 0.48) + (dot-negative-kern . 0.75) (font-encoding . fetaMusic) (meta . ((class . Spanner) (interfaces . (multi-measure-rest-interface font-interface - percent-repeat-interface - )))))) + percent-repeat-interface)))))) (PercentRepeatCounter . ( @@ -1482,11 +1495,11 @@ (horizontal-skylines . ,ly:separation-item::calc-skylines) (stencil . ,ly:separation-item::print) (meta . ((class . Item) - (interfaces . ( - separation-item-interface)))))) + (interfaces . (separation-item-interface)))))) (Slur - . ((details . ,default-slur-details) + . ( + (details . ,default-slur-details) (control-points . ,ly:slur::calc-control-points) (direction . ,ly:slur::calc-direction) (springs-and-rods . ,ly:spanner::set-spacing-rods) @@ -1544,8 +1557,7 @@ (base-shortest-duration . ,(ly:make-moment 3 16)) (meta . ((class . Spanner) - (interfaces . ( - spacing-options-interface + (interfaces . (spacing-options-interface spacing-spanner-interface)))))) (SpanBar @@ -1625,11 +1637,14 @@ (length . ,ly:stem::calc-length) (thickness . 1.3) (cross-staff . ,ly:stem::calc-cross-staff) + (flag . ,ly:stem::calc-flag) + (beamlet-default-length . (1.0 . 1.0)) + (beamlet-max-length-proportion . (0.5 . 0.5)) (details . ( ;; 3.5 (or 3 measured from note head) is standard length - ;; 32nd, 64th flagged stems should be longer - (lengths . (3.5 3.5 3.5 4.5 5.0)) + ;; 32nd, 64th, 128th flagged stems should be longer + (lengths . (3.5 3.5 3.5 4.5 5.0 6.0)) ;; FIXME. 3.5 yields too long beams (according to Ross and ;; looking at Baerenreiter examples) for a number of common @@ -1683,6 +1698,7 @@ (self-alignment-X . ,CENTER) (self-alignment-Y . ,CENTER) (script-priority . 100) + (avoid-slur . around) (font-encoding . fetaNumber) (font-size . -5) ; don't overlap when next to heads. (meta . ((class . Item) @@ -1827,12 +1843,12 @@ (stem-attachment . (0.0 . 1.35)) (font-series . bold) (meta . ((class . Item) - (interfaces - . (rhythmic-head-interface - font-interface rhythmic-grob-interface - note-head-interface - staff-symbol-referencer-interface - text-interface)))))) + (interfaces . (rhythmic-head-interface + font-interface + rhythmic-grob-interface + note-head-interface + staff-symbol-referencer-interface + text-interface)))))) (TextScript . ( @@ -1859,7 +1875,9 @@ (meta . ((class . Item) (interfaces . (text-script-interface text-interface + instrument-specific-markup-interface side-position-interface + self-alignment-interface font-interface)))))) (TextSpanner @@ -1882,12 +1900,13 @@ )) (right . ((Y . 0) (padding . 0.25) - )) + )) )) (stencil . ,ly:line-spanner::print) (meta . ((class . Spanner) (interfaces . (line-spanner-interface + line-interface side-position-interface font-interface)))))) @@ -1918,7 +1937,7 @@ (outer-tie-length-symmetry-penalty-factor . 10) (vertical-distance-penalty-factor . 7) (outer-tie-vertical-gap . 0.25) - (multi-tie-region-size . 1) + (multi-tie-region-size . 3) (single-tie-region-size . 4) (between-length-limit . 1.0))) @@ -2044,6 +2063,7 @@ (edge-height . (0.7 . 0.7)) (shorten-pair . (-0.2 . -0.2)) (staff-padding . 0.25) + (full-length-to-extent . #t) (direction . ,ly:tuplet-bracket::calc-direction) (positions . ,ly:tuplet-bracket::calc-positions) (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors) @@ -2249,6 +2269,7 @@ (define pure-print-callbacks (list + fret-board::calc-stencil print-circled-text-callback lyric-text::print ly:arpeggio::print