X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=802774e3f2caf15614d49fc3c719e87496fec366;hb=175a579bf90f938533d3bc18648fad01ba287804;hp=3182c54018f6e718f99d2de81f554038f5d3e0ea;hpb=dd0ab344f7daadfef8ccae83291f00aff934e48a;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 3182c54018..802774e3f2 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1,9 +1,20 @@ -;;;; define-grobs.scm -- +;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 1998--2009 Han-Wen Nienhuys +;;;; Copyright (C) 1998--2009 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen +;;;; +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . ;;;; distances are given in line-thickness (thicknesses) and ;;;; staff-space (distances) @@ -107,7 +118,6 @@ (AmbitusAccidental . ( (direction . ,LEFT) - (font-family . music) (glyph-name-alist . ,standard-alteration-glyph-name-alist) (padding . 0.5) (side-axis . ,X) @@ -122,14 +132,13 @@ (AmbitusLine . ( - (join-heads . #t) - (stencil . ,ly:ambitus::print) + (gap . 0.35) + (stencil . ,ambitus::print) (thickness . 2) (X-offset . ,ly:self-alignment-interface::centered-on-x-parent) (meta . ((class . Item) (interfaces . (ambitus-interface - font-interface - staff-symbol-referencer-interface)))))) + font-interface)))))) (AmbitusNoteHead . ( @@ -482,7 +491,6 @@ (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor) (break-align-symbol . clef) (break-visibility . ,begin-of-line-visible) - (font-family . music) (glyph-name . ,ly:clef::calc-glyph-name) (non-musical . #t) (space-alist . ((ambitus . (extra-space . 2.0)) @@ -981,7 +989,7 @@ (clef . (extra-space . 0.8)) (first-note . (fixed-space . 2.0)) (right-edge . (extra-space . 0.0)) - (key-signature . (extra-space . 0.0)) + (key-signature . (extra-space . 0.8)) (key-cancellation . (extra-space . 0.0)) )) (X-extent . (0 . 0)) @@ -1620,8 +1628,12 @@ (StaffGrouper . ( - (between-staff-spacing . ((space . 9) (minimum-distance . 7))) - (after-last-staff-spacing . ((space . 10.5) (minimum-distance . 8))) + (between-staff-spacing . ((space . 9) + (minimum-distance . 7) + (padding . 1))) + (after-last-staff-spacing . ((space . 10.5) + (minimum-distance . 8) + (padding . 1))) (meta . ((class . Spanner) (interfaces . (staff-grouper-interface)))))) @@ -1868,6 +1880,10 @@ (TabNoteHead . ( + (details . ((tied-properties . ((break-visibility . ,begin-of-line-visible) + (parenthesize . #t))) + (repeat-tied-properties . ((note-head-visible . #t) + (parenthesize . #t))))) (direction . ,CENTER) (duration-log . ,note-head::calc-duration-log) (font-series . bold) @@ -1882,6 +1898,7 @@ rhythmic-grob-interface rhythmic-head-interface staff-symbol-referencer-interface + tab-note-head-interface text-interface)))))) (TextScript @@ -1919,6 +1936,7 @@ (padding . 0.25) (attach-dir . ,LEFT) )) + (left-broken . ((end-on-note . #t))) (right . ((Y . 0) (padding . 0.25) )) @@ -2180,8 +2198,11 @@ . ( (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights) (axes . (,Y)) - (default-next-staff-spacing . ((space . 9) (minimum-distance . 8))) + (default-next-staff-spacing . ((space . 9) + (minimum-distance . 8) + (padding . 1))) (next-staff-spacing . ,ly:axis-group-interface::calc-next-staff-spacing) + (non-affinity-spacing . ((padding . 0.5))) (stencil . ,ly:axis-group-interface::print) (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines) (X-extent . ,ly:axis-group-interface::width) @@ -2222,7 +2243,7 @@ (font-encoding . fetaNumber) (font-size . -4) (stencil . ,ly:volta-bracket-interface::print) - (thickness . 1.6) ;; line-thickness + (thickness . 1.6) ;; line-thickness (word-space . 0.6) (meta . ((class . Spanner) (interfaces . (font-interface @@ -2230,14 +2251,15 @@ line-interface side-position-interface text-interface - volta-bracket-interface)))))) + volta-bracket-interface + volta-interface)))))) (VoltaBracketSpanner . ( (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff) (axes . (,Y)) (direction . ,UP) - (no-alignment . ,#t) + (no-alignment . #t) (outside-staff-priority . 600) (padding . 1) (side-axis . ,Y) @@ -2246,7 +2268,8 @@ (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Spanner) (interfaces . (axis-group-interface - side-position-interface)))))) + side-position-interface + volta-interface)))))) )) @@ -2257,10 +2280,10 @@ ;; (newline) (let* ((name-sym (car x)) (grob-entry (cdr x)) - (meta-entry (cdr (assoc 'meta grob-entry))) - (class (cdr (assoc 'class meta-entry))) + (meta-entry (assoc-get 'meta grob-entry)) + (class (assoc-get 'class meta-entry)) (ifaces-entry - (cdr (assoc 'interfaces meta-entry)))) + (assoc-get 'interfaces meta-entry))) (cond ((eq? 'Item class) @@ -2303,6 +2326,7 @@ (define pure-print-callbacks (list fret-board::calc-stencil + note-head::brew-ez-stencil print-circled-text-callback lyric-text::print ly:arpeggio::print @@ -2315,7 +2339,7 @@ ly:text-interface::print ly:script-interface::print)) -;; ly:grob::stencil-extent is safe iff the print callback is safe too +;; ly:grob::stencil-extent is safe if the print callback is safe too (define (pure-stencil-height grob start stop) (let ((sten (ly:grob-property-data grob 'stencil))) (if (or