X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fps.scm;h=423c3326ada24ccb10afddb1cc01444cfa74e15d;hb=27b9af8ea42caa6fe4505b0c70d4411a10d2aaba;hp=95280791262b3daee6651d936e1cd37c2a8ec9fc;hpb=70a98a1bfe6eafa9a4cee14a8a5264a52a329d03;p=lilypond.git

diff --git a/scm/ps.scm b/scm/ps.scm
index 9528079126..423c3326ad 100644
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -6,256 +6,295 @@
 ;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
-(define (ps-scm action-name)
 
-  ;; alist containing fontname -> fontcommand assoc (both strings)
-  (define font-alist '())
-  (define font-count 0)
-  (define current-font "")
+(define-module (scm ps)
+  )
 
-  
-  (define (cached-fontname i)
-    (string-append
-     "lilyfont"
-     (make-string 1 (integer->char (+ 65 i)))))
-    
-
-  (define (select-font name-mag-pair)
-    (let*
-	(
-	 (c (assoc name-mag-pair font-name-alist))
-	 )
-
-      (if (eq? c #f)
-	  (begin
-	    (display "FAILED\n")
-	    (display (object-type (car name-mag-pair)))
-	    (display (object-type (caaar font-name-alist)))
-
-	    (ly-warn (string-append
-		      "Programming error: No such font known "
-		      (car name-mag-pair) " "
-		      (ly-number->string (cdr name-mag-pair))
-		      ))
-	    
-	    "") ; issue no command	  
-	  (string-append " " (cddr c) " "))
-      ))
-
-    (define (font-load-command name-mag command)
-      (string-append
-       "/" command
-       " { /"
-       (car name-mag)
-       " findfont "
-       "12 " (ly-number->string (cdr name-mag)) " mul "
-       "lilypondpaperoutputscale div scalefont setfont } bind def "
-       "\n"))
-
-
-  (define (beam width slope thick)
-    (string-append
-     (numbers->string (list width slope thick)) " draw_beam" ))
-
-  (define (comment s)
-    (string-append "% " s))
-
-  (define (bracket arch_angle arch_width arch_height  height arch_thick thick)
-    (string-append
-     (numbers->string (list arch_angle arch_width arch_height height arch_thick thick)) " draw_bracket" ))
-
-  (define (char i)
-    (invoke-char " show" i))
-
-
-  (define (hairpin 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) 
-     " [ "
-     (ly-number->string dash)
-     " "
-     (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 dy)
-     " "
-     (ly-number->string thick) 
-     " [ "
-     (ly-number->string on)
-     " "
-     (ly-number->string off)
-     " ] 0 draw_dashed_line"))
-  
-  (define (repeat-slash wid slope thick)
-   (string-append (numbers->string (list wid slope thick))
-    " draw_repeat_slash"))
-  
-  (define (end-output)
-    "\nend-lilypond-output\n")
-  
-  (define (experimental-on) "")
-  
-  (define (filledbox breapth width depth height) 
-    (string-append (numbers->string (list breapth width depth height))
-		   " draw-box" ))
-
-  ;; obsolete?
-  (define (font-def i s)
-    (string-append
-     "\n/" (font i) " {/" 
-     (substring s 0 (- (string-length s) 4))
-     " findfont 12 scalefont setfont} bind def \n"))
-
-  (define (font-switch i)
-    (string-append (font i) " "))
-
-  (define (header-end)
-    (string-append
-     ;; URG: now we can't use scm output without Lily
-     (ly-gulp-file "lilyponddefs.ps")
-     " {exch pop //systemdict /run get exec} "
-     (ly-gulp-file "music-drawing-routines.ps")
-     "{ exch pop //systemdict /run get exec } "
+(define this-module (current-module))
+
+(debug-enable 'backtrace)
+
+(if (or (equal? (minor-version) "4.1")
+	(equal? (minor-version) "4")
+	(equal? (minor-version) "3.4"))
+    (define-public (ps-output-expression expr port)
+      (display (eval-in-module expr this-module) port))
+
+    (define-public (ps-output-expression expr port)
+      (display (eval expr this-module) port)))
+
+ 
+(use-modules
+ (guile)
+)
+
+
+
+;;;;;;;;
+;;;;;;;; DOCUMENT ME!
+;;;;;;;; 
+(define (tex-encoded-fontswitch name-mag)
+  (let* ((iname-mag (car name-mag))
+	 (ename-mag (cdr name-mag)))
+    (cons iname-mag
+	  (cons ename-mag
+		(string-append  "magfont"
+			  (string-encode-integer
+			   (hashq (car ename-mag) 1000000))
+			  "m"
+			  (string-encode-integer
+			   (inexact->exact (* 1000 (cdr ename-mag)))))))))
+
+(define (fontify name-mag-pair exp)
+  (string-append (select-font name-mag-pair)
+		 exp))
+
+
+(define (define-fonts internal-external-name-mag-pairs)
+  (set! font-name-alist (map tex-encoded-fontswitch
+			     internal-external-name-mag-pairs))
+  (apply string-append
+	 (map (lambda (x)
+		(font-load-command (car x) (cdr x)))
+	      (map cdr font-name-alist))))
+
+
+
+;; alist containing fontname -> fontcommand assoc (both strings)
+(define font-alist '())
+(define font-count 0)
+(define current-font "")
+
+(define (select-font name-mag-pair)
+  (let*
+      (
+       (c (assoc name-mag-pair font-name-alist))
+       )
+
+    (if (eq? c #f)
+	(begin
+	  (display "FAILED\n")
+	  (display (object-type (car name-mag-pair)))
+	  (display (object-type (caaar font-name-alist)))
+
+	  (ly-warn (string-append
+		    "Programming error: No such font known "
+		    (car name-mag-pair) " "
+		    (ly-number->string (cdr name-mag-pair))
+		    ))
+	  
+	  "") ; issue no command	  
+	(string-append " " (cddr c) " "))
     ))
-  
-  (define (lily-def key val)
-
-     (if (string=? (substring key 0 (min (string-length "lilypondpaper") (string-length key))) "lilypondpaper")
-	 (string-append "/" key " {" val "} bind def\n")
-	 (string-append "/" key " (" val ") def\n")
-	 )
-     )
-
-  (define (header creator generate) 
-    (string-append
-     "%!PS-Adobe-3.0\n"
-     "%%Creator: " creator generate "\n"))
-  
-  (define (invoke-char s i)
-    (string-append 
-     "(\\" (inexact->string i 8) ") " s " " ))
-  
-  (define (invoke-dim1 s d) 
-    (string-append
-     (ly-number->string (* d  (/ 72.27 72))) " " s ))
-
-  (define (placebox x y s) 
-    (string-append 
-     (ly-number->string x) " " (ly-number->string y) " {" s "} place-box\n"))
-
-  (define (bezier-sandwich l thick)
-    (string-append 
-     (apply string-append (map control->string l))
-     (ly-number->string  thick)
-     " draw_bezier_sandwich"))
-
-; TODO: use HEIGHT argument
-  (define (start-line height)
-    (string-append
-     "\n"
-     (ly-number->string height)
-     " start-line {
-lilypondpaperoutputscale lilypondpaperoutputscale scale
-"))
-  
-  (define (stem breapth width depth height) 
-    (string-append (numbers->string (list breapth width depth height))
-		   " draw-box" ))
 
-  (define (stop-line)
-      "}\nstop-line\n")
+(define (font-load-command name-mag command)
+  (string-append
+   "/" command
+   " { /"
+   (capitalize-font-name (car name-mag))
+   " findfont "
+   "20 " (ly-number->string (cdr name-mag)) " mul "
+   "output-scale div scalefont setfont } bind def "
+   "\n"))
+
+;; Ugh, the Bluesky type1 fonts for computer modern use capitalized 
+;; postscript font names.
+(define (capitalize-font-name name)
+  (if (equal? (substring name 0 2) "cm")
+      (string-upcase name)
+      name))
+
+(define (beam width slope thick)
+  (string-append
+   (numbers->string (list slope width thick)) " draw_beam" ))
+
+(define (comment s)
+  (string-append "% " s "\n"))
+
+(define (bracket arch_angle arch_width arch_height  height arch_thick thick)
+  (string-append
+   (numbers->string (list arch_angle arch_width arch_height height arch_thick thick)) " draw_bracket" ))
+
+(define (char i)
+  (invoke-char " show" i))
+
+
+
+;; 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) 
+   " [ "
+   (ly-number->string dash)
+   " "
+   (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 dy)
+   " "
+   (ly-number->string thick)
+   " [ "
+   (ly-number->string on)
+   " "
+   (ly-number->string off)
+   " ] 0 draw_dashed_line"))
+
+(define (draw-line thick x1 y1 x2 y2)
+
+  (string-append 
+  "	1 setlinecap
+	1 setlinejoin "
+  (ly-number->string thick)
+	" setlinewidth "
+   (ly-number->string x1)
+   " "
+   (ly-number->string y1)
+   " moveto "
+   (ly-number->string x2)
+   " "
+   (ly-number->string y2)
+   " lineto stroke"
+
+  ))
+
+(define (repeat-slash wid slope thick)
+  (string-append (numbers->string (list wid slope thick))
+		 " draw_repeat_slash"))
+
+(define (end-output)
+  "\nend-lilypond-output\n")
+
+(define (experimental-on) "")
+
+(define (filledbox breapth width depth height) 
+  (string-append (numbers->string (list breapth width depth height))
+		 " draw_box" ))
+
+(define (roundfilledbox x y width height blotdiam)
+   (string-append " "
+      (numbers->string
+         (list x y width height blotdiam)) " draw_round_box"))
+
+(define (dot x y radius)
+    (string-append " "
+     (numbers->string
+      (list x y radius)) " draw_dot"))
+
+;; obsolete?
+(define (font-def i s)
+  (string-append
+   "\n/" (font i) " {/" 
+   (substring s 0 (- (string-length s) 4))
+   " findfont 12 scalefont setfont} bind def \n"))
+
+(define (font-switch i)
+  (string-append (font i) " "))
+
+(define (header-end)
+  (string-append
+   ;; URG: now we can't use scm output without Lily
+   (ly-gulp-file "lilyponddefs.ps")
+   " {exch pop //systemdict /run get exec} "
+   (ly-gulp-file "music-drawing-routines.ps")
+   "{ exch pop //systemdict /run get exec } "
+;; ps-testing is broken: global module
+   (if (defined? 'ps-testing) "\n /testing true def" "")
+;;   "\n /testing true def"
+   ))
+
+(define (lily-def key val)
+
+  (if (string=? (substring key 0 (min (string-length "lilypondpaper") (string-length key))) "lilypondpaper")
+      (string-append "/" key " {" val "} bind def\n")
+      (string-append "/" key " (" val ") def\n")
+      )
+  )
 
-  (define (text s)
-    (string-append "(" s ") show  "))
+(define (header creator generate) 
+  (string-append
+   "%!PS-Adobe-3.0\n"
+   "%%Creator: " creator generate "\n"))
+
+(define (invoke-char s i)
+  (string-append 
+   "(\\" (inexact->string i 8) ") " s " " ))
+
+
+(define (placebox x y s) 
+  (string-append 
+   (ly-number->string x) " " (ly-number->string y) " {" s "} place-box\n"))
+
+;; two beziers
+(define (bezier-sandwich l thick)
+  (string-append 
+   (apply string-append (map control->string l))
+   (ly-number->string thick)
+   " draw_bezier_sandwich "))
+
+;; two beziers with round endings
+(define (bezier-bow l thick)
+  (string-append 
+   (apply string-append (map control->string l))
+   (ly-number->string thick)
+   " draw_bezier_sandwich "
+   (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))))
+
+;; two beziers with round endings
+(define (bezier-ending z0 z1 z2)
+  (let ((x0 (car z0))
+	(y0 (cdr z0))
+	(x1 (car z1))
+	(y1 (cdr z1))
+	(x2 (car z2))
+	(y2 (cdr z2)))
+    (string-append " "
+     (numbers->string
+      (list x0 y0
+	    (/ (sqrt (+ (* (- x1 x2) (- x1 x2)) (* (- y1 y2) (- y1 y2)))) 2)))
+     " draw_dot")))
+
+					; TODO: use HEIGHT argument
+
+  (define (start-system height)
+  (string-append
+   "\n"
+   (ly-number->string height)
+   " start-system {
+set-ps-scale-to-lily-scale
 
+"))
 
-  (define (volta 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 (stem breapth width depth height) 
+  (string-append (numbers->string (list breapth width depth height))
+		 " draw_box" ))
 
-  (define (tuplet ht gap dx dy thick dir)
-    (string-append 
-     (numbers->string (list ht gap dx dy thick (inexact->exact dir)))
-     " draw_tuplet"))
+(define (stop-system)
+  "}\nstop-system\n")
 
+(define (stop-last-system)
+  "}\nstop-system\n")
 
-  (define (unknown) 
-    "\n unknown\n")
+(define (text s)
+  (string-append "(" s ") show  "))
 
-  (define (ez-ball ch letter-col ball-col)
-    (string-append
-     " (" ch ") "
-     (numbers->string (list letter-col ball-col))
-     " /Helvetica-Bold " ;; ugh
-     " draw_ez_ball"))
 
-  (define (define-origin a b c ) "")
-  (define (no-origin) "")
-  
-  ;; PS
-  (cond ((eq? action-name 'all-definitions)
-	 `(begin
-	    (define beam ,beam)
-	    (define tuplet ,tuplet)
-	    (define bracket ,bracket)
-	    (define char ,char)
-	    (define hairpin ,hairpin)
-	    (define volta ,volta)
-	    (define bezier-sandwich ,bezier-sandwich)
-	    (define dashed-line ,dashed-line) 
-	    (define dashed-slur ,dashed-slur) 
-	    (define end-output ,end-output)
-	    (define experimental-on ,experimental-on)
-	    (define filledbox ,filledbox)
-	    (define font-def ,font-def)
-	    (define font-switch ,font-switch)
-	    (define header-end ,header-end)
-	    (define lily-def ,lily-def)
-	    (define font-load-command ,font-load-command)
-	    (define header ,header) 
-	    (define invoke-char ,invoke-char) 
-	    (define invoke-dim1 ,invoke-dim1)
-	    (define placebox ,placebox)
-	    (define select-font ,select-font)
-	    (define start-line ,start-line)
-	    (define stem ,stem)
-	    (define stop-line ,stop-line)
-	    (define stop-last-line ,stop-line)
-	    (define repeat-slash ,repeat-slash)
-	    (define text ,text)
-	    (define no-origin ,no-origin)
-	    (define define-origin ,define-origin)
-	    (define ez-ball ,ez-ball)
-	    ))
-	((eq? action-name 'repeat-slash) repeat-slash)
-	((eq? action-name 'tuplet) tuplet)
-	((eq? action-name 'beam) beam)
-	((eq? action-name 'bezier-sandwich) bezier-sandwich)
-	((eq? action-name 'bracket) bracket)
-	((eq? action-name 'char) char)
-	((eq? action-name 'dashed-line) dashed-line) 
-	((eq? action-name 'dashed-slur) dashed-slur) 
-	((eq? action-name 'hairpin) hairpin)
-	((eq? action-name 'experimental-on) experimental-on)
-	((eq? action-name 'filledbox) filledbox)
-	((eq? action-name 'ez-ball) ez-ball)	
-	((eq? action-name 'select-font) select-font)
-	((eq? action-name 'volta) volta)
-	(else (error "unknown tag -- PS-SCM " action-name))
-	)
-  )
+(define (unknown) 
+  "\n unknown\n")
+
+(define (ez-ball ch letter-col ball-col)
+  (string-append
+   " (" ch ") "
+   (numbers->string (list letter-col ball-col))
+   " /Helvetica-Bold " ;; ugh
+   " draw_ez_ball"))
 
-(define (scm-ps-output)
-  (ly-eval (ps-scm 'all-definitions)))
+(define (define-origin a b c ) "")
+(define (no-origin) "")
+  
+