X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7fdbcd83877ab0317df43e1120c583af3ba86bc4..22bcf2046977620a7f37bbd4dff4be4a4fffc0ed:/lisp/printing.el diff --git a/lisp/printing.el b/lisp/printing.el index ddd4685880..a604b9f102 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -1,7 +1,6 @@ ;;; printing.el --- printing utilities -;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -;; Free Software Foundation, Inc. +;; Copyright (C) 2000-2001, 2003-2011 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre @@ -548,7 +547,7 @@ Please send all bug fixes and enhancements to ;; `pr-auto-region' Non-nil means region is automagically detected. ;; ;; `pr-auto-mode' Non-nil means major-mode specific printing is -;; prefered over normal printing. +;; preferred over normal printing. ;; ;; `pr-mode-alist' Specify an alist for a major-mode and printing ;; function. @@ -1387,20 +1386,6 @@ Used by `pr-menu-bind' and `pr-update-menus'.") (require 'easymenu)) ; to avoid compilation gripes (eval-and-compile - (cond - ;; GNU Emacs 20 - ((< emacs-major-version 21) - (defun pr-global-menubar (pr-menu-spec) - (require 'easymenu) - (easy-menu-change '("tools") "Printing" pr-menu-spec pr-menu-print-item) - (when pr-menu-print-item - (easy-menu-remove-item nil '("tools") pr-menu-print-item) - (setq pr-menu-print-item nil - pr-menu-bar (vector 'menu-bar 'tools - (pr-get-symbol "Printing"))))) - ) - ;; GNU Emacs 21 & 22 - (t (defun pr-global-menubar (pr-menu-spec) (require 'easymenu) (let ((menu-file (if (= emacs-major-version 21) @@ -1422,8 +1407,7 @@ Used by `pr-menu-bind' and `pr-update-menus'.") (t (easy-menu-add-item global-map menu-file (easy-menu-create-menu "Print" pr-menu-spec))) - ))) - ))) + )))) (eval-and-compile (cond @@ -2442,7 +2426,7 @@ marked instead of all buffer." (defcustom pr-auto-mode t - "Non-nil means major-mode specific printing is prefered over normal printing. + "Non-nil means major-mode specific printing is preferred over normal printing. That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*' and `*-region*' commands will behave like `*-mode*' commands; otherwise, @@ -2552,7 +2536,7 @@ LPR-PRINT It's a symbol function for text printing. It's invoked with nil, it's used (point-max). PS-PRINT It's a symbol function for PostScript printing. It's invoked - with 3 arguments: n-up printing, file name and the list: + with three arguments: n-up printing, file name and the list: (HEADER-LINES LEFT-HEADER RIGHT-HEADER DEFAULT...). Usually PS-PRINT function prepares the environment or buffer @@ -3453,12 +3437,7 @@ See `pr-ps-printer-alist'.") (defun pr-menu-bind () "Install `printing' menu in the menubar. - -On Emacs 20, it replaces the Tools/Print menu by Tools/Printing menu. - -On Emacs 21 and 22, it replaces the File/Print* menu entries by File/Print -menu. - +This replaces the File/Print* menu entries with a File/Print sub-menu. Calls `pr-update-menus' to adjust menus." (interactive) (pr-global-menubar pr-menu-spec) @@ -3713,7 +3692,7 @@ VI. Customization: "\n\n The printing interface buffer has the same functionality as the printing menu. The major difference is that the states (like sending PostScript generated to a -file, n-up printing, etc.) are set and saved between priting buffer +file, n-up printing, etc.) are set and saved between printing buffer activation. Also, the landscape, duplex and tumble values are the same for PostScript file and directory/buffer/region/mode processing; using menu, there are different value sets for PostScript file and directory/buffer/region/mode @@ -4632,7 +4611,7 @@ bottom." ;;;###autoload (defun pr-toggle-region () - "Toggle auto region." + "Toggle whether the region is automagically detected." (interactive) (pr-toggle-region-menu t)) @@ -4688,7 +4667,7 @@ bottom." "Interactively select a PostScript utility." (interactive) (pr-menu-set-utility-title - (pr-complete-alist "Postscript utility" + (pr-complete-alist "PostScript utility" pr-ps-utility-alist pr-ps-utility))) @@ -4731,12 +4710,12 @@ Interactively, you have the following situations: M-x pr-ps-fast-fire RET The command prompts the user for a N-UP value and printing will - immediatelly be done using the current active printer. + immediately be done using the current active printer. C-u M-x pr-ps-fast-fire RET C-u 0 M-x pr-ps-fast-fire RET The command prompts the user for a N-UP value and also for a current - PostScript printer, then printing will immediatelly be done using the new + PostScript printer, then printing will immediately be done using the new current active printer. C-u 1 M-x pr-ps-fast-fire RET @@ -4757,7 +4736,7 @@ zero and the argument SELECT is treated as follows: If it's nil, send the image to the printer. If it's a list or an integer lesser or equal to zero, the command prompts - the user for a current PostScript printer, then printing will immediatelly + the user for a current PostScript printer, then printing will immediately be done using the new current active printer. If it's an integer equal to 1, the command prompts the user for a file name @@ -4770,7 +4749,7 @@ zero and the argument SELECT is treated as follows: instead of sending it to the printer. If it's a symbol which it's defined in `pr-ps-printer-alist', it's the new - active printer and printing will immediatelly be done using the new active + active printer and printing will immediately be done using the new active printer. Otherwise, send the image to the printer. @@ -4821,7 +4800,7 @@ Noninteractively, the argument SELECT-PRINTER is treated as follows: If it's nil, the printing is sent to the current active text printer. If it's a symbol which it's defined in `pr-txt-printer-alist', it's the new - active printer and printing will immediatelly be done using the new active + active printer and printing will immediately be done using the new active printer. If it's non-nil, the command prompts the user for a new active text printer. @@ -5367,102 +5346,119 @@ If menu binding was not done, calls `pr-menu-bind'." (defun pr-toggle-file-duplex-menu (&optional no-menu) + "Toggle whether to print PostScript files in duplex mode." (interactive) (pr-toggle 'pr-file-duplex "PS file duplex" nil 7 5 nil '("PostScript Print" "File") no-menu)) (defun pr-toggle-file-tumble-menu (&optional no-menu) + "Toggle whether to print PostScript files in tumble mode." (interactive) (pr-toggle 'pr-file-tumble "PS file tumble" nil 8 5 nil '("PostScript Print" "File") no-menu)) (defun pr-toggle-file-landscape-menu (&optional no-menu) + "Toggle whether to print PostScript files in landscape orientation." (interactive) (pr-toggle 'pr-file-landscape "PS file landscape" nil 6 5 nil '("PostScript Print" "File") no-menu)) (defun pr-toggle-ghostscript-menu (&optional no-menu) + "Toggle whether to print using ghostscript." (interactive) (pr-toggle 'pr-print-using-ghostscript "Printing using ghostscript" 'postscript-process 2 12 'toggle nil no-menu)) (defun pr-toggle-faces-menu (&optional no-menu) + "Toggle whether to print with face attributes." (interactive) (pr-toggle 'pr-faces-p "Printing with faces" 'postscript-process 1 12 'toggle nil no-menu)) (defun pr-toggle-spool-menu (&optional no-menu) + "Toggle whether to spool printing in a buffer." (interactive) (pr-toggle 'pr-spool-p "Spooling printing" 'postscript-process 0 12 'toggle nil no-menu)) (defun pr-toggle-duplex-menu (&optional no-menu) + "Toggle whether to generate PostScript for a two-sided printer." (interactive) (pr-toggle 'ps-spool-duplex "Printing duplex" 'postscript-options 5 12 'toggle nil no-menu)) (defun pr-toggle-tumble-menu (&optional no-menu) + "Toggle how pages on opposite sides of a sheet are oriented." (interactive) (pr-toggle 'ps-spool-tumble "Tumble" 'postscript-options 6 12 'toggle nil no-menu)) (defun pr-toggle-landscape-menu (&optional no-menu) + "Toggle whether to print in landscape mode." (interactive) (pr-toggle 'ps-landscape-mode "Landscape" 'postscript-options 0 12 'toggle nil no-menu)) (defun pr-toggle-upside-down-menu (&optional no-menu) + "Toggle whether to print upside-down (that is, rotated by 180 degrees)." (interactive) (pr-toggle 'ps-print-upside-down "Upside-Down" 'postscript-options 7 12 'toggle nil no-menu)) (defun pr-toggle-line-menu (&optional no-menu) + "Toggle whether to means print line numbers." (interactive) (pr-toggle 'ps-line-number "Line number" 'postscript-options 3 12 'toggle nil no-menu)) (defun pr-toggle-zebra-menu (&optional no-menu) + "Toggle whether to print zebra stripes." (interactive) (pr-toggle 'ps-zebra-stripes "Zebra stripe" 'postscript-options 4 12 'toggle nil no-menu)) (defun pr-toggle-header-menu (&optional no-menu) + "Toggle whether to print a header at the top of each page." (interactive) (pr-toggle 'ps-print-header "Print header" 'postscript-options 1 12 'toggle nil no-menu)) (defun pr-toggle-header-frame-menu (&optional no-menu) + "Toggle whether to draw a gaudy frame around the header." (interactive) (pr-toggle 'ps-print-header-frame "Print header frame" 'postscript-options 2 12 'toggle nil no-menu)) (defun pr-toggle-lock-menu (&optional no-menu) + "Toggle whether the menu is locked while selecting toggle options." (interactive) (pr-toggle 'pr-menu-lock "Menu lock" 'printing 2 12 'toggle nil no-menu)) (defun pr-toggle-region-menu (&optional no-menu) + "Toggle whether the region is automagically detected." (interactive) (pr-toggle 'pr-auto-region "Auto region" 'printing 0 12 'toggle nil no-menu)) (defun pr-toggle-mode-menu (&optional no-menu) + "Toggle whether major-mode specific printing is preferred over normal printing." (interactive) (pr-toggle 'pr-auto-mode "Auto mode" 'printing 1 12 'toggle nil no-menu)) @@ -5728,8 +5724,8 @@ If menu binding was not done, calls `pr-menu-bind'." (let* ((dir-name (file-name-directory (or (buffer-file-name) default-directory))) (fmt-prompt (concat "%s[" mess "] Directory to print: ")) - (dir (read-file-name (format fmt-prompt "") - "" dir-name nil dir-name)) + (dir (read-directory-name (format fmt-prompt "") + "" dir-name nil dir-name)) prompt) (while (cond ((not (file-directory-p dir)) (ding) @@ -5739,8 +5735,8 @@ If menu binding was not done, calls `pr-menu-bind'." (setq prompt "Directory is unreadable! ")) (t nil)) (setq dir-name (file-name-directory dir) - dir (read-file-name (format fmt-prompt prompt) - "" dir-name nil dir-name))) + dir (read-directory-name (format fmt-prompt prompt) + "" dir-name nil dir-name))) (file-name-as-directory dir))) @@ -6685,5 +6681,4 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." (provide 'printing) -;; arch-tag: 9ce9ac3f-0f60-4370-900b-1943215d9d18 ;;; printing.el ends here