X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffret-diagrams.scm;h=2792ef7956197d0d3dcb5bf2518fe5f81944ad47;hb=480a711ef5165e3d38839c0b6c90ec931bce94d3;hp=39b31d8cacdd12babb232be5cc25e694c579e800;hpb=7becb60ed0708eecd8a8c67a7d8899fe92edc0f2;p=lilypond.git diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm index 39b31d8cac..2792ef7956 100644 --- a/scm/fret-diagrams.scm +++ b/scm/fret-diagrams.scm @@ -2,10 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004 Carl D. Sorensen - -(define ly:paper-lookup ly:output-def-lookup) ; compat for 2.3, remove when using 2.2 -(define my-font-encoding 'ec ) +;;;; (c) 2004--2006 Carl D. Sorensen (define (fret-parse-marking-list marking-list fret-count) (let* ((fret-range (list 1 fret-count)) @@ -24,7 +21,8 @@ ((eq? my-code 'place-fret) (set! dot-list (cons* (cdr my-item) dot-list)))) (parse-item (cdr mylist))))) - ; calculate fret-range + + ;; calculate fret-range (let ((maxfret 0) (minfret 99)) (let updatemax ((fret-list dot-list)) (if (null? fret-list) @@ -43,7 +41,9 @@ (acons 'barre-list barre-list (acons 'dot-list dot-list (acons 'xo-list xo-list '())))))) - + + + (define (subtract-base-fret base-fret dot-list) "Subtract @var{base-fret} from every fret in @var{dot-list}" (if (null? dot-list) @@ -54,9 +54,19 @@ (third this-list))) (subtract-base-fret base-fret (cdr dot-list)))))) +(define (sans-serif-stencil layout props mag text) +"create a stencil in sans-serif font based on @var{layout} and @var{props} +with magnification @varr{mag} of the string @var{text}." + (let* ((my-props (prepend-alist-chain 'font-size (stepmag mag) + (prepend-alist-chain 'font-family 'sans props)))) + (interpret-markup layout my-props text))) + + (define (draw-strings string-count fret-range th size) -"Draw the strings (vertical lines) for a fret diagram with @var{string-count} strings and frets as indicated - in @var{fret-range}. Line thickness is given by @var{th}, fret & string spacing by @var{size}. " +"Draw the strings (vertical lines) for a fret diagram with +@var{string-count} strings and frets as indicated in @var{fret-range}. +Line thickness is given by @var{th}, fret & string spacing by +@var{size}. " (let* ((fret-count (+ (- (cadr fret-range) (car fret-range)) 1)) (sl (* (+ fret-count 1) size)) (sth (* size th)) @@ -73,8 +83,9 @@ gap 0)))) (define (draw-fret-lines fret-count string-count th size) - "Draw @var{fret-count} frets (horizontal lines) for a fret diagram with @var{string-count} strings. - Line thickness is given by @var{th}, fret & string spacing by @var{size}. " + "Draw @var{fret-count} frets (horizontal lines) for a fret diagram +with @var{string-count} strings. Line thickness is given by @var{th}, +fret & string spacing by @var{size}. " (let* ((fret-length (* (- string-count 1) size)) (sth (* size th)) (half-thickness (* sth 0.5)) @@ -105,9 +116,11 @@ x-extent y-extent))) -(define (draw-frets paper props fret-range string-count th size) - "Draw the frets (horizontal lines) for a fret diagram with @var{string-count} strings and frets as indicated - in @var{fret-range}. Line thickness is given by @var{th}, fret & string spacing by @var{size}. " +(define (draw-frets layout props fret-range string-count th size) + "Draw the frets (horizontal lines) for a fret diagram with +@var{string-count} strings and frets as indicated in @var{fret-range}. +Line thickness is given by @var{th}, fret & string spacing by +@var{size}. " (let* ((fret-count (+ (- (cadr fret-range) (car fret-range)) 1)) (fret-length (* (- string-count 1) size)) (half-thickness (* th 0.5)) @@ -120,28 +133,21 @@ (- size th) 0))) -(define (centered-stencil stencil) - "Center stencil @var{stencil} in both the X and Y directions" - (let* ((output-stencil stencil)) -; (if (= (cadr (ly:version)) 3) - (begin - (ly:stencil-align-to! output-stencil Y 0) - (ly:stencil-align-to! output-stencil X 0) - output-stencil))) -; (ly:stencil-align-to (ly:stencil-align-to text-stencil X 0) Y 0)))) - -(define (draw-dots paper props string-count fret-range size finger-code dot-position dot-radius dot-list) +(define (draw-dots layout props string-count fret-range size finger-code + dot-position dot-radius dot-thickness dot-list) "Make dots for fret diagram." + (let* ((scale-dot-radius (* size dot-radius)) + (scale-dot-thick (* size dot-thickness)) (dot-color (chain-assoc-get 'dot-color props 'black)) ; (finger-xoffset (chain-assoc-get 'finger-xoffset props -0.25)) ; (finger-yoffset (chain-assoc-get 'finger-yoffset props (- size))) (finger-xoffset -0.25) - (finger-yoffset (- size)) + (finger-yoffset (- (* size 0.5))) ; (dot-label-font-mag (* scale-dot-radius (chain-assoc-get 'dot-label-font-mag props 1.0))) (dot-label-font-mag scale-dot-radius) ; (string-label-font-mag (* size (chain-assoc-get 'label-font-mag props 0.7))) - (string-label-font-mag (* size 0.7)) + (string-label-font-mag (* size 0.6)) (fret-count (+ (- (cadr fret-range) (car fret-range) 1))) (mypair (car dot-list)) (restlist (cdr dot-list)) @@ -152,84 +158,77 @@ (extent (cons (- scale-dot-radius) scale-dot-radius)) (finger (caddr mypair)) (finger (if (number? finger) (number->string finger) finger)) - (string-label-font - (ly:paper-get-font paper `(((font-family . sans) - (font-encoding . ,ss-font-encoding) - (font-series . medium) - (font-shape . upright) - (font-size . ,(stepmag string-label-font-mag)))))) - (dot-label-font - (ly:paper-get-font paper `(((font-family . sans) - (font-encoding . ,ss-font-encoding) - (font-series . medium) - (font-shape . upright) - (font-size . ,(stepmag dot-label-font-mag)))))) (dotstencil (if (eq? dot-color 'white) - (begin - (ly:make-stencil (list 'white-dot 0 0 scale-dot-radius) extent extent)) - (ly:make-stencil (list 'dot 0 0 scale-dot-radius ) extent extent))) - (positioned-dot (ly:stencil-translate-axis - (ly:stencil-translate-axis dotstencil xpos X) - ypos Y)) + (ly:stencil-add + (make-circle-stencil scale-dot-radius scale-dot-thick #t) + (ly:stencil-in-color + (make-circle-stencil + (- scale-dot-radius (* 0.5 scale-dot-thick)) 0 #t) + 1 1 1)) + (make-circle-stencil scale-dot-radius scale-dot-thick #t))) + (positioned-dot (begin + ;(display dotstencil) + (ly:stencil-translate-axis + (ly:stencil-translate-axis dotstencil xpos X) + ypos Y))) + (labeled-dot-stencil (if (or (eq? finger '())(eq? finger-code 'none)) positioned-dot - (if (eq? finger-code 'in-dot) - (let* ((dot-proc (if (eq? dot-color 'white) 'white-dot 'dot))) - (ly:stencil-add - (ly:stencil-translate-axis - (ly:stencil-translate-axis - (if (eq? dot-color 'white) - (centered-stencil (fontify-text dot-label-font finger)) - (centered-stencil (fontify-text-white dot-label-font-mag - dot-label-font finger))) - xpos X) - ypos Y) - (ly:stencil-translate-axis - (ly:stencil-translate-axis - (ly:make-stencil (list dot-proc 0 0 scale-dot-radius) extent extent) + (if (eq? finger-code 'in-dot) + (let* ((finger-label (centered-stencil + (sans-serif-stencil layout props + dot-label-font-mag finger)))) + (ly:stencil-translate-axis + (ly:stencil-translate-axis + (ly:stencil-add + dotstencil + (if (eq? dot-color 'white) + finger-label + (ly:stencil-in-color finger-label 1 1 1))) xpos X) - ypos Y))) + ypos Y)) (if (eq? finger-code 'below-string) (ly:stencil-add positioned-dot (ly:stencil-translate-axis (ly:stencil-translate-axis - (centered-stencil (fontify-text string-label-font finger)) xpos X) - (* size finger-yoffset) Y)) + (centered-stencil (sans-serif-stencil layout props + string-label-font-mag finger)) + xpos X) + (* size finger-yoffset) Y)) ;unknown finger-code positioned-dot))))) (if (null? restlist) labeled-dot-stencil (ly:stencil-add - (draw-dots paper props string-count fret-range size finger-code - dot-position dot-radius restlist) + (draw-dots layout props string-count fret-range size finger-code + dot-position dot-radius dot-thickness restlist) labeled-dot-stencil)))) -(define (draw-xo paper props string-count fret-range size xo-list) +(define (draw-xo layout props string-count fret-range size xo-list) "Put open and mute string indications on diagram, as contained in @var{xo-list}." (let* ((fret-count (+ (- (cadr fret-range) (car fret-range) 1))) ; (xo-font-mag (* size (chain-assoc-get 'xo-font-magnification props 0.5))) (xo-font-mag (* size 0.5)) ; (xo-horizontal-offset (* size (chain-assoc-get 'xo-horizontal-offset props -0.35))) (xo-horizontal-offset (* size -0.35)) - (font (ly:paper-get-font paper `(((font-encoding . ,ss-font-encoding)(font-family . sans) - (font-series . medium) (font-shape . upright) - (font-size . ,(stepmag (* size xo-font-mag))))))) (mypair (car xo-list)) (restlist (cdr xo-list)) (glyph-string (if (eq? (car mypair) 'mute) "X" "O")) (xpos (+ (* (- string-count (cadr mypair)) size) xo-horizontal-offset )) - (glyph-stencil (ly:stencil-translate-axis (fontify-text font glyph-string) xpos X))) + (glyph-stencil (ly:stencil-translate-axis + (sans-serif-stencil layout props (* size xo-font-mag) glyph-string) xpos X))) (if (null? restlist) glyph-stencil (ly:stencil-add - (draw-xo paper props string-count fret-range size restlist) + (draw-xo layout props string-count fret-range size restlist) glyph-stencil)))) (define (make-bezier-sandwich-list left right bottom height thickness) -" Make the argument list for a horizontal bezier sandwich from @var{left} to @var{right} with a bottom at @var{bottom}, - a height of @var{height}, and a thickness of @var{thickness}." +" Make the argument list for a horizontal bezier sandwich from +@var{left} to @var{right} with a bottom at @var{bottom}, a height of +@var{height}, and a thickness of @var{thickness}." (let* ((width (+ (- right left) 1)) (x1 (+ (* width thickness) left)) (x2 (- right (* width thickness))) @@ -240,77 +239,70 @@ (list (cons x1 bottom-control-point-height) (cons x2 bottom-control-point-height) (cons right bottom) (cons left bottom) (cons x2 top-control-point-height) (cons x1 top-control-point-height) (cons left bottom) (cons right bottom)))) -(define (draw-barre paper props string-count fret-range size finger-code dot-position dot-radius barre-list) +(define (draw-barre layout props string-count fret-range size finger-code dot-position dot-radius barre-list) "Create barre indications for a fret diagram" (if (not (null? barre-list)) (let* ((string1 (caar barre-list)) (string2 (cadar barre-list)) - (fret (caddar barre-list)) + (fret (caddar barre-list)) (barre-type (chain-assoc-get 'barre-type props 'curved)) (scale-dot-radius (* size dot-radius)) (barre-vertical-offset (chain-assoc-get 'barre-vertical-offset props 0.5)) - ; 2 is 1 for empty fret at bottom of figure + 1 for interval (top-fret - fret + 1) -- not an arbitrary constant - (dot-center-y (* size (- (+ 2 (- (cadr fret-range) fret))dot-position) )) - (bottom (+ dot-center-y (* barre-vertical-offset scale-dot-radius))) + ;; 2 is 1 for empty fret at bottom of figure + 1 for interval (top-fret - fret + 1) -- not an arbitrary constant + (dot-center-y (* size + (- (+ 2 (- (cadr fret-range) fret)) dot-position))) + (bottom (+ dot-center-y (* barre-vertical-offset scale-dot-radius))) (left (* size (- string-count string1))) (right (* size (- string-count string2))) -; (bezier-thick (chain-assoc-get 'bezier-thickness props 0.1)) +;; (bezier-thick (chain-assoc-get 'bezier-thickness props 0.1)) (bezier-thick 0.1) -; (bezier-height (chain-assoc-get 'bezier-height props 0.5)) +;; (bezier-height (chain-assoc-get 'bezier-height props 0.5)) (bezier-height 0.5) (bezier-list (make-bezier-sandwich-list left right bottom (* size bezier-height) (* size bezier-thick))) (barre-stencil (if (eq? barre-type 'straight) (ly:make-stencil (list 'draw-line (* size dot-radius) left dot-center-y right dot-center-y) (cons left right) (cons (- dot-center-y scale-dot-radius) (+ dot-center-y scale-dot-radius))) - (ly:make-stencil (list 'bezier-sandwich `(quote ,bezier-list) (* size bezier-thick) ) + (ly:make-stencil (list 'bezier-sandwich `(quote ,bezier-list) (* size bezier-thick)) (cons left right) (cons bottom (+ bottom (* size bezier-height))))))) (if (not (null? (cdr barre-list))) (ly:stencil-add barre-stencil - (draw-barre paper props string-count fret-range size finger-code + (draw-barre layout props string-count fret-range size finger-code dot-position dot-radius (cdr barre-list))) barre-stencil )))) - (define (stepmag mag) "Calculate the font step necessary to get a desired magnification" (* 6 (/ (log mag) (log 2)))) -(define (label-fret paper props string-count fret-range size) +(define (label-fret layout props string-count fret-range size) "Label the base fret on a fret diagram" (let* ((base-fret (car fret-range)) ; (label-font-mag (chain-assoc-get 'label-font-mag props 0.7)) - (label-font-mag 0.7) + (label-font-mag 0.5) ; (label-vertical-offset (chain-assoc-get 'fret-label-vertical-offset props -0.2)) (label-vertical-offset -0.2) (number-type (chain-assoc-get 'number-type props 'roman-lower)) (fret-count (+ (- (cadr fret-range) (car fret-range)) 1)) - (font (ly:paper-get-font paper `(((font-encoding . ,ss-font-encoding) - (font-family . sans) - (font-series . medium) - (font-shape . upright) - (font-size . ,(stepmag (* size label-font-mag))))))) (label-text - (case number-type - ('roman-lower (format #f "~(~:@r~)" base-fret)) - ('roman-upper (format #f "~:@r" base-fret)) - ('arabic (format #f "~d" base-fret)) - (else (format #f "~(~:@r~)" base-fret))))) + (cond + ((equal? number-type 'roman-lower) (format #f "~(~:@r~)" base-fret)) + ((equal? number-type 'roman-upper) (format #f "~:@r" base-fret)) + ((equal? 'arabic number-type) (format #f "~d" base-fret)) + (else (format #f "~(~:@r~)" base-fret))))) (ly:stencil-translate-axis - (fontify-text font label-text) + (sans-serif-stencil layout props (* size label-font-mag) label-text) (* size (+ fret-count label-vertical-offset)) Y))) -(def-markup-command (fret-diagram-verbose paper props marking-list) +(define-markup-command (fret-diagram-verbose layout props marking-list) (list?) "Make a fret diagram containing the symbols indicated in @var{marking-list} - Syntax: \\fret-diagram marking-list - For example, @example - \\markup \\fret-diagram #'((mute 6) (mute 5) (open 4) + \\markup \\fret-diagram-verbose #'((mute 6) (mute 5) (open 4) (place-fret 3 2) (place-fret 2 3) (place-fret 1 2)) @end example @@ -328,16 +320,24 @@ Place a small 'o' at the top of string @var{string-number} Place a barre indicator (much like a tie) from string @var{start-string}to string @var{end-string} at fret @var{fret-number} @item (place-fret string-number fret-number finger-value) -Place a fret playing indication on string @var{string-number} at fret @var{fret-number} with an optional -fingering label @var{finger-value}. By default, the fret playing indicator is a solid dot. This can be -changed by setting the value of the variable @var{dot-color}. If the @var{finger} -part of the place-fret element is present, @var{finger-value} will be displayed according to the setting of the variable -@var{finger-code}. There is no limit to the number of fret indications per string. + +Place a fret playing indication on string @var{string-number} at fret +@var{fret-number} with an optional fingering label @var{finger-value}. +By default, the fret playing indicator is a solid dot. This can be +changed by setting the value of the variable @var{dot-color}. If the +@var{finger} part of the place-fret element is present, +@var{finger-value} will be displayed according to the setting of the +variable @var{finger-code}. There is no limit to the number of fret +indications per string. + + + + @end table " - (make-fret-diagram paper props marking-list)) + (make-fret-diagram layout props marking-list)) -(define (make-fret-diagram paper props marking-list) +(define (make-fret-diagram layout props marking-list) " Make a fret diagram markup" (let* ( ; note: here we get items from props that are needed in this routine, or that are needed in more than one @@ -354,13 +354,13 @@ part of the place-fret element is present, @var{finger-value} will be displayed (default-dot-position (if (eq? finger-code 'in-dot) (- 0.95 default-dot-radius) 0.6)) ; move up to make room for bigger if labeled (dot-radius (chain-assoc-get 'dot-radius props default-dot-radius)) ; needed for both draw-dots and draw-barre (dot-position (chain-assoc-get 'dot-position props default-dot-position)) ; needed for both draw-dots and draw-barre - (th (* (ly:paper-lookup paper 'linethickness) + (th (* (ly:output-def-lookup layout 'line-thickness) (chain-assoc-get 'thickness props 0.5))) ; needed for both draw-frets and draw-strings (alignment (chain-assoc-get 'align-dir props -0.4)) ; needed only here ; (xo-padding (* th (chain-assoc-get 'padding props 2))) ; needed only here - (label-space 0.25) - (xo-padding (* th 2)) + (label-space (* 0.25 size)) + (xo-padding (* th size 5)) (label-dir (chain-assoc-get 'label-dir props RIGHT)) (parameters (fret-parse-marking-list marking-list fret-count)) (dot-list (cdr (assoc 'dot-list parameters))) @@ -369,33 +369,36 @@ part of the place-fret element is present, @var{finger-value} will be displayed (barre-list (cdr (assoc 'barre-list parameters))) (fret-diagram-stencil (ly:stencil-add (draw-strings string-count fret-range th size) - (draw-frets paper props fret-range string-count th size)))) + (draw-frets layout props fret-range string-count th size)))) (if (not (null? barre-list)) (set! fret-diagram-stencil (ly:stencil-add - (draw-barre paper props string-count fret-range size finger-code + (draw-barre layout props string-count fret-range size finger-code dot-position dot-radius barre-list) fret-diagram-stencil))) (if (not (null? dot-list)) (set! fret-diagram-stencil (ly:stencil-add - (draw-dots paper props string-count fret-range size finger-code - dot-position dot-radius dot-list) - fret-diagram-stencil))) + fret-diagram-stencil + (draw-dots layout props string-count fret-range size finger-code + dot-position dot-radius th dot-list)))) (if (not (null? xo-list)) (set! fret-diagram-stencil (ly:stencil-combine-at-edge fret-diagram-stencil Y UP - (draw-xo paper props string-count fret-range size xo-list) xo-padding 0))) + (draw-xo layout props string-count fret-range size xo-list) xo-padding 0))) (if (> (car fret-range) 1) (set! fret-diagram-stencil (ly:stencil-combine-at-edge fret-diagram-stencil X label-dir - (label-fret paper props string-count fret-range size) label-space 0))) - (ly:stencil-align-to! fret-diagram-stencil X alignment) - fret-diagram-stencil)) + (label-fret layout props string-count fret-range size) label-space 0))) + (ly:stencil-aligned-to fret-diagram-stencil X alignment) + )) -(def-markup-command (fret-diagram paper props definition-string) +(define-markup-command (fret-diagram layout props definition-string) (string?) - "Syntax: \\fret-diagram definition-string - -eg: \\markup \\fret-diagram #\"s:0.75;6-x;5-x;4-o;3-2;2-3;1-2;\" + " +Example + +@example + \\markup \\fret-diagram #\"s:0.75;6-x;5-x;4-o;3-2;2-3;1-2;\" +@end example for fret spacing 3/4 of staff space, D chord diagram @@ -450,7 +453,7 @@ Note: There is no limit to the number of fret indications per string. " (let ((definition-list (fret-parse-definition-string props definition-string))) - (make-fret-diagram paper (car definition-list) (cdr definition-list)))) + (make-fret-diagram layout (car definition-list) (cdr definition-list)))) (define (fret-parse-definition-string props definition-string) "parse a fret diagram string and return a pair containing: @@ -508,7 +511,7 @@ Note: There is no limit to the number of fret indications per string. (define (get-numeric-from-key keystring) "Get the numeric value from a key of the form k:val" - (string->number (substring keystring 2 (string-length keystring) ))) + (string->number (substring keystring 2 (string-length keystring)))) (define (numerify mylist) "Convert string values to numeric or character" @@ -519,13 +522,15 @@ Note: There is no limit to the number of fret indications per string. (cons* numeric-value (numerify (cdr mylist))) (cons* (car (string->list (car mylist))) (numerify (cdr mylist))))))) -(def-markup-command (fret-diagram-terse paper props definition-string) +(define-markup-command (fret-diagram-terse layout props definition-string) (string?) "Make a fret diagram markup using terse string-based syntax. -Syntax: \\fret-diagram-terse definition-string - -eg: \\markup \\fret-diagram #\"x;x;o;2;3;2;\" for a D chord diagram. +Example +@example + \\markup \\fret-diagram-terse #\"x;x;o;2;3;2;\" +@end example +for a D chord diagram. Syntax rules for @var{definition-string}: @itemize @bullet @@ -558,7 +563,7 @@ with \"-(\" to start a barre and \"-)\" to end the barre. @end itemize" ;TODO -- change syntax to fret\string-finger (let ((definition-list (fret-parse-terse-definition-string props definition-string))) - (make-fret-diagram paper (car definition-list) (cdr definition-list)))) + (make-fret-diagram layout (car definition-list) (cdr definition-list)))) (define (fret-parse-terse-definition-string props definition-string) "parse a fret diagram string that uses terse syntax; return a pair containing: