;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
"Draw a circle around @var{arg}. Use @code{thickness},
@code{circle-padding} and @code{font-size} properties to determine line
thickness and padding around the markup."
+
(let* ((th (chain-assoc-get 'thickness props 0.1))
(size (chain-assoc-get 'font-size props 0))
(pad
(ly:round-filled-box
xext yext blot))
+(define-markup-command (rotate layout props ang arg) (number? markup?)
+ "Rotate object with @var{ang} degrees around its center."
+ (let* ((stil (interpret-markup layout props arg)))
+ (ly:stencil-rotate stil ang 0 0)))
+
+
(define-markup-command (whiteout layout props arg) (markup?)
"Provide a white underground for @var{arg}"
- (let* ((stil (interpret-markup layout props
- (make-with-color-markup black arg)))
- (white
- (interpret-markup layout props
- (make-with-color-markup
- white
- (make-filled-box-markup
- (ly:stencil-extent stil X)
- (ly:stencil-extent stil Y)
- 0.0)))))
-
- (ly:stencil-add white stil)))
+ (stencil-whiteout (interpret-markup layout props arg)))
(define-markup-command (pad-markup layout props padding arg) (number? markup?)
"Add space around a markup object."
scalefont setfont 90 rotate (hello) show grestore
@end verbatim
"
+
;; FIXME
(ly:make-stencil
- (list 'embedded-ps str)
+ (list 'embedded-ps
+ (format "
+gsave currentpoint translate
+0.1 setlinewidth
+ ~a
+grestore
+"
+ str))
'(0 . 0) '(0 . 0)))
;; basic formatting.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
(define-markup-command (simple layout props str) (string?)
"A simple text string; @code{\\markup @{ foo @}} is equivalent with
@code{\\markup @{ \\simple #\"foo\" @}}."
(interpret-markup layout props str))
+(define-markup-command (tied-lyric layout props str) (string?)
+
+ "Like simple-markup, but use tie characters for ~ tilde symbols."
+
+ (if (string-contains str "~")
+ (let*
+ ((parts (string-split str #\~))
+ (tie-str (ly:wide-char->utf-8 #x203f))
+ (joined (list-join parts tie-str))
+ (join-stencil (interpret-markup layout props tie-str))
+ )
+
+ (interpret-markup layout
+ (prepend-alist-chain
+ 'word-space
+ (/ (interval-length (ly:stencil-extent join-stencil X)) -3.5)
+ props)
+ (make-line-markup joined)))
+ ;(map (lambda (s) (interpret-markup layout props s)) parts))
+ (interpret-markup layout props str)))
+
;; TODO: use font recoding.
;; (make-line-markup
(text-width (apply + text-widths))
(text-dir (chain-assoc-get 'text-direction props RIGHT))
(word-count (length stencils))
- (word-space (chain-assoc-get 'word-space props))
- (line-width (chain-assoc-get 'line-width props))
+ (word-space (chain-assoc-get 'word-space props 1))
+ (prop-line-width (chain-assoc-get 'line-width props #f))
+ (line-width (if prop-line-width prop-line-width
+ (ly:output-def-lookup layout 'line-width)))
(fill-space
(cond
((= word-count 1)
space
(remove ly:stencil-empty? stencils))))
+(define-markup-command (concat layout props args) (markup-list?)
+ "Concatenate @var{args} in a horizontal line, without spaces inbetween.
+Strings and simple markups are concatenated on the input level, allowing
+ligatures. For example, @code{\\concat @{ \"f\" \\simple #\"i\" @}} is
+equivalent to @code{\"fi\"}."
+
+ (define (concat-string-args arg-list)
+ (fold-right (lambda (arg result-list)
+ (let ((result (if (pair? result-list)
+ (car result-list)
+ '())))
+ (if (and (pair? arg) (eqv? (car arg) simple-markup))
+ (set! arg (cadr arg)))
+ (if (and (string? result) (string? arg))
+ (cons (string-append arg result) (cdr result-list))
+ (cons arg result-list))))
+ '()
+ arg-list))
+
+ (interpret-markup layout
+ (prepend-alist-chain 'word-space 0 props)
+ (make-line-markup (concat-string-args args))))
(define (wordwrap-stencils stencils
justify base-space line-width text-dir)
(define (wordwrap-markups layout props args justify)
(let*
((baseline-skip (chain-assoc-get 'baseline-skip props))
- (line-width (chain-assoc-get 'line-width props))
+ (prop-line-width (chain-assoc-get 'line-width props #f))
+ (line-width (if prop-line-width prop-line-width
+ (ly:output-def-lookup layout 'line-width)))
(word-space (chain-assoc-get 'word-space props))
(text-dir (chain-assoc-get 'text-direction props RIGHT))
(lines (wordwrap-stencils
(ly:make-stencil '() '(1 . -1) '(1 . -1)))))
(define-markup-command (justify-field layout props symbol) (symbol?)
-- (let* ((m (chain-assoc-get symbol props)))
+ (let* ((m (chain-assoc-get symbol props)))
(if (string? m)
(interpret-markup layout props
(list justify-string-markup m))
x y)))
-(define-markup-command (pad-to-box layout props x-ext y-ext arg) (number-pair? number-pair? markup?)
+(define-markup-command (pad-to-box layout props x-ext y-ext arg)
+ (number-pair? number-pair? markup?)
"Make @var{arg} take at least @var{x-ext}, @var{y-ext} space"
(let*
(interval-union y-ext y))))
+(define-markup-command (hcenter-in layout props length arg)
+ (number? markup?)
+ "Center @var{arg} horizontally within a box of extending
+@var{length}/2 to the left and right."
+
+ (interpret-markup layout props
+ (make-pad-to-box-markup
+ (cons (/ length -2) (/ length 2))
+ '(0 . 0)
+ (make-hcenter-markup arg))))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; property
"Set font size to -3."
(interpret-markup layout (prepend-alist-chain 'font-size -3 props) arg))
-(define-markup-command (caps layout props arg) (markup?)
+(define-markup-command (fontCaps layout props arg) (markup?)
"Set @code{font-shape} to @code{caps}."
(interpret-markup layout (prepend-alist-chain 'font-shape 'caps props) arg))
#f
#f)))
+(define-markup-command (caps layout props arg) (markup?)
+ (interpret-markup layout props (make-smallCaps-markup arg)))
+
(define-markup-command (dynamic layout props arg) (markup?)
"Use the dynamic font. This font only contains @b{s}, @b{f}, @b{m},
@b{z}, @b{p}, and @b{r}. When producing phrases, like ``pi@`{u} @b{f}'', the
(define-markup-command (char layout props num) (integer?)
"Produce a single character, e.g. @code{\\char #65} produces the
letter 'A'."
- (ly:get-glyph (ly:paper-get-font layout props) num))
+ (ly:text-interface::interpret-markup layout props (ly:wide-char->utf-8 num)))
(define number->mark-letter-vector (make-vector 25 #\A))
(define-markup-command (note-by-number layout props log dot-count dir) (number? number? number?)
"Construct a note symbol, with stem. By using fractional values for
@var{dir}, you can obtain longer or shorter stems."
+
+ (define (get-glyph-name-candidates dir log style)
+ (map (lambda (dir-name)
+ (format "noteheads.~a~a~a" dir-name (min log 2)
+ (if (and (symbol? style)
+ (not (equal? 'default style)))
+ (symbol->string style)
+ "")))
+ (list (if (= dir UP) "u" "d")
+ "s")))
+
+ (define (get-glyph-name font cands)
+ (if (null? cands)
+ ""
+ (if (ly:stencil-empty? (ly:font-get-glyph font (car cands)))
+ (get-glyph-name font (cdr cands))
+ (car cands))))
+
(let* ((font (ly:paper-get-font layout (cons '((font-encoding . fetaMusic)) props)))
- (size (chain-assoc-get 'font-size props 0))
- (stem-length (* (magstep size) (max 3 (- log 1))))
- (head-glyph (ly:font-get-glyph
- font
- (string-append "noteheads.s" (number->string (min log 2)))))
- (stem-thickness 0.13) ;; TODO: should scale with font-size.
+ (size-factor (magstep (chain-assoc-get 'font-size props 0)))
+ (style (chain-assoc-get 'style props '()))
+ (stem-length (* size-factor (max 3 (- log 1))))
+ (head-glyph-name (get-glyph-name font (get-glyph-name-candidates (sign dir) log style)))
+ (head-glyph (ly:font-get-glyph font head-glyph-name))
+ (attach-indices (ly:note-head::stem-attachment font head-glyph-name))
+ (stem-thickness (* size-factor 0.13))
(stemy (* dir stem-length))
- (attachx (if (> dir 0)
- (- (cdr (ly:stencil-extent head-glyph X)) stem-thickness)
- 0))
- (attachy (* (magstep size) (* dir 0.28)))
+ (attach-off (cons (interval-index
+ (ly:stencil-extent head-glyph X)
+ (* (sign dir) (car attach-indices)))
+ (* (sign dir) ; fixme, this is inconsistent between X & Y.
+ (interval-index
+ (ly:stencil-extent head-glyph Y)
+ (cdr attach-indices)))))
(stem-glyph (and (> log 0)
(ly:round-filled-box
- (cons attachx (+ attachx stem-thickness))
- (cons (min stemy attachy)
- (max stemy attachy))
+ (ordered-cons (car attach-off)
+ (+ (car attach-off) (* (- (sign dir)) stem-thickness)))
+ (cons (min stemy (cdr attach-off))
+ (max stemy (cdr attach-off)))
(/ stem-thickness 3))))
+
(dot (ly:font-get-glyph font "dots.dot"))
(dotwid (interval-length (ly:stencil-extent dot X)))
(dots (and (> dot-count 0)
(string-append "flags."
(if (> dir 0) "u" "d")
(number->string log)))
- (cons (+ attachx (/ stem-thickness 2)) stemy)))))
+ (cons (+ (car attach-off) (/ stem-thickness 2)) stemy)))))
(if flaggl
(set! stem-glyph (ly:stencil-add flaggl stem-glyph)))
(if (ly:stencil? stem-glyph)
(- amount) Y))
+(define-markup-command (translate-scaled layout props offset arg) (number-pair? markup?)
+ "Translate @var{arg} by @var{offset}, scaling the offset by the @code{font-size}."
+
+ (let*
+ ((factor (magstep (chain-assoc-get 'font-size props 0)))
+ (scaled (cons (* factor (car offset))
+ (* factor (cdr offset)))))
+
+ (ly:stencil-translate (interpret-markup layout props arg)
+ scaled)))
+
(define-markup-command (raise layout props amount arg) (number? markup?)
"
Raise @var{arg}, by the distance @var{amount}.
(define-markup-command (fraction layout props arg1 arg2) (markup? markup?)
"Make a fraction of two markups."
(let* ((m1 (interpret-markup layout props arg1))
- (m2 (interpret-markup layout props arg2)))
+ (m2 (interpret-markup layout props arg2))
+ (factor (magstep (chain-assoc-get 'font-size props 0)))
+ (boxdimen (cons (* factor -0.05) (* factor 0.05)))
+ (padding (* factor 0.2))
+ (baseline (* factor 0.6))
+ (offset (* factor 0.75)))
(set! m1 (ly:stencil-aligned-to m1 X CENTER))
(set! m2 (ly:stencil-aligned-to m2 X CENTER))
(let* ((x1 (ly:stencil-extent m1 X))
(x2 (ly:stencil-extent m2 X))
- (line (ly:round-filled-box (interval-union x1 x2) '(-0.05 . 0.05) 0.0))
+ (line (ly:round-filled-box (interval-union x1 x2) boxdimen 0.0))
;; should stack mols separately, to maintain LINE on baseline
- (stack (stack-lines -1 0.2 0.6 (list m1 line m2))))
+ (stack (stack-lines DOWN padding baseline (list m1 line m2))))
(set! stack
(ly:stencil-aligned-to stack Y CENTER))
(set! stack
(ly:stencil-aligned-to stack X LEFT))
;; should have EX dimension
;; empirical anyway
- (ly:stencil-translate-axis stack 0.75 Y))))
+ (ly:stencil-translate-axis stack offset Y))))
projects / lilypond.git / blobdiff