changeset 51007:c3f9aa88ed68

Avoid unnecessary calls to funs in header and footer variables

--- a/lisp/ChangeLog	Thu May 15 01:37:54 2003 +0000
+++ b/lisp/ChangeLog	Thu May 15 02:32:03 2003 +0000
@@ -1,3 +1,16 @@
[phone]  Vinicius Jose Latorre  <[e-mail]>
+
+	* ps-print.el: Avoid unnecessary calls to funs in header and footer
+	variables.  Reported by Greg Hill <[e-mail]>.
+	(ps-print-version): New version number (6.6.1).
+	(ps-begin-page): Code fix.
+	(ps-generate-string-list, ps-header-footer-string): New funs.
+	(ps-lh-cache, ps-rh-cache, ps-lf-cache, ps-rf-cache): New vars.
+
+	* ps-mule.el (ps-mule-header-string-charsets): Call
+	ps-header-footer-string to avoid unnecessary calls to functions in
+	header and footer variables.
+
 2003-05-15  John Paul Wallington  <[e-mail]>
 
 	* mail/rmail.el (rmail-ignored-headers): Ignore Face: header.

--- a/lisp/ps-mule.el	Thu May 15 01:37:54 2003 +0000
+++ b/lisp/ps-mule.el	Thu May 15 02:32:03 2003 +0000
@@ -1,13 +1,14 @@
 ;;; ps-mule.el --- provide multi-byte character facility to ps-print
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+;; Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <[e-mail]>
 ;;	Kenichi Handa <[e-mail]> (multi-byte characters)
 ;; Maintainer: Kenichi Handa <[e-mail]> (multi-byte characters)
 ;;	Vinicius Jose Latorre <[e-mail]>
 ;; Keywords: wp, print, PostScript, multibyte, mule
-;; Time-stamp: <2001/08/15 15:34:11 vinicius>
+;; Time-stamp: <2003/05/14 22:19:41 vinicius>
 
 ;; This file is part of GNU Emacs.
 
@@ -1439,36 +1440,17 @@
 ;;;###autoload
 (defun ps-mule-header-string-charsets ()
   "Return a list of character sets that appears in header strings."
-  (let ((str ""))
-    (when ps-print-header
-      (let ((tail (list ps-left-header ps-right-header)))
-	(while tail
-	  ;; Simulate what is done by ps-generate-header-line to get a
-	  ;; string to plot.
-	  (let ((count 0)
-		(tmp (car tail)))
-	    (setq tail (cdr tail))
-	    (while (and tmp (< count ps-header-lines))
-	      (let ((elt (car tmp)))
-		(setq tmp (cdr tmp)
-		      count (1+ count)
-		      str (concat str
-				  (cond ((stringp elt) elt)
-					((and (symbolp elt) (fboundp elt))
-					 (funcall elt))
-					((and (symbolp elt) (boundp elt))
-					 (symbol-value elt))
-					(t ""))))))))))
-    (let ((len (length str))
-	  (i 0)
-	  charset-list)
-      (while (< i len)
-	(let ((charset (char-charset (aref str i))))
-	  (setq i (1+ i))
-	  (or (eq charset 'ascii)
-	      (memq charset charset-list)
-	      (setq charset-list (cons charset charset-list)))))
-      charset-list)))
+  (let* ((str (ps-header-footer-string))
+	 (len (length str))
+	 (i 0)
+	 charset-list)
+    (while (< i len)
+      (let ((charset (char-charset (aref str i))))
+	(setq i (1+ i))
+	(or (eq charset 'ascii)
+	    (memq charset charset-list)
+	    (setq charset-list (cons charset charset-list)))))
+    charset-list))
 
 ;;;###autoload
 (defun ps-mule-begin-job (from to)

--- a/lisp/ps-print.el	Thu May 15 01:37:54 2003 +0000
+++ b/lisp/ps-print.el	Thu May 15 02:32:03 2003 +0000
@@ -10,12 +10,12 @@
 ;; Maintainer: Kenichi Handa <[e-mail]> (multi-byte characters)
 ;;	Vinicius Jose Latorre <[e-mail]>
 ;; Keywords: wp, print, PostScript
-;; Time-stamp: <2003/03/05 21:54:55 vinicius>
-;; Version: 6.6
+;; Time-stamp: <2003/05/14 22:34:05 vinicius>
+;; Version: 6.6.1
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
 
-(defconst ps-print-version "6.6"
-  "ps-print.el, v 6.6 <2003/03/05 vinicius>
+(defconst ps-print-version "6.6.1"
+  "ps-print.el, v 6.6.1 <2003/05/14 vinicius>
 
 Vinicius's last change version -- this file may have been edited as part of
 Emacs without changes to the version number.  When reporting bugs, please also
@@ -840,7 +840,7 @@
 ;;		22       +   22          +
 ;;		--------     -----------     ---------     ----------------
 ;;
-;; Any other value is treated as `nil'.
+;; Any other value is treated as nil.
 ;;
 ;; See also section How Ps-Print Has A Text And/Or Image On Background.
 ;;
@@ -4666,6 +4666,42 @@
     (goto-char (point-max))
     (insert-file fname)))
 
+;; These functions are used in `ps-mule' to get charset of header and footer.
+;; To avoid unnecessary calls to functions in `ps-left-header',
+;; `ps-right-header', `ps-left-footer' and `ps-right-footer'.
+
+(defun ps-generate-string-list (content)
+  (let (str)
+    (while content
+      (setq str (cons (cond
+		       ((stringp (car content))
+			(car content))
+		       ((and (symbolp (car content)) (fboundp (car content)))
+			(concat "(" (funcall (car content)) ")"))
+		       ((and (symbolp (car content)) (boundp (car content)))
+			(concat "(" (symbol-value (car content)) ")"))
+		       (t
+			""))
+		      str)
+	    content (cdr content)))
+    (nreverse str)))
+
+(defvar ps-lh-cache nil)
+(defvar ps-rh-cache nil)
+(defvar ps-lf-cache nil)
+(defvar ps-rf-cache nil)
+
+(defun ps-header-footer-string ()
+  (and ps-print-header
+       (setq ps-lh-cache (ps-generate-string-list ps-left-header)
+	     ps-rh-cache (ps-generate-string-list ps-right-header)))
+  (and ps-print-footer
+       (setq ps-lf-cache (ps-generate-string-list ps-left-footer)
+	     ps-rf-cache (ps-generate-string-list ps-right-footer)))
+  (mapconcat 'identity
+	     (append ps-lh-cache ps-rh-cache ps-lf-cache ps-rf-cache)
+	     ""))
+
 ;; These functions insert the arrays that define the contents of the headers.
 
 (defun ps-generate-header-line (fonttag &optional content)
@@ -5809,14 +5845,22 @@
 	     (format "/PageNumber %d def\n" (ps-page-number)))
 
   (when ps-print-header
-    (ps-generate-header "HeaderLinesLeft"  "/h0" "/h1" ps-left-header)
-    (ps-generate-header "HeaderLinesRight" "/h0" "/h1" ps-right-header)
-    (ps-output (format "%d SetHeaderLines\n" ps-header-lines)))
+    (ps-generate-header "HeaderLinesLeft"  "/h0" "/h1"
+			(or ps-lh-cache ps-left-header))
+    (ps-generate-header "HeaderLinesRight" "/h0" "/h1"
+			(or ps-rh-cache ps-right-header))
+    (ps-output (format "%d SetHeaderLines\n" ps-header-lines))
+    (setq ps-lh-cache nil
+	  ps-rh-cache nil))
 
   (when ps-print-footer
-    (ps-generate-header "FooterLinesLeft"  "/H0" "/H0" ps-left-footer)
-    (ps-generate-header "FooterLinesRight" "/H0" "/H0" ps-right-footer)
-    (ps-output (format "%d SetFooterLines\n" ps-footer-lines)))
+    (ps-generate-header "FooterLinesLeft"  "/H0" "/H0"
+			(or ps-lf-cache ps-left-footer))
+    (ps-generate-header "FooterLinesRight" "/H0" "/H0"
+			(or ps-rf-cache ps-right-footer))
+    (ps-output (format "%d SetFooterLines\n" ps-footer-lines))
+    (setq ps-lf-cache nil
+	  ps-rf-cache nil))
 
   (ps-output (number-to-string ps-lines-printed) " BeginPage\n")
   (ps-set-font  ps-current-font)