X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e20192f449a364f52ea6172e6e12966fe449da0a..1b74c4346e92c9ac1ae0575c2ad69f8d81126d7e:/lisp/lpr.el

diff --git a/lisp/lpr.el b/lisp/lpr.el
index 0ed7a1c418..c44971e4f3 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -1,6 +1,7 @@
-;;; lpr.el --- print Emacs buffer on line printer.
+;;; lpr.el --- print Emacs buffer on line printer
 
-;; Copyright (C) 1985, 1988, 1992, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003,
+;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix
@@ -19,24 +20,34 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;; Commands to send the region or a buffer your printer.  Entry points
-;; are `lpr-buffer', `print-buffer', lpr-region', or `print-region'; option
+;; Commands to send the region or a buffer to your printer.  Entry points
+;; are `lpr-buffer', `print-buffer', `lpr-region', or `print-region'; option
 ;; variables include `printer-name', `lpr-switches' and `lpr-command'.
 
 ;;; Code:
 
+;;;###autoload
+(defvar lpr-windows-system
+  (memq system-type '(emx win32 w32 mswindows ms-dos windows-nt)))
+
+;;;###autoload
+(defvar lpr-lp-system
+  (memq system-type '(usg-unix-v dgux hpux irix)))
+
+
 (defgroup lpr nil
-  "Print Emacs buffer on line printer"
+  "Print Emacs buffer on line printer."
   :group 'wp)
 
+
 ;;;###autoload
 (defcustom printer-name
-  (if (memq system-type '(ms-dos windows-nt)) "PRN")
+  (and lpr-windows-system "PRN")
   "*The name of a local printer to which data is sent for printing.
 \(Note that PostScript files are sent to `ps-printer-name', which see.\)
 
@@ -50,13 +61,15 @@ printers, or \"COM1\" to \"COM4\" or \"AUX\" for serial printers, or
 \"//hostname/printer\" for a shared network printer.  You can also set
 it to the name of a file, in which case the output gets appended to that
 file.  If you want to discard the printed output, set this to \"NUL\"."
-  :type '(choice ; could use string but then we lose completion for files.
-		 (file :tag "Name")
-		 (const :tag "Default" nil))
+  :type '(choice :menu-tag "Printer Name"
+		 :tag "Printer Name"
+		 (const :tag "Default" nil)
+		 ;; could use string but then we lose completion for files.
+		 (file :tag "Name"))
   :group 'lpr)
 
 ;;;###autoload
-(defcustom lpr-switches nil 
+(defcustom lpr-switches nil
   "*List of strings to pass as extra options for the printer program.
 It is recommended to set `printer-name' instead of including an explicit
 switch on this list.
@@ -64,20 +77,32 @@ See `lpr-command'."
   :type '(repeat (string :tag "Argument"))
   :group 'lpr)
 
-(defcustom lpr-add-switches (eq system-type 'berkeley-unix)
-  "*Non-nil means construct -T and -J options for the printer program.
+(defcustom lpr-add-switches (memq system-type '(berkeley-unix gnu/linux))
+  "*Non-nil means construct `-T' and `-J' options for the printer program.
 These are made assuming that the program is `lpr';
 if you are using some other incompatible printer program,
 this variable should be nil."
   :type 'boolean
   :group 'lpr)
 
+(defcustom lpr-printer-switch
+  (if lpr-lp-system
+      "-d "
+    "-P")
+  "*Printer switch, that is, something like \"-P\", \"-d \", \"/D:\", etc.
+This switch is used in conjunction with `printer-name'."
+  :type '(choice :menu-tag "Printer Name Switch"
+		 :tag "Printer Name Switch"
+		 (const :tag "None" nil)
+		 (string :tag "Printer Switch"))
+  :group 'lpr)
+
 ;;;###autoload
 (defcustom lpr-command
   (cond
-   ((memq system-type '(ms-dos windows-nt))
+   (lpr-windows-system
     "")
-   ((memq system-type '(usg-unix-v dgux hpux irix))
+   (lpr-lp-system
     "lp")
    (t
     "lpr"))
@@ -105,7 +130,7 @@ and print the result."
 (defcustom print-region-function nil
   "Function to call to print the region on a printer.
 See definition of `print-region-1' for calling conventions."
-  :type 'function
+  :type '(choice (const nil) function)
   :group 'lpr)
 
 (defcustom lpr-page-header-program "pr"
@@ -123,34 +148,51 @@ The variable `lpr-page-header-program' specifies the program to use."
 
 ;;;###autoload
 (defun lpr-buffer ()
-  "Print buffer contents as with Unix command `lpr'.
-`lpr-switches' is a list of extra switches (strings) to pass to lpr."
+  "Print buffer contents without pagination or page headers.
+See the variables `lpr-switches' and `lpr-command'
+for customization of the printer command."
   (interactive)
   (print-region-1 (point-min) (point-max) lpr-switches nil))
 
 ;;;###autoload
 (defun print-buffer ()
   "Paginate and print buffer contents.
-Normally invokes `pr' for pagination, but see the variable
-`lpr-page-header-program'.  Printing is normally done with `lpr'
-or `lp'; the variable `lpr-command' changes this.
 
-Also see the variables `lpr-switches' and `lpr-page-header-switches'
-for further customization of the commands used."
+The variable `lpr-headers-switches' controls how to paginate.
+If it is nil (the default), we run the `pr' program (or whatever program
+`lpr-page-header-program' specifies) to paginate.
+`lpr-page-header-switches' specifies the switches for that program.
+
+Otherwise, the switches in `lpr-headers-switches' are used
+in the print command itself; we expect them to request pagination.
+
+See the variables `lpr-switches' and `lpr-command'
+for further customization of the printer command."
   (interactive)
   (print-region-1 (point-min) (point-max) lpr-switches t))
 
 ;;;###autoload
 (defun lpr-region (start end)
-  "Print region contents as with Unix command `lpr'.
-`lpr-switches' is a list of extra switches (strings) to pass to lpr."
+  "Print region contents without pagination or page headers.
+See the variables `lpr-switches' and `lpr-command'
+for customization of the printer command."
   (interactive "r")
   (print-region-1 start end lpr-switches nil))
 
 ;;;###autoload
 (defun print-region (start end)
-  "Print region contents as with Unix command `lpr -p'.
-`lpr-switches' is a list of extra switches (strings) to pass to lpr."
+  "Paginate and print the region contents.
+
+The variable `lpr-headers-switches' controls how to paginate.
+If it is nil (the default), we run the `pr' program (or whatever program
+`lpr-page-header-program' specifies) to paginate.
+`lpr-page-header-switches' specifies the switches for that program.
+
+Otherwise, the switches in `lpr-headers-switches' are used
+in the print command itself; we expect them to request pagination.
+
+See the variables `lpr-switches' and `lpr-command'
+for further customization of the printer command."
   (interactive "r")
   (print-region-1 start end lpr-switches t))
 
@@ -158,34 +200,37 @@ for further customization of the commands used."
   ;; On some MIPS system, having a space in the job name
   ;; crashes the printer demon.  But using dashes looks ugly
   ;; and it seems to annoying to do for that MIPS system.
-  (let ((name (concat (buffer-name) " Emacs buffer"))
+  (let ((name  (concat (buffer-name) " Emacs buffer"))
 	(title (concat (buffer-name) " Emacs buffer"))
 	;; Make pipes use the same coding system as
 	;; writing the buffer to a file would.
-	(coding-system-for-write
-	 (or coding-system-for-write buffer-file-coding-system))
-	(coding-system-for-read
-	 (or coding-system-for-read buffer-file-coding-system))
+	(coding-system-for-write (or coding-system-for-write
+				     buffer-file-coding-system))
+	(coding-system-for-read  (or coding-system-for-read
+				     buffer-file-coding-system))
 	(width tab-width)
+	nswitches
 	switch-string)
     (save-excursion
-      (if page-headers
-	  (if lpr-headers-switches
-	      ;; It is possible to use an lpr option
-	      ;; to get page headers.
-	      (setq switches (append (if (stringp lpr-headers-switches)
-					 (list lpr-headers-switches)
-				        lpr-headers-switches)
-				     switches))))
-      (setq switch-string
-	    (if switches (concat " with options "
-				 (mapconcat 'identity switches " "))
-	      ""))
+      (and page-headers lpr-headers-switches
+	   ;; It's possible to use an lpr option to get page headers.
+	   (setq switches (append (if (stringp lpr-headers-switches)
+				      (list lpr-headers-switches)
+				    lpr-headers-switches)
+				  switches)))
+      (setq nswitches     (lpr-flatten-list
+			   (mapcar 'lpr-eval-switch ; Dynamic evaluation
+				   switches))
+	    switch-string (if switches
+			      (concat " with options "
+				      (mapconcat 'identity switches " "))
+			    ""))
       (message "Spooling%s..." switch-string)
       (if (/= tab-width 8)
 	  (let ((new-coords (print-region-new-buffer start end)))
-	    (setq start (car new-coords) end (cdr new-coords))
-	    (setq tab-width width)
+	    (setq start     (car new-coords)
+		  end       (cdr new-coords)
+		  tab-width width)
 	    (save-excursion
 	      (goto-char end)
 	      (setq end (point-marker)))
@@ -196,23 +241,24 @@ for further customization of the commands used."
 	      nil
 	    ;; Run a separate program to get page headers.
 	    (let ((new-coords (print-region-new-buffer start end)))
-	      (setq start (car new-coords) end (cdr new-coords)))
-	    (apply 'call-process-region start end lpr-page-header-program
-				 t t nil
-				 (nconc (list "-h" title)
-					lpr-page-header-switches))
-	    (setq start (point-min) end (point-max))))
+	      (apply 'call-process-region (car new-coords) (cdr new-coords)
+		     lpr-page-header-program t t nil
+		     (nconc (list "-h" title)
+			    lpr-page-header-switches)))
+	    (setq start (point-min)
+		  end   (point-max))))
       (apply (or print-region-function 'call-process-region)
 	     (nconc (list start end lpr-command
 			  nil nil nil)
-		    (nconc (and lpr-add-switches
-				(list "-J" name))
-			   ;; These belong in pr if we are using that.
-			   (and lpr-add-switches lpr-headers-switches
-				(list "-T" title))
-			   (and (stringp printer-name)
-				(list (concat "-P" printer-name)))
-			   switches)))
+		    (and lpr-add-switches
+			 (list "-J" name))
+		    ;; These belong in pr if we are using that.
+		    (and lpr-add-switches lpr-headers-switches
+			 (list "-T" title))
+		    (and (stringp printer-name)
+			 (list (concat lpr-printer-switch
+				       printer-name)))
+		    nswitches))
       (if (markerp end)
 	  (set-marker end nil))
       (message "Spooling%s...done" switch-string))))
@@ -227,7 +273,8 @@ for further customization of the commands used."
       (cons ostart oend)
     (let ((oldbuf (current-buffer)))
       (set-buffer (get-buffer-create " *spool temp*"))
-      (widen) (erase-buffer)
+      (widen)
+      (erase-buffer)
       (insert-buffer-substring oldbuf ostart oend)
       (cons (point-min) (point-max)))))
 
@@ -237,16 +284,47 @@ The printable representations use ^ (for ASCII control characters) or hex.
 The characters tab, linefeed, space, return and formfeed are not affected."
   (interactive "r")
   (save-excursion
-    (goto-char begin)
-    (let (c)
-      (while (re-search-forward "[\^@-\^h\^k\^n-\^_\177-\377]" end t)
-	(setq c (preceding-char))
-	(delete-backward-char 1)
-	(insert 
-	 (if (< c ?\ )
-	     (format "\\^%c" (+ c ?@))
-	   (format "\\%02x" c)))))))
+    (save-restriction
+      (narrow-to-region begin end)
+      (goto-char (point-min))
+      (let (c)
+	(while (re-search-forward "[\^@-\^h\^k\^n-\^_\177-\377]" nil t)
+	  (setq c (preceding-char))
+	  (delete-backward-char 1)
+	  (insert (if (< c ?\s)
+		      (format "\\^%c" (+ c ?@))
+		    (format "\\%02x" c))))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Functions hacked from `ps-print' package.
+
+;; Dynamic evaluation
+(defun lpr-eval-switch (arg)
+  (cond ((stringp arg) arg)
+	((functionp arg) (apply arg nil))
+	((symbolp arg) (symbol-value arg))
+	((consp arg) (apply (car arg) (cdr arg)))
+	(t nil)))
+
+;; `lpr-flatten-list' is defined here (copied from "message.el" and
+;; enhanced to handle dotted pairs as well) until we can get some
+;; sensible autoloads, or `flatten-list' gets put somewhere decent.
+
+;; (lpr-flatten-list '((a . b) c (d . e) (f g h) i . j))
+;; => (a b c d e f g h i j)
+
+(defun lpr-flatten-list (&rest list)
+  (lpr-flatten-list-1 list))
+
+(defun lpr-flatten-list-1 (list)
+  (cond
+   ((null list) (list))
+   ((consp list)
+    (append (lpr-flatten-list-1 (car list))
+	    (lpr-flatten-list-1 (cdr list))))
+   (t (list list))))
 
 (provide 'lpr)
 
+;;; arch-tag: 21c3f821-ebec-4ca9-ac67-a81e4b75c62a
 ;;; lpr.el ends here