X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-markup-commands.scm;h=436d2c23781b33ab1133e3f9a0f1d77cdf159ca0;hb=ba3045ce76cd37a4e11fd775fa04ce4b7586ad77;hp=484a1c3d88fea8d4f054fb0cb936070a636f1c7d;hpb=30eb1ded55e8d8b17495b96a3741750fe34d3599;p=lilypond.git diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 484a1c3d88..436d2c2378 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2000--2005 Han-Wen Nienhuys +;;;; (c) 2000--2006 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen @@ -24,13 +24,13 @@ ;; geometric shapes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (draw-circle layout props radius thickness fill) +(define-builtin-markup-command (draw-circle layout props radius thickness fill) (number? number? boolean?) "A circle of radius @var{radius}, thickness @var{thickness} and optionally filled." (make-circle-stencil radius thickness fill)) -(def-markup-command (triangle layout props filled) (boolean?) +(define-builtin-markup-command (triangle layout props filled) (boolean?) "A triangle, filled or not" (let* ((th (chain-assoc-get 'thickness props 0.1)) @@ -51,10 +51,11 @@ optionally filled." (cons 0 (* .86 ex)) ))) -(def-markup-command (circle layout props arg) (markup?) +(define-builtin-markup-command (circle layout props arg) (markup?) "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 @@ -63,7 +64,7 @@ thickness and padding around the markup." (m (interpret-markup layout props arg))) (circle-stencil m th pad))) -(def-markup-command (with-url layout props url arg) (string? markup?) +(define-builtin-markup-command (with-url layout props url arg) (string? markup?) "Add a link to URL @var{url} around @var{arg}. This only works in the PDF backend." (let* ((stil (interpret-markup layout props arg)) @@ -74,7 +75,7 @@ the PDF backend." (ly:stencil-add (ly:make-stencil url-expr xextent yextent) stil))) -(def-markup-command (beam layout props width slope thickness) +(define-builtin-markup-command (beam layout props width slope thickness) (number? number? number?) "Create a beam with the specified parameters." (let* ((y (* slope width)) @@ -87,16 +88,17 @@ the PDF backend." width (+ (* width slope) (/ thickness -2)) width (+ (* width slope) (/ thickness 2)) 0 (/ thickness 2)) - ,(ly:output-def-lookup layout 'blotdiameter) + ,(ly:output-def-lookup layout 'blot-diameter) #t) (cons 0 width) (cons (+ (- half) (car yext)) (+ half (cdr yext)))))) -(def-markup-command (box layout props arg) (markup?) +(define-builtin-markup-command (box layout props arg) (markup?) "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) @@ -104,28 +106,30 @@ thickness and padding around the markup." (m (interpret-markup layout props arg))) (box-stencil m th pad))) -(def-markup-command (filled-box layout props xext yext blot) +(define-builtin-markup-command (filled-box layout props xext yext blot) (number-pair? number-pair? number?) - "Draw a box with rounded corners of dimensions @var{xext} and @var{yext}." + "Draw a box with rounded corners of dimensions @var{xext} and +@var{yext}. For example, +@verbatim +\\filled-box #'(-.3 . 1.8) #'(-.3 . 1.8) #0 +@end verbatim +create a box extending horizontally from -0.3 to 1.8 and +vertically from -0.3 up to 1.8, with corners formed from a +circle of diameter 0 (ie sharp corners)." (ly:round-filled-box xext yext blot)) -(def-markup-command (whiteout layout props arg) (markup?) +(define-builtin-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-builtin-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))) - -(def-markup-command (pad-markup layout props padding arg) (number? markup?) + (stencil-whiteout (interpret-markup layout props arg))) + +(define-builtin-markup-command (pad-markup layout props padding arg) (number? markup?) "Add space around a markup object." (let* @@ -143,9 +147,9 @@ thickness and padding around the markup." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;FIXME: is this working? -(def-markup-command (strut layout props) () +(define-builtin-markup-command (strut layout props) () "Create a box of the same height as the space in the current font." - (let ((m (Text_interface::interpret_markup layout props " "))) + (let ((m (ly:text-interface::interpret-markup layout props " "))) (ly:make-stencil (ly:stencil-expr m) '(1000 . -1000) (ly:stencil-extent m X) @@ -153,7 +157,7 @@ thickness and padding around the markup." ;; todo: fix negative space -(def-markup-command (hspace layout props amount) (number?) +(define-builtin-markup-command (hspace layout props amount) (number?) "This produces a invisible object taking horizontal space. @example \\markup @{ A \\hspace #2.0 B @} @@ -170,7 +174,7 @@ normally inserted before elements on a line. ;; importing graphics. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (stencil layout props stil) (ly:stencil?) +(define-builtin-markup-command (stencil layout props stil) (ly:stencil?) "Stencil as markup" stil) @@ -189,46 +193,16 @@ normally inserted before elements on a line. #f))) -(def-markup-command (epsfile layout props file-name) (string?) - "Inline an EPS image. The image is scaled such that 10 PS units is -one staff-space." +(define-builtin-markup-command (epsfile layout props axis size file-name) (number? number? string?) + "Inline an EPS image. The image is scaled along @var{axis} to +@var{size}." (if (ly:get-option 'safe) - (interpret-markup layout props "not allowed in safe") - (let* - ((contents (ly:gulp-file file-name)) - (bbox (get-postscript-bbox contents)) - (scaled-bbox - (if bbox - (map (lambda (x) (/ x 10)) bbox) - (begin - (ly:warning (_ "can't find bounding box of `~a'") - file-name) - '())))) - - - (if bbox - - (ly:make-stencil - (list - 'embedded-ps - (string-append - - ; adobe 5002. - "BeginEPSF " - "0.1 0.1 scale " - (format "\n%%BeginDocument: ~a\n" file-name) - contents - "%%EndDocument\n" - "EndEPSF\n" - )) - (cons (list-ref scaled-bbox 0) (list-ref scaled-bbox 2)) - (cons (list-ref scaled-bbox 1) (list-ref scaled-bbox 3))) - - (ly:make-stencil "" '(0 . 0) '(0 . 0)))))) - + (interpret-markup layout props "not allowed in safe") + (eps-file->stencil axis size file-name) + )) -(def-markup-command (postscript layout props str) (string?) +(define-builtin-markup-command (postscript layout props str) (string?) "This inserts @var{str} directly into the output as a PostScript command string. Due to technicalities of the output backends, different scales should be used for the @TeX{} and PostScript backend, @@ -256,13 +230,21 @@ gsave /ecrm10 findfont 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))) -(def-markup-command (score layout props score) (ly:score?) +(define-builtin-markup-command (score layout props score) (ly:score?) "Inline an image of music." (let* ((output (ly:score-embedded-format score layout))) @@ -273,7 +255,7 @@ gsave /ecrm10 findfont (ly:warning (_"no systems found in \\score markup, does it have a \\layout block?")) empty-stencil)))) -(def-markup-command (null layout props) () +(define-builtin-markup-command (null layout props) () "An empty markup with extents of a single point" point-stencil) @@ -282,11 +264,34 @@ gsave /ecrm10 findfont ;; basic formatting. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (simple layout props str) (string?) + + +(define-builtin-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-builtin-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 @@ -324,7 +329,7 @@ gsave /ecrm10 findfont (/ (+ (car text-widths) (car (cdr text-widths))) 2)) (get-fill-space word-count line-width (cdr text-widths)))))) -(def-markup-command (fill-line layout props markups) +(define-builtin-markup-command (fill-line layout props markups) (markup-list?) "Put @var{markups} in a horizontal line of width @var{line-width}. The markups are spaced/flushed to fill the entire line. @@ -347,8 +352,10 @@ gsave /ecrm10 findfont (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)) + (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) @@ -382,7 +389,7 @@ gsave /ecrm10 findfont (stack-stencils-padding-list X RIGHT fill-space-normal line-stencils)))) -(def-markup-command (line layout props args) (markup-list?) +(define-builtin-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* @@ -391,7 +398,6 @@ determines the space between each markup in @var{args}." (text-dir (chain-assoc-get 'text-direction props RIGHT)) ) - (if (= text-dir LEFT) (set! stencils (reverse stencils))) @@ -400,6 +406,28 @@ determines the space between each markup in @var{args}." space (remove ly:stencil-empty? stencils)))) +(define-builtin-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) @@ -482,7 +510,9 @@ determines the space between each markup in @var{args}." (define (wordwrap-markups layout props args justify) (let* ((baseline-skip (chain-assoc-get 'baseline-skip props)) - (line-width (chain-assoc-get 'linewidth 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 @@ -494,25 +524,29 @@ determines the space between each markup in @var{args}." (stack-lines DOWN 0.0 baseline-skip lines))) -(def-markup-command (justify layout props args) (markup-list?) +(define-builtin-markup-command (justify layout props args) (markup-list?) "Like wordwrap, but with lines stretched to justify the margins. -Use @code{\\override #'(linewidth . X)} to set linewidth, where X +Use @code{\\override #'(line-width . X)} to set line-width, where X is the number of staff spaces." (wordwrap-markups layout props args #t)) -(def-markup-command (wordwrap layout props args) (markup-list?) - "Simple wordwrap. Use @code{\\override #'(linewidth . X)} to set -linewidth, where X is the number of staff spaces." +(define-builtin-markup-command (wordwrap layout props args) (markup-list?) + "Simple wordwrap. Use @code{\\override #'(line-width . X)} to set +line-width, where X is the number of staff spaces." (wordwrap-markups layout props args #f)) (define (wordwrap-string layout props justify arg) (let* ((baseline-skip (chain-assoc-get 'baseline-skip props)) - (line-width (chain-assoc-get 'linewidth props)) + (line-width (chain-assoc-get 'line-width 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) @@ -538,23 +572,23 @@ linewidth, where X is the number of staff spaces." (stack-lines DOWN 0.0 baseline-skip (apply append para-lines)))) -(def-markup-command (wordwrap-string layout props arg) (string?) +(define-builtin-markup-command (wordwrap-string layout props arg) (string?) "Wordwrap a string. Paragraphs may be separated with double newlines" (wordwrap-string layout props #f arg)) -(def-markup-command (justify-string layout props arg) (string?) +(define-builtin-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?) +(define-builtin-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?) +(define-builtin-markup-command (justify-field layout props symbol) (symbol?) (let* ((m (chain-assoc-get symbol props))) (if (string? m) (interpret-markup layout props @@ -563,7 +597,7 @@ linewidth, where X is the number of staff spaces." -(def-markup-command (combine layout props m1 m2) (markup? markup?) +(define-builtin-markup-command (combine layout props m1 m2) (markup? markup?) "Print two markups on top of each other." (let* ((s1 (interpret-markup layout props m1)) (s2 (interpret-markup layout props m2))) @@ -572,15 +606,21 @@ linewidth, where X is the number of staff spaces." ;; ;; TODO: should extract baseline-skip from each argument somehow.. ;; -(def-markup-command (column layout props args) (markup-list?) +(define-builtin-markup-command (column layout props args) (markup-list?) "Stack the markups in @var{args} vertically. The property @code{baseline-skip} determines the space between each markup in @var{args}." - (stack-lines - -1 0.0 (chain-assoc-get 'baseline-skip props) - (remove ly:stencil-empty? - (map (lambda (m) (interpret-markup layout props m)) args)))) -(def-markup-command (dir-column layout props args) (markup-list?) + (let* + ((arg-stencils (map (lambda (m) (interpret-markup layout props m)) args)) + (skip (chain-assoc-get 'baseline-skip props))) + + + (stack-lines + -1 0.0 skip + (remove ly:stencil-empty? arg-stencils)))) + + +(define-builtin-markup-command (dir-column layout props args) (markup-list?) "Make a column of args, going up or down, depending on the setting of the @code{#'direction} layout property." (let* ((dir (chain-assoc-get 'direction props))) @@ -590,38 +630,39 @@ of the @code{#'direction} layout property." (chain-assoc-get 'baseline-skip props) (map (lambda (x) (interpret-markup layout props x)) args)))) -(def-markup-command (center-align layout props args) (markup-list?) +(define-builtin-markup-command (center-align layout props args) (markup-list?) "Put @code{args} in a centered column. " (let* ((mols (map (lambda (x) (interpret-markup layout props x)) args)) (cmols (map (lambda (x) (ly:stencil-aligned-to x X CENTER)) mols))) + (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) cmols))) -(def-markup-command (vcenter layout props arg) (markup?) +(define-builtin-markup-command (vcenter layout props arg) (markup?) "Align @code{arg} to its Y center. " (let* ((mol (interpret-markup layout props arg))) (ly:stencil-aligned-to mol Y CENTER))) -(def-markup-command (hcenter layout props arg) (markup?) +(define-builtin-markup-command (hcenter layout props arg) (markup?) "Align @code{arg} to its X center. " (let* ((mol (interpret-markup layout props arg))) (ly:stencil-aligned-to mol X CENTER))) -(def-markup-command (right-align layout props arg) (markup?) +(define-builtin-markup-command (right-align layout props arg) (markup?) "Align @var{arg} on its right edge. " (let* ((m (interpret-markup layout props arg))) (ly:stencil-aligned-to m X RIGHT))) -(def-markup-command (left-align layout props arg) (markup?) +(define-builtin-markup-command (left-align layout props arg) (markup?) "Align @var{arg} on its left edge. " (let* ((m (interpret-markup layout props arg))) (ly:stencil-aligned-to m X LEFT))) -(def-markup-command (general-align layout props axis dir arg) (integer? number? markup?) +(define-builtin-markup-command (general-align layout props axis dir arg) (integer? number? markup?) "Align @var{arg} in @var{axis} direction to the @var{dir} side." (let* ((m (interpret-markup layout props arg))) (ly:stencil-aligned-to m axis dir))) -(def-markup-command (halign layout props dir arg) (number? markup?) +(define-builtin-markup-command (halign layout props dir arg) (number? markup?) "Set horizontal alignment. If @var{dir} is @code{-1}, then it is left-aligned, while @code{+1} is right. Values in between interpolate alignment accordingly." @@ -629,7 +670,15 @@ alignment accordingly." (ly:stencil-aligned-to m X dir))) -(def-markup-command (pad-around layout props amount arg) (number? markup?) + +(define-builtin-markup-command (with-dimensions layout props x y arg) (number-pair? number-pair? markup?) + "Set the dimensions of @var{arg} to @var{x} and @var{y}." + + (let* ((m (interpret-markup layout props arg))) + (ly:make-stencil (ly:stencil-expr m) x y))) + + +(define-builtin-markup-command (pad-around layout props amount arg) (number? markup?) "Add padding @var{amount} all around @var{arg}. " @@ -643,7 +692,24 @@ alignment accordingly." (interval-widen x amount) (interval-widen y amount)) )) -(def-markup-command (put-adjacent layout props arg1 axis dir arg2) (markup? integer? ly:dir? markup?) + + +(define-builtin-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) + )) + + +(define-builtin-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}. " @@ -653,11 +719,50 @@ alignment accordingly." (ly:stencil-combine-at-edge m1 axis dir m2 0.0 0.0) )) +(define-builtin-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))) + + +(define-builtin-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)))) + + +(define-builtin-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 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (fromproperty layout props symbol) (symbol?) +(define-builtin-markup-command (fromproperty layout props symbol) (symbol?) "Read the @var{symbol} from property settings, and produce a stencil from the markup contained within. If @var{symbol} is not defined, it returns an empty markup" @@ -667,7 +772,7 @@ alignment accordingly." (ly:make-stencil '() '(1 . -1) '(1 . -1))))) -(def-markup-command (on-the-fly layout props procedure arg) (symbol? markup?) +(define-builtin-markup-command (on-the-fly layout props procedure arg) (symbol? markup?) "Apply the @var{procedure} markup command to @var{arg}. @var{procedure} should take a single argument." (let* ((anonymous-with-signature (lambda (layout props arg) (procedure layout props arg)))) @@ -678,7 +783,7 @@ alignment accordingly." -(def-markup-command (override layout props new-prop arg) (pair? markup?) +(define-builtin-markup-command (override layout props new-prop arg) (pair? markup?) "Add the first argument in to the property list. Properties may be any sort of property supported by @internalsref{font-interface} and @internalsref{text-interface}, for example @@ -690,31 +795,50 @@ any sort of property supported by @internalsref{font-interface} and " (interpret-markup layout (cons (list new-prop) props) arg)) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; files +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-builtin-markup-command (verbatim-file layout props name) (string?) + "Read the contents of a file, and include verbatimly" + + (interpret-markup + layout props + (if (ly:get-option 'safe) + "verbatim-file disabled in safe mode" + (let* + ((str (ly:gulp-file name)) + (lines (string-split str #\nl))) + + (make-typewriter-markup + (make-column-markup lines))) + ))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; fonts. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (bigger layout props arg) (markup?) +(define-builtin-markup-command (bigger layout props arg) (markup?) "Increase the font size relative to current setting" (interpret-markup layout props `(,fontsize-markup 1 ,arg))) -(def-markup-command (smaller layout props arg) (markup?) +(define-builtin-markup-command (smaller layout props arg) (markup?) "Decrease the font size relative to current setting" (interpret-markup layout props `(,fontsize-markup -1 ,arg))) -(def-markup-command larger (markup?) bigger-markup) +(define-builtin-markup-command larger (markup?) bigger-markup) -(def-markup-command (finger layout props arg) (markup?) +(define-builtin-markup-command (finger layout props arg) (markup?) "Set the argument as small numbers." (interpret-markup layout (cons '((font-size . -5) (font-encoding . fetaNumber)) props) arg)) -(def-markup-command (fontsize layout props increment arg) (number? markup?) +(define-builtin-markup-command (fontsize layout props increment arg) (number? markup?) "Add @var{increment} to the font-size. Adjust baseline skip accordingly." (let* ((fs (chain-assoc-get 'font-size props 0)) @@ -728,7 +852,7 @@ any sort of property supported by @internalsref{font-interface} and ;; FIXME -> should convert to font-size. -(def-markup-command (magnify layout props sz arg) (number? markup?) +(define-builtin-markup-command (magnify layout props sz arg) (number? markup?) "Set the font magnification for the its argument. In the following example, the middle A will be 10% larger: @example @@ -742,53 +866,122 @@ Use @code{\\fontsize} otherwise." (prepend-alist-chain 'font-magnification sz props) arg)) -(def-markup-command (bold layout props arg) (markup?) +(define-builtin-markup-command (bold layout props arg) (markup?) "Switch to bold font-series" (interpret-markup layout (prepend-alist-chain 'font-series 'bold props) arg)) -(def-markup-command (sans layout props arg) (markup?) +(define-builtin-markup-command (sans layout props arg) (markup?) "Switch to the sans serif family" (interpret-markup layout (prepend-alist-chain 'font-family 'sans props) arg)) -(def-markup-command (number layout props arg) (markup?) +(define-builtin-markup-command (number layout props arg) (markup?) "Set font family to @code{number}, which yields the font used for time signatures and fingerings. This font only contains numbers and some punctuation. It doesn't have any letters. " (interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaNumber props) arg)) -(def-markup-command (roman layout props arg) (markup?) +(define-builtin-markup-command (roman layout props arg) (markup?) "Set font family to @code{roman}." (interpret-markup layout (prepend-alist-chain 'font-family 'roman props) arg)) -(def-markup-command (huge layout props arg) (markup?) +(define-builtin-markup-command (huge layout props arg) (markup?) "Set font size to +2." (interpret-markup layout (prepend-alist-chain 'font-size 2 props) arg)) -(def-markup-command (large layout props arg) (markup?) +(define-builtin-markup-command (large layout props arg) (markup?) "Set font size to +1." (interpret-markup layout (prepend-alist-chain 'font-size 1 props) arg)) -(def-markup-command (normalsize layout props arg) (markup?) +(define-builtin-markup-command (normalsize layout props arg) (markup?) "Set font size to default." (interpret-markup layout (prepend-alist-chain 'font-size 0 props) arg)) -(def-markup-command (small layout props arg) (markup?) +(define-builtin-markup-command (small layout props arg) (markup?) "Set font size to -1." (interpret-markup layout (prepend-alist-chain 'font-size -1 props) arg)) -(def-markup-command (tiny layout props arg) (markup?) +(define-builtin-markup-command (tiny layout props arg) (markup?) "Set font size to -2." (interpret-markup layout (prepend-alist-chain 'font-size -2 props) arg)) -(def-markup-command (teeny layout props arg) (markup?) +(define-builtin-markup-command (teeny layout props arg) (markup?) "Set font size to -3." (interpret-markup layout (prepend-alist-chain 'font-size -3 props) arg)) -(def-markup-command (caps layout props arg) (markup?) +(define-builtin-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)) -(def-markup-command (dynamic layout props arg) (markup?) +;; Poor man's caps +(define-builtin-markup-command (smallCaps layout props text) (markup?) + "Turn @code{text}, which should be a string, to small caps. +@example +\\markup \\smallCaps \"Text between double quotes\" +@end example +" + (define (make-small-caps-markup chars) + (cond ((null? chars) + (markup)) + ((char-whitespace? (car chars)) + (markup #:fontsize -2 #:simple (string-upcase (list->string (cdr chars))))) + (else + (markup #:hspace -1 + #:fontsize -2 #:simple (string-upcase (list->string chars)))))) + (define (make-not-small-caps-markup chars) + (cond ((null? chars) + (markup)) + ((char-whitespace? (car chars)) + (markup #:simple (list->string (cdr chars)))) + (else + (markup #:hspace -1 + #:simple (list->string chars))))) + (define (small-caps-aux done-markups current-chars rest-chars small? after-space?) + (cond ((null? rest-chars) + ;; the end of the string: build the markup + (make-line-markup (reverse! (cons ((if small? + make-small-caps-markup + make-not-small-caps-markup) + (reverse! current-chars)) + done-markups)))) + ((char-whitespace? (car rest-chars)) + ;; a space char. + (small-caps-aux done-markups current-chars (cdr rest-chars) small? #t)) + ((or (and small? (char-lower-case? (car rest-chars))) + (and (not small?) (not (char-lower-case? (car rest-chars))))) + ;; same case + ;; add the char to the current char list + (small-caps-aux done-markups + (cons (car rest-chars) + (if after-space? + (cons #\space current-chars) + current-chars)) + (cdr rest-chars) + small? + #f)) + (else + ;; case change + ;; make a markup with current chars, and start a new list with new char + (small-caps-aux (cons ((if small? + make-small-caps-markup + make-not-small-caps-markup) + (reverse! current-chars)) + done-markups) + (if after-space? + (list (car rest-chars) #\space) + (list (car rest-chars))) + (cdr rest-chars) + (not small?) + #f)))) + (interpret-markup layout props (small-caps-aux (list) + (list) + (cons #\space (string->list text)) + #f + #f))) + +(define-builtin-markup-command (caps layout props arg) (markup?) + (interpret-markup layout props (make-smallCaps-markup arg))) + +(define-builtin-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 normal words (like ``pi@`{u}'') should be done in a different font. The @@ -796,7 +989,7 @@ recommend font for this is bold and italic" (interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg)) -(def-markup-command (text layout props arg) (markup?) +(define-builtin-markup-command (text layout props arg) (markup?) "Use a text font instead of music symbol or music alphabet font." ;; ugh - latin1 @@ -804,26 +997,26 @@ recommend font for this is bold and italic" arg)) -(def-markup-command (italic layout props arg) (markup?) +(define-builtin-markup-command (italic layout props arg) (markup?) "Use italic @code{font-shape} for @var{arg}. " (interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg)) -(def-markup-command (typewriter layout props arg) (markup?) +(define-builtin-markup-command (typewriter layout props arg) (markup?) "Use @code{font-family} typewriter for @var{arg}." (interpret-markup layout (prepend-alist-chain 'font-family 'typewriter props) arg)) -(def-markup-command (upright layout props arg) (markup?) +(define-builtin-markup-command (upright layout props arg) (markup?) "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?) +(define-builtin-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?) +(define-builtin-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 @@ -836,44 +1029,45 @@ recommend font for this is bold and italic" ;; symbols. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (doublesharp layout props) () +(define-builtin-markup-command (doublesharp layout props) () "Draw a double sharp symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.4"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get 1 standard-alteration-glyph-name-alist "")))) -(def-markup-command (sesquisharp layout props) () +(define-builtin-markup-command (sesquisharp layout props) () "Draw a 3/2 sharp symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.3"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get 3/4 standard-alteration-glyph-name-alist "")))) + -(def-markup-command (sharp layout props) () +(define-builtin-markup-command (sharp layout props) () "Draw a sharp symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.2"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get 1/2 standard-alteration-glyph-name-alist "")))) -(def-markup-command (semisharp layout props) () +(define-builtin-markup-command (semisharp layout props) () "Draw a semi sharp symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.1"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get 1/4 standard-alteration-glyph-name-alist "")))) -(def-markup-command (natural layout props) () +(define-builtin-markup-command (natural layout props) () "Draw a natural symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.0"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get 0 standard-alteration-glyph-name-alist "")))) -(def-markup-command (semiflat layout props) () +(define-builtin-markup-command (semiflat layout props) () "Draw a semiflat." - (interpret-markup layout props (markup #:musicglyph "accidentals.M1"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get -1/4 standard-alteration-glyph-name-alist "")))) -(def-markup-command (flat layout props) () +(define-builtin-markup-command (flat layout props) () "Draw a flat symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.M2"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get -1/2 standard-alteration-glyph-name-alist "")))) -(def-markup-command (sesquiflat layout props) () +(define-builtin-markup-command (sesquiflat layout props) () "Draw a 3/2 flat symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.M3"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get -3/4 standard-alteration-glyph-name-alist "")))) -(def-markup-command (doubleflat layout props) () +(define-builtin-markup-command (doubleflat layout props) () "Draw a double flat symbol." - (interpret-markup layout props (markup #:musicglyph "accidentals.M4"))) + (interpret-markup layout props (markup #:musicglyph (assoc-get -1 standard-alteration-glyph-name-alist "")))) -(def-markup-command (with-color layout props color arg) (color? markup?) +(define-builtin-markup-command (with-color layout props color arg) (color? markup?) "Draw @var{arg} in color specified by @var{color}" (let* ((stil (interpret-markup layout props arg))) @@ -888,7 +1082,7 @@ recommend font for this is bold and italic" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (arrow-head layout props axis direction filled) +(define-builtin-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* @@ -903,25 +1097,25 @@ recommend font for this is bold and italic" props)) name))) -(def-markup-command (musicglyph layout props glyph-name) (string?) +(define-builtin-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. +#\"accidentals.natural\"} will select the natural sign from the music font. See @usermanref{The Feta font} for a complete listing of the possible glyphs." (ly:font-get-glyph (ly:paper-get-font layout (cons '((font-encoding . fetaMusic)) props)) glyph-name)) -(def-markup-command (lookup layout props glyph-name) (string?) +(define-builtin-markup-command (lookup layout props glyph-name) (string?) "Lookup a glyph by name." (ly:font-get-glyph (ly:paper-get-font layout props) glyph-name)) -(def-markup-command (char layout props num) (integer?) +(define-builtin-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)) @@ -945,18 +1139,71 @@ letter 'A'." (number->markletter-string vec (remainder n lst))) (make-string 1 (vector-ref vec n))))) -(def-markup-command (markletter layout props num) (integer?) +(define-builtin-markup-command (markletter layout props num) (integer?) "Make a markup letter for @var{num}. The letters start with A to Z (skipping I), and continues with double letters." - (Text_interface::interpret_markup layout props + (ly:text-interface::interpret-markup layout props (number->markletter-string number->mark-letter-vector num))) -(def-markup-command (markalphabet layout props num) (integer?) +(define-builtin-markup-command (markalphabet layout props num) (integer?) "Make a markup letter for @var{num}. The letters start with A to Z and continues with double letters." - (Text_interface::interpret_markup layout props + (ly:text-interface::interpret-markup layout props (number->markletter-string number->mark-alphabet-vector num))) + + +(define-builtin-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)) + (is-sane (and (interval-sane? num-x) (interval-sane? num-y))) + + (slash-stencil + (if is-sane + (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) + #f))) + + (set! slash-stencil + (cond + ((not (ly:stencil? slash-stencil)) #f) + ((= 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))) + + (if slash-stencil + (set! number-stencil + (ly:stencil-add number-stencil slash-stencil)) + + (ly:warning "invalid number for slashed digit ~a" num)) + + + number-stencil)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; the note command. @@ -965,27 +1212,51 @@ letter 'A'." ;; TODO: better syntax. -(def-markup-command (note-by-number layout props log dot-count dir) (number? number? number?) +(define-builtin-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) + (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 (* 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) @@ -1000,7 +1271,7 @@ letter 'A'." (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) @@ -1038,7 +1309,7 @@ letter 'A'." (if dots (string-length dots) 0))) (ly:error (_ "not a valid duration string: ~a") duration-string)))) -(def-markup-command (note layout props duration dir) (string? number?) +(define-builtin-markup-command (note layout props duration dir) (string? number?) "This produces a note with a stem pointing in @var{dir} direction, with the @var{duration} for the note head type and augmentation dots. For example, @code{\\note #\"4.\" #-0.75} creates a dotted quarter note, with @@ -1051,16 +1322,27 @@ a shortened down stem." ;; translating. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (lower layout props amount arg) (number? markup?) +(define-builtin-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)) -(def-markup-command (raise layout props amount arg) (number? markup?) +(define-builtin-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-builtin-markup-command (raise layout props amount arg) (number? markup?) " Raise @var{arg}, by the distance @var{amount}. A negative @var{amount} indicates lowering, see also @code{\\lower}. @@ -1079,36 +1361,41 @@ positions it next to the staff cancels any shift made with and/or @code{extra-offset} properties. " (ly:stencil-translate-axis (interpret-markup layout props arg) amount Y)) -(def-markup-command (fraction layout props arg1 arg2) (markup? markup?) +(define-builtin-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)))) -(def-markup-command (normal-size-super layout props arg) (markup?) +(define-builtin-markup-command (normal-size-super layout props arg) (markup?) "Set @var{arg} in superscript with a normal font size." (ly:stencil-translate-axis (interpret-markup layout props arg) (* 0.5 (chain-assoc-get 'baseline-skip props)) Y)) -(def-markup-command (super layout props arg) (markup?) +(define-builtin-markup-command (super layout props arg) (markup?) " @cindex raising text @cindex lowering text @@ -1134,7 +1421,7 @@ Raising and lowering texts can be done with @code{\\super} and (* 0.5 (chain-assoc-get 'baseline-skip props)) Y)) -(def-markup-command (translate layout props offset arg) (number-pair? markup?) +(define-builtin-markup-command (translate layout props offset arg) (number-pair? markup?) "This translates an object. Its first argument is a cons of numbers @example A \\translate #(cons 2 -3) @{ B C @} D @@ -1148,7 +1435,7 @@ that. (ly:stencil-translate (interpret-markup layout props arg) offset)) -(def-markup-command (sub layout props arg) (markup?) +(define-builtin-markup-command (sub layout props arg) (markup?) "Set @var{arg} in subscript." (ly:stencil-translate-axis (interpret-markup @@ -1158,7 +1445,7 @@ that. (* -0.5 (chain-assoc-get 'baseline-skip props)) Y)) -(def-markup-command (normal-size-sub layout props arg) (markup?) +(define-builtin-markup-command (normal-size-sub layout props arg) (markup?) "Set @var{arg} in subscript, in a normal font size." (ly:stencil-translate-axis (interpret-markup layout props arg) @@ -1169,22 +1456,28 @@ that. ;; brackets. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def-markup-command (hbracket layout props arg) (markup?) +(define-builtin-markup-command (hbracket layout props arg) (markup?) "Draw horizontal brackets around @var{arg}." (let ((th 0.1) ;; todo: take from GROB. (m (interpret-markup layout props arg))) (bracketify-stencil m X th (* 2.5 th) th))) -(def-markup-command (bracket layout props arg) (markup?) +(define-builtin-markup-command (bracket layout props arg) (markup?) "Draw vertical brackets around @var{arg}." (let ((th 0.1) ;; todo: take from GROB. (m (interpret-markup layout props arg))) (bracketify-stencil m Y th (* 2.5 th) th))) -(def-markup-command (bracketed-y-column layout props indices args) +(define-builtin-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)))