From c9284cfe3b1fa3512f19c4e053077339c20d5662 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 26 Dec 2004 21:19:41 +0000 Subject: [PATCH] *** empty log message *** --- scm/define-markup-commands.scm | 15 +++++++-------- scm/define-music-types.scm | 11 +++++------ scm/documentation-lib.scm | 12 ++++++------ scm/framework-tex.scm | 4 ++-- scm/new-markup.scm | 6 +++--- scm/output-pdf.scm | 30 +++++++++++++++--------------- scm/output-pdftex.scm | 12 ++++++------ scm/output-sketch.scm | 32 ++++++++++++++++---------------- scm/output-tex.scm | 12 ++++++------ 9 files changed, 66 insertions(+), 68 deletions(-) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index e59c01574e..c8e05e405e 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -642,7 +642,6 @@ any sort of property supported by @internalsref{font-interface} and (def-markup-command larger (markup?) bigger-markup) - (def-markup-command (box layout props arg) (markup?) "Draw a box round @var{arg}. Looks at @code{thickness} and @code{box-padding} properties to determine line thickness and padding @@ -652,7 +651,7 @@ around the markup." (m (interpret-markup layout props arg))) (box-stencil m th pad))) - ;FIXME: is this working? +;;FIXME: is this working? (def-markup-command (strut layout props) () "Create a box of the same height as the space in the current font." @@ -673,11 +672,11 @@ around the markup." (define (number->markletter-string n) "Double letters for big marks." - (let* ((l (vector-length number->mark-letter-vector))) + (let* ((lst (vector-length number->mark-letter-vector))) - (if (>= n l) - (string-append (number->markletter-string (1- (quotient n l))) - (number->markletter-string (remainder n l))) + (if (>= n lst) + (string-append (number->markletter-string (1- (quotient n lst))) + (number->markletter-string (remainder n lst))) (make-string 1 (vector-ref number->mark-letter-vector n))))) @@ -693,8 +692,8 @@ around the markup." "Make a column of the markups in @var{args}, putting brackets around the elements marked in @var{indices}, which is a list of numbers." - (define (sublist l start stop) - (take (drop l start) (- (1+ stop) start)) ) + (define (sublist lst start stop) + (take (drop lst start) (- (1+ stop) start)) ) (define (stencil-list-extent ss axis) (cons diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 600989c549..5784760d32 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -772,12 +772,11 @@ Syntax: @code{\\\\}") (set-object-property! (car x) 'music-description (cdr (assq 'description (cdr x)))) - (let ((l (cdr x))) - (set! l (assoc-set! l 'name (car x))) - (set! l (assq-remove! l 'description)) - (hashq-set! music-name-to-property-table (car x) l) - (cons (car x) l) - )) + (let ((lst (cdr x))) + (set! lst (assoc-set! lst 'name (car x))) + (set! lst (assq-remove! lst 'description)) + (hashq-set! music-name-to-property-table (car x) lst) + (cons (car x) lst))) music-descriptions)) (define-public (make-music name . music-properties) diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm index 10c66c36a5..c7b276d07e 100644 --- a/scm/documentation-lib.scm +++ b/scm/documentation-lib.scm @@ -147,14 +147,14 @@ "Add ref to X" (string-append "@ref{" x "}")) -(define (human-listify l) - "Produce a textual enumeration from L, a list of strings" +(define (human-listify lst) + "Produce a textual enumeration from LST, a list of strings" (cond - ((null? l) "none") - ((null? (cdr l)) (car l)) - ((null? (cddr l)) (string-append (car l) " and " (cadr l))) - (else (string-append (car l) ", " (human-listify (cdr l)))))) + ((null? lst) "none") + ((null? (cdr lst)) (car lst)) + ((null? (cddr lst)) (string-append (car lst) " and " (cadr lst))) + (else (string-append (car lst) ", " (human-listify (cdr lst)))))) (define (writing-wip x) (display (string-append "\nWriting " x " ... ") (current-error-port))) diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index c4b4ad8207..b6bdb22368 100644 --- a/scm/framework-tex.scm +++ b/scm/framework-tex.scm @@ -299,8 +299,8 @@ (header-end))) (for-each - (lambda (l) - (dump-line outputter l (not (ly:paper-system-title? l)))) + (lambda (lst) + (dump-line outputter lst (not (ly:paper-system-title? lst)))) (take lines (1+ first-notes-index))) (ly:outputter-dump-string outputter "\\lilypondend\n"))) diff --git a/scm/new-markup.scm b/scm/new-markup.scm index 5397514793..a5dbc73f58 100644 --- a/scm/new-markup.scm +++ b/scm/new-markup.scm @@ -356,9 +356,9 @@ eg: ((italic) (raise 4) (bold)), maps the commands on each markup argument, eg: (not (not (markup-command-signature x)))) (define (markup-list? arg) - (define (markup-list-inner? l) - (or (null? l) - (and (markup? (car l)) (markup-list-inner? (cdr l))))) + (define (markup-list-inner? lst) + (or (null? lst) + (and (markup? (car lst)) (markup-list-inner? (cdr lst))))) (and (list? arg) (markup-list-inner? arg))) (define (markup-argument-list? signature arguments) diff --git a/scm/output-pdf.scm b/scm/output-pdf.scm index 691e8f3c55..8ee7363c41 100644 --- a/scm/output-pdf.scm +++ b/scm/output-pdf.scm @@ -34,7 +34,7 @@ (moveto (+ x (car currentpoint)) (+ y (cdr currentpoint)))) (define (lineto x y) (set! currentpoint (cons x y)) - (string-append (showcp) "l ")) + (string-append (showcp) "lst ")) (define (lineto-pair pair) (lineto (car pair) (cdr pair))) (define (rlineto x y) @@ -101,13 +101,13 @@ (invoke-char " show" i)) -(define (dashed-slur thick dash l) +(define (dashed-slur thick dash lst) (string-append (setlineparams) "[ " (ly:number->string dash) " " (ly:number->string (* 10 thick)) " ] 0 d " (setlinewidth thick) - (moveto-pair (car l)) - (apply curveto (cdr l)) + (moveto-pair (car lst)) + (apply curveto (cdr lst)) (closestroke))) (define (dashed-line thick on off dx dy) @@ -188,19 +188,19 @@ (define (placebox x y s) "") -(define (bezier-sandwich l thick) +(define (bezier-sandwich lst thick) (string-append (setlinewidth thick) - (moveto-pair (list-ref l 7)) - (curveto-pairs (list-ref l 4) - (list-ref l 5) - (list-ref l 6)) - (lineto-pair (list-ref l 3)) - (curveto-pairs (list-ref l 0) - (list-ref l 1) - (list-ref l 2)) + (moveto-pair (list-ref lst 7)) + (curveto-pairs (list-ref lst 4) + (list-ref lst 5) + (list-ref lst 6)) + (lineto-pair (list-ref lst 3)) + (curveto-pairs (list-ref lst 0) + (list-ref lst 1) + (list-ref lst 2)) "B " - (bezier-ending (list-ref l 3) (list-ref l 0) (list-ref l 5)) - (bezier-ending (list-ref l 7) (list-ref l 0) (list-ref l 5)))) + (bezier-ending (list-ref lst 3) (list-ref lst 0) (list-ref lst 5)) + (bezier-ending (list-ref lst 7) (list-ref lst 0) (list-ref lst 5)))) (define (bezier-ending z0 z1 z2) (let ((x0 (car z0)) diff --git a/scm/output-pdftex.scm b/scm/output-pdftex.scm index dbfe74fc2e..e8378aeacb 100644 --- a/scm/output-pdftex.scm +++ b/scm/output-pdftex.scm @@ -45,8 +45,8 @@ (define (bracket arch_angle arch_width arch_height height arch_thick thick) (embedded-pdf (list 'bracket arch_angle arch_width arch_height height arch_thick thick))) -(define (dashed-slur thick dash l) - (embedded-pdf (list 'dashed-slur thick dash l))) +(define (dashed-slur thick dash lst) + (embedded-pdf (list 'dashed-slur thick dash lst))) (define (char i) (string-append "\\char" (ly:inexact->string i 10) " ")) @@ -62,8 +62,8 @@ (ly:number->string (inexact->exact (* 1000 (cdr name-mag)))) "\n")) -(define (ez-ball c l b) - (embedded-pdf (list 'ez-ball c l b))) +(define (ez-ball c lst b) + (embedded-pdf (list 'ez-ball c lst b))) (define (header-to-file fn key val) (set! key (symbol->string key)) @@ -171,8 +171,8 @@ (ly:number->string x) "}{" s "}%\n")) -(define (bezier-sandwich l thick) - (embedded-pdf (list 'bezier-sandwich `(quote ,l) thick))) +(define (bezier-sandwich lst thick) + (embedded-pdf (list 'bezier-sandwich `(quote ,lst) thick))) (define (start-system wd ht) (string-append "\\leavevmode\n" diff --git a/scm/output-sketch.scm b/scm/output-sketch.scm index d15487a678..6a42089b47 100644 --- a/scm/output-sketch.scm +++ b/scm/output-sketch.scm @@ -40,12 +40,12 @@ ; (let ((keyword (car expr))) ; (cond ; ((eq? keyword 'beam x y width slope thick) -; ((eq? keyword 'bezier-sandwich x y l thick) +; ((eq? keyword 'bezier-sandwich x y lst thick) ; ((eq? keyword 'bracket arch_angle arch_width arch_height height arch_thick thick) ; ((eq? keyword 'char x y i) ; ((eq? keyword 'comment s) ; ((eq? keyword 'dashed-line thick on off dx dy) -; ((eq? keyword 'dashed-slur thick dash l) +; ((eq? keyword 'dashed-slur thick dash lst) ; ((eq? keyword 'define-origin a b c ) "") ; ((eq? keyword 'experimental-on) "") ; ((eq? keyword 'ez-ball ch letter-col ball-col) @@ -95,12 +95,12 @@ (cons (car c) (* -1 (cdr c)))) ;;; urg. -(define (sketch-numbers->string l) +(define (sketch-numbers->string lst) (string-append - (ly:number->string (car l)) - (if (null? (cdr l)) + (ly:number->string (car lst)) + (if (null? (cdr lst)) "" - (string-append "," (sketch-numbers->string (cdr l)))))) + (string-append "," (sketch-numbers->string (cdr lst)))))) ;;;\def\scaletounit{ 2.83464566929134 mul }% @@ -124,9 +124,9 @@ ")\n")) -(define (sketch-bezier x y l) - (let* ((c0 (car (list-tail l 3))) - (c123 (list-head l 3)) +(define (sketch-bezier x y lst) + (let* ((c0 (car (list-tail lst 3))) + (c123 (list-head lst 3)) (start (control->list x y c0)) (control (apply append (map (lambda (c) (control->list x y c)) c123)))) @@ -136,9 +136,9 @@ -(define (sketch-beziers x y l thick) - (let* ((first (list-tail l 4)) - (second (list-head l 4))) +(define (sketch-beziers x y lst thick) + (let* ((first (list-tail lst 4)) + (second (list-head lst 4))) (string-append "fp((0,0,0))\n" "lw(0.1)\n" @@ -217,9 +217,9 @@ ;; what the heck is this interface ? -(define (dashed-slur thick dash l) +(define (dashed-slur thick dash lst) (string-append - (string-join (map ly:number-pair->string l) " ") + (string-join (map ly:number-pair->string lst) " ") " " (ly:number->string thick) " [ " @@ -278,9 +278,9 @@ layer('Layer 1',1,1,0,0,(0,0,0)) (define (invoke-char s i) "") -(define (bezier-sandwich x y l thick) +(define (bezier-sandwich x y lst thick) (apply - sketch-beziers (list x y (primitive-eval l) thick))) + sketch-beziers (list x y (primitive-eval lst) thick))) (define (start-system width height) (set! current-y (- current-y height)) diff --git a/scm/output-tex.scm b/scm/output-tex.scm index a0efaddded..b0fc77e8d4 100644 --- a/scm/output-tex.scm +++ b/scm/output-tex.scm @@ -90,8 +90,8 @@ (define (bracket arch_angle arch_width arch_height height arch_thick thick) (embedded-ps (list 'bracket arch_angle arch_width arch_height height arch_thick thick))) -(define (dashed-slur thick dash l) - (embedded-ps (list 'dashed-slur thick dash `(quote ,l)))) +(define (dashed-slur thick dash lst) + (embedded-ps (list 'dashed-slur thick dash `(quote ,lst)))) (define (named-glyph font name) (let* ((info (ly:otf-font-glyph-info font name)) @@ -116,8 +116,8 @@ (define (zigzag-line centre? zzw zzh thick dx dy) (embedded-ps (list 'zigzag-line centre? zzw zzh thick dx dy))) -(define (ez-ball c l b) - (embedded-ps (list 'ez-ball c l b))) +(define (ez-ball c lst b) + (embedded-ps (list 'ez-ball c lst b))) (define (embedded-ps expr) (let ((ps-string @@ -137,8 +137,8 @@ (string-append "\\lyitem{" (ly:number->string x) "}{" (ly:number->string y) "}{" s "}%\n")) -(define (bezier-sandwich l thick) - (embedded-ps (list 'bezier-sandwich `(quote ,l) thick))) +(define (bezier-sandwich lst thick) + (embedded-ps (list 'bezier-sandwich `(quote ,lst) thick))) ;; WTF is this in every backend? (define (horizontal-line x1 x2 th) -- 2.39.5