;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
;;;; distances are given in line-thickness (thicknesses) and
. (
(break-align-symbol . staff-bar)
(glyph . "|")
+ (gap . 0.4)
(layer . 0)
(break-visibility . ,all-visible)
(non-musical . #t)
(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)
(interfaces . (staff-symbol-referencer-interface
beam-interface))))))
+ (BendAfter
+ . (
+ (stencil . ,fall::print)
+ (thickness . 2.0)
+ (meta . ((class . Spanner)
+ (interfaces . (spanner-interface
+ bend-after-interface))))))
+
(BreakAlignment
. (
(non-musical . #t)
(Dots
. (
(stencil . ,ly:dots::print)
- (dot-count . 1)
+ (dot-count . ,dots::calc-dot-count)
(meta . ((class . Item)
(interfaces . (font-interface
staff-symbol-referencer-interface
dynamic-text-spanner-interface
spanner-interface))))))
+
(Fingering
. (
(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)
(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))
(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)
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)
font-interface
text-interface))))))
+ (NonMusicalPaperColumn
+ . (
+ (allow-loose-spacing . #t)
+ (axes . (0))
+ (before-line-breaking . ,ly:paper-column::before-line-breaking)
+ (X-extent . ,ly:axis-group-interface::width)
+ ;; (stencil . ,ly:paper-column::print)
+
+ (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)
+
+ (meta . ((class . Paper_column)
+ (interfaces . (paper-column-interface
+ axis-group-interface
+ spaceable-grob-interface))))))
+
(NoteCollision
. (
(axes . (0 1))
(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)
(PaperColumn
. (
(axes . (0))
+ (allow-loose-spacing . #t)
(before-line-breaking . ,ly:paper-column::before-line-breaking)
;; (stencil . ,ly:paper-column::print)
(X-extent . ,ly:axis-group-interface::width)
(meta . ((class . Spanner)
(interfaces . (slur-interface))))))
- (NonMusicalPaperColumn
- . (
- (axes . (0))
- (before-line-breaking . ,ly:paper-column::before-line-breaking)
- (X-extent . ,ly:axis-group-interface::width)
- ;; (stencil . ,ly:paper-column::print)
-
- (non-musical . #t)
- (line-break-permission . allow)
-
- ;; debugging stuff: print column number.
- ;; (font-size . -6) (font-name . "sans") (Y-extent . #f)
- (meta . ((class . Paper_column)
- (interfaces . (paper-column-interface
- axis-group-interface
- spaceable-grob-interface))))))
(PercentRepeat
. (
(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)
. (
;; 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)
(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
(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)
(StringNumber
. (
(stencil . ,print-circled-text-callback)
+ (text . ,string-number::calc-text)
(padding . 0.5)
(staff-padding . 0.5)
(self-alignment-X . 0)
. (
(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)
(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)
(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)
(stencil . ,ly:accidental-interface::print)
(meta . ((class . Item)
(interfaces . (item-interface
- accidental-interface
+ trill-pitch-accidental-interface
side-position-interface
font-interface))))))
(edge-height . (0.7 . 0.7))
(shorten-pair . (-0.2 . -0.2))
(staff-padding . 0.25)
-
(direction . ,ly:tuplet-bracket::calc-direction)
(positions . ,ly:tuplet-bracket::calc-positions)
(connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
(TupletNumber
. (
(stencil . ,ly:tuplet-number::print)
+ (text . ,tuplet-number::calc-denominator-text)
(font-shape . italic)
(font-size . -2)
(avoid-slur . inside)
(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))))))
(set! all-grob-descriptions (sort all-grob-descriptions alist<?))
-
(define pure-print-callbacks
(list
`(,ly:note-head::print . '())
`(,ly:clef::print . '())
- `(,ly:text-interface::print . '())))
+ `(,ly:text-interface::print . '())
+ `(,ly:script-interface::print . '())))
;; ly:grob::stencil-extent is safe iff the print callback is safe too
(define (pure-stencil-height grob start stop)
`(,ly:grob::stencil-height . ,pure-stencil-height)
`(,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:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
+ `(,ly:slur::height . ,ly:slur::pure-height)))
(define pure-Y-offsets
(list
(define-public (pure-relevant grob)
(let ((extent-callback (ly:grob-property-data grob 'Y-extent)))
(or
+ (pair? extent-callback)
(pair? (assq extent-callback pure-Y-extents))
(and
(pair? (assq extent-callback Y-extent-conversions))
(define (pure-conversion pures conversions defsymbol defreturn rettype? grob start stop)
(let* ((normal-callback (ly:grob-property-data grob defsymbol))
- (pure-callback (assq normal-callback conversions)))
+ )
+
(if (rettype? normal-callback)
normal-callback
(if (pair? (assq normal-callback pures))
(normal-callback grob)
- (if (pair? pure-callback)
- ((cdr pure-callback) grob start stop)
- defreturn)))))
+ (let
+ ((pure-callback (assq normal-callback conversions)))
+
+ (if (pair? pure-callback)
+ ((cdr pure-callback) grob start stop)
+ defreturn))))))
(define-public (pure-Y-extent grob start stop)
(pure-conversion pure-Y-extents Y-extent-conversions
projects / lilypond.git / blobdiff