;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
(half (/ thickness 2)))
(ly:make-stencil
- (list 'beam width
- slope
- thickness
- (ly:output-def-lookup layout 'blotdiameter))
+ `(polygon ',(list
+ 0 (/ thickness -2)
+ width (+ (* width slope) (/ thickness -2))
+ width (+ (* width slope) (/ thickness 2))
+ 0 (/ thickness 2))
+ ,(ly:output-def-lookup layout 'blotdiameter)
+ #t)
(cons 0 width)
(cons (+ (- half) (car yext))
(+ half (cdr yext))))))
"Draw a box round @var{arg}. Looks at @code{thickness},
@code{box-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 (* (magstep size)
"Create a box of the same height as the space in the current font."
(let ((m (Text_interface::interpret_markup layout props " ")))
(ly:make-stencil (ly:stencil-expr m)
+ '(1000 . -1000)
(ly:stencil-extent m X)
- '(1000 . -1000))))
+ )))
;; todo: fix negative space
stil)
(define bbox-regexp
- (make-regexp "%%BoundingBox: ([0-9-]+) ([0-9-]+) ([0-9-]+) ([0-9-]+)"))
+ (make-regexp "%%BoundingBox:[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)"))
(define (get-postscript-bbox string)
"Extract the bbox from STRING, or return #f if not present."
(if bbox
(map (lambda (x) (/ x 10)) bbox)
(begin
- (ly:warn (_ "can't find bounding box of `~a'")
+ (ly:warning (_ "can't find bounding box of `~a'")
file-name)
'()))))
(let* ((output (ly:score-embedded-format score layout)))
(if (ly:music-output? output)
- (ly:paper-system-stencil
+ (paper-system-stencil
(vector-ref (ly:paper-score-paper-systems output) 0))
(begin
(ly:warning (_"no systems found in \\score markup, does it have a \\layout block?"))
empty-stencil))))
+(def-markup-command (null layout props) ()
+ "An empty markup with extents of a single point"
+
+ point-stencil)
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; basic formatting.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(interval-length (ly:stencil-extent stc X))))
stencils))
(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 'linewidth props))
(- line-width text-width)))
(else
(get-fill-space word-count line-width text-widths))))
- (fill-space-normal
- (map (lambda (x)
- (if (< x word-space)
- word-space
- x))
- fill-space))
+ (fill-space-normal
+ (map (lambda (x)
+ (if (< x word-space)
+ word-space
+ x))
+ fill-space))
(line-stencils (if (= word-count 1)
(list
point-stencil)
stencils)))
+ (if (= text-dir LEFT)
+ (set! line-stencils (reverse line-stencils)))
+
(if (null? (remove ly:stencil-empty? orig-stencils))
empty-stencil
- (stack-stencils-padding-list X RIGHT fill-space-normal line-stencils))))
+ (stack-stencils-padding-list X
+ RIGHT fill-space-normal line-stencils))))
(def-markup-command (line layout props args) (markup-list?)
"Put @var{args} in a horizontal line. The property @code{word-space}
determines the space between each markup in @var{args}."
(let*
((stencils (map (lambda (m) (interpret-markup layout props m)) args))
- (space (chain-assoc-get 'word-space props)))
+ (space (chain-assoc-get 'word-space props))
+ (text-dir (chain-assoc-get 'text-direction props RIGHT))
+ )
- (stack-stencil-line
- space
- (remove ly:stencil-empty? stencils))))
+ (if (= text-dir LEFT)
+ (set! stencils (reverse stencils)))
+
+
+ (stack-stencil-line
+ space
+ (remove ly:stencil-empty? stencils))))
(define (wordwrap-stencils stencils
- justify base-space line-width
- )
+ justify base-space line-width text-dir)
"Perform simple wordwrap, return stencil of each line."
+
(define space (if justify
;; justify only stretches lines.
(line (stack-stencil-line
line-word-space
- (reverse line-stencils))))
+ (if (= text-dir RIGHT)
+ (reverse line-stencils)
+ line-stencils))))
(if (pair? (cdr line-break))
(loop (cons line lines)
(cdr line-break))
- (reverse (cons line lines))
- ))
+ (begin
+ (if (= text-dir LEFT)
+ (set! line
+ (ly:stencil-translate-axis line
+ (- line-width (interval-end (ly:stencil-extent line X)))
+ X)))
+ (reverse (cons line lines))
+
+ )))
))
((baseline-skip (chain-assoc-get 'baseline-skip props))
(line-width (chain-assoc-get 'linewidth props))
(word-space (chain-assoc-get 'word-space props))
+ (text-dir (chain-assoc-get 'text-direction props RIGHT))
(lines (wordwrap-stencils
(remove ly:stencil-empty?
(map (lambda (m) (interpret-markup layout props m)) args))
- justify word-space line-width)
+ justify word-space line-width
+ text-dir)
))
(stack-lines DOWN 0.0 baseline-skip lines)))
(def-markup-command (justify layout props args) (markup-list?)
- "Simple wordwrap"
+ "Like wordwrap, but with lines stretched to justify the margins.
+Use @code{\\override #'(linewidth . X)} to set linewidth, where X
+is the number of staff spaces."
(wordwrap-markups layout props args #t))
(def-markup-command (wordwrap layout props args) (markup-list?)
- "Like wordwrap, but with lines stretched to justify the margins."
+ "Simple wordwrap. Use @code{\\override #'(linewidth . X)} to set
+linewidth, where X is the number of staff spaces."
(wordwrap-markups layout props args #f))
((baseline-skip (chain-assoc-get 'baseline-skip props))
(line-width (chain-assoc-get 'linewidth props))
(word-space (chain-assoc-get 'word-space props))
- (para-strings (regexp-split arg "\n[ \t\n]*\n[ \t\n]*"))
+ (para-strings (regexp-split
+ (string-regexp-substitute "\r" "\n"
+ (string-regexp-substitute "\r\n" "\n" arg))
+ "\n[ \t\n]*\n[ \t\n]*"))
+
+ (text-dir (chain-assoc-get 'text-direction props RIGHT))
(list-para-words (map (lambda (str)
(regexp-split str "[ \t\n]+"))
para-strings))
(interpret-markup layout props x))
words)))
(lines (wordwrap-stencils stencils
- justify word-space line-width)))
+ justify word-space
+ line-width text-dir
+ )))
lines))
(def-markup-command (justify-string layout props arg) (string?)
"Justify a string. Paragraphs may be separated with double newlines"
(wordwrap-string layout props #t arg))
-
+
+
+(def-markup-command (wordwrap-field layout props symbol) (symbol?)
+ (let* ((m (chain-assoc-get symbol props)))
+ (if (string? m)
+ (interpret-markup layout props
+ (list wordwrap-string-markup m))
+ (ly:make-stencil '() '(1 . -1) '(1 . -1)))))
+
+(def-markup-command (justify-field layout props symbol) (symbol?)
+- (let* ((m (chain-assoc-get symbol props)))
+ (if (string? m)
+ (interpret-markup layout props
+ (list justify-string-markup m))
+ (ly:make-stencil '() '(1 . -1) '(1 . -1)))))
+
+
+
(def-markup-command (combine layout props m1 m2) (markup? markup?)
"Print two markups on top of each other."
(let* ((s1 (interpret-markup layout props m1))
(ly:stencil-aligned-to m X dir)))
+(def-markup-command (pad-around layout props amount arg) (number? markup?)
+
+ "Add padding @var{amount} all around @var{arg}. "
+
+ (let*
+ ((m (interpret-markup layout props arg))
+ (x (ly:stencil-extent m X))
+ (y (ly:stencil-extent m Y)))
+
+
+ (ly:make-stencil (ly:stencil-expr m)
+ (interval-widen x amount)
+ (interval-widen y amount))
+ ))
+
+
+(def-markup-command (pad-x layout props amount arg) (number? markup?)
+
+ "Add padding @var{amount} around @var{arg} in the X-direction. "
+ (let*
+ ((m (interpret-markup layout props arg))
+ (x (ly:stencil-extent m X))
+ (y (ly:stencil-extent m Y)))
+
+
+ (ly:make-stencil (ly:stencil-expr m)
+ (interval-widen x amount)
+ y)
+ ))
+
+
+(def-markup-command (put-adjacent layout props arg1 axis dir arg2) (markup? integer? ly:dir? markup?)
+
+ "Put @var{arg2} next to @var{arg1}, without moving @var{arg1}. "
+
+ (let* ((m1 (interpret-markup layout props arg1))
+ (m2 (interpret-markup layout props arg2)))
+
+ (ly:stencil-combine-at-edge m1 axis dir m2 0.0 0.0)
+ ))
+
+(def-markup-command (transparent layout props arg) (markup?)
+ "Make the argument transparent"
+ (let*
+ ((m (interpret-markup layout props arg))
+ (x (ly:stencil-extent m X))
+ (y (ly:stencil-extent m Y)))
+
+
+
+ (ly:make-stencil ""
+ x y)))
+
+
+(def-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*
+ ((m (interpret-markup layout props arg))
+ (x (ly:stencil-extent m X))
+ (y (ly:stencil-extent m Y)))
+
+
+ (ly:make-stencil (ly:stencil-expr m)
+ (interval-union x-ext x)
+ (interval-union y-ext y))))
+
+
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; property
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
"Set @code{font-shape} to @code{caps}."
(interpret-markup layout (prepend-alist-chain 'font-shape 'caps props) arg))
-;(def-markup-command (latin-i layout props arg) (markup?)
-; "TEST latin1 encoding."
-; (interpret-markup layout (prepend-alist-chain 'font-shape 'latin1 props) arg))
-
(def-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
layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))
(def-markup-command (text layout props arg) (markup?)
- "Use a text font instead of music symbol or music alphabet "
- "font."
+ "Use a text font instead of music symbol or music alphabet font."
;; ugh - latin1
(interpret-markup layout (prepend-alist-chain 'font-encoding 'latin1 props)
layout (prepend-alist-chain 'font-family 'typewriter props) arg))
(def-markup-command (upright layout props arg) (markup?)
- "Set font shape to @code{upright}."
+ "Set font shape to @code{upright}. This is the opposite of @code{italic}."
(interpret-markup
layout (prepend-alist-chain 'font-shape 'upright props) arg))
+(def-markup-command (medium layout props arg) (markup?)
+ "Switch to medium font-series (in contrast to bold)."
+ (interpret-markup layout (prepend-alist-chain 'font-series 'medium props)
+ arg))
+
+(def-markup-command (normal-text layout props arg) (markup?)
+ "Set all font related properties (except the size) to get the default normal text font, no matter what font was used earlier."
+ ;; ugh - latin1
+ (interpret-markup layout
+ (cons '((font-family . roman) (font-shape . upright)
+ (font-series . medium) (font-encoding . latin1))
+ props)
+ arg))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; symbols.
(ly:stencil-extent stil X)
(ly:stencil-extent stil Y))))
-
+\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; glyphs
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def-markup-command (arrow-head layout props axis direction filled)
+ (integer? ly:dir? boolean?)
+ "produce an arrow head in specified direction and axis. Use the filled head if @var{filled} is specified."
+ (let*
+ ((name (format "arrowheads.~a.~a~a"
+ (if filled
+ "close"
+ "open")
+ axis
+ direction)))
+ (ly:font-get-glyph
+ (ly:paper-get-font layout (cons '((font-encoding . fetaMusic))
+ props))
+ name)))
+
(def-markup-command (musicglyph layout props glyph-name) (string?)
"This is converted to a musical symbol, e.g. @code{\\musicglyph
#\"accidentals.0\"} will select the natural sign from the music font.
(Text_interface::interpret_markup layout props
(number->markletter-string number->mark-alphabet-vector num)))
+
+
+(def-markup-command (slashed-digit layout props num) (integer?)
+ "A feta number, with slash. This is for use in the context of
+figured bass notation"
+ (let*
+ ((mag (magstep (chain-assoc-get 'font-size props 0)))
+ (thickness
+ (* mag
+ (chain-assoc-get 'thickness props 0.16)))
+ (dy (* mag 0.15))
+ (number-stencil (interpret-markup layout
+ (prepend-alist-chain 'font-encoding 'fetaNumber props)
+ (number->string num)))
+ (num-x (interval-widen (ly:stencil-extent number-stencil X)
+ (* mag 0.2)))
+ (num-y (ly:stencil-extent number-stencil Y))
+ (slash-stencil
+ (ly:make-stencil
+ `(draw-line
+ ,thickness
+ ,(car num-x) ,(- (interval-center num-y) dy)
+ ,(cdr num-x) ,(+ (interval-center num-y) dy))
+ num-x num-y
+ )))
+
+ (ly:stencil-add number-stencil
+ (cond
+ ((= num 5) (ly:stencil-translate slash-stencil
+ ;;(cons (* mag -0.05) (* mag 0.42))
+ (cons (* mag -0.00) (* mag -0.07))
+
+ ))
+ ((= num 7) (ly:stencil-translate slash-stencil
+ ;;(cons (* mag -0.05) (* mag 0.42))
+ (cons (* mag -0.00) (* mag -0.15))
+
+ ))
+
+ (else slash-stencil)))
+ ))
+\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; the note command.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(let ((parsed (parse-simple-duration duration)))
(note-by-number-markup layout props (car parsed) (cadr parsed) dir)))
+\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; translating.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(def-markup-command (lower layout props amount arg) (number? markup?)
"
Lower @var{arg}, by the distance @var{amount}.
-A negative @var{amount} indicates raising, see also @code{\raise}.
+A negative @var{amount} indicates raising, see also @code{\\raise}.
"
(ly:stencil-translate-axis (interpret-markup layout props arg)
(- amount) Y))
(interpret-markup layout props arg)
(* -0.5 (chain-assoc-get 'baseline-skip props))
Y))
-
+\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; brackets.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(def-markup-command (bracketed-y-column layout props indices args)
(list? markup-list?)
"Make a column of the markups in @var{args}, putting brackets around
-the elements marked in @var{indices}, which is a list of numbers."
+the elements marked in @var{indices}, which is a list of numbers.
+
+"
+;;
+;; DROPME? This command is a relic from the old figured bass implementation.
+;;
+
(define (sublist lst start stop)
(take (drop lst start) (- (1+ stop) start)))
(apply ly:stencil-add
(append stacked brackets))))
+\f
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; size indications arrow
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
projects / lilypond.git / blobdiff