X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fsketch.scm;h=f877bd56f4b9ca466586664414d1f737480b6183;hb=ffe6f890aaa8bcf7638682a2ced4411330b30144;hp=76eb7755968c7c59f4b0573f99313465f91434e0;hpb=5896577d6df28d9febb5613de9ecdc772dfa8211;p=lilypond.git

diff --git a/scm/sketch.scm b/scm/sketch.scm
index 76eb775596..f877bd56f4 100644
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -3,12 +3,10 @@
 ;;;
 ;;;  source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
-;; als in: 
-
 ;; def dispats (out,x,y,expr):
 ;;     (symbol, rest) = expr
 ;;     if symbol == 'placebox':
@@ -20,19 +18,13 @@
 ;;         out.write ('moveto( %f %f); char(%d)' % (x,y,rest))
 
 
-;; (define (dispatch x y expr)
-;;  (let ((keyword (car expr))) 
-;;   (cond
-;;    ((eq? keyword 'placebox)
-;;    	    (dispatch (+ x (cadr expr)) (+ y (caddr expr) (cadddr expr)))
-
-;;      [etc.]
-;;    ))
 
 
-;; guile < 1.4 compatibility for eval
-(define (ly-eval e m)
-  (eval-in-module e m))
+;;
+;; All functions have the signature 
+;;
+;;  NAME X Y ARGUMENTS-PASSED-BY-LILYPOND
+;;
 
 (define-module (scm sketch))
 (debug-enable 'backtrace)
@@ -42,25 +34,60 @@
 (define-public (sketch-output-expression expr port)
   (display (dispatch expr) port))
 
-(use-modules
- (guile))
-
-(use-modules (ice-9 format))
-
+(use-modules (ice-9 format) (guile) (lily))
+
+;; hmm
+; (define (dispatch x y expr)
+;  (let ((keyword (car expr))) 
+;    (cond
+; ((eq? keyword 'beam x y width slope thick)
+; ((eq? keyword 'bezier-bow x y l thick)
+; ((eq? keyword 'bezier-sandwich x y l 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 'define-origin a b c ) "")
+; ((eq? keyword 'end-output)
+; ((eq? keyword 'experimental-on) "")
+; ((eq? keyword 'ez-ball ch letter-col ball-col)
+; ((eq? keyword 'filledbox x y breapth width depth height)
+; ((eq? keyword 'font-load-command name-mag command)
+; ((eq? keyword 'font-switch i)
+; ((eq? keyword 'header creator generate)
+; ((eq? keyword 'header-end)
+; ((eq? keyword 'invoke-char s i)
+; ((eq? keyword 'lily-def key val)
+; ((eq? keyword 'no-origin) "")
+; ((eq? keyword 'output-scale 1)
+; ((eq? keyword 'placebox)
+;  (dispatch (+ x (cadr expr)) (+ y (caddr expr) (cadddr expr))))
+; ((eq? keyword 'repeat-slash wid slope thick)
+; ((eq? keyword 'roundfilledbox x y dx dy w h b)
+; ((eq? keyword 'select-font name-mag-pair)
+; ((eq? keyword 'start-system width height)
+; ((eq? keyword 'stem x y z w) (filledbox x y z w))
+; ((eq? keyword 'stop-last-system)
+; ((eq? keyword 'stop-system)
+; ((eq? keyword 'text x y s)
+; ((eq? keyword 'unknown)
+
+;     )))
+
+
+(define current-y 150)
 
 (define (dispatch expr)
   (let ((keyword (car expr))) 
     (cond
      ((eq? keyword 'placebox)
-      (dispatch-x-y (cadr expr) (+ 150 (caddr expr)) (cadddr expr)))
+      (dispatch-x-y (cadr expr) (+ current-y (caddr expr)) (cadddr expr)))
      (else
-      (apply (ly-eval keyword this-module) (cdr expr))))))
+      (apply (eval keyword this-module) (cdr expr))))))
 
 (define (dispatch-x-y x y expr)
-  (apply (ly-eval (car expr) this-module) (append (list x y) (cdr expr))))
-
-
-
+  (apply (eval (car expr) this-module) (append (list x y) (cdr expr))))
       
 (define (ascii->string i) (make-string 1 (integer->char i)))
 
@@ -78,9 +105,18 @@
        ""
        (string-append ","  (sketch-numbers->string (cdr l))))))
 
-(define font "")
-(define output-scale 1.0)
-(define (mul-scale x) (* output-scale x))
+;;;\def\scaletounit{ 2.83464566929134 mul }%
+
+;;(define output-scale 2.83464566929134)
+
+(define scale-to-unit
+  (cond
+   ((equal? (ly:unit) "mm") (/ 72.0  25.4))
+   ((equal? (ly:unit) "pt") (/ 72.0  72.27))
+   (else (error "unknown unit" (ly:unit)))
+   ))
+
+(define (mul-scale x) (* scale-to-unit output-scale x))
 
 (define (sketch-filled-rectangle width dy dx height x y)
   (string-append
@@ -90,6 +126,7 @@
    (sketch-numbers->string (map mul-scale (list width dy dx height x y)))
    ")\n"))
 
+
 (define (sketch-bezier x y l)
   (let* ((c0 (car (list-tail l 3)))
 	 (c123 (list-head l 3))
@@ -101,6 +138,7 @@
      "bc(" (sketch-numbers->string (map mul-scale control)) ",2)\n")))
   
 
+
 (define (sketch-beziers x y l thick)
   (let* ((first (list-tail l 4))
 	 (second (list-head l 4)))
@@ -113,13 +151,23 @@
 	 
 
 ;; alist containing fontname -> fontcommand assoc (both strings)
-(define font-alist '())
+;; old scheme
+;;(define font-alist '(("feta13" . ("feta13" . "13"))
+;;		     ("feta20" . ("feta20" . "20"))))
+(define font-alist '(("feta13" . ("LilyPond-Feta13" . "13"))
+;;		     ("feta20" . ("LilyPond-Feta-20" . "20")
+		     ("feta20" . ("GNU-LilyPond-feta-20" . "20")
+		      )))
+
+;;(define font "")
+(define font (cdar font-alist))
+
 (define font-count 0)
 (define current-font "")
 
 (define (fontify x y name-mag-pair exp)
   (string-append (select-font name-mag-pair)
-		 (apply (ly-eval (car exp) this-module)
+		 (apply (eval (car exp) this-module)
 			(append (list x y) (cdr exp)))))
 ;;		 (if (string? exp) exp "")))
 
@@ -132,8 +180,19 @@
 (define (cached-fontname i)
   "")
 
+
+(define (roundfilledbox x y dx dy w h b)
+  (sketch-filled-rectangle w 0 0 h x y))
+
+(define (polygon points blotdiameter) "") ;; TODO
+
 (define (select-font name-mag-pair)
-  (set! font (car name-mag-pair))
+  ;; name-mag-pair: (quote ("feta20" . 0.569055118110236))"feta20"(quote ("feta20" . 0.569055118110236))
+  (let ((f (assoc (caadr name-mag-pair) font-alist)))
+    (if (pair? f)
+	(set! font (cdr f))
+	(format #t "font not found: ~s\n" (caadr name-mag-pair))))
+  ;;(write font)
   "")
 
 (define (font-load-command name-mag command)
@@ -141,11 +200,10 @@
 
 (define (beam x y width slope thick)
   (apply sketch-filled-rectangle
-	 (map mul-scale
-	      (list width (* slope width) 0 thick x y))))
+	 (list width (* slope width) 0 thick x y)))
 
 (define (comment s)
-  (string-append "# " s))
+  (string-append "# " s "\n"))
 
 (define (bracket arch_angle arch_width arch_height  height arch_thick thick)
   (string-append
@@ -156,44 +214,39 @@
    "fp((0,0,0))\n"
    "le()\n"
    "lw(0.1)\n"
-   ;; "Fn('" global-font "')\n"
-   ;; "Fn('Times-Roman')\n"
-   "Fn('TeX-feta20')\n"
-   "Fs(20)\n"
-   ;; chars > 128 don't work yet
-   (format #f "txt('\\~o',(" (modulo i 128))
-   ;;	    "char(" ,(number->string i)  ",("
+   "Fn('" (car font) "')\n"
+   "Fs(" (cdr font) ")\n"
+   ;; how to get zero-left padding with ``Guile's fprintf'' ?
+   ;;(format #f "txt('\\x~2x',(" i)
+   ;;(format #f "txt('\\x~02x',(" i)
+   ;; ugh: python's '%02x' % i
+   (format #f "&#x~2,'0x;" i)
    (sketch-numbers->string (map mul-scale (list x y)))
    "))\n"))
 
-(define (hairpin x y thick width starth endh )
-  (string-append
-   "#"
-   (numbers->string (list width starth endh thick))
-   " draw_hairpin"))
 
 ;; what the heck is this interface ?
 (define (dashed-slur thick dash l)
   (string-append 
-   (apply string-append (map control->string l)) 
-   (ly-number->string thick) 
+   (apply string-append (map number-pair->string l)) 
+   (ly:number->string thick) 
    " [ "
-   (ly-number->string dash)
+   (ly:number->string dash)
    " "
-   (ly-number->string (* 10 thick))	;UGH.  10 ?
+   (ly:number->string (* 10 thick))	;UGH.  10 ?
    " ] 0 draw_dashed_slur"))
 
 (define (dashed-line thick on off dx dy)
   (string-append 
-   (ly-number->string dx)
+   (ly:number->string dx)
    " "
-   (ly-number->string dy)
+   (ly:number->string dy)
    " "
-   (ly-number->string thick) 
+   (ly:number->string thick) 
    " [ "
-   (ly-number->string on)
+   (ly:number->string on)
    " "
-   (ly-number->string off)
+   (ly:number->string off)
    " ] 0 draw_dashed_line"))
 
 (define (repeat-slash wid slope thick)
@@ -212,10 +265,13 @@ grid((0,0,20,20),0,(0,0,1),'Grid')\n")
 (define (header-end)
   "")
 
+(define output-scale 1)
+
 (define (lily-def key val)
   (if (equal? key "lilypondpaperoutputscale")
       ;; ugr
-      (set! output-scale (string->number val)))
+      (set! output-scale (string->number val))
+      )
   "")
 
 
@@ -230,18 +286,17 @@ layer('Layer 1',1,1,0,0,(0,0,0))
 (define (invoke-char s i)
   "")
 
-(define (invoke-dim1 s d) 
-  (string-append
-   (ly-number->string (* d  (/ 72.27 72))) " " s ))
+;; TODO: bezier-ending, see ps.scm
+(define (bezier-bow x y l thick)
+  (bezier-sandwich x y l thick))
 
 (define (bezier-sandwich x y l thick)
   (apply
    sketch-beziers (list x y (primitive-eval l) thick)))
 
-; TODO: use HEIGHT argument
-(define (start-line height)
-   "G()\n"
-   )
+(define (start-system width height)
+  (set! current-y (- current-y height))
+  "G()\n")
 
 ;;  r((520.305,0,0,98.0075,51.8863,10.089))
 ;;  width, 0, 0, height, x, y
@@ -253,29 +308,24 @@ layer('Layer 1',1,1,0,0,(0,0,0))
 (define (stem x y z w) (filledbox x y z w))
 
 
-(define (stop-line)
+(define (stop-system)
     "G_()\n")
 
 ;; huh?
-(define (stop-last-line)
-   (stop-line))
+(define (stop-last-system)
+   (stop-system))
 
 (define (text x y s)
-  (string-append "txt('" s "',(" (sketch-numbers->string
+  (string-append
+   "fp((0,0,0))\n"
+   "le()\n"
+   "lw(0.1)\n"
+   "Fn('" (car font) "')\n"
+   "Fs(" (cdr font) ")\n"
+   ;; Hmm
+   "txt('" s "',(" (sketch-numbers->string
 				  (map mul-scale (list x y))) "))\n"))
 
-
-(define (volta x y h w thick vert_start vert_end)
-  (string-append "#"
-   (numbers->string (list h w thick (inexact->exact vert_start) (inexact->exact vert_end)))
-   " draw_volta"))
-
-(define (tuplet x y ht gap dx dy thick dir)
-  (string-append "#"
-   (numbers->string (list ht gap dx dy thick (inexact->exact dir)))
-   " draw_tuplet"))
-
-
 (define (unknown) 
   "\n unknown\n")
 
@@ -291,3 +341,7 @@ layer('Layer 1',1,1,0,0,(0,0,0))
 
 
 
+;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;
+
+