X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=575c96d8fb1771549bdab9bfda953c2cf77b60d8;hb=326d10399091bd821918dfe9b2328360a8df0d3f;hp=7a1d8e03af8bd86ef6d9103b19dad9ed0e14e59f;hpb=9c27eb4661de7ac96a4dec84371769b112382bc2;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 7a1d8e03af..575c96d8fb 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -19,8 +19,6 @@
   #:re-export (quote)
   #:export (define-fonts
 	     unknown
-	     output-paper-def
-	     output-scopes
 	     select-font
 	     blank
 	     dot
@@ -62,10 +60,6 @@
 	     (srfi srfi-13)
 	     (lily))
 
-;;; Global vars
-(define page-count 0)
-(define page-number 0)
-
 ;;; helper functions, not part of output interface
 (define (escape-parentheses s)
   (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
@@ -78,7 +72,7 @@
   (escape-parentheses text))
 
 ;; FIXME: lily-def
-(define (ps-string-def prefix key val)
+(define-public (ps-string-def prefix key val)
   (string-append "/" prefix (symbol->string key) " ("
 		 (escape-parentheses val)
 		 ") def\n"))
@@ -89,9 +83,6 @@
 	       (ly:number->string (exact->inexact val)))))
     (string-append "/" prefix (symbol->string key) " " s " def\n")))
 
-(define (tex-font? fontname)
-  (equal? (substring fontname 0 2) "cm"))
-
 
 ;;;
 ;;; Lily output interface, PostScript implementation --- cleanup and docme
@@ -118,7 +109,7 @@
 
 (define (char font i)
   (string-append 
-    (font-command font) " setfont " 
+    (ps-font-command font) " setfont " 
    "(\\" (ly:inexact->string i 8) ") show" ))
 
 (define (comment s)
@@ -147,94 +138,29 @@
    (ly:number->string (* 10 thick))
    " ] 0 draw_dashed_slur"))
 
-;; FIXME -- now that we can have ENCODING == #f, this can be
-;; simplified, esp OVERRIDE-CODING-COMMAND
-(define (font-command font . override-coding-command)
+; todo: merge with tex-font-command?
+
+(define-public (ps-font-command font . override-coding)
   (let* ((name (ly:font-filename font))
 	 (magnify (ly:font-magnification font))
 	 (coding-alist (ly:font-encoding-alist font))
 	 (input-encoding (assoc-get 'input-name coding-alist))
 	 (font-encoding (assoc-get 'output-name coding-alist))
-	 (coding-command (if (not (null? override-coding-command))
-			     (car override-coding-command)
-			     (if font-encoding
-				 (get-coding-command font-encoding)
-				 #f))))
+	 (coding-command (if (null? override-coding)
+			     (if (equal? input-encoding font-encoding)
+				 #f font-encoding)
+			     (car override-coding))))
+
+    ;; FIXME:  now feta stuff has feta* input-encoding (again?)
+    ;;(format (current-error-port) "FONT: ~S, ~S\n" name font-encoding)
+    ;;(format (current-error-port) "INPUT: ~S\n" input-encoding)
+    (if (and coding-command (equal? (substring coding-command 0 4) "feta"))
+	(set! coding-command #f))
 
     (string-append
      "magfont" (string-encode-integer (hashq  name 1000000))
      "m" (string-encode-integer (inexact->exact (round (* 1000 magnify))))
-     (if (or (not font-encoding) (equal? input-encoding font-encoding)) ""
-	 (string-append "e" coding-command)))))
-
-(define (define-fonts paper font-list)
-  
-  (define (define-font command fontname scaling)
-    (string-append
-     "/" command " { /" fontname " findfont "
-     (ly:number->string scaling) " output-scale div scalefont } bind def\n"))
-
-  (define (reencode-font plain encoding command)
-    (let ((coding-vector (get-coding-command encoding)))
-      (string-append
-       plain " " coding-vector " /" command " reencode-font\n"
-       "/" command "{ /" command " findfont 1 scalefont } bind def\n")))
-  
-  (define (guess-ps-fontname basename)
-    "We do not have the FontName, try to guess is from basename."
-    (cond
-     ((tex-font? basename)
-      ;; FIXME: we need proper Fontmap for the bluesky CM*, EC* fonts.
-      ;; Only the fonts that we trace in mf/ are in our own FontMap.
-      (string-append basename ".pfb"))
-     (else (string-append basename ".pfa"))
-     ))
-
-  (define (font-load-command paper font)
-    (let* ((specced-font-name (ly:font-name font))
-	   (fontname (if specced-font-name
-			 specced-font-name
-			 (guess-ps-fontname (ly:font-filename font))))
-	   
-	   (coding-alist (ly:font-encoding-alist font))
-	   (input-encoding (assoc-get 'input-name coding-alist))
-	   (font-encoding (assoc-get 'output-name coding-alist))
-	   (command (font-command font))
-	   ;; FIXME -- see (font-command )
-	   (plain (if font-encoding
-		      (font-command font . (get-coding-command font-encoding))
-		      command))
-	   (designsize (ly:font-design-size font))
-	   (magnification (* (ly:font-magnification font)))
-	   (ops (ly:paper-lookup paper 'outputscale))
-	   (scaling (* ops magnification designsize)))
-
-      (string-append
-       (define-font plain fontname scaling)
-       (if (or (equal? input-encoding font-encoding)
-	       ;; guh
-	       (equal? font-encoding "fetaBraces")
-	       (equal? font-encoding "fetaNumber")
-	       (equal? font-encoding "fetaMusic")
-	       (equal? font-encoding "parmesanMusic"))
-	       ""
-	   (reencode-font plain input-encoding command)))))
-  
-  (define (font-load-encoding encoding)
-    (let ((filename (get-coding-filename encoding)))
-      (ly:kpathsea-gulp-file filename)))
-
-  (let* ((encoding-list (map (lambda (x)
-			       (assoc-get 'input-name
-					  (ly:font-encoding-alist x)))
-			     font-list))
-	 (encodings (uniq-list (sort-list (filter string? encoding-list)
-					  string<?))))
-
-    (string-append
-     (apply string-append (map font-load-encoding encodings))
-     (apply string-append
-	    (map (lambda (x) (font-load-command paper x)) font-list)))))
+     (if (not coding-command) "" (string-append "e" coding-command)))))
 
 (define (define-origin file line col) "")
 
@@ -263,34 +189,13 @@
    " /Helvetica-Bold " ;; ugh
    " draw_ez_ball"))
 
-(define (filledbox breapth width depth height) 
+(define (filledbox breapth width depth height) ; FIXME : use draw_round_box
   (string-append (ly:numbers->string (list breapth width depth height))
 		 " draw_box"))
 
-(define (header creator time-stamp page-count-)
-  (set! page-count page-count-)
-  (set! page-number 0)
-  (string-append
-   "%!PS-Adobe-3.0\n"
-   "%%Creator: " creator " " time-stamp "\n"
-   "%%Pages: " (number->string page-count) "\n"
-   "%%PageOrder: Ascend\n"
-   ;; FIXME: TODO get from paper
-   ;; "%%DocumentPaperSizes: a6\n"
-   ;;(string-append "GNU LilyPond (" (lilypond-version) "), ")
-   ;;	   (strftime "%c" (localtime (current-time))))
-   ;; FIXME: duplicated in every backend
-   (ps-string-def
-    "lilypond" 'tagline
-    (string-append "Engraved by LilyPond (version " (lilypond-version) ")"))))
-
-(define (header-end)
-  (string-append
-   (ly:gulp-file "lilyponddefs.ps")
-   (ly:gulp-file "music-drawing-routines.ps")))
-
+;; WTF is this in every backend?
 (define (horizontal-line x1 x2 th)
-  (draw-line th x1  0 x2 0))
+  (draw-line th x1 0 x2 0))
 
 (define (lily-def key val)
   (let ((prefix "lilypondpaper"))
@@ -302,66 +207,7 @@
 
 (define (no-origin) "")
 
-;; FIXME: duplictates output-scopes, duplicated in other backends
-;; FIXME: silly interface name
-(define (output-paper-def pd)
-  (let ((prefix "lilypondpaper"))
-    
-    (define (scope-entry->string key var)
-      (if (variable-bound? var)
-	  (let ((val (variable-ref var)))
-	    (cond
-	     ((string? val) (ps-string-def prefix key val))
-	     ((number? val) (ps-number-def prefix key val))
-	     (else "")))
-	  ""))
-      
-    (apply
-     string-append
-     (module-map scope-entry->string (ly:output-def-scope pd)))))
-
-;; FIXME: duplicated in other output backends
-;; FIXME: silly interface name
-(define (output-scopes paper scopes fields basename)
-  (let ((prefix "lilypond"))
-
-    ;; FIXME: duplicates output-paper's scope-entry->string, mostly
-    (define (scope-entry->string key var)
-      (if (variable-bound? var)
-	  (let ((val (variable-ref var)))
-	    (if (and (memq key fields) (string? val))
-		(header-to-file basename key val))
-	    (cond
-	     ((string? val) (ps-string-def prefix key val))
-	     ((number? val) (ps-number-def prefix key val))
-	     (else "")))
-	  ""))
-    
-    (define (output-scope scope)
-      (apply string-append (module-map scope-entry->string scope)))
-
-    (string-append (apply string-append (map output-scope scopes)))))
-
-;; hmm, looks like recursing call is always last statement, does guile
-;; think so too?
-(define (output-stencil port expr offset)
-  (if (pair? expr)
-      (let ((head (car expr)))
-	(cond
-	 ((ly:input-location? head)
-	  (display (apply define-origin (ly:input-location head)) port)
-	  (output-stencil port (cadr expr) offset))
-	 ((eq? head 'no-origin)
-	  (display (expression->string head) port)
-	  (output-stencil port (cadr expr) offset))
-	 ((eq? head 'translate-stencil)
-	  (output-stencil port (caddr expr) (offset-add offset (cadr expr))))
-	 ((eq? head 'combine-stencil)
-	  (output-stencil port (cadr expr) offset)
-	  (output-stencil port (caddr expr) offset))
-	 (else
-	  (display (placebox (car offset) (cdr offset)
-			     (expression->string expr)) port))))))
+
 
 (define (placebox x y s) 
   (string-append 
@@ -384,20 +230,12 @@
     (ly:numbers->string
      (list x y width height blotdiam)) " draw_round_box"))
 
-(define (start-system origin dim)
-  (string-append
-   "\n" (ly:number-pair->string origin) " start-system\n"
-   "{\n"
-   "set-ps-scale-to-lily-scale\n"))
 
-(define (stem breapth width depth height) 
+(define (stem breapth width depth height) ; FIXME: use draw_round_box.
   (string-append
    (ly:numbers->string (list breapth width depth height))
    " draw_box" ))
 
-(define (stop-system last?)
-  "} stop-system\n")
-
 (define (symmetric-x-triangle thick w h)
   (string-append
    (ly:numbers->string (list h w thick))
@@ -432,7 +270,7 @@
      (string-append  s " "))
 
     (string-append
-     (font-command font) " setfont "
+     (ps-font-command font) " setfont "
      (string-join (reverse commands)))
     ))
   
@@ -449,14 +287,3 @@
     (ly:number->string dx) " "
     (ly:number->string dy)
     " draw_zigzag_line"))
-
-(define (start-page)
-  (set! page-number (+ page-number 1))
-  (string-append
-   "%%Page: " (number->string page-number) " " (number->string page-count) "\n"
-  "start-page\n"))
-
-(define (stop-page last?)
-  (if last?
-      "\nstop-last-page\n"
-      "\nstop-page\n"))