X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=4cc714fdecf34ac05ae58d18c255ebed76b10f1b;hb=13d8b383afd5bceb11747f5a3ee79ee9d4eca0aa;hp=7358bd8666e1018f5f09e56773348f70ab37bc5d;hpb=5365c4158eabf00af420e23d601eda0709a6a042;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 7358bd8666..4cc714fdec 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -1,4 +1,4 @@
-;;;; output-ps.scm -- implement Scheme output routines for PostScript
+;;;; output-ps.scm -- implement Scheme output interface for PostScript
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
@@ -9,11 +9,7 @@
 ;;;;       input/test/title-markup.ly
 ;;;; 
 ;;;; TODO:
-;;;;   * papersize in header
-;;;;   * special characters, encoding.
-;;;;     + implement encoding switch (switches?  input/output??),
-;;;;     + move encoding definitions to ENCODING.ps files, or
-;;;;     + find out which program's PS(?) encoding code we can use?
+;;;;   * %% Papersize in (header ...)
 ;;;;   * text setting, kerning.
 ;;;;   * document output-interface
 
@@ -54,32 +50,22 @@
 	     tuplet
 	     polygon
 	     draw-line
-	     between-system-string
 	     define-origin
 	     no-origin
 	     start-page
 	     stop-page
-	     )
-)
+	     ))
+
 (use-modules (guile)
 	     (ice-9 regex)
+	     (srfi srfi-1)
 	     (srfi srfi-13)
 	     (lily))
 
 ;;; Global vars
-;; alist containing fontname -> fontcommand assoc (both strings)
 (define page-count 0)
 (define page-number 0)
 
-;; /lilypondpaperoutputscale 1.75729901757299 def
-;;/lily-output-units 2.83464  def  %% milimeter
-;;/output-scale lilypondpaperoutputscale lily-output-units mul def
-;;
-;; output-scale = 1.75729901757299 * 2.83464 = 4.9813100871731003736
-
-(define OUTPUT-SCALE 4.98)
-(define TOP-MARGIN 0)
-
 ;;; helper functions, not part of output interface
 (define (escape-parentheses s)
   (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
@@ -88,8 +74,6 @@
   (cons (+ (car a) (car b))
 	(+ (cdr a) (cdr b))))
 
-;;    ("ecmb12" . "ISOLatin1Encoding")))
-		 
 (define (ps-encoding text)
   (escape-parentheses text))
 
@@ -163,83 +147,94 @@
    (ly:number->string (* 10 thick))
    " ] 0 draw_dashed_slur"))
 
-(define (font-command font)
-  (string-append
-   "magfont"
-   (string-encode-integer
-    (hashq (ly:font-name font) 1000000))
-   "m"
-   (string-encode-integer
-    (inexact->exact (round (* 1000 (ly:font-magnification font)))))))
+(define (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 (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 (not coding-command) "" (string-append "e" coding-command)))))
 
 (define (define-fonts paper font-list)
+  
   (define (define-font command fontname scaling)
     (string-append
      "/" command " { /" fontname " findfont "
-     ;; FIXME
      (ly:number->string scaling) " output-scale div scalefont } bind def\n"))
-     ;;(ly:number->string scaling) " scalefont } bind def\n"))
 
-  (define (reencode-font raw encoding command)
-    (string-append
-     raw " " encoding " /" command " reencode-font\n"
-     "/" command "{ /" command " findfont 1 scalefont } bind def\n"))
-	  
-  ;; frobnicate NAME to jibe with external definitions.
-  (define (possibly-mangle-fontname fontname)
+  (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? fontname)
-      ;; FIXME: we need proper Fontmap for CM fonts, like so:
-      ;; /CMR10 (cmr10.pfb); 
-      ;; (string-upcase fontname)
-      (string-append fontname ".pfb"))
-     ((or (equal? (substring fontname 0 4) "feta")
-	  (equal? (substring fontname 0 4) "parm"))
-      (regexp-substitute/global
-       #f "(feta|parmesan)([a-z-]*)([0-9]+)"
-       fontname 'pre "GNU-LilyPond-" 1 2 "-" 3 'post))
-     (else fontname)))
-			 
+     ((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* ((command (font-command font))
-	   (fontname (ly:font-name font))
-	   (mangled (possibly-mangle-fontname fontname))
+    (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))
-	   (encoding (assoc-get 'input-name coding-alist ))
+	   (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 (font-command font #f))
 	   (designsize (ly:font-design-size font))
 	   (magnification (* (ly:font-magnification font)))
 	   (ops (ly:paper-lookup paper 'outputscale))
 	   (scaling (* ops magnification designsize)))
 
-      (if
-       #t
-       (begin
-	 (newline)
-	 (format (current-error-port) "fontname ~S\n" fontname)
-	 (format (current-error-port) "command ~S\n" command)
-	 (format (current-error-port) "encoding name ~S\n" encoding)
-	 (format (current-error-port) "mangled ~S\n" mangled)
-	 (format (current-error-port) "designsize ~S\n" designsize)
-	 (format (current-error-port) "magnification ~S\n" magnification)
-	 (format (current-error-port) "ops ~S\n" ops)
-	 (format (current-error-port) "scaling ~S\n" scaling)))
-      
-      (if (or (equal? encoding "ISOLatin1Encoding")
-	      ;; UGH, uhg 
-	      (equal? fontname "feta20")
-	      (equal? fontname "parmesan20"))
-	  (define-font command mangled scaling)
-	  ;; FIXME: should rather tag encoded font
-	  (let ((raw (string-append command "-raw"))
-		(vector (get-coding-command encoding))
-		(filename (get-coding-filename encoding)))
-	    (string-append
-	     (ly:kpathsea-gulp-file filename)
-	     (define-font raw mangled scaling)
-	     (reencode-font raw vector command))))))
+      (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)))))
   
-  (apply string-append
-	 (map (lambda (x) (font-load-command paper x)) font-list)))
+  (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)))))
 
 (define (define-origin file line col) "")
 
@@ -268,11 +263,11 @@
    " /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-)
+(define (header creator time-stamp paper page-count- classic?)
   (set! page-count page-count-)
   (set! page-number 0)
   (string-append
@@ -280,8 +275,7 @@
    "%%Creator: " creator " " time-stamp "\n"
    "%%Pages: " (number->string page-count) "\n"
    "%%PageOrder: Ascend\n"
-   ;; FIXME: TODO get from paper
-   ;; "%%DocumentPaperSizes: a6\n"
+   "%%DocumentPaperSizes: " (ly:paper-lookup paper 'papersize) "\n"
    ;;(string-append "GNU LilyPond (" (lilypond-version) "), ")
    ;;	   (strftime "%c" (localtime (current-time))))
    ;; FIXME: duplicated in every backend
@@ -294,8 +288,9 @@
    (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"))
@@ -347,27 +342,6 @@
 
     (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 
    (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
@@ -389,35 +363,58 @@
     (ly:numbers->string
      (list x y width height blotdiam)) " draw_round_box"))
 
-(define (new-start-system origin dim)
+(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)
+(define (stop-system last?)
   "} stop-system\n")
 
-(define stop-last-system stop-system)
-
 (define (symmetric-x-triangle thick w h)
   (string-append
    (ly:numbers->string (list h w thick))
    " draw_symmetric_x_triangle"))
 
 (define (text font s)
-  
-;;  (string-append "(" (escape-parentheses s) ") show "))
-  (string-append
-
-   (font-command font) " setfont " 
-   "(" (ps-encoding s) ") show"))
+  (let*
+      
+      (
+       ;; ugh, we should find a better way to
+       ;; extract the hsbw for /space from the font.
+       
+       (space-length (cdar (ly:text-dimension font "t"))) 
+       (commands '())
+       (add-command (lambda (x) (set! commands (cons x commands)))) )
+
+    (string-fold
+     (lambda (chr word)
+       "Translate space as into moveto, group the rest in words."
+       (if (and (< 0 (string-length word))
+		(equal? #\space  chr))
+	   (add-command 
+	    (string-append "(" (ps-encoding word) ") show\n")))
+
+       (if (equal? #\space  chr)
+	   (add-command  (string-append (number->string space-length) " 0.0 rmoveto ")) )
+       
+       (if (equal? #\space  chr)
+	   ""
+	   (string-append word (make-string 1 chr))))
+     ""
+     (string-append  s " "))
 
+    (string-append
+     (font-command font) " setfont "
+     (string-join (reverse commands)))
+    ))
+  
 (define (unknown) 
   "\n unknown\n")