Fix previous change.

[gnu-emacs] / lisp / ps-print.el

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index ffb430dbdf78d670925bd28411e192d107577f18..6f18fd6857e4a94b4a07b8355ea1935072e8085e 100644 (file)
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1,24 +1,25 @@
-;;; ps-print.el --- Jim's Pretty-Good PostScript Generator for Emacs 19.
+;;; ps-print.el --- Print text from the buffer as PostScript

 
 

-;; Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.

 
 ;; Author:     Jim Thompson (was <thompson@wg2.waii.com>)
 ;; Author:     Jacques Duthen <duthen@cegelec-red.fr>
 
 ;; Author:     Jim Thompson (was <thompson@wg2.waii.com>)
 ;; Author:     Jacques Duthen <duthen@cegelec-red.fr>

-;; Maintainer: Vinicius Jose Latorre <vinicius@cpqd.br>
+;; Author:     Vinicius Jose Latorre <vinicius@cpqd.com.br>
+;; Maintainer: Vinicius Jose Latorre <vinicius@cpqd.com.br>

 ;; Keywords:   print, PostScript
 ;; Keywords:   print, PostScript

-;; Time-stamp: <97/08/09 1:30:17 vinicius>
-;; Version:    3.05
+;; Time-stamp: <98/06/04  15:23:12 vinicius>
+;; Version:    3.06.3

 
 

-(defconst ps-print-version "3.05"
-  "ps-print.el, v 3.05 <97/08/09 vinicius>
+(defconst ps-print-version "3.06.3"
+  "ps-print.el, v 3.06.3 <98/06/04 vinicius>

 
 

-Jack's last change version -- this file may have been edited as part of
+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 report the version of Emacs, if any, that ps-print was
 distributed with.
 
 Please send all bug fixes and enhancements to
 Emacs without changes to the version number.  When reporting bugs,
 please also report the version of Emacs, if any, that ps-print was
 distributed with.
 
 Please send all bug fixes and enhancements to

-       Jacques Duthen <duthen@cegelec-red.fr>.
+       Vinicius Jose Latorre <vinicius@cpqd.com.br>.

 ")
 
 ;; This file is part of GNU Emacs.
 ")
 
 ;; This file is part of GNU Emacs.


@@ -99,8 +100,8 @@ Please send all bug fixes and enhancements to
 ;; otherwise be wasted on banner pages, and to make it easier to find
 ;; your output at the printer (it's easier to pick up one 50-page
 ;; printout than to find 50 single-page printouts).
 ;; otherwise be wasted on banner pages, and to make it easier to find
 ;; your output at the printer (it's easier to pick up one 50-page
 ;; printout than to find 50 single-page printouts).

-;; 
-;; Ps-print has a hook in the `kill-emacs-hooks' so that you won't
+;;
+;; Ps-print has a hook in the `kill-emacs-hook' so that you won't

 ;; accidentally quit from Emacs while you have unprinted PostScript
 ;; waiting in the spool buffer.  If you do attempt to exit with
 ;; spooled PostScript, you'll be asked if you want to print it, and if
 ;; accidentally quit from Emacs while you have unprinted PostScript
 ;; waiting in the spool buffer.  If you do attempt to exit with
 ;; spooled PostScript, you'll be asked if you want to print it, and if


@@ -268,15 +269,15 @@ Please send all bug fixes and enhancements to
 ;; Headers
 ;; -------
 ;;
 ;; Headers
 ;; -------
 ;;

-;; Ps-print can print headers at the top of each column; the default
-;; headers contain the following four items: on the left, the name of
-;; the buffer and, if the buffer is visiting a file, the file's
-;; directory; on the right, the page number and date of printing.
-;; The default headers look something like this:
+;; Ps-print can print headers at the top of each column or at the top
+;; of each page; the default headers contain the following four items:
+;; on the left, the name of the buffer and, if the buffer is visiting
+;; a file, the file's directory; on the right, the page number and
+;; date of printing.  The default headers look something like this:

 ;;
 ;;     ps-print.el                                         1/21
 ;;     /home/jct/emacs-lisp/ps/new                     94/12/31
 ;;
 ;;     ps-print.el                                         1/21
 ;;     /home/jct/emacs-lisp/ps/new                     94/12/31

-;; 
+;;

 ;; When printing on duplex printers, left and right are reversed so
 ;; that the page numbers are toward the outside (cf. `ps-spool-duplex').
 ;;
 ;; When printing on duplex printers, left and right are reversed so
 ;; that the page numbers are toward the outside (cf. `ps-spool-duplex').
 ;;


@@ -285,8 +286,11 @@ Please send all bug fixes and enhancements to
 ;; To turn off the header's gaudy framing box,
 ;; set `ps-print-header-frame' to nil.
 ;;
 ;; To turn off the header's gaudy framing box,
 ;; set `ps-print-header-frame' to nil.
 ;;

+;; To print only one header at the top of each page,
+;; set `ps-print-only-one-header' to t.
+;;

 ;; The font family and size of text in the header are determined
 ;; The font family and size of text in the header are determined

-;; by the variables `ps-header-font-family', `ps-header-font-size' and 
+;; by the variables `ps-header-font-family', `ps-header-font-size' and

 ;; `ps-header-title-font-size' (see below).
 ;;
 ;; The variable `ps-header-line-pad' determines the portion of a header
 ;; `ps-header-title-font-size' (see below).
 ;;
 ;; The variable `ps-header-line-pad' determines the portion of a header


@@ -361,39 +365,98 @@ Please send all bug fixes and enhancements to
 ;; Don't forget to set `ps-lpr-switches' to select duplex printing
 ;; for your printer.
 ;;
 ;; Don't forget to set `ps-lpr-switches' to select duplex printing
 ;; for your printer.
 ;;

-;; 
+;;
+;; Control And 8-bit Characters
+;; ----------------------------
+;;
+;; The variable `ps-print-control-characters' specifies whether you want to see
+;; a printable form for control and 8-bit characters, that is, instead of
+;; sending, for example, a ^D (\004) to printer, it is sent the string "^D".
+;;
+;; Valid values for `ps-print-control-characters' are:
+;;
+;;  8-bit           This is the value to use when you want an ascii encoding of
+;;                  any control or non-ascii character. Control characters are
+;;                  encoded as "^D", and non-ascii characters have an
+;;                  octal encoding.
+;;
+;;  control-8-bit   This is the value to use when you want an ascii encoding of
+;;                  any control character, whether it is 7 or 8-bit.
+;;                  European 8-bits accented characters are printed according
+;;                  the current font.
+;;
+;;  control         Only ascii control characters have an ascii encoding.
+;;                  European 8-bits accented characters are printed according
+;;                  the current font.
+;;
+;;  nil             No ascii encoding. Any character is printed according the
+;;                  current font.
+;;
+;; Any other value is treated as nil.
+;;
+;; The default is `control-8-bit'.
+;;
+;; Characters TAB, NEWLINE and FORMFEED are always treated by ps-print engine.
+;;
+;;

 ;; Line Number
 ;; -----------
 ;;
 ;; Line Number
 ;; -----------
 ;;

-;; The variable `ps-line-number' determines if lines will be
-;; numerated (non-nil value) or not (nil value).
-;; The default is not numerated (nil value).
+;; The variable `ps-line-number' specifies whether to number each line;
+;; non-nil means do so.  The default is nil (don't number each line).

 ;;
 ;;
 ;; Zebra Stripes
 ;; -------------
 ;;
 ;;
 ;;
 ;; Zebra Stripes
 ;; -------------
 ;;

-;; Zebra stripes is a kind of background effect, where the background looks
-;; like:
+;; Zebra stripes are a kind of background that appear "underneath" the text
+;; and can make the text easier to read.  They look like this:

 ;;
 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 ;;
 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 ;; XXXXXXXXXXXXXXXXXXXXXXXX

+;; XXXXXXXXXXXXXXXXXXXXXXXX

 ;;
 ;;
 ;;
 ;;

+;;
+;; XXXXXXXXXXXXXXXXXXXXXXXX

 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 ;;
 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 ;;

-;; The X's are representing a rectangle area filled with a light gray color.
+;; The blocks of X's represent rectangles filled with a light gray color.
+;; Each rectangle extends all the way across the page.
+;;
+;; The height, in lines, of each rectangle is controlled by
+;; the variable `ps-zebra-stripe-height', which is 3 by default.
+;; The distance between stripes equals the height of a stripe.
+;;
+;; The variable `ps-zebra-stripes' controls whether to print zebra stripes.
+;; Non-nil means yes, nil means no.  The default is nil.
+;;
+;; See also section How Ps-Print Has A Text And/Or Image On Background.
+;;
+;;
+;; Hooks
+;; -----
+;;
+;; Ps-print has the following hook variables:

 ;;
 ;;

-;; The variable `ps-zebra-stripe' determines if zebra stripe lines will be
-;; printed (non-nil value) or not (nil value).
-;; The default is not print zebra stripes (nil value).
+;; `ps-print-hook'
+;;    It is evaluated once before any printing process.  This is the right
+;;    place to initialize ps-print global data.
+;;    For an example, see section Adding a New Font Family.

 ;;
 ;;

-;; The variable `ps-number-of-zebra' indicates the number of lines on a
-;; zebra stripe.  The default is 3.
+;; `ps-print-begin-page-hook'
+;;    It is evaluated on each real beginning of page, that is, ps-print
+;;    considers each beginning of column as a beginning of page, and a real
+;;    beginning of page is when the beginning of column coincides with a
+;;    paper change on your printer.

 ;;
 ;;

+;; `ps-print-begin-column-hook'
+;;    It is evaluated on each beginning of column, except in the beginning
+;;    of column that `ps-print-begin-page-hook' is evaluated.

 ;;
 ;;

-;; Font managing
+;;
+;; Font Managing

 ;; -------------
 ;;
 ;; Ps-print now knows rather precisely some fonts:
 ;; -------------
 ;;
 ;; Ps-print now knows rather precisely some fonts:


@@ -403,7 +466,7 @@ Please send all bug fixes and enhancements to
 ;; Each font family contains the font names for standard, bold, italic
 ;; and bold-italic characters, a reference size (usually 10) and the
 ;; corresponding line height, width of a space and average character width.
 ;; Each font family contains the font names for standard, bold, italic
 ;; and bold-italic characters, a reference size (usually 10) and the
 ;; corresponding line height, width of a space and average character width.

-;; 
+;;

 ;; The variable `ps-font-family' determines which font family
 ;; is to be used for ordinary text.
 ;; If its value does not correspond to a known font family,
 ;; The variable `ps-font-family' determines which font family
 ;; is to be used for ordinary text.
 ;; If its value does not correspond to a known font family,


@@ -422,7 +485,7 @@ Please send all bug fixes and enhancements to
 ;; in points, for the top line of text in the header.
 ;;
 ;;
 ;; in points, for the top line of text in the header.
 ;;
 ;;

-;; Adding a new font family
+;; Adding a New Font Family

 ;; ------------------------
 ;;
 ;; To use a new font family, you MUST first teach ps-print
 ;; ------------------------
 ;;
 ;; To use a new font family, you MUST first teach ps-print


@@ -436,7 +499,7 @@ Please send all bug fixes and enhancements to
 ;; - generate the PostScript image to a file (C-u M-x ps-print-buffer)
 ;; - open this file and find the line:
 ;;     `% 3 cm 20 cm moveto  10 /Courier ReportFontInfo  showpage'
 ;; - generate the PostScript image to a file (C-u M-x ps-print-buffer)
 ;; - open this file and find the line:
 ;;     `% 3 cm 20 cm moveto  10 /Courier ReportFontInfo  showpage'

-;; - delete the leading `%' (which is the Postscript comment character)
+;; - delete the leading `%' (which is the PostScript comment character)

 ;; - replace in this line `Courier' by the new font (say `Helvetica')
 ;;   to get the line:
 ;;     `3 cm 20 cm moveto  10 /Helvetica ReportFontInfo  showpage'
 ;; - replace in this line `Courier' by the new font (say `Helvetica')
 ;;   to get the line:
 ;;     `3 cm 20 cm moveto  10 /Helvetica ReportFontInfo  showpage'


@@ -448,11 +511,17 @@ Please send all bug fixes and enhancements to
 ;;
 ;; - Add these values to the `ps-font-info-database':
 ;;   (setq ps-font-info-database
 ;;
 ;; - Add these values to the `ps-font-info-database':
 ;;   (setq ps-font-info-database

-;;      (append
-;;       '((Helvetica ; the family name
-;;         "Helvetica" "Helvetica-Bold" "Helvetica-Oblique" "Helvetica-BoldOblique"
-;;         10.0 11.56 2.78 5.09243))
-;;       ps-font-info-database))
+;;        (append
+;;         '((Helvetica                        ; the family key
+;;            (fonts (normal      . "Helvetica")
+;;                   (bold        . "Helvetica-Bold")
+;;                   (italic      . "Helvetica-Oblique")
+;;                   (bold-italic . "Helvetica-BoldOblique"))
+;;            (size . 10.0)
+;;            (line-height . 11.56)
+;;            (space-width . 2.78)
+;;            (avg-char-width . 5.09243)))
+;;         ps-font-info-database))

 ;; - Now you can use this font family with any size:
 ;;     (setq ps-font-family 'Helvetica)
 ;; - if you want to use this family in another emacs session, you must
 ;; - Now you can use this font family with any size:
 ;;     (setq ps-font-family 'Helvetica)
 ;; - if you want to use this family in another emacs session, you must


@@ -461,24 +530,52 @@ Please send all bug fixes and enhancements to
 ;;     (setq ps-font-info-database (append ...)))
 ;;   if you don't want to load ps-print, you have to copy the whole value:
 ;;     (setq ps-font-info-database '(<your stuff> <the standard stuff>))
 ;;     (setq ps-font-info-database (append ...)))
 ;;   if you don't want to load ps-print, you have to copy the whole value:
 ;;     (setq ps-font-info-database '(<your stuff> <the standard stuff>))

-;;   or, if you can wait until the `ps-print-hook' is implemented, do:
-;;      (add-hook 'ps-print-hook '(setq ps-font-info-database (append ...)))
-;;      This does not work yet, since there is no `ps-print-hook' yet.
+;;   or, use `ps-print-hook' (see section Hooks):
+;;     (add-hook 'ps-print-hook
+;;               '(lambda () (setq ps-font-info-database (append ...))))

 ;;
 ;; You can create new `mixed' font families like:
 ;;
 ;; You can create new `mixed' font families like:

-;;     (my-mixed-family
-;;      "Courier-Bold" "Helvetica"
-;;      "Zapf-Chancery-MediumItalic" "NewCenturySchlbk-BoldItalic"
-;;      10.0 10.55 6.0 6.0)
+;;      (my-mixed-family
+;;       (fonts (normal               . "Courier-Bold")
+;;              (bold                 . "Helvetica")
+;;              (italic               . "Zapf-Chancery-MediumItalic")
+;;              (bold-italic          . "NewCenturySchlbk-BoldItalic")
+;;              (w3-table-hack-x-face . "LineDrawNormal"))
+;;       (size . 10.0)
+;;       (line-height . 10.55)
+;;       (space-width . 6.0)
+;;       (avg-char-width . 6.0))

 ;; Now you can use your new font family with any size:
 ;;     (setq ps-font-family 'my-mixed-family)
 ;;
 ;; Now you can use your new font family with any size:
 ;;     (setq ps-font-family 'my-mixed-family)
 ;;

+;; Note that on above example the `w3-table-hack-x-face' entry refers to
+;; a face symbol, so when printing this face it'll be used the font
+;; `LineDrawNormal'.  If the face  `w3-table-hack-x-face'  is remapped to
+;; use bold and/or italic attribute, the corresponding entry (bold, italic
+;; or bold-italic) will be used instead of `w3-table-hack-x-face' entry.
+;;
+;; Note also that the font family entry order is irrelevant, so the above
+;; example could also be written:
+;;      (my-mixed-family
+;;       (size . 10.0)
+;;       (fonts (w3-table-hack-x-face . "LineDrawNormal")
+;;              (bold                 . "Helvetica")
+;;              (bold-italic          . "NewCenturySchlbk-BoldItalic")
+;;              (italic               . "Zapf-Chancery-MediumItalic")
+;;              (normal               . "Courier-Bold"))
+;;       (avg-char-width . 6.0)
+;;       (space-width . 6.0)
+;;       (line-height . 10.55))
+;;
+;; Despite the note above, it is recommended that some convention about
+;; entry order be used.
+;;

 ;; You can get information on all the fonts resident in YOUR printer
 ;; by uncommenting the line:
 ;;     % 3 cm 20 cm moveto  ReportAllFontInfo           showpage
 ;;
 ;; You can get information on all the fonts resident in YOUR printer
 ;; by uncommenting the line:
 ;;     % 3 cm 20 cm moveto  ReportAllFontInfo           showpage
 ;;

-;; The postscript file should be sent to YOUR postscript printer.
-;; If you send it to ghostscript or to another postscript printer,
+;; The PostScript file should be sent to YOUR PostScript printer.
+;; If you send it to ghostscript or to another PostScript printer,

 ;; you may get slightly different results.
 ;; Anyway, as ghostscript fonts are autoload, you won't get
 ;; much font info.
 ;; you may get slightly different results.
 ;; Anyway, as ghostscript fonts are autoload, you won't get
 ;; much font info.


@@ -492,15 +589,16 @@ Please send all bug fixes and enhancements to
 ;; always right.  For example, you might want to map colors into faces
 ;; so that blue faces print in bold, and red faces in italic.
 ;;
 ;; always right.  For example, you might want to map colors into faces
 ;; so that blue faces print in bold, and red faces in italic.
 ;;

-;; It is possible to force ps-print to consider specific faces bold or
-;; italic, no matter what font they are displayed in, by setting the
-;; variables `ps-bold-faces' and `ps-italic-faces'.  These variables
-;; contain lists of faces that ps-print should consider bold or
-;; italic; to set them, put code like the following into your .emacs
-;; file:
+;; It is possible to force ps-print to consider specific faces bold,
+;; italic or underline, no matter what font they are displayed in, by setting
+;; the variables `ps-bold-faces', `ps-italic-faces' and `ps-underlined-faces'.
+;; These variables contain lists of faces that ps-print should consider bold,
+;; italic or underline; to set them, put code like the following into your
+;; .emacs file:

 ;;
 ;;

-;;     (setq ps-bold-faces '(my-blue-face))
+;;      (setq ps-bold-faces '(my-blue-face))

 ;;      (setq ps-italic-faces '(my-red-face))
 ;;      (setq ps-italic-faces '(my-red-face))

+;;      (setq ps-underlined-faces '(my-green-face))

 ;;
 ;; Faces like bold-italic that are both bold and italic should go in
 ;; *both* lists.
 ;;
 ;; Faces like bold-italic that are both bold and italic should go in
 ;; *both* lists.


@@ -514,7 +612,9 @@ Please send all bug fixes and enhancements to
 ;; get out of sync, if a face changes, or if new faces are added.  To
 ;; get the lists back in sync, you can set the variable
 ;; `ps-build-face-reference' to t, and the lists will be rebuilt the
 ;; get out of sync, if a face changes, or if new faces are added.  To
 ;; get the lists back in sync, you can set the variable
 ;; `ps-build-face-reference' to t, and the lists will be rebuilt the

-;; next time ps-print is invoked.
+;; next time ps-print is invoked.  If you need that the lists always be
+;; rebuilt when ps-print is invoked, set the variable
+;; `ps-always-build-face-reference' to t.

 ;;
 ;;
 ;; How Ps-Print Deals With Color
 ;;
 ;;
 ;; How Ps-Print Deals With Color


@@ -539,45 +639,17 @@ Please send all bug fixes and enhancements to
 ;;   overline  - like underline, but the line is over the text.
 ;;   shadow    - text will have a shadow.
 ;;   box       - text will be surrounded by a box.
 ;;   overline  - like underline, but the line is over the text.
 ;;   shadow    - text will have a shadow.
 ;;   box       - text will be surrounded by a box.

-;;   outline   - only the text border font will be printed.
-;;
-;; See documentation for `ps-extend-face' and `ps-extend-face-list'.
+;;   outline   - print characters as hollow outlines.

 ;;
 ;;

-;; Besides remapping existing faces it is also possible to create new faces
-;; using `ps-new-faces' (see the documentation) for both the screen and
-;; printing presentation.
+;; See the documentation for `ps-extend-face'.

 ;;
 ;; Let's, for example, remap font-lock-keyword-face to another foreground color
 ;; and bold attribute:
 ;;
 ;;
 ;; Let's, for example, remap font-lock-keyword-face to another foreground color
 ;; and bold attribute:
 ;;

-;;    (ps-extend-face '(font-lock-keyword-face "RoyalBlue" nil bold))
-;;
-;; If we wish to extend a list of faces, we could do:
-;;
-;;    (ps-extend-face-list
-;;     '((font-lock-function-name-face "Blue"      nil bold)
-;;       (font-lock-variable-name-face "Sienna"    nil bold italic)
-;;       (font-lock-keyword-face       "RoyalBlue" nil underline))
-;;     'MERGE)
-;;
-;; And if we wish to create new faces and extend:
-;;
-;;    (ps-new-faces
-;;     ;; new faces for screen
-;;     '((my-obsolete-face "White"     "FireBrick" italic underline bold)
-;;       (my-keyword-face  "Blue")
-;;       (my-comment-face  "FireBrick" nil         italic)
-;;       (my-string-face   "Grey40"    nil         italic))
-;;     ;; face extension for printing
-;;     '((my-keyword-face nil nil bold)
-;;       (my-comment-face nil nil bold)
-;;       (font-lock-function-name-face "Blue"      nil bold)
-;;       (font-lock-variable-name-face "Sienna"    nil bold italic)
-;;       (font-lock-keyword-face       "RoyalBlue" nil underline))
-;;     'OVERRIDE 'MERGE)
+;;    (ps-extend-face '(font-lock-keyword-face "RoyalBlue" nil bold) 'MERGE)

 ;;
 ;;

-;; Note: the only attributes that have effect on screen are: bold, italic and
-;; underline. All other screen effect is ignored.
+;; If you want to use a new face, define it first with `defface',
+;; and then call `ps-extend-face' to specify how to print it.

 ;;
 ;;
 ;; How Ps-Print Has A Text And/Or Image On Background
 ;;
 ;;
 ;; How Ps-Print Has A Text And/Or Image On Background


@@ -602,7 +674,7 @@ Please send all bug fixes and enhancements to
 ;;          "LeftMargin" "BottomMargin PrintHeight add" ; X and Y position
 ;;                                      ; (upper left corner)
 ;;          nil nil nil
 ;;          "LeftMargin" "BottomMargin PrintHeight add" ; X and Y position
 ;;                                      ; (upper left corner)
 ;;          nil nil nil

-;;          "PrintHeight neg PrintWidth atan" ; angle
+;;          "PrintHeight neg PrintPageWidth atan" ; angle

 ;;          5 (11 . 17))                ; page list
 ;;         ))
 ;;
 ;;          5 (11 . 17))                ; page list
 ;;         ))
 ;;


@@ -631,7 +703,7 @@ Please send all bug fixes and enhancements to
 ;;    4. Print background texts only for current page (if any)
 ;;    5. Print background images only for current page (if any)
 ;;    6. Print header
 ;;    4. Print background texts only for current page (if any)
 ;;    5. Print background images only for current page (if any)
 ;;    6. Print header

-;;    7. Print buffer text (with faces, if specified) with line number
+;;    7. Print buffer text (with faces, if specified) and line number

 ;;
 ;;
 ;; Utilities
 ;;
 ;;
 ;; Utilities


@@ -653,8 +725,9 @@ Please send all bug fixes and enhancements to
 ;; the correspondence between a number of pages and the maximum font
 ;; size which allow the number of lines of the current buffer or of
 ;; its current region to fit in this number of pages.
 ;; the correspondence between a number of pages and the maximum font
 ;; size which allow the number of lines of the current buffer or of
 ;; its current region to fit in this number of pages.

-;; Note: line folding is not taken into account in this process
-;; and could change the results.
+;;
+;; NOTE: line folding is not taken into account in this process and could
+;;       change the results.

 ;;
 ;;
 ;; New since version 1.5
 ;;
 ;;
 ;; New since version 1.5


@@ -671,8 +744,21 @@ Please send all bug fixes and enhancements to
 ;; New since version 2.8
 ;; ---------------------
 ;;
 ;; New since version 2.8
 ;; ---------------------
 ;;

-;; [vinicius] 970809 Vinicius Jose Latorre <vinicius@cpqd.br>
+;; [vinicius] 980306 Vinicius Jose Latorre <vinicius@cpqd.com.br>
+;;
+;; Skip invisible text
+;;
+;; [vinicius] 971130 Vinicius Jose Latorre <vinicius@cpqd.com.br>
+;;
+;; Hooks: `ps-print-hook', `ps-print-begin-page-hook' and
+;; `ps-print-begin-column-hook'.
+;; Put one header per page over the columns.
+;; Better database font management.
+;; Better control characters handling.

 ;;
 ;;

+;; [vinicius] 971121 Vinicius Jose Latorre <vinicius@cpqd.com.br>
+;;
+;; Dynamic evaluation at print time of `ps-lpr-switches'.

 ;; Handle control characters.
 ;; Face remapping.
 ;; New face attributes.
 ;; Handle control characters.
 ;; Face remapping.
 ;; New face attributes.


@@ -682,7 +768,7 @@ Please send all bug fixes and enhancements to
 ;;
 ;; [jack] 960517 Jacques Duthen <duthen@cegelec-red.fr>
 ;;
 ;;
 ;; [jack] 960517 Jacques Duthen <duthen@cegelec-red.fr>
 ;;

-;; Font familiy and float size for text and header.
+;; Font family and float size for text and header.

 ;; Landscape mode.
 ;; Multiple columns.
 ;; Tools for page setup.
 ;; Landscape mode.
 ;; Multiple columns.
 ;; Tools for page setup.


@@ -700,12 +786,12 @@ Please send all bug fixes and enhancements to
 ;; Automatic font-attribute detection doesn't work well, especially
 ;; with hilit19 and older versions of get-create-face.  Users having
 ;; problems with auto-font detection should use the lists
 ;; Automatic font-attribute detection doesn't work well, especially
 ;; with hilit19 and older versions of get-create-face.  Users having
 ;; problems with auto-font detection should use the lists

-;; `ps-italic-faces' and `ps-bold-faces' and/or turn off automatic
-;; detection by setting `ps-auto-font-detect' to nil.
+;; `ps-italic-faces', `ps-bold-faces' and `ps-underlined-faces' and/or
+;; turn off automatic detection by setting `ps-auto-font-detect' to nil.

 ;;
 ;; Automatic font-attribute detection doesn't work with XEmacs 19.12
 ;;
 ;; Automatic font-attribute detection doesn't work with XEmacs 19.12

-;; in tty mode; use the lists `ps-italic-faces' and `ps-bold-faces'
-;; instead.
+;; in tty mode; use the lists `ps-italic-faces', `ps-bold-faces' and
+;; `ps-underlined-faces' instead.

 ;;
 ;; Still too slow; could use some hand-optimization.
 ;;
 ;;
 ;; Still too slow; could use some hand-optimization.
 ;;


@@ -715,7 +801,7 @@ Please send all bug fixes and enhancements to
 ;;
 ;; Epoch and Emacs 18 not supported.  At all.
 ;;
 ;;
 ;; Epoch and Emacs 18 not supported.  At all.
 ;;

-;; Fixed-pitch fonts work better for line folding, but are not required.  
+;; Fixed-pitch fonts work better for line folding, but are not required.

 ;;
 ;; `ps-nb-pages-buffer' and `ps-nb-pages-region' don't take care
 ;; of folding lines.
 ;;
 ;; `ps-nb-pages-buffer' and `ps-nb-pages-region' don't take care
 ;; of folding lines.


@@ -724,11 +810,8 @@ Please send all bug fixes and enhancements to
 ;; Things to change:
 ;; ----------------
 ;;
 ;; Things to change:
 ;; ----------------
 ;;

-;; Add `ps-print-hook' (I don't know how to do that (yet!)).
-;; Add 4-up capability (really needed?).
-;; Add line numbers (should not be too hard).
+;; Avoid page break inside a paragraph.

 ;; Add `ps-non-bold-faces' and `ps-non-italic-faces' (should be easy).
 ;; Add `ps-non-bold-faces' and `ps-non-italic-faces' (should be easy).

-;; Put one header per page over the columns (easy but needed?).

 ;; Improve the memory management for big files (hard?).
 ;; `ps-nb-pages-buffer' and `ps-nb-pages-region' should take care
 ;; of folding lines.
 ;; Improve the memory management for big files (hard?).
 ;; `ps-nb-pages-buffer' and `ps-nb-pages-region' should take care
 ;; of folding lines.


@@ -736,6 +819,31 @@ Please send all bug fixes and enhancements to
 ;;
 ;; Acknowledgements
 ;; ----------------
 ;;
 ;; Acknowledgements
 ;; ----------------

+;;
+;; Thanks to Roland Ducournau <ducour@lirmm.fr> for
+;; `ps-print-control-characters' variable documentation.
+;;
+;; Thanks to Marcus G Daniels <marcus@cathcart.sysc.pdx.edu> for a better
+;; database font management.
+;;
+;; Thanks to Martin Boyer <gamin@videotron.ca> for some ideas on putting one
+;; header per page over the columns and correct line numbers when printing a
+;; region.
+;;
+;; Thanks to Steven L Baur <steve@miranova.com> for dynamic evaluation at
+;; print time of `ps-lpr-switches'.
+;;
+;; Thanks to Kevin Rodgers <kevinr@ihs.com> for handling control characters
+;; (his code was severely modified, but the main idea was kept).
+;;
+;; Thanks to some suggestions on:
+;;  * Face color map: Marco Melgazzi <marco@techie.com>
+;;  * XEmacs compatibility: William J. Henney <will@astrosmo.unam.mx>
+;;  * Check `ps-paper-type': Sudhakar Frederick <sfrederi@asc.corp.mot.com>
+;;
+;; Thanks to Jacques Duthen <duthen@cegelec-red.fr> (Jack) for the 3.4 version
+;; I started from. [vinicius]
+;;

 ;; Thanks to Jim Thompson <?@?> for the 2.8 version I started from.
 ;; [jack]
 ;;
 ;; Thanks to Jim Thompson <?@?> for the 2.8 version I started from.
 ;; [jack]
 ;;


@@ -764,9 +872,6 @@ Please send all bug fixes and enhancements to
 
 ;;; Code:
 
 
 ;;; Code:
 

-(eval-when-compile
-  (require 'cl))
-

 (unless (featurep 'lisp-float-type)
   (error "`ps-print' requires floating point support"))
 
 (unless (featurep 'lisp-float-type)
   (error "`ps-print' requires floating point support"))
 


@@ -776,7 +881,7 @@ Please send all bug fixes and enhancements to
 ;;; Interface to the command system
 
 (defgroup ps-print nil
 ;;; Interface to the command system
 
 (defgroup ps-print nil

-  "Postscript generator for Emacs 19"
+  "PostScript generator for Emacs 19"

   :prefix "ps-"
   :group 'wp)
 
   :prefix "ps-"
   :group 'wp)
 


@@ -818,6 +923,30 @@ Please send all bug fixes and enhancements to
   :group 'faces)
 
 
   :group 'faces)
 
 

+(defcustom ps-printer-name printer-name
+  "*The name of a local printer for printing PostScript files.
+
+On Unix-like systems, a string value should be a name understood by
+lpr's -P option; otherwise the value should be nil.
+
+On MS-DOS and MS-Windows systems, if the value is a string, then it is
+taken as the name of the device to which PostScript files are written.
+By default it is the same as `printer-name'; typical non-default
+settings would be \"LPT1\" to \"LPT3\" for parallel printers, or
+\"COM1\" to \"COM4\" or \"AUX\" for serial printers, or
+\"//hostname/printer\" for a shared network printer.  You can also set
+it to a name of a file, in which case the output gets appended to that
+file.  \(Note that `ps-print' package already has facilities for
+printing to a file, so you might as well use them instead of changing
+the setting of this variable.\) If you want to silently discard the
+printed output, set this to \"NUL\".
+
+On DOS/Windows, if the value is anything but a string, PostScript files
+will be piped to the program given by `ps-lpr-command', with switches
+given by `ps-lpr-switches', which see."
+  :type '(choice file (other :tag "Pipe to ps-lpr-command" pipe))
+  :group 'ps-print)
+

 (defcustom ps-lpr-command lpr-command
   "*The shell command for printing a PostScript file."
   :type 'string
 (defcustom ps-lpr-command lpr-command
   "*The shell command for printing a PostScript file."
   :type 'string


@@ -869,6 +998,7 @@ see `ps-paper-type'."
                       (number :tag "Height")))
   :group 'ps-print)
 
                       (number :tag "Height")))
   :group 'ps-print)
 

+;;;###autoload

 (defcustom ps-paper-type 'letter
   "*Specifies the size of paper to format for.
 Should be one of the paper types defined in `ps-page-dimensions-database', for
 (defcustom ps-paper-type 'letter
   "*Specifies the size of paper to format for.
 Should be one of the paper types defined in `ps-page-dimensions-database', for


@@ -886,20 +1016,49 @@ example `letter', `legal' or `a4'."
   :type 'boolean
   :group 'ps-print)
 
   :type 'boolean
   :group 'ps-print)
 

+(defcustom ps-print-control-characters 'control-8-bit
+  "*Specifies the printable form for control and 8-bit characters.
+That is, instead of sending, for example, a ^D (\004) to printer,
+you can send ^ and D.
+
+Valid values are:
+
+  `8-bit'         This is the value to use when you want an ASCII encoding of
+                  any control or non-ASCII character.  Control characters are
+                  encoded as \"^D\", and non-ascii characters have an
+                  octal encoding.
+
+  `control-8-bit' This is the value to use when you want an ASCII encoding of
+                  any control character, whether it is 7 or 8-bit.
+                  European 8-bits accented characters are printed according
+                  the current font.
+
+  `control'       Only ascii control characters have an ASCII encoding.
+                  European 8-bits accented characters are printed according
+                  the current font.
+
+  nil             No ASCII encoding.  Any character is printed according the
+                  current font.
+
+Any other value is treated as nil."
+  :type '(choice (const 8-bit) (const control-8-bit)
+                (const control) (other :tag "nil" nil))
+  :group 'ps-print)
+

 (defcustom ps-number-of-columns (if ps-landscape-mode 2 1)
   "*Specifies the number of columns"
   :type 'number
   :group 'ps-print)
 
 (defcustom ps-number-of-columns (if ps-landscape-mode 2 1)
   "*Specifies the number of columns"
   :type 'number
   :group 'ps-print)
 

-(defcustom ps-zebra-stripe nil
+(defcustom ps-zebra-stripes nil

   "*Non-nil means print zebra stripes.
   "*Non-nil means print zebra stripes.

-See also documentation for ps-print-n-zebra."
+See also documentation for `ps-zebra-stripe-height'."

   :type 'boolean
   :group 'ps-print)
 
   :type 'boolean
   :group 'ps-print)
 

-(defcustom ps-number-of-zebra 3
+(defcustom ps-zebra-stripe-height 3

   "*Number of zebra stripe lines.
   "*Number of zebra stripe lines.

-See also documentation for ps-print-zebra."
+See also documentation for `ps-zebra-stripes'."

   :type 'number
   :group 'ps-print)
 
   :type 'number
   :group 'ps-print)
 


@@ -939,7 +1098,17 @@ PostScript programming that returns a float or integer value.
 For example, if you wish to print an EPS image on all pages do:
 
    '((\"~/images/EPS-image.ps\"))"
 For example, if you wish to print an EPS image on all pages do:
 
    '((\"~/images/EPS-image.ps\"))"

-  :type 'list
+  :type '(repeat (list file
+                      (choice :tag "X" number string (const nil))
+                      (choice :tag "Y" number string (const nil))
+                      (choice :tag "X Scale" number string (const nil))
+                      (choice :tag "Y Scale" number string (const nil))
+                      (choice :tag "Rotation" number string (const nil))
+                      (repeat :tag "Pages" :inline t
+                              (radio integer
+                                     (cons :tag "Range"
+                                           (integer :tag "From")
+                                           (integer :tag "To"))))))

   :group 'ps-print)
 
 (defcustom ps-print-background-text nil
   :group 'ps-print)
 
 (defcustom ps-print-background-text nil


@@ -977,7 +1146,18 @@ PostScript programming that returns a float or integer value.
 For example, if you wish to print text \"Preliminary\" on all pages do:
 
    '((\"Preliminary\"))"
 For example, if you wish to print text \"Preliminary\" on all pages do:
 
    '((\"Preliminary\"))"

-  :type 'list
+  :type '(repeat (list string
+                      (choice :tag "X" number string (const nil))
+                      (choice :tag "Y" number string (const nil))
+                      (choice :tag "Font" string (const nil))
+                      (choice :tag "Fontsize" number string (const nil))
+                      (choice :tag "Gray" number string (const nil))
+                      (choice :tag "Rotation" number string (const nil))
+                      (repeat :tag "Pages" :inline t
+                              (radio integer
+                                     (cons :tag "Range"
+                                           (integer :tag "From")
+                                           (integer :tag "To"))))))

   :group 'ps-print)
 
 ;;; Horizontal layout
   :group 'ps-print)
 
 ;;; Horizontal layout


@@ -1049,21 +1229,29 @@ customizable by changing variables `ps-left-header' and
   :type 'boolean
   :group 'ps-print-header)
 
   :type 'boolean
   :group 'ps-print-header)
 

+(defcustom ps-print-only-one-header nil
+  "*Non-nil means print only one header at the top of each page.
+This is useful when printing more than one column, so it is possible
+to have only one header over all columns or one header per column.
+See also `ps-print-header'."
+  :type 'boolean
+  :group 'ps-print-header)
+

 (defcustom ps-print-header-frame t
   "*Non-nil means draw a gaudy frame around the header."
   :type 'boolean
   :group 'ps-print-header)
 
 (defcustom ps-header-lines 2
 (defcustom ps-print-header-frame t
   "*Non-nil means draw a gaudy frame around the header."
   :type 'boolean
   :group 'ps-print-header)
 
 (defcustom ps-header-lines 2

-  "*Number of lines to display in page header, when generating Postscript."
+  "*Number of lines to display in page header, when generating PostScript."

   :type 'integer
   :group 'ps-print-header)
 (make-variable-buffer-local 'ps-header-lines)
 
 (defcustom ps-show-n-of-n t
   "*Non-nil means show page numbers as N/M, meaning page N of M.
   :type 'integer
   :group 'ps-print-header)
 (make-variable-buffer-local 'ps-header-lines)
 
 (defcustom ps-show-n-of-n t
   "*Non-nil means show page numbers as N/M, meaning page N of M.

-Note: page numbers are displayed as part of headers, see variable
-`ps-print-headers'."
+NOTE: page numbers are displayed as part of headers,
+      see variable `ps-print-headers'."

   :type 'boolean
   :group 'ps-print-header)
 
   :type 'boolean
   :group 'ps-print-header)
 


@@ -1082,60 +1270,114 @@ the left on even-numbered pages."
 
 (defcustom ps-font-info-database
   '((Courier                           ; the family key
 
 (defcustom ps-font-info-database
   '((Courier                           ; the family key

-     "Courier" "Courier-Bold" "Courier-Oblique" "Courier-BoldOblique"
-     10.0 10.55 6.0     6.0)
+     (fonts (normal      . "Courier")
+           (bold        . "Courier-Bold")
+           (italic      . "Courier-Oblique")
+           (bold-italic . "Courier-BoldOblique"))
+     (size . 10.0)
+     (line-height . 10.55)
+     (space-width . 6.0)
+     (avg-char-width . 6.0))

     (Helvetica                         ; the family key
     (Helvetica                         ; the family key

-     "Helvetica" "Helvetica-Bold" "Helvetica-Oblique" "Helvetica-BoldOblique"
-     10.0 11.56 2.78    5.09243)
+     (fonts (normal      . "Helvetica")
+           (bold        . "Helvetica-Bold")
+           (italic      . "Helvetica-Oblique")
+           (bold-italic . "Helvetica-BoldOblique"))
+     (size . 10.0)
+     (line-height . 11.56)
+     (space-width . 2.78)
+     (avg-char-width . 5.09243))

     (Times
     (Times

-     "Times-Roman" "Times-Bold" "Times-Italic" "Times-BoldItalic"
-     10.0 11.0  2.5     4.71432)
+     (fonts (normal      . "Times-Roman")
+           (bold        . "Times-Bold")
+           (italic      . "Times-Italic")
+           (bold-italic . "Times-BoldItalic"))
+     (size . 10.0)
+     (line-height . 11.0)
+     (space-width . 2.5)
+     (avg-char-width 4.71432))

     (Palatino
     (Palatino

-     "Palatino-Roman" "Palatino-Bold" "Palatino-Italic" "Palatino-BoldItalic"
-     10.0 12.1  2.5     5.08676)
+     (fonts (normal      . "Palatino-Roman")
+           (bold        . "Palatino-Bold")
+           (italic      . "Palatino-Italic")
+           (bold-italic . "Palatino-BoldItalic"))
+     (size . 10.0)
+     (line-height . 12.1)
+     (space-width . 2.5)
+     (avg-char-width . 5.08676))

     (Helvetica-Narrow
     (Helvetica-Narrow

-     "Helvetica-Narrow" "Helvetica-Narrow-Bold"
-     "Helvetica-Narrow-Oblique" "Helvetica-Narrow-BoldOblique"
-     10.0 11.56 2.2796  4.17579)
+     (fonts (normal      . "Helvetica-Narrow")
+           (bold        . "Helvetica-Narrow-Bold")
+           (italic      . "Helvetica-Narrow-Oblique")
+           (bold-italic . "Helvetica-Narrow-BoldOblique"))
+     (size . 10.0)
+     (line-height . 11.56)
+     (space-width . 2.2796)
+     (avg-char-width . 4.17579))

     (NewCenturySchlbk
     (NewCenturySchlbk

-     "NewCenturySchlbk-Roman" "NewCenturySchlbk-Bold"
-     "NewCenturySchlbk-Italic" "NewCenturySchlbk-BoldItalic"
-     10.0 12.15 2.78    5.31162)
+     (fonts (normal      . "NewCenturySchlbk-Roman")
+           (bold        . "NewCenturySchlbk-Bold")
+           (italic      . "NewCenturySchlbk-Italic")
+           (bold-italic . "NewCenturySchlbk-BoldItalic"))
+     (size . 10.0)
+     (line-height 12.15)
+     (space-width . 2.78)
+     (avg-char-width . 5.31162))

     ;; got no bold for the next ones
     (AvantGarde-Book
     ;; got no bold for the next ones
     (AvantGarde-Book

-     "AvantGarde-Book" "AvantGarde-Book"
-     "AvantGarde-BookOblique" "AvantGarde-BookOblique"
-     10.0 11.77 2.77    5.45189)
+     (fonts (normal . "AvantGarde-Book")
+           (italic . "AvantGarde-BookOblique"))
+     (size . 10.0)
+     (line-height . 11.77)
+     (space-width . 2.77)
+     (avg-char-width . 5.45189))

     (AvantGarde-Demi
     (AvantGarde-Demi

-     "AvantGarde-Demi" "AvantGarde-Demi"
-     "AvantGarde-DemiOblique" "AvantGarde-DemiOblique"
-     10.0 12.72 2.8     5.51351)
+     (fonts (normal . "AvantGarde-Demi")
+           (italic . "AvantGarde-DemiOblique"))
+     (size . 10.0)
+     (line-height . 12.72)
+     (space-width . 2.8)
+     (avg-char-width . 5.51351))

     (Bookman-Demi
     (Bookman-Demi

-     "Bookman-Demi" "Bookman-Demi"
-     "Bookman-DemiItalic" "Bookman-DemiItalic"
-     10.0 11.77 3.4     6.05946)
+     (fonts (normal . "Bookman-Demi")
+           (italic . "Bookman-DemiItalic"))
+     (size . 10.0)
+     (line-height . 11.77)
+     (space-width . 3.4)
+     (avg-char-width . 6.05946))

     (Bookman-Light
     (Bookman-Light

-     "Bookman-Light" "Bookman-Light"
-     "Bookman-LightItalic" "Bookman-LightItalic"
-     10.0 11.79 3.2     5.67027)
+     (fonts (normal . "Bookman-Light")
+           (italic . "Bookman-LightItalic"))
+     (size . 10.0)
+     (line-height . 11.79)
+     (space-width . 3.2)
+     (avg-char-width . 5.67027))

     ;; got no bold and no italic for the next ones
     (Symbol
     ;; got no bold and no italic for the next ones
     (Symbol

-     "Symbol" "Symbol" "Symbol" "Symbol"
-     10.0 13.03 2.5     3.24324)
+     (fonts (normal . "Symbol"))
+     (size . 10.0)
+     (line-height . 13.03)
+     (space-width . 2.5)
+     (avg-char-width . 3.24324))

     (Zapf-Dingbats
     (Zapf-Dingbats

-     "Zapf-Dingbats" "Zapf-Dingbats" "Zapf-Dingbats" "Zapf-Dingbats"
-     10.0  9.63 2.78    2.78)
+     (fonts (normal . "Zapf-Dingbats"))
+     (size . 10.0)
+     (line-height . 9.63)
+     (space-width . 2.78)
+     (avg-char-width . 2.78))

     (Zapf-Chancery-MediumItalic
     (Zapf-Chancery-MediumItalic

-     "Zapf-Chancery-MediumItalic" "Zapf-Chancery-MediumItalic"
-     "Zapf-Chancery-MediumItalic" "Zapf-Chancery-MediumItalic"
-     10.0 11.45 2.2     4.10811)
+     (fonts (normal . "Zapf-Chancery-MediumItalic"))
+     (size . 10.0)
+     (line-height . 11.45)
+     (space-width . 2.2)
+     (avg-char-width . 4.10811))

     )
   "*Font info database: font family (the key), name, bold, italic, bold-italic,
 reference size, line height, space width, average character width.
 To get the info for another specific font (say Helvetica), do the following:
 - create a new buffer
 - generate the PostScript image to a file (C-u M-x ps-print-buffer)
     )
   "*Font info database: font family (the key), name, bold, italic, bold-italic,
 reference size, line height, space width, average character width.
 To get the info for another specific font (say Helvetica), do the following:
 - create a new buffer
 - generate the PostScript image to a file (C-u M-x ps-print-buffer)

-- open this file and delete the leading `%' (which is the Postscript
+- open this file and delete the leading `%' (which is the PostScript

   comment character) from the line
           `% 3 cm 20 cm moveto  10 /Courier ReportFontInfo  showpage'
   to get the line
   comment character) from the line
           `% 3 cm 20 cm moveto  10 /Courier ReportFontInfo  showpage'
   to get the line


@@ -1143,40 +1385,46 @@ To get the info for another specific font (say Helvetica), do the following:
 - add the values to `ps-font-info-database'.
 You can get all the fonts of YOUR printer using `ReportAllFontInfo'."
   :type '(repeat (list :tag "Font Definition"
 - add the values to `ps-font-info-database'.
 You can get all the fonts of YOUR printer using `ReportAllFontInfo'."
   :type '(repeat (list :tag "Font Definition"

-                      (symbol :tag "Font")
-                      (string :tag "Name")
-                      (string :tag "Bold")
-                      (string :tag "Italic")
-                      (string :tag "Bold-Italic")
-                      (number :tag "Reference Size")
-                      (number :tag "Line Height")
-                      (number :tag "Space Width")
-                      (number :tag "Average Character Width")))
+                      (symbol :tag "Font Family")
+                      (cons (const fonts)
+                            (repeat (cons (choice (const normal)
+                                                  (const bold)
+                                                  (const italic)
+                                                  (const bold-italic)
+                                                  (symbol :tag "Face"))
+                                          (string :tag "Font Name"))))
+                      (cons (const size)
+                            (number :tag "Reference Size"))
+                      (cons (const line-height)
+                            (number :tag "Line Height"))
+                      (cons (const space-width)
+                            (number :tag "Space Width"))
+                      (cons (const avg-char-width)
+                            (number :tag "Average Character Width"))))

   :group 'ps-print-font)
 
 (defcustom ps-font-family 'Courier
   :group 'ps-print-font)
 
 (defcustom ps-font-family 'Courier

-  "Font family name for ordinary text, when generating Postscript."
+  "Font family name for ordinary text, when generating PostScript."

   :type 'symbol
   :group 'ps-print-font)
 
 (defcustom ps-font-size   (if ps-landscape-mode 7 8.5)
   :type 'symbol
   :group 'ps-print-font)
 
 (defcustom ps-font-size   (if ps-landscape-mode 7 8.5)

-  "Font size, in points, for ordinary text, when generating Postscript."
+  "Font size, in points, for ordinary text, when generating PostScript."

   :type 'number
   :group 'ps-print-font)
 
 (defcustom ps-header-font-family      'Helvetica
   :type 'number
   :group 'ps-print-font)
 
 (defcustom ps-header-font-family      'Helvetica

-  "Font family name for text in the header, when generating Postscript."
+  "Font family name for text in the header, when generating PostScript."

   :type 'symbol
   :group 'ps-print-font)
 
 (defcustom ps-header-font-size       (if ps-landscape-mode 10 12)
   :type 'symbol
   :group 'ps-print-font)
 
 (defcustom ps-header-font-size       (if ps-landscape-mode 10 12)

-  "Font size, in points, for text in the header, when generating Postscript."
+  "Font size, in points, for text in the header, when generating PostScript."

   :type 'number
   :group 'ps-print-font)
 
 (defcustom ps-header-title-font-size (if ps-landscape-mode 12 14)
   :type 'number
   :group 'ps-print-font)
 
 (defcustom ps-header-title-font-size (if ps-landscape-mode 12 14)

-  "Font size, in points, for the top line of text in the header,
-when generating Postscript."
+  "Font size, in points, for the top line of text in header, in PostScript."

   :type 'number
   :group 'ps-print-font)
 
   :type 'number
   :group 'ps-print-font)
 


@@ -1184,7 +1432,8 @@ when generating Postscript."
 
 ;; Printing color requires x-color-values.
 (defcustom ps-print-color-p (or (fboundp 'x-color-values) ; Emacs
 
 ;; Printing color requires x-color-values.
 (defcustom ps-print-color-p (or (fboundp 'x-color-values) ; Emacs

-                               (fboundp 'pixel-components)) ; XEmacs
+                               (fboundp 'color-instance-rgb-components))
+                                       ; XEmacs

   "*If non-nil, print the buffer's text in color."
   :type 'boolean
   :group 'ps-print-color)
   "*If non-nil, print the buffer's text in color."
   :type 'boolean
   :group 'ps-print-color)


@@ -1201,7 +1450,7 @@ when generating Postscript."
 
 (defcustom ps-auto-font-detect t
   "*Non-nil means automatically detect bold/italic face attributes.
 
 (defcustom ps-auto-font-detect t
   "*Non-nil means automatically detect bold/italic face attributes.

-nil means rely solely on the lists `ps-bold-faces', `ps-italic-faces',
+If nil, we rely solely on the lists `ps-bold-faces', `ps-italic-faces',

 and `ps-underlined-faces'."
   :type 'boolean
   :group 'ps-print-font)
 and `ps-underlined-faces'."
   :type 'boolean
   :group 'ps-print-font)


@@ -1214,36 +1463,36 @@ and `ps-underlined-faces'."
       font-lock-keyword-face
       font-lock-warning-face))
   "*A list of the \(non-bold\) faces that should be printed in bold font.
       font-lock-keyword-face
       font-lock-warning-face))
   "*A list of the \(non-bold\) faces that should be printed in bold font.

-This applies to generating Postscript."
+This applies to generating PostScript."

   :type '(repeat face)
   :group 'ps-print-face)
 
 (defcustom ps-italic-faces
   (unless ps-print-color-p
     '(font-lock-variable-name-face
   :type '(repeat face)
   :group 'ps-print-face)
 
 (defcustom ps-italic-faces
   (unless ps-print-color-p
     '(font-lock-variable-name-face

+      font-lock-type-face

       font-lock-string-face
       font-lock-comment-face
       font-lock-warning-face))
   "*A list of the \(non-italic\) faces that should be printed in italic font.
       font-lock-string-face
       font-lock-comment-face
       font-lock-warning-face))
   "*A list of the \(non-italic\) faces that should be printed in italic font.

-This applies to generating Postscript."
+This applies to generating PostScript."

   :type '(repeat face)
   :group 'ps-print-face)
 
 (defcustom ps-underlined-faces
   (unless ps-print-color-p
     '(font-lock-function-name-face
   :type '(repeat face)
   :group 'ps-print-face)
 
 (defcustom ps-underlined-faces
   (unless ps-print-color-p
     '(font-lock-function-name-face

-      font-lock-type-face
-      font-lock-reference-face
+      font-lock-constant-face

       font-lock-warning-face))
   "*A list of the \(non-underlined\) faces that should be printed underlined.
       font-lock-warning-face))
   "*A list of the \(non-underlined\) faces that should be printed underlined.

-This applies to generating Postscript."
+This applies to generating PostScript."

   :type '(repeat face)
   :group 'ps-print-face)
 
 (defcustom ps-left-header
   (list 'ps-get-buffer-name 'ps-header-dirpart)
   "*The items to display (each on a line) on the left part of the page header.
   :type '(repeat face)
   :group 'ps-print-face)
 
 (defcustom ps-left-header
   (list 'ps-get-buffer-name 'ps-header-dirpart)
   "*The items to display (each on a line) on the left part of the page header.

-This applies to generating Postscript.
+This applies to generating PostScript.

 
 The value should be a list of strings and symbols, each representing an
 entry in the PostScript array HeaderLinesLeft.
 
 The value should be a list of strings and symbols, each representing an
 entry in the PostScript array HeaderLinesLeft.


@@ -1264,7 +1513,7 @@ string delimiters added to it."
 (defcustom ps-right-header
   (list "/pagenumberstring load" 'time-stamp-mon-dd-yyyy 'time-stamp-hh:mm:ss)
   "*The items to display (each on a line) on the right part of the page header.
 (defcustom ps-right-header
   (list "/pagenumberstring load" 'time-stamp-mon-dd-yyyy 'time-stamp-hh:mm:ss)
   "*The items to display (each on a line) on the right part of the page header.

-This applies to generating Postscript.
+This applies to generating PostScript.

 
 See the variable `ps-left-header' for a description of the format of
 this variable."
 
 See the variable `ps-left-header' for a description of the format of
 this variable."


@@ -1277,10 +1526,12 @@ this variable."
   :type 'boolean
   :group 'ps-print)
 
   :type 'boolean
   :group 'ps-print)
 

-(defvar ps-adobe-tag "%!PS-Adobe-3.0\n"
+(defcustom ps-adobe-tag "%!PS-Adobe-3.0\n"

   "*Contains the header line identifying the output as PostScript.
 By default, `ps-adobe-tag' contains the standard identifier.  Some
   "*Contains the header line identifying the output as PostScript.
 By default, `ps-adobe-tag' contains the standard identifier.  Some

-printers require slightly different versions of this line.")
+printers require slightly different versions of this line."
+  :type 'string
+  :group 'ps-print)

 
 (defcustom ps-build-face-reference t
   "*Non-nil means build the reference face lists.
 
 (defcustom ps-build-face-reference t
   "*Non-nil means build the reference face lists.


@@ -1301,7 +1552,7 @@ about its setting, though."
 
 If this variable is non-nil, ps-print will rebuild its internal
 reference lists of bold and italic faces *every* time one of the
 
 If this variable is non-nil, ps-print will rebuild its internal
 reference lists of bold and italic faces *every* time one of the

--with-faces commands is called.  Most users shouldn't need to set this
+...-with-faces commands is called.  Most users shouldn't need to set this

 variable."
   :type 'boolean
   :group 'ps-print-face)
 variable."
   :type 'boolean
   :group 'ps-print-face)


@@ -1340,7 +1591,7 @@ are using a window system, so it has a way to determine color values."
   "Generate and print a PostScript image of the region.
 Like `ps-print-buffer', but prints just the current region."
   (interactive (list (point) (mark) (ps-print-preprint current-prefix-arg)))
   "Generate and print a PostScript image of the region.
 Like `ps-print-buffer', but prints just the current region."
   (interactive (list (point) (mark) (ps-print-preprint current-prefix-arg)))

-  (ps-print-without-faces from to filename))
+  (ps-print-without-faces from to filename t))

 
 
 ;;;###autoload
 
 
 ;;;###autoload


@@ -1350,9 +1601,7 @@ Like `ps-print-region', but includes font, color, and underline
 information in the generated image.  This command works only if you
 are using a window system, so it has a way to determine color values."
   (interactive (list (point) (mark) (ps-print-preprint current-prefix-arg)))
 information in the generated image.  This command works only if you
 are using a window system, so it has a way to determine color values."
   (interactive (list (point) (mark) (ps-print-preprint current-prefix-arg)))

-  (ps-generate (current-buffer) from to
-              'ps-generate-postscript-with-faces)
-  (ps-print-with-faces from to filename))
+  (ps-print-with-faces from to filename t))

 
 
 ;;;###autoload
 
 
 ;;;###autoload


@@ -1385,7 +1634,7 @@ Like `ps-spool-buffer', but spools just the current region.
 
 Use the command `ps-despool' to send the spooled images to the printer."
   (interactive "r")
 
 Use the command `ps-despool' to send the spooled images to the printer."
   (interactive "r")

-  (ps-spool-without-faces from to))
+  (ps-spool-without-faces from to t))

 
 
 ;;;###autoload
 
 
 ;;;###autoload


@@ -1397,7 +1646,7 @@ are using a window system, so it has a way to determine color values.
 
 Use the command `ps-despool' to send the spooled images to the printer."
   (interactive "r")
 
 Use the command `ps-despool' to send the spooled images to the printer."
   (interactive "r")

-  (ps-spool-with-faces from to))
+  (ps-spool-with-faces from to t))

 
 ;;;###autoload
 (defun ps-despool (&optional filename)
 
 ;;;###autoload
 (defun ps-despool (&optional filename)


@@ -1416,7 +1665,7 @@ number, prompt the user for the name of the file to save in."
 
 ;;;###autoload
 (defun ps-line-lengths ()
 
 ;;;###autoload
 (defun ps-line-lengths ()

-  "*Display the correspondence between a line length and a font size,
+  "Display the correspondence between a line length and a font size,

 using the current ps-print setup.
 Try: pr -t file | awk '{printf \"%3d %s\n\", length($0), $0}' | sort -r | head"
   (interactive)
 using the current ps-print setup.
 Try: pr -t file | awk '{printf \"%3d %s\n\", length($0), $0}' | sort -r | head"
   (interactive)


@@ -1424,38 +1673,47 @@ Try: pr -t file | awk '{printf \"%3d %s\n\", length($0), $0}' | sort -r | head"
 
 ;;;###autoload
 (defun ps-nb-pages-buffer (nb-lines)
 
 ;;;###autoload
 (defun ps-nb-pages-buffer (nb-lines)

-  "*Display an approximate correspondence between a font size and the number
-of pages the current buffer would require to print
-using the current ps-print setup."
+  "Display number of pages to print this buffer, for various font heights.
+The table depends on the current ps-print setup."

   (interactive (list (count-lines (point-min) (point-max))))
   (ps-nb-pages nb-lines))
 
 ;;;###autoload
 (defun ps-nb-pages-region (nb-lines)
   (interactive (list (count-lines (point-min) (point-max))))
   (ps-nb-pages nb-lines))
 
 ;;;###autoload
 (defun ps-nb-pages-region (nb-lines)

-  "*Display an approximate correspondence between a font size and the number
-of pages the current region would require to print
-using the current ps-print setup."
+  "Display number of pages to print the region, for various font heights.
+The table depends on the current ps-print setup."

   (interactive (list (count-lines (mark) (point))))
   (ps-nb-pages nb-lines))
 
 ;;;###autoload
 (defun ps-setup ()
   (interactive (list (count-lines (mark) (point))))
   (ps-nb-pages nb-lines))
 
 ;;;###autoload
 (defun ps-setup ()

-  "*Return the current setup"
-  (format "
- (setq ps-print-color-p  %s
+  "Return the current PostScript-generation setup."
+  (format
+   "
+\(setq ps-print-color-p  %s

       ps-lpr-command    \"%s\"
       ps-lpr-switches   %s
 
       ps-lpr-command    \"%s\"
       ps-lpr-switches   %s
 

-      ps-paper-type       '%s
-      ps-landscape-mode   %s
-      ps-number-of-columns %s
+      ps-paper-type          '%s
+      ps-landscape-mode      %s
+      ps-number-of-columns   %s
+
+      ps-zebra-stripes       %s
+      ps-zebra-stripe-height %s
+      ps-line-number         %s
+
+      ps-print-control-characters %s

 
 

-      ps-left-margin   %s
-      ps-right-margin  %s
-      ps-inter-column  %s
-      ps-bottom-margin %s
-      ps-top-margin    %s
-      ps-header-offset %s
+      ps-print-background-image %s
+
+      ps-print-background-text %s
+
+      ps-left-margin        %s
+      ps-right-margin       %s
+      ps-inter-column       %s
+      ps-bottom-margin      %s
+      ps-top-margin         %s
+      ps-header-offset      %s

       ps-header-line-pad    %s
       ps-print-header       %s
       ps-print-header-frame %s
       ps-header-line-pad    %s
       ps-print-header       %s
       ps-print-header-frame %s


@@ -1463,35 +1721,41 @@ using the current ps-print setup."
       ps-show-n-of-n        %s
       ps-spool-duplex       %s
 
       ps-show-n-of-n        %s
       ps-spool-duplex       %s
 

-      ps-font-family             '%s
-      ps-font-size               %s
-      ps-header-font-family      '%s
-      ps-header-font-size        %s
-      ps-header-title-font-size  %s)
+      ps-font-family            '%s
+      ps-font-size              %s
+      ps-header-font-family     '%s
+      ps-header-font-size       %s
+      ps-header-title-font-size %s)

 "
 "

-  ps-print-color-p
-  ps-lpr-command
-  ps-lpr-switches
-  ps-paper-type
-  ps-landscape-mode
-  ps-number-of-columns
-  ps-left-margin
-  ps-right-margin
-  ps-inter-column
-  ps-bottom-margin
-  ps-top-margin
-  ps-header-offset
-  ps-header-line-pad
-  ps-print-header
-  ps-print-header-frame
-  ps-header-lines
-  ps-show-n-of-n
-  ps-spool-duplex
-  ps-font-family
-  ps-font-size
-  ps-header-font-family
-  ps-header-font-size
-  ps-header-title-font-size))
+   ps-print-color-p
+   ps-lpr-command
+   ps-lpr-switches
+   ps-paper-type
+   ps-landscape-mode
+   ps-number-of-columns
+   ps-zebra-stripes
+   ps-zebra-stripe-height
+   ps-line-number
+   ps-print-control-characters
+   ps-print-background-image
+   ps-print-background-text
+   ps-left-margin
+   ps-right-margin
+   ps-inter-column
+   ps-bottom-margin
+   ps-top-margin
+   ps-header-offset
+   ps-header-line-pad
+   ps-print-header
+   ps-print-header-frame
+   ps-header-lines
+   ps-show-n-of-n
+   ps-spool-duplex
+   ps-font-family
+   ps-font-size
+   ps-header-font-family
+   ps-header-font-size
+   ps-header-title-font-size))

 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Utility functions and variables:
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Utility functions and variables:


@@ -1509,36 +1773,16 @@ using the current ps-print setup."
   (require 'faces))                    ; face-font, face-underline-p,
                                        ; x-font-regexp
 
   (require 'faces))                    ; face-font, face-underline-p,
                                        ; x-font-regexp
 

-(require 'time-stamp)
-
-(defvar ps-font nil
-  "Font family name for ordinary text, when generating Postscript.")
+;; Return t if the device (which can be changed during an emacs session)
+;; can handle colors.
+;; This is function is not yet implemented for GNU emacs.
+(defun ps-color-device ()
+  (if (and (eq ps-print-emacs-type 'xemacs)
+          (>= emacs-minor-version 12))
+      (eq (device-class) 'color)
+    t))

 
 

-(defvar ps-font-bold nil
-  "Font family name for bold text, when generating Postscript.")
-
-(defvar ps-font-italic nil
-  "Font family name for italic text, when generating Postscript.")
-
-(defvar ps-font-bold-italic nil
-  "Font family name for bold italic text, when generating Postscript.")
-
-(defvar ps-avg-char-width nil
-  "The average width, in points, of a character, for generating Postscript.
-This is the value that ps-print uses to determine the length,
-x-dimension, of the text it has printed, and thus affects the point at
-which long lines wrap around.")
-
-(defvar ps-space-width nil
-  "The width of a space character, for generating Postscript.
-This value is used in expanding tab characters.")
-
-(defvar ps-line-height nil
-  "The height of a line, for generating Postscript.
-This is the value that ps-print uses to determine the height,
-y-dimension, of the lines of text it has printed, and thus affects the
-point at which page-breaks are placed.
-The line-height is *not* the same as the point size of the font.")
+(require 'time-stamp)

 
 (defvar ps-print-prologue-1
   "% ISOLatin1Encoding stolen from ps_init.ps in GhostScript 2.6.1.4:
 
 (defvar ps-print-prologue-1
   "% ISOLatin1Encoding stolen from ps_init.ps in GhostScript 2.6.1.4:


@@ -1601,8 +1845,10 @@ StandardEncoding 46 82 getinterval aload pop
     } forall           % Copy each of the symbols from the old dictionary
                        % to the new one except for the font ID.
 
     } forall           % Copy each of the symbols from the old dictionary
                        % to the new one except for the font ID.
 

-    /Encoding ISOLatin1Encoding def    % Override the encoding with
+    currentdict /FontType get 0 ne {
+      /Encoding ISOLatin1Encoding def  % Override the encoding with

                                        % the ISOLatin1 encoding.
                                        % the ISOLatin1 encoding.

+    } if

 
     % Use the font's bounding box to determine the ascent, descent,
     % and overall height; don't forget that these values have to be
 
     % Use the font's bounding box to determine the ascent, descent,
     % and overall height; don't forget that these values have to be


@@ -1620,9 +1866,17 @@ StandardEncoding 46 82 getinterval aload pop
 %             |    |   v Descent (usually < 0)
 % (x1 y1) --> +----+ - -
 
 %             |    |   v Descent (usually < 0)
 % (x1 y1) --> +----+ - -
 

-    FontBBox                           % -- x1 y1 x2 y2
-    FontMatrix transform /Ascent  exch def pop
-    FontMatrix transform /Descent exch def pop
+    currentdict /FontType get 0 ne {
+      FontBBox                         % -- x1 y1 x2 y2
+      FontMatrix transform /Ascent  exch def pop
+      FontMatrix transform /Descent exch def pop
+    } {
+      /PrimaryFont FDepVector 0 get def
+      PrimaryFont /FontBBox get aload pop
+      PrimaryFont /FontMatrix get transform /Ascent exch def pop
+      PrimaryFont /FontMatrix get transform /Descent exch def pop
+    } ifelse
+

     /FontHeight Ascent Descent sub def % use `sub' because descent < 0
 
     % Define these in case they're not in the FontInfo
     /FontHeight Ascent Descent sub def % use `sub' because descent < 0
 
     % Define these in case they're not in the FontInfo


@@ -1835,26 +2089,30 @@ StandardEncoding 46 82 getinterval aload pop
 
 % stack:  --
 /doLineNumber {
 
 % stack:  --
 /doLineNumber {

-  currentfont
-  gsave
-  0.0 0.0 0.0 setrgbcolor
-  /L0 findfont setfont
-  LineNumber Lines ge
-    {(end      )}
-    {LineNumber 6 string cvs (      ) strcat}
-  ifelse
-  dup stringwidth pop neg 0 rmoveto
-  show
-  grestore
-  setfont
-  /LineNumber LineNumber 1 add def
+  /LineNumber where
+  {
+    pop
+    currentfont
+    gsave
+    0.0 0.0 0.0 setrgbcolor
+    /L0 findfont setfont
+    LineNumber Lines ge
+      {(end      )}
+      {LineNumber 6 string cvs (      ) strcat}
+    ifelse
+    dup stringwidth pop neg 0 rmoveto
+    show
+    grestore
+    setfont
+    /LineNumber LineNumber 1 add def
+  } if

 } def
 
 % stack: --
 /printZebra {
   gsave
   0.985 setgray
 } def
 
 % stack: --
 /printZebra {
   gsave
   0.985 setgray

-  /double-zebra NumberOfZebra NumberOfZebra add def
+  /double-zebra ZebraHeight ZebraHeight add def

   /yiter double-zebra LineHeight mul neg def
   /xiter PrintWidth InterColumn add def
   NumberOfColumns {LinesPerColumn doColumnZebra xiter 0 rmoveto}repeat
   /yiter double-zebra LineHeight mul neg def
   /xiter PrintWidth InterColumn add def
   NumberOfColumns {LinesPerColumn doColumnZebra xiter 0 rmoveto}repeat


@@ -1864,9 +2122,9 @@ StandardEncoding 46 82 getinterval aload pop
 % stack:  lines-per-column |- --
 /doColumnZebra {
   gsave
 % stack:  lines-per-column |- --
 /doColumnZebra {
   gsave

-  dup double-zebra idiv {NumberOfZebra doZebra 0 yiter rmoveto}repeat
+  dup double-zebra idiv {ZebraHeight doZebra 0 yiter rmoveto}repeat

   double-zebra mod
   double-zebra mod

-  dup 0 le {pop}{dup NumberOfZebra gt {pop NumberOfZebra}if doZebra}ifelse
+  dup 0 le {pop}{dup ZebraHeight gt {pop ZebraHeight}if doZebra}ifelse

   grestore
 } def
 
   grestore
 } def
 


@@ -1942,20 +2200,26 @@ StandardEncoding 46 82 getinterval aload pop
 
 /BeginDSCPage {
   % ---- when 1st column, save the state of the page
 
 /BeginDSCPage {
   % ---- when 1st column, save the state of the page

-  ColumnIndex 1 eq { /pageState save def
-  0 PrintStartY moveto                 % move to where printing will start
-  Zebra {printZebra}if
-  printGlobalBackground
-  printLocalBackground
-  } if
+  ColumnIndex 1 eq { /pageState save def } if

   % ---- save the state of the column
   /columnState save def
 } def
 
   % ---- save the state of the column
   /columnState save def
 } def
 

+/PrintHeaderWidth PrintOnlyOneHeader{PrintPageWidth}{PrintWidth}ifelse def
+

 /BeginPage {
 /BeginPage {

+  % ---- when 1st column, print all background effects
+  ColumnIndex 1 eq {
+  0 PrintStartY moveto                 % move to where printing will start
+  Zebra {printZebra}if
+  printGlobalBackground
+  printLocalBackground
+  } if

   PrintHeader {
   PrintHeader {

-    PrintHeaderFrame { HeaderFrame } if
-    HeaderText
+    PrintOnlyOneHeader{ColumnIndex 1 eq}{true}ifelse {
+      PrintHeaderFrame {HeaderFrame}if
+      HeaderText
+    } if

   } if
   0 PrintStartY moveto                 % move to where printing will start
   PLN
   } if
   0 PrintStartY moveto                 % move to where printing will start
   PLN


@@ -2008,10 +2272,10 @@ StandardEncoding 46 82 getinterval aload pop
 } def
 
 /HeaderFramePath {
 } def
 
 /HeaderFramePath {

-  PrintWidth    0                      rlineto
-  0             HeaderHeight           rlineto
-  PrintWidth neg 0                     rlineto
-  0             HeaderHeight neg       rlineto
+  PrintHeaderWidth     0                       rlineto
+  0                    HeaderHeight            rlineto
+  PrintHeaderWidth neg 0                       rlineto
+  0                    HeaderHeight neg        rlineto

 } def
 
 /HeaderFrame {
 } def
 
 /HeaderFrame {


@@ -2081,7 +2345,7 @@ StandardEncoding 46 82 getinterval aload pop
     gsave
       dup xcheck { exec } if
       dup stringwidth pop
     gsave
       dup xcheck { exec } if
       dup stringwidth pop

-      PrintWidth exch sub HeaderPad 2 mul sub 0 rmoveto
+      PrintHeaderWidth exch sub HeaderPad 2 mul sub 0 rmoveto

       show
     grestore
     0 HeaderLineHeight neg rmoveto
       show
     grestore
     0 HeaderLineHeight neg rmoveto


@@ -2158,10 +2422,12 @@ StandardEncoding 46 82 getinterval aload pop
 (defvar ps-output-head nil)
 (defvar ps-output-tail nil)
 
 (defvar ps-output-head nil)
 (defvar ps-output-tail nil)
 

+(defvar ps-page-postscript 0)

 (defvar ps-page-count 0)
 (defvar ps-page-count 0)

-(defvar ps-showpage-count 0)

 (defvar ps-showline-count 1)
 
 (defvar ps-showline-count 1)
 

+(defvar ps-control-or-escape-regexp nil)
+

 (defvar ps-background-pages nil)
 (defvar ps-background-all-pages nil)
 (defvar ps-background-text-count 0)
 (defvar ps-background-pages nil)
 (defvar ps-background-all-pages nil)
 (defvar ps-background-text-count 0)


@@ -2177,28 +2443,21 @@ StandardEncoding 46 82 getinterval aload pop
 (defvar ps-color-format
   (if (eq ps-print-emacs-type 'emacs)
 
 (defvar ps-color-format
   (if (eq ps-print-emacs-type 'emacs)
 

-    ;;Emacs understands the %f format; we'll
-    ;;use it to limit color RGB values to
-    ;;three decimals to cut down some on the
-    ;;size of the PostScript output.
-    "%0.3f %0.3f %0.3f"
+      ;; Emacs understands the %f format; we'll use it to limit color RGB
+      ;; values to three decimals to cut down some on the size of the
+      ;; PostScript output.
+      "%0.3f %0.3f %0.3f"

 
 

-    ;; Lucid emacsen will have to make do with
-    ;; %s (princ) for floats.
+    ;; Lucid emacsen will have to make do with %s (princ) for floats.

     "%s %s %s"))
 
 ;; These values determine how much print-height to deduct when headers
 ;; are turned on.  This is a pretty clumsy way of handling it, but
 ;; it'll do for now.
 
     "%s %s %s"))
 
 ;; These values determine how much print-height to deduct when headers
 ;; are turned on.  This is a pretty clumsy way of handling it, but
 ;; it'll do for now.
 

-(defvar ps-header-font nil)
-(defvar ps-header-title-font nil)
-
-(defvar ps-header-line-height nil)
-(defvar ps-header-title-line-height nil)

 (defvar ps-header-pad 0
 (defvar ps-header-pad 0

-  "Vertical and horizontal space in points (1/72 inch) between the header frame
-and the text it contains.")
+  "Vertical and horizontal space between the header frame and the text.
+This is in units of points (1/72 inch).")

 
 ;; Define accessors to the dimensions list.
 
 
 ;; Define accessors to the dimensions list.
 


@@ -2210,12 +2469,8 @@ and the text it contains.")
 (defvar ps-print-width nil)
 (defvar ps-print-height nil)
 
 (defvar ps-print-width nil)
 (defvar ps-print-height nil)
 

-(defvar ps-height-remaining)
-(defvar ps-width-remaining)
-
-(defvar ps-ref-bold-faces nil)
-(defvar ps-ref-italic-faces nil)
-(defvar ps-ref-underlined-faces nil)
+(defvar ps-height-remaining nil)
+(defvar ps-width-remaining nil)

 
 (defvar ps-print-color-scale nil)
 
 
 (defvar ps-print-color-scale nil)
 


@@ -2225,7 +2480,7 @@ and the text it contains.")
 
 
 (defvar ps-print-face-extension-alist nil
 
 
 (defvar ps-print-face-extension-alist nil

-  "Alist of symbolic faces with extension features (box, outline, etc).
+  "Alist of symbolic faces *WITH* extension features (box, outline, etc).

 An element of this list has the following form:
 
    (FACE . [BITS FG BG])
 An element of this list has the following form:
 
    (FACE . [BITS FG BG])


@@ -2237,10 +2492,19 @@ An element of this list has the following form:
    FG foreground color (string or nil)
    BG background color (string or nil)
 
    FG foreground color (string or nil)
    BG background color (string or nil)
 

-This list should not be handled directly, but through `ps-new-faces',
-`ps-extend-face' and `ps-extend-face-list'.
-See documentation for `ps-extend-face' for valid extension symbol.
-See also `font-lock-face-attributes'.")
+Don't change this list directly; instead,
+use `ps-extend-face' and `ps-extend-face-list'.
+See documentation for `ps-extend-face' for valid extension symbol.")
+
+
+(defvar ps-print-face-alist nil
+  "Alist of symbolic faces *WITHOUT* extension features (box, outline, etc).
+
+An element of this list has the same form as an element of
+`ps-print-face-extension-alist'.
+
+Don't change this list directly; this list is used by `ps-face-attributes',
+`ps-map-face' and `ps-build-reference-face-lists'.")

 
 
 (defconst ps-print-face-map-alist
 
 
 (defconst ps-print-face-map-alist


@@ -2257,92 +2521,15 @@ Each symbol correspond to one bit in a bit vector.")
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Creating and Remapping Faces
-
-
-(require 'font-lock)
-
-
-;; The definition below is necessary because some emacs variant does not
-;; define it on font-lock package.
-
-(defvar font-lock-face-attributes nil)
-
-
-;;;###autoload
-(defun ps-new-faces (face-screen &optional face-extension override-p merge-p)
-  "Create new faces from FACE-SCREEN.
-
-The FACE-SCREEN elements are added to `font-lock-face-attributes'.
-If optional OVERRIDE-P is non-nil, faces that already exist in
-`font-lock-face-attributes' are overrided.
-
-If optional MERGE-p is non-nil, extensions in FACE-EXTENSION are merged with
-face extension in `ps-print-face-extension-alist'; otherwise, overrides.
-
-The arguments FACE-SCREEN and FACE-EXTENSION are lists whose elements are:
-
-   (FACE-NAME FOREGROUND BACKGROUND EXTENSION...)
-
-FACE-NAME is a face name.
-
-FOREGROUND and BACKGROUND may be nil or a string that denotes the
-foreground and background colors respectively.
-
-EXTENSION is some valid extension symbol (see `ps-extend-face')."
-  (let ((mapfun (if override-p
-                   '(lambda (face)
-                      (let ((face-attributes (ps-extension-to-screen-face face)))
-                        (font-lock-make-face face-attributes)
-                        (ps-override-list 'font-lock-face-attributes
-                                          face-attributes)
-                        (ps-override-list 'ps-print-face-extension-alist
-                                          (ps-extension-to-bit-face face))))
-                 '(lambda (face)
-                    (let ((face-attributes (ps-extension-to-screen-face face)))
-                      (font-lock-make-face face-attributes)
-                      (add-to-list 'font-lock-face-attributes
-                                   face-attributes)
-                      (add-to-list 'ps-print-face-extension-alist
-                                   (ps-extension-to-bit-face face))))
-                 ))
-       maplist)
-    (mapcar mapfun face-screen)
-    (ps-extend-face-list face-extension merge-p)))
-
-
-(defun ps-override-list (sym-list element)
-  (let ((maplist (assq (car element) (symbol-value sym-list))))
-    (if maplist
-       (setcdr maplist (cdr element))
-      (set sym-list (cons element (symbol-value sym-list)))
-      )))
-
-
-(defun ps-extension-to-bit-face (face-extension)
-  (cons (nth 0 face-extension)
-       (vector (ps-extension-bit face-extension)
-               (nth 1 face-extension)
-               (nth 2 face-extension))))
-
-
-(defun ps-extension-to-screen-face (face)
-  (let ((face-name       (nth 0 face))
-       (face-foreground (nth 1 face))
-       (face-background (nth 2 face))
-       (face-attributes (nthcdr 3 face)))
-    (list face-name face-foreground face-background
-         (and (memq 'bold face-attributes) t)
-         (and (memq 'italic face-attributes) t)
-         (and (memq 'underline face-attributes) t))))
+;; Remapping Faces

 
 
 ;;;###autoload
 (defun ps-extend-face-list (face-extension-list &optional merge-p)
   "Extend face in `ps-print-face-extension-alist'.
 
 
 
 ;;;###autoload
 (defun ps-extend-face-list (face-extension-list &optional merge-p)
   "Extend face in `ps-print-face-extension-alist'.
 

-If optional MERGE-p is non-nil, extensions in FACE-EXTENSION are merged with
-face extension in `ps-print-face-extension-alist'; otherwise, overrides.
+If optional MERGE-P is non-nil, extensions in FACE-EXTENSION-LIST are merged
+with face extension in `ps-print-face-extension-alist'; otherwise, overrides.

 
 The elements in FACE-EXTENSION-LIST is like those for `ps-extend-face'.
 
 
 The elements in FACE-EXTENSION-LIST is like those for `ps-extend-face'.
 


@@ -2356,8 +2543,8 @@ See `ps-extend-face' for documentation."
 (defun ps-extend-face (face-extension &optional merge-p)
   "Extend face in `ps-print-face-extension-alist'.
 
 (defun ps-extend-face (face-extension &optional merge-p)
   "Extend face in `ps-print-face-extension-alist'.
 

-If optional MERGE-p is non-nil, extensions in FACE-EXTENSION are merged with
-face extensions in `ps-print-face-extension-alist'; otherwise, overrides.
+If optional MERGE-P is non-nil, extensions in FACE-EXTENSION list are merged
+with face extensions in `ps-print-face-extension-alist'; otherwise, overrides.

 
 The elements of FACE-EXTENSION list have the form:
 
 
 The elements of FACE-EXTENSION list have the form:
 


@@ -2376,7 +2563,7 @@ EXTENSION is one of the following symbols:
    overline  - like underline, but the line is over the text.
    shadow    - text will have a shadow.
    box       - text will be surrounded by a box.
    overline  - like underline, but the line is over the text.
    shadow    - text will have a shadow.
    box       - text will be surrounded by a box.

-   outline   - only the text border font will be printed.
+   outline   - print characters as hollow outlines.

 
 If EXTENSION is any other symbol, it is ignored."
   (let* ((face-name  (nth 0 face-extension))
 
 If EXTENSION is any other symbol, it is ignored."
   (let* ((face-name  (nth 0 face-extension))


@@ -2409,77 +2596,158 @@ If EXTENSION is any other symbol, it is ignored."
                                 0))))
     face-bit))
 
                                 0))))
     face-bit))
 

+\f
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Adapted from font-lock:
+;; Originally face attributes were specified via `font-lock-face-attributes'.
+;; Users then changed the default face attributes by setting that variable.
+;; However, we try and be back-compatible and respect its value if set except
+;; for faces where M-x customize has been used to save changes for the face.
+
+(defun ps-font-lock-face-attributes ()
+  (and (boundp 'font-lock-mode) (symbol-value 'font-lock-mode)
+       (boundp 'font-lock-face-attributes)
+       (let ((face-attributes font-lock-face-attributes))
+        (while face-attributes
+          (let* ((face-attribute
+                  (car (prog1 face-attributes
+                         (setq face-attributes (cdr face-attributes)))))
+                 (face (car face-attribute)))
+            ;; Rustle up a `defface' SPEC from a
+            ;; `font-lock-face-attributes' entry.
+            (unless (get face 'saved-face)
+              (let ((foreground (nth 1 face-attribute))
+                    (background (nth 2 face-attribute))
+                    (bold-p (nth 3 face-attribute))
+                    (italic-p (nth 4 face-attribute))
+                    (underline-p (nth 5 face-attribute))
+                    face-spec)
+                (when foreground
+                  (setq face-spec (cons ':foreground
+                                        (cons foreground face-spec))))
+                (when background
+                  (setq face-spec (cons ':background
+                                        (cons background face-spec))))
+                (when bold-p
+                  (setq face-spec (append '(:bold t) face-spec)))
+                (when italic-p
+                  (setq face-spec (append '(:italic t) face-spec)))
+                (when underline-p
+                  (setq face-spec (append '(:underline t) face-spec)))
+                (custom-declare-face face (list (list t face-spec)) nil)
+                )))))))
+

 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal functions and variables
 
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal functions and variables
 
 

-(defun ps-print-without-faces (from to &optional filename)
-  (ps-generate (current-buffer) from to 'ps-generate-postscript)
+(make-local-hook 'ps-print-hook)
+(make-local-hook 'ps-print-begin-page-hook)
+(make-local-hook 'ps-print-begin-column-hook)
+
+
+(defun ps-print-without-faces (from to &optional filename region-p)
+  (ps-spool-without-faces from to region-p)

   (ps-do-despool filename))
 
 
   (ps-do-despool filename))
 
 

-(defun ps-spool-without-faces (from to)
+(defun ps-spool-without-faces (from to &optional region-p)
+  (run-hooks 'ps-print-hook)
+  (ps-printing-region region-p)

   (ps-generate (current-buffer) from to 'ps-generate-postscript))
 
 
   (ps-generate (current-buffer) from to 'ps-generate-postscript))
 
 

-(defun ps-print-with-faces (from to &optional filename)
-  (ps-initialize-faces)
-  (ps-generate (current-buffer) from to 'ps-generate-postscript-with-faces)
+(defun ps-print-with-faces (from to &optional filename region-p)
+  (ps-spool-with-faces from to region-p)

   (ps-do-despool filename))
 
 
   (ps-do-despool filename))
 
 

-(defun ps-spool-with-faces (from to)
-  (ps-initialize-faces)
+(defun ps-spool-with-faces (from to &optional region-p)
+  (run-hooks 'ps-print-hook)
+  (ps-printing-region region-p)

   (ps-generate (current-buffer) from to 'ps-generate-postscript-with-faces))
 
 
   (ps-generate (current-buffer) from to 'ps-generate-postscript-with-faces))
 
 

-(defvar ps-initialize-faces nil)
-
-
-(defun ps-initialize-faces ()
-  (or ps-initialize-faces
-      (progn
-       (setq ps-initialize-faces t)
-       (mapcar 'ps-map-font-lock font-lock-face-attributes))))
+(defsubst ps-count-lines (from to)
+  (+ (count-lines from to)
+     (save-excursion
+       (goto-char to)
+       (if (= (current-column) 0) 1 0))))

 
 
 
 

-(defun ps-map-font-lock (face)
-  (let* ((face-map (ps-screen-to-bit-face face))
-        (ps-face-bit (cdr (assq (car face-map)
-                                ps-print-face-extension-alist))))
-    (if ps-face-bit
-       ;; if face exists, merge both
-       (let ((face-bit (cdr face-map)))
-         (aset ps-face-bit 0 (logior (aref ps-face-bit 0) (aref face-bit 0)))
-         (or (aref ps-face-bit 1) (aset ps-face-bit 1 (aref face-bit 1)))
-         (or (aref ps-face-bit 2) (aset ps-face-bit 2 (aref face-bit 2))))
-      ;; if face does not exist, insert it
-      (setq ps-print-face-extension-alist
-           (cons face-map ps-print-face-extension-alist))
-      )))
+(defvar ps-printing-region nil
+  "Variable used to indicate if ps-print is printing a region.
+If non-nil, it is a cons, the car of which is the line number
+where the region begins, and its cdr is the total number of lines
+in the buffer.  Formatting functions can use this information
+to print the original line number (and not the number of lines printed),
+and to indicate in the header that the printout is of a partial file.")

 
 
 
 

-(defun ps-screen-to-bit-face (face)
-  (let ((face-name (car face))
-       (face-foreground (nth 1 face))
-       (face-background (nth 2 face))
-       (face-bit (logior (if (nth 3 face) 1 0) ; bold
-                         (if (nth 4 face) 2 0) ; italic
-                         (if (nth 5 face) 4 0)))) ; underline
-    (cons face-name (vector face-bit face-foreground face-background))))
+(defun ps-printing-region (region-p)
+  (setq ps-printing-region
+       (and region-p
+            (cons (ps-count-lines (point-min) (region-beginning))
+                  (ps-count-lines (point-min) (point-max))))))

 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal functions
 
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal functions
 

+(defsubst ps-font-alist (font-sym)
+  (get font-sym 'fonts))
+
+(defun ps-font (font-sym font-type)
+  "Font family name for text of `font-type', when generating PostScript."
+  (let* ((font-list (ps-font-alist font-sym))
+        (normal-font (cdr (assq 'normal font-list))))
+    (while (and font-list (not (eq font-type (car (car font-list)))))
+      (setq font-list (cdr font-list)))
+    (or (cdr (car font-list)) normal-font)))
+
+(defun ps-fonts (font-sym)
+  (mapcar 'cdr (ps-font-alist font-sym)))
+
+(defun ps-font-number (font-sym font-type)
+  (or (ps-alist-position font-type (ps-font-alist font-sym))
+      0))
+
+(defsubst ps-line-height (font-sym)
+  "The height of a line, for generating PostScript.
+This is the value that ps-print uses to determine the height,
+y-dimension, of the lines of text it has printed, and thus affects the
+point at which page-breaks are placed.
+The line-height is *not* the same as the point size of the font."
+  (get font-sym 'line-height))
+
+(defsubst ps-title-line-height (font-sym)
+  "The height of a `title' line, for generating PostScript.
+This is the value that ps-print uses to determine the height,
+y-dimension, of the lines of text it has printed, and thus affects the
+point at which page-breaks are placed.
+The title-line-height is *not* the same as the point size of the font."
+  (get font-sym 'title-line-height))
+
+(defsubst ps-space-width (font-sym)
+  "The width of a space character, for generating PostScript.
+This value is used in expanding tab characters."
+  (get font-sym 'space-width))
+
+(defsubst ps-avg-char-width (font-sym)
+  "The average width, in points, of a character, for generating PostScript.
+This is the value that ps-print uses to determine the length,
+x-dimension, of the text it has printed, and thus affects the point at
+which long lines wrap around."
+  (get font-sym 'avg-char-width))
+

 (defun ps-line-lengths-internal ()
   "Display the correspondence between a line length and a font size,
 using the current ps-print setup.
 Try: pr -t file | awk '{printf \"%3d %s\n\", length($0), $0}' | sort -r | head"
   (let ((buf (get-buffer-create "*Line-lengths*"))
        (ifs ps-font-size)              ; initial font size
 (defun ps-line-lengths-internal ()
   "Display the correspondence between a line length and a font size,
 using the current ps-print setup.
 Try: pr -t file | awk '{printf \"%3d %s\n\", length($0), $0}' | sort -r | head"
   (let ((buf (get-buffer-create "*Line-lengths*"))
        (ifs ps-font-size)              ; initial font size

-       (icw ps-avg-char-width)         ; initial character width
+       (icw (ps-avg-char-width 'ps-font-for-text)) ; initial character width

        (print-width (progn (ps-get-page-dimensions)
                            ps-print-width))
        (ps-setup (ps-setup))           ; setup for the current buffer
        (print-width (progn (ps-get-page-dimensions)
                            ps-print-width))
        (ps-setup (ps-setup))           ; setup for the current buffer


@@ -2496,28 +2764,28 @@ Try: pr -t file | awk '{printf \"%3d %s\n\", length($0), $0}' | sort -r | head"
     (setq cw-min     (/ (* icw fs-min) ifs)
          nb-cpl-max (floor (/ print-width cw-min))
          cw-max     (/ (* icw fs-max) ifs)
     (setq cw-min     (/ (* icw fs-min) ifs)
          nb-cpl-max (floor (/ print-width cw-min))
          cw-max     (/ (* icw fs-max) ifs)

-         nb-cpl-min (floor (/ print-width cw-max)))
-    (setq nb-cpl nb-cpl-min)
+         nb-cpl-min (floor (/ print-width cw-max))
+         nb-cpl     nb-cpl-min)

     (set-buffer buf)
     (goto-char (point-max))
     (set-buffer buf)
     (goto-char (point-max))

-    (if (not (bolp)) (insert "\n"))
-    (insert ps-setup)
-    (insert "nb char per line / font size\n")
+    (or (bolp) (insert "\n"))
+    (insert ps-setup
+           "nb char per line / font size\n")

     (while (<= nb-cpl nb-cpl-max)
     (while (<= nb-cpl nb-cpl-max)

-      (setq cw     (/ print-width (float nb-cpl))
-           fs     (/ (* ifs cw) icw))
+      (setq cw (/ print-width (float nb-cpl))
+           fs (/ (* ifs cw) icw))

       (insert (format "%3s %s\n" nb-cpl fs))
       (setq nb-cpl (1+ nb-cpl)))
     (insert "\n")
     (display-buffer buf 'not-this-window)))
 
 (defun ps-nb-pages (nb-lines)
       (insert (format "%3s %s\n" nb-cpl fs))
       (setq nb-cpl (1+ nb-cpl)))
     (insert "\n")
     (display-buffer buf 'not-this-window)))
 
 (defun ps-nb-pages (nb-lines)

-  "Display an approximate correspondence between a font size and the number
-of pages the number of lines would require to print
-using the current ps-print setup."
+  "Display correspondence between font size and the number of pages.
+The correspondence is based on having NB-LINES lines of text,
+and on the current ps-print setup."

   (let ((buf (get-buffer-create "*Nb-Pages*"))
        (ifs ps-font-size)              ; initial font size
   (let ((buf (get-buffer-create "*Nb-Pages*"))
        (ifs ps-font-size)              ; initial font size

-       (ilh ps-line-height)            ; initial line height
+       (ilh (ps-line-height 'ps-font-for-text)) ; initial line height

        (page-height (progn (ps-get-page-dimensions)
                            ps-print-height))
        (ps-setup (ps-setup))           ; setup for the current buffer
        (page-height (progn (ps-get-page-dimensions)
                            ps-print-height))
        (ps-setup (ps-setup))           ; setup for the current buffer


@@ -2539,14 +2807,14 @@ using the current ps-print setup."
          nb-page-min (ceiling (/ (float nb-lines) nb-lpp-max))
          lh-max      (/ (* ilh fs-max) ifs)
          nb-lpp-min  (floor (/ page-height lh-max))
          nb-page-min (ceiling (/ (float nb-lines) nb-lpp-max))
          lh-max      (/ (* ilh fs-max) ifs)
          nb-lpp-min  (floor (/ page-height lh-max))

-         nb-page-max (ceiling (/ (float nb-lines) nb-lpp-min)))
-    (setq nb-page nb-page-min)
+         nb-page-max (ceiling (/ (float nb-lines) nb-lpp-min))
+         nb-page     nb-page-min)

     (set-buffer buf)
     (goto-char (point-max))
     (set-buffer buf)
     (goto-char (point-max))

-    (if (not (bolp)) (insert "\n"))
-    (insert ps-setup)
-    (insert (format "%d lines\n" nb-lines))
-    (insert "nb page / font size\n")
+    (or (bolp) (insert "\n"))
+    (insert ps-setup
+           (format "%d lines\n" nb-lines)
+           "nb page / font size\n")

     (while (<= nb-page nb-page-max)
       (setq nb-lpp (ceiling (/ nb-lines (float nb-page)))
            lh     (/ page-height nb-lpp)
     (while (<= nb-page nb-page-max)
       (setq nb-lpp (ceiling (/ nb-lines (float nb-page)))
            lh     (/ page-height nb-lpp)


@@ -2556,59 +2824,23 @@ using the current ps-print setup."
     (insert "\n")
     (display-buffer buf 'not-this-window)))
 
     (insert "\n")
     (display-buffer buf 'not-this-window)))
 

-(defun ps-select-font ()
-  "Choose the font name and size (scaling data)."
-  (let ((assoc (assq ps-font-family ps-font-info-database))
-       l fn fb fi bi sz lh sw aw)
-    (if (null assoc)
-       (error "Don't have data to scale font %s. Known fonts families are %s"
-              ps-font-family
-              (mapcar 'car ps-font-info-database)))
-    (setq l  (cdr assoc)
-         fn (prog1 (car l) (setq l (cdr l))) ; need `pop'
-         fb (prog1 (car l) (setq l (cdr l)))
-         fi (prog1 (car l) (setq l (cdr l)))
-         bi (prog1 (car l) (setq l (cdr l)))
-         sz (prog1 (car l) (setq l (cdr l)))
-         lh (prog1 (car l) (setq l (cdr l)))
-         sw (prog1 (car l) (setq l (cdr l)))
-         aw (prog1 (car l) (setq l (cdr l))))
-
-    (setq ps-font             fn)
-    (setq ps-font-bold        fb)
-    (setq ps-font-italic      fi)
-    (setq ps-font-bold-italic bi)
-    ;; These data just need to be rescaled:
-    (setq ps-line-height    (/ (* lh ps-font-size) sz))
-    (setq ps-space-width    (/ (* sw ps-font-size) sz))
-    (setq ps-avg-char-width (/ (* aw ps-font-size) sz))
-    ps-font-family))
-
-(defun ps-select-header-font ()
-  "Choose the font name and size (scaling data) for the header."
-  (let ((assoc (assq ps-header-font-family ps-font-info-database))
-       l fn fb fi bi sz lh sw aw)
-    (if (null assoc)
+;; macros used in `ps-select-font'
+(defmacro ps-lookup (key) `(cdr (assq ,key font-entry)))
+(defmacro ps-size-scale (key) `(/ (* (ps-lookup ,key) font-size) size))
+
+(defun ps-select-font (font-family sym font-size title-font-size)
+  (let ((font-entry (cdr (assq font-family ps-font-info-database))))
+    (or font-entry

        (error "Don't have data to scale font %s. Known fonts families are %s"
        (error "Don't have data to scale font %s. Known fonts families are %s"

-              ps-font-family
+              font-family

               (mapcar 'car ps-font-info-database)))
               (mapcar 'car ps-font-info-database)))

-    (setq l  (cdr assoc)
-         fn (prog1 (car l) (setq l (cdr l))) ; need `pop'
-         fb (prog1 (car l) (setq l (cdr l)))
-         fi (prog1 (car l) (setq l (cdr l)))
-         bi (prog1 (car l) (setq l (cdr l)))
-         sz (prog1 (car l) (setq l (cdr l)))
-         lh (prog1 (car l) (setq l (cdr l)))
-         sw (prog1 (car l) (setq l (cdr l)))
-         aw (prog1 (car l) (setq l (cdr l))))
-
-    ;; Font name
-    (setq ps-header-font             fn)
-    (setq ps-header-title-font       fb)
-    ;; Line height: These data just need to be rescaled:
-    (setq ps-header-title-line-height (/ (* lh ps-header-title-font-size) sz))
-    (setq ps-header-line-height       (/ (* lh ps-header-font-size)       sz))
-    ps-header-font-family))
+    (let ((size (ps-lookup 'size)))
+      (put sym 'fonts (ps-lookup 'fonts))
+      (put sym 'space-width (ps-size-scale 'space-width))
+      (put sym 'avg-char-width (ps-size-scale 'avg-char-width))
+      (put sym 'line-height (ps-size-scale 'line-height))
+      (put sym 'title-line-height
+          (/ (* (ps-lookup 'line-height) title-font-size) size)))))

 
 (defun ps-get-page-dimensions ()
   (let ((page-dimensions (cdr (assq ps-paper-type ps-page-dimensions-database)))
 
 (defun ps-get-page-dimensions ()
   (let ((page-dimensions (cdr (assq ps-paper-type ps-page-dimensions-database)))


@@ -2618,10 +2850,13 @@ using the current ps-print setup."
       (error "`ps-paper-type' must be one of:\n%s"
             (mapcar 'car ps-page-dimensions-database)))
      ((< ps-number-of-columns 1)
       (error "`ps-paper-type' must be one of:\n%s"
             (mapcar 'car ps-page-dimensions-database)))
      ((< ps-number-of-columns 1)

-      (error "The number of columns %d should not be negative" ps-number-of-columns)))
+      (error "The number of columns %d should be positive"
+            ps-number-of-columns)))

 
 

-    (ps-select-font)
-    (ps-select-header-font)
+    (ps-select-font ps-font-family 'ps-font-for-text
+                   ps-font-size ps-font-size)
+    (ps-select-font ps-header-font-family 'ps-font-for-header
+                   ps-header-font-size ps-header-title-font-size)

 
     (setq page-width  (ps-page-dimensions-get-width  page-dimensions)
          page-height (ps-page-dimensions-get-height page-dimensions))
 
     (setq page-width  (ps-page-dimensions-get-width  page-dimensions)
          page-height (ps-page-dimensions-get-height page-dimensions))


@@ -2637,11 +2872,10 @@ using the current ps-print setup."
     ;; | lm | text | ic | text | ic | text | rm |
     ;; page-width == lm  +  n * pw  +  (n - 1) * ic  +  rm
     ;; => pw == (page-width - lm -rm - (n - 1) * ic) / n
     ;; | lm | text | ic | text | ic | text | rm |
     ;; page-width == lm  +  n * pw  +  (n - 1) * ic  +  rm
     ;; => pw == (page-width - lm -rm - (n - 1) * ic) / n

-    (setq ps-print-width
-         (/ (- page-width
-               ps-left-margin ps-right-margin
-               (* (1- ps-number-of-columns) ps-inter-column))
-            ps-number-of-columns))
+    (setq ps-print-width (/ (- page-width
+                              ps-left-margin ps-right-margin
+                              (* (1- ps-number-of-columns) ps-inter-column))
+                           ps-number-of-columns))

     (if (<= ps-print-width 0)
        (error "Bad horizontal layout:
 page-width           == %s
     (if (<= ps-print-width 0)
        (error "Bad horizontal layout:
 page-width           == %s


@@ -2672,17 +2906,16 @@ page-height == bm + print-height + tm
               ps-print-height))
     ;; If headers are turned on, deduct the height of the header from
     ;; the print height.
               ps-print-height))
     ;; If headers are turned on, deduct the height of the header from
     ;; the print height.

-    (cond
-     (ps-print-header
-      (setq ps-header-pad
-           (* ps-header-line-pad ps-header-title-line-height))
-      (setq ps-print-height
-           (- ps-print-height
-              ps-header-offset
-              ps-header-pad
-              ps-header-title-line-height
-              (* ps-header-line-height (- ps-header-lines 1))
-              ps-header-pad))))
+    (if ps-print-header
+       (setq ps-header-pad   (* ps-header-line-pad
+                                (ps-title-line-height 'ps-font-for-header))
+             ps-print-height (- ps-print-height
+                                ps-header-offset
+                                ps-header-pad
+                                (ps-title-line-height 'ps-font-for-header)
+                                (* (ps-line-height 'ps-font-for-header)
+                                   (1- ps-header-lines))
+                                ps-header-pad)))

     (if (<= ps-print-height 0)
        (error "Bad vertical layout:
 ps-top-margin    == %s
     (if (<= ps-print-height 0)
        (error "Bad vertical layout:
 ps-top-margin    == %s


@@ -2697,46 +2930,76 @@ page-height == bm + print-height + tm - ho - hh
               ps-header-offset
               ps-header-pad
               (+ ps-header-pad
               ps-header-offset
               ps-header-pad
               (+ ps-header-pad

-                 ps-header-title-line-height
-                 (* ps-header-line-height (- ps-header-lines 1))
+                 (ps-title-line-height 'ps-font-for-header)
+                 (* (ps-line-height 'ps-font-for-header)
+                    (1- ps-header-lines))

                  ps-header-pad)
               ps-print-height))))
 
 (defun ps-print-preprint (&optional filename)
                  ps-header-pad)
               ps-print-height))))
 
 (defun ps-print-preprint (&optional filename)

-  (if (and filename
-          (or (numberp filename)
-              (listp filename)))
-      (let* ((name (concat (buffer-name) ".ps"))
-            (prompt (format "Save PostScript to file: (default %s) "
-                            name))
-            (res (read-file-name prompt default-directory name nil)))
-       (if (file-directory-p res)
-           (expand-file-name name (file-name-as-directory res))
-         res))))
+  (and filename
+       (or (numberp filename)
+          (listp filename))
+       (let* ((name   (concat (buffer-name) ".ps"))
+             (prompt (format "Save PostScript to file: (default %s) " name))
+             (res    (read-file-name prompt default-directory name nil)))
+        (if (file-directory-p res)
+            (expand-file-name name (file-name-as-directory res))
+          res))))

 
 ;; The following functions implement a simple list-buffering scheme so
 ;; that ps-print doesn't have to repeatedly switch between buffers
 
 ;; The following functions implement a simple list-buffering scheme so
 ;; that ps-print doesn't have to repeatedly switch between buffers

-;; while spooling.  The functions ps-output and ps-output-string build
-;; up the lists; the function ps-flush-output takes the lists and
+;; while spooling.  The functions `ps-output' and `ps-output-string' build
+;; up the lists; the function `ps-flush-output' takes the lists and

 ;; insert its contents into the spool buffer (*PostScript*).
 
 ;; insert its contents into the spool buffer (*PostScript*).
 

+(defvar ps-string-escape-codes
+  (let ((table (make-vector 256 nil))
+       (char ?\000))
+    ;; control characters
+    (while (<= char ?\037)
+      (aset table char (format "\\%03o" char))
+      (setq char (1+ char)))
+    ;; printable characters
+    (while (< char ?\177)
+      (aset table char (format "%c" char))
+      (setq char (1+ char)))
+    ;; DEL and 8-bit characters
+    (while (<= char ?\377)
+      (aset table char (format "\\%o" char))
+      (setq char (1+ char)))
+    ;; Override ASCII formatting characters with named escape code:
+    (aset table ?\n "\\n")             ; [NL] linefeed
+    (aset table ?\r "\\r")             ; [CR] carriage return
+    (aset table ?\t "\\t")             ; [HT] horizontal tab
+    (aset table ?\b "\\b")             ; [BS] backspace
+    (aset table ?\f "\\f")             ; [NP] form feed
+    ;; Escape PostScript escape and string delimiter characters:
+    (aset table ?\\ "\\\\")
+    (aset table ?\( "\\(")
+    (aset table ?\) "\\)")
+    table)
+  "Vector used to map characters to PostScript string escape codes.")
+

 (defun ps-output-string-prim (string)
   (insert "(")                         ;insert start-string delimiter
   (save-excursion                      ;insert string
     (insert string))
 (defun ps-output-string-prim (string)
   (insert "(")                         ;insert start-string delimiter
   (save-excursion                      ;insert string
     (insert string))

-

   ;; Find and quote special characters as necessary for PS
   ;; Find and quote special characters as necessary for PS

-  (while (re-search-forward "[()\\]" nil t)
-    (save-excursion
-      (forward-char -1)
-      (insert "\\")))
-
+  ;; This skips everything except control chars, nonascii chars,
+  ;; (, ) and \.
+  (while (progn (skip-chars-forward " -'*-[]-~") (not (eobp)))
+    (let ((special (following-char)))
+      (if (> (char-bytes special) 1)
+         (forward-char)
+       (delete-char 1)
+       (insert (aref ps-string-escape-codes special)))))

   (goto-char (point-max))
   (insert ")"))                                ;insert end-string delimiter
 
 (defun ps-init-output-queue ()
   (goto-char (point-max))
   (insert ")"))                                ;insert end-string delimiter
 
 (defun ps-init-output-queue ()

-  (setq ps-output-head (list ""))
-  (setq ps-output-tail ps-output-head))
+  (setq ps-output-head '("")
+       ps-output-tail ps-output-head))

 
 (defun ps-output (&rest args)
   (setcdr ps-output-tail args)
 
 (defun ps-output (&rest args)
   (setcdr ps-output-tail args)


@@ -2772,7 +3035,7 @@ page-height == bm + print-height + tm - ho - hh
     (set-buffer ps-spool-buffer)
     (goto-char (point-max))
     (insert-file fname)))
     (set-buffer ps-spool-buffer)
     (goto-char (point-max))
     (insert-file fname)))

-    
+

 ;; These functions insert the arrays that define the contents of the
 ;; headers.
 
 ;; These functions insert the arrays that define the contents of the
 ;; headers.
 


@@ -2807,17 +3070,12 @@ page-height == bm + print-height + tm - ho - hh
        (while (and (< count ps-header-lines)
                    (setq contents (cdr contents)))
          (ps-generate-header-line "/h1" (car contents))
        (while (and (< count ps-header-lines)
                    (setq contents (cdr contents)))
          (ps-generate-header-line "/h1" (car contents))

-         (setq count (+ count 1)))
+         (setq count (1+ count)))

        (ps-output "] def\n"))))
 
 (defun ps-output-boolean (name bool)
   (ps-output (format "/%s %s def\n" name (if bool "true" "false"))))
 
        (ps-output "] def\n"))))
 
 (defun ps-output-boolean (name bool)
   (ps-output (format "/%s %s def\n" name (if bool "true" "false"))))
 

-(defsubst ps-count-lines (from to)
-  (+ (count-lines from to)
-     (save-excursion (goto-char to)
-                    (if (= (current-column) 0) 1 0))))
-

 
 (defun ps-background-pages (page-list func)
   (if page-list
 
 (defun ps-background-pages (page-list func)
   (if page-list


@@ -2931,11 +3189,11 @@ page-height == bm + print-height + tm - ho - hh
    ps-print-background-image))
 
 
    ps-print-background-image))
 
 

-(defun ps-background ()
+(defun ps-background (page-number)

   (let (has-local-background)
     (mapcar '(lambda (range)
   (let (has-local-background)
     (mapcar '(lambda (range)

-              (and (<= (aref range 0) ps-page-count)
-                   (<= ps-page-count (aref range 1))
+              (and (<= (aref range 0) page-number)
+                   (<= page-number (aref range 1))

                    (if has-local-background
                        (ps-output (aref range 2))
                      (setq has-local-background t)
                    (if has-local-background
                        (ps-output (aref range 2))
                      (setq has-local-background t)


@@ -2945,68 +3203,92 @@ page-height == bm + print-height + tm - ho - hh
     (and has-local-background (ps-output "} def\n"))))
 
 
     (and has-local-background (ps-output "} def\n"))))
 
 

+;; Return a list of the distinct elements of LIST.
+;; Elements are compared with `equal'.
+(defun ps-remove-duplicates (list)
+  (let (new (tail list))
+    (while tail
+      (or (member (car tail) new)
+         (setq new (cons (car tail) new)))
+      (setq tail (cdr tail)))
+    (nreverse new)))
+
+;; Find the first occurrence of ITEM in LIST.
+;; Return the index of the matching item, or nil if not found.
+;; Elements are compared with `eq'.
+(defun ps-alist-position (item list)
+  (let ((tail list) (index 0) found)
+    (while tail
+      (if (setq found (eq (car (car tail)) item))
+         (setq tail nil)
+       (setq index (1+ index)
+             tail (cdr tail))))
+    (and found index)))
+
+

 (defun ps-begin-file ()
   (ps-get-page-dimensions)
 (defun ps-begin-file ()
   (ps-get-page-dimensions)

-  (setq ps-showpage-count 0
-       ps-showline-count 1
+  (setq ps-page-postscript 0

        ps-background-text-count 0
        ps-background-image-count 0
        ps-background-pages nil
        ps-background-all-pages nil)
 
        ps-background-text-count 0
        ps-background-image-count 0
        ps-background-pages nil
        ps-background-all-pages nil)
 

-  (ps-output ps-adobe-tag)
-  (ps-output "%%Title: " (buffer-name)) ;Take job name from name of
-                                       ;first buffer printed
-  (ps-output "\n%%Creator: " (user-full-name))
-  (ps-output "\n%%CreationDate: "
+  (ps-output ps-adobe-tag
+            "%%Title: " (buffer-name)  ; Take job name from name of
+                                       ; first buffer printed
+            "\n%%Creator: " (user-full-name)
+            " (using ps-print v" ps-print-version
+            ")\n%%CreationDate: "

             (time-stamp-hh:mm:ss) " " (time-stamp-mon-dd-yyyy)
             "\n%%Orientation: "
             (time-stamp-hh:mm:ss) " " (time-stamp-mon-dd-yyyy)
             "\n%%Orientation: "

-            (if ps-landscape-mode "Landscape" "Portrait"))
-  (ps-output "\n%% DocumentFonts: Times-Roman Times-Italic "
-            ps-font " " ps-font-bold " " ps-font-italic " "
-            ps-font-bold-italic " "
-            ps-header-font " " ps-header-title-font)
-  (ps-output "\n%%Pages: (atend)\n")
-  (ps-output "%%EndComments\n\n")
+            (if ps-landscape-mode "Landscape" "Portrait")
+            "\n%% DocumentFonts: Times-Roman Times-Italic "
+            (mapconcat 'identity
+                       (ps-remove-duplicates
+                        (append (ps-fonts 'ps-font-for-text)
+                                (list (ps-font 'ps-font-for-header 'normal)
+                                      (ps-font 'ps-font-for-header 'bold))))
+                       " ")
+            "\n%%Pages: (atend)\n"
+            "%%EndComments\n\n")

 
   (ps-output-boolean "LandscapeMode"             ps-landscape-mode)
 
   (ps-output-boolean "LandscapeMode"             ps-landscape-mode)

-  (ps-output (format "/NumberOfColumns %d def\n" ps-number-of-columns))
+  (ps-output (format "/NumberOfColumns %d def\n" ps-number-of-columns)

 
 

-  (ps-output (format "/LandscapePageHeight %s def\n" ps-landscape-page-height))
-  (ps-output (format "/PrintPageWidth      %s def\n"
+            (format "/LandscapePageHeight %s def\n" ps-landscape-page-height)
+            (format "/PrintPageWidth      %s def\n"

                     (- (* (+ ps-print-width ps-inter-column)
                           ps-number-of-columns)
                     (- (* (+ ps-print-width ps-inter-column)
                           ps-number-of-columns)

-                       ps-inter-column)))
-  (ps-output (format "/PrintWidth   %s def\n" ps-print-width))
-  (ps-output (format "/PrintHeight  %s def\n" ps-print-height))
-
-  (ps-output (format "/LeftMargin   %s def\n" ps-left-margin))
-  (ps-output (format "/RightMargin  %s def\n" ps-right-margin)) ; not used
-  (ps-output (format "/InterColumn  %s def\n" ps-inter-column))
-
-  (ps-output (format "/BottomMargin %s def\n" ps-bottom-margin))
-  (ps-output (format "/TopMargin    %s def\n" ps-top-margin)) ; not used
-  (ps-output (format "/HeaderOffset %s def\n" ps-header-offset))
-  (ps-output (format "/HeaderPad    %s def\n" ps-header-pad))
-  
-  (ps-output-boolean "PrintHeader"      ps-print-header)
-  (ps-output-boolean "PrintHeaderFrame" ps-print-header-frame)
-  (ps-output-boolean "ShowNofN"         ps-show-n-of-n)
-  (ps-output-boolean "Duplex"           ps-spool-duplex)
-
-  (ps-output (format "/LineHeight   %s def\n" ps-line-height)
-            (format "/LinesPerColumn %d def\n"
-                    (round (/ (+ (if ps-print-header
-                                     (- ps-print-height (ps-header-height))
-                                   ps-print-height)
-                                 (* ps-line-height 0.45))
-                              ps-line-height))))
-
-  (ps-output-boolean "Zebra" ps-zebra-stripe)
-  (ps-output (format "/NumberOfZebra %d def\n" ps-number-of-zebra))
-
+                       ps-inter-column))
+            (format "/PrintWidth   %s def\n" ps-print-width)
+            (format "/PrintHeight  %s def\n" ps-print-height)
+
+            (format "/LeftMargin   %s def\n" ps-left-margin)
+            (format "/RightMargin  %s def\n" ps-right-margin) ; not used
+            (format "/InterColumn  %s def\n" ps-inter-column)
+
+            (format "/BottomMargin %s def\n" ps-bottom-margin)
+            (format "/TopMargin    %s def\n" ps-top-margin) ; not used
+            (format "/HeaderOffset %s def\n" ps-header-offset)
+            (format "/HeaderPad    %s def\n" ps-header-pad))
+
+  (ps-output-boolean "PrintHeader"        ps-print-header)
+  (ps-output-boolean "PrintOnlyOneHeader" ps-print-only-one-header)
+  (ps-output-boolean "PrintHeaderFrame"   ps-print-header-frame)
+  (ps-output-boolean "ShowNofN"           ps-show-n-of-n)
+  (ps-output-boolean "Duplex"             ps-spool-duplex)
+
+  (let ((line-height (ps-line-height 'ps-font-for-text)))
+    (ps-output (format "/LineHeight   %s def\n" line-height)
+              (format "/LinesPerColumn %d def\n"
+                      (round (/ (+ ps-print-height
+                                   (* line-height 0.45))
+                                line-height)))))
+
+  (ps-output-boolean "Zebra" ps-zebra-stripes)

   (ps-output-boolean "PrintLineNumber" ps-line-number)
   (ps-output-boolean "PrintLineNumber" ps-line-number)

-  (ps-output (format "/Lines %d def\n" (ps-count-lines (point-min) (point-max))))
+  (ps-output (format "/ZebraHeight %d def\n" ps-zebra-stripe-height))

 
   (ps-background-text)
   (ps-background-image)
 
   (ps-background-text)
   (ps-background-image)


@@ -3020,21 +3302,28 @@ page-height == bm + print-height + tm - ho - hh
   (ps-output "} def\n/printLocalBackground {\n} def\n")
 
   ;; Header fonts
   (ps-output "} def\n/printLocalBackground {\n} def\n")
 
   ;; Header fonts

-  (ps-output                           ; /h0 14 /Helvetica-Bold Font
-   (format "/h0 %s /%s DefFont\n" ps-header-title-font-size ps-header-title-font))
-  (ps-output                           ; /h1 12 /Helvetica Font
-   (format "/h1 %s /%s DefFont\n" ps-header-font-size       ps-header-font))
+  (ps-output (format "/h0 %s /%s DefFont\n" ; /h0 14 /Helvetica-Bold DefFont
+                    ps-header-title-font-size (ps-font 'ps-font-for-header
+                                                       'bold))
+            (format "/h1 %s /%s DefFont\n" ; /h1 12 /Helvetica DefFont
+                    ps-header-font-size (ps-font 'ps-font-for-header
+                                                 'normal)))

 
   (ps-output ps-print-prologue-2)
 
   ;; Text fonts
 
   (ps-output ps-print-prologue-2)
 
   ;; Text fonts

-  (ps-output (format "/f0 %s /%s DefFont\n" ps-font-size ps-font))
-  (ps-output (format "/f1 %s /%s DefFont\n" ps-font-size ps-font-bold))
-  (ps-output (format "/f2 %s /%s DefFont\n" ps-font-size ps-font-italic))
-  (ps-output (format "/f3 %s /%s DefFont\n" ps-font-size ps-font-bold-italic))
-
-  (ps-output "\nBeginDoc\n\n")
-  (ps-output "%%EndPrologue\n"))
+  (let ((font (ps-font-alist 'ps-font-for-text))
+       (i 0))
+    (while font
+      (ps-output (format "/f%d %s /%s DefFont\n"
+                        i
+                        ps-font-size
+                        (ps-font 'ps-font-for-text (car (car font)))))
+      (setq font (cdr font)
+           i (1+ i))))
+
+  (ps-output "\nBeginDoc\n\n"
+            "%%EndPrologue\n"))

 
 (defun ps-header-dirpart ()
   (let ((fname (buffer-file-name)))
 
 (defun ps-header-dirpart ()
   (let ((fname (buffer-file-name)))


@@ -3053,23 +3342,34 @@ page-height == bm + print-height + tm - ho - hh
    ((string= (buffer-name) "sokoban.el")
     "Super! C'est sokoban.el!")
    (t (concat
    ((string= (buffer-name) "sokoban.el")
     "Super! C'est sokoban.el!")
    (t (concat

+       (and ps-printing-region "Subset of: ")

        (buffer-name)
        (and (buffer-modified-p) " (unsaved)")))))
 
 (defun ps-begin-job ()
        (buffer-name)
        (and (buffer-modified-p) " (unsaved)")))))
 
 (defun ps-begin-job ()

-  (setq ps-page-count 0))
+  (save-excursion
+    (set-buffer ps-spool-buffer)
+    (goto-char (point-max))
+    (and (re-search-backward "^%%Trailer$" nil t)
+        (delete-region (match-beginning 0) (point-max))))
+  (setq ps-showline-count (if ps-printing-region (car ps-printing-region) 1)
+       ps-page-count 0
+       ps-control-or-escape-regexp
+       (cond ((eq ps-print-control-characters '8-bit)
+              "[\000-\037\177-\377]")
+             ((eq ps-print-control-characters 'control-8-bit)
+              "[\000-\037\177-\237]")
+             ((eq ps-print-control-characters 'control)
+              "[\000-\037\177]")
+             (t "[\t\n\f]"))))
+
+(defmacro ps-page-number ()
+  `(1+ (/ (1- ps-page-count) ps-number-of-columns)))

 
 (defun ps-end-file ()
 
 (defun ps-end-file ()

-  (ps-output "\n%%Trailer\n")
-  (ps-output (format "%%%%Pages: %d\n" (1+ (/ (1- ps-page-count)
-                                             ps-number-of-columns))))
-  (ps-output "\nEndDoc\n\n%%EOF\n"))
-
-
-(defun ps-header-height ()
-  (+ ps-header-title-line-height
-     (* ps-header-line-height (1- ps-header-lines))
-     (* 2 ps-header-pad)))
+  (ps-output "\n%%Trailer\n%%Pages: "
+            (format "%d" ps-page-postscript)
+            "\n\nEndDoc\n\n%%EOF\n"))

 
 
 (defun ps-next-page ()
 
 
 (defun ps-next-page ()


@@ -3077,70 +3377,72 @@ page-height == bm + print-height + tm - ho - hh
   (ps-flush-output)
   (ps-begin-page))
 
   (ps-flush-output)
   (ps-begin-page))
 

-(defun ps-begin-page (&optional dummypage)
+(defun ps-header-page ()
+  ;; set total line and page number when printing has finished
+  ;; (see `ps-generate')
+  (if (prog1
+         (zerop (mod ps-page-count ps-number-of-columns))
+       (setq ps-page-count (1+ ps-page-count)))
+      ;; Print only when a new real page begins.
+      (progn
+       (setq ps-page-postscript (1+ ps-page-postscript))
+       (ps-output (format "\n%%%%Page: %d %d\n"
+                          ps-page-postscript ps-page-postscript))
+       (ps-output "/Lines 0 def\n/PageCount 0 def\nBeginDSCPage\n")
+       (ps-background ps-page-postscript)
+       (run-hooks 'ps-print-begin-page-hook))
+    ;; Print when any other page begins.
+    (ps-output "/Lines 0 def\n/PageCount 0 def\nBeginDSCPage\n")
+    (run-hooks 'ps-print-begin-column-hook)))
+
+(defun ps-begin-page ()

   (ps-get-page-dimensions)
   (ps-get-page-dimensions)

-  (setq ps-width-remaining  ps-print-width)
-  (setq ps-height-remaining ps-print-height)
+  (setq ps-width-remaining  ps-print-width
+       ps-height-remaining ps-print-height)

 
 

-  ;; Print only when a new real page begins.
-  (when (zerop (mod ps-page-count ps-number-of-columns))
-    (ps-output (format "\n%%%%Page: %d %d\n"
-                      (1+ (/ ps-page-count ps-number-of-columns))
-                      (1+ (/ ps-page-count ps-number-of-columns)))))
+  (ps-header-page)

 
 

-  (ps-output "BeginDSCPage\n")

   (ps-output (format "/LineNumber %d def\n" ps-showline-count)
   (ps-output (format "/LineNumber %d def\n" ps-showline-count)

-            (format "/PageNumber %d def\n" (incf ps-page-count)))
-  (ps-output "/PageCount 0 def\n")
+            (format "/PageNumber %d def\n" (if ps-print-only-one-header
+                                               (ps-page-number)
+                                             ps-page-count)))

 
   (when ps-print-header
     (ps-generate-header "HeaderLinesLeft"    ps-left-header)
     (ps-generate-header "HeaderLinesRight"   ps-right-header)
     (ps-output (format "%d SetHeaderLines\n" ps-header-lines)))
 
 
   (when ps-print-header
     (ps-generate-header "HeaderLinesLeft"    ps-left-header)
     (ps-generate-header "HeaderLinesRight"   ps-right-header)
     (ps-output (format "%d SetHeaderLines\n" ps-header-lines)))
 

-  (ps-background)
-

   (ps-output "BeginPage\n")
   (ps-set-font  ps-current-font)
   (ps-set-bg    ps-current-bg)
   (ps-set-color ps-current-color))
 
 (defun ps-end-page ()
   (ps-output "BeginPage\n")
   (ps-set-font  ps-current-font)
   (ps-set-bg    ps-current-bg)
   (ps-set-color ps-current-color))
 
 (defun ps-end-page ()

-  (setq ps-showpage-count (+ 1 ps-showpage-count))
-  (ps-output "EndPage\n")
-  (ps-output "EndDSCPage\n"))
+  (ps-output "EndPage\nEndDSCPage\n"))

 
 (defun ps-dummy-page ()
 
 (defun ps-dummy-page ()

-  (setq ps-showpage-count (+ 1 ps-showpage-count))
-  (ps-output "%%Page: " (format "- %d\n" ps-showpage-count)
-            "BeginDSCPage
-/PrintHeader false def
+  (ps-header-page)
+  (ps-output "/PrintHeader false def

 BeginPage
 EndPage
 EndDSCPage\n"))
 BeginPage
 EndPage
 EndDSCPage\n"))

-           
+

 (defun ps-next-line ()
   (setq ps-showline-count (1+ ps-showline-count))
 (defun ps-next-line ()
   (setq ps-showline-count (1+ ps-showline-count))

-  (if (< ps-height-remaining ps-line-height)
-      (ps-next-page)
-    (setq ps-width-remaining  ps-print-width)
-    (setq ps-height-remaining (- ps-height-remaining ps-line-height))
-    (ps-hard-lf)))
+  (let ((lh (ps-line-height 'ps-font-for-text)))
+    (if (< ps-height-remaining lh)
+       (ps-next-page)
+      (setq ps-width-remaining  ps-print-width
+           ps-height-remaining (- ps-height-remaining lh))
+      (ps-output "HL\n"))))

 
 (defun ps-continue-line ()
 
 (defun ps-continue-line ()

-  (if (< ps-height-remaining ps-line-height)
-      (ps-next-page)
-    (setq ps-width-remaining  ps-print-width)
-    (setq ps-height-remaining (- ps-height-remaining ps-line-height))
-    (ps-soft-lf)))
-
-;; [jack] Why hard and soft ?
-
-(defun ps-hard-lf ()
-  (ps-output "HL\n"))
-
-(defun ps-soft-lf ()
-  (ps-output "SL\n"))
+  (let ((lh (ps-line-height 'ps-font-for-text)))
+    (if (< ps-height-remaining lh)
+       (ps-next-page)
+      (setq ps-width-remaining  ps-print-width
+           ps-height-remaining (- ps-height-remaining lh))
+      (ps-output "SL\n"))))

 
 (defun ps-find-wrappoint (from to char-width)
   (let ((avail (truncate (/ ps-width-remaining char-width)))
 
 (defun ps-find-wrappoint (from to char-width)
   (let ((avail (truncate (/ ps-width-remaining char-width)))


@@ -3150,7 +3452,8 @@ EndDSCPage\n"))
       (cons (+ from avail) ps-width-remaining))))
 
 (defun ps-basic-plot-string (from to &optional bg-color)
       (cons (+ from avail) ps-width-remaining))))
 
 (defun ps-basic-plot-string (from to &optional bg-color)

-  (let* ((wrappoint (ps-find-wrappoint from to ps-avg-char-width))
+  (let* ((wrappoint (ps-find-wrappoint from to
+                                      (ps-avg-char-width 'ps-font-for-text)))

         (to (car wrappoint))
         (string (buffer-substring-no-properties from to)))
     (ps-output-string string)
         (to (car wrappoint))
         (string (buffer-substring-no-properties from to)))
     (ps-output-string string)


@@ -3158,7 +3461,8 @@ EndDSCPage\n"))
     wrappoint))
 
 (defun ps-basic-plot-whitespace (from to &optional bg-color)
     wrappoint))
 
 (defun ps-basic-plot-whitespace (from to &optional bg-color)

-  (let* ((wrappoint (ps-find-wrappoint from to ps-space-width))
+  (let* ((wrappoint (ps-find-wrappoint from to
+                                      (ps-space-width 'ps-font-for-text)))

         (to (car wrappoint)))
     (ps-output (format "%d W\n" (- to from)))
     wrappoint))
         (to (car wrappoint)))
     (ps-output (format "%d W\n" (- to from)))
     wrappoint))


@@ -3168,40 +3472,38 @@ EndDSCPage\n"))
     (let* ((wrappoint (funcall plotfunc from to bg-color))
           (plotted-to (car wrappoint))
           (plotted-width (cdr wrappoint)))
     (let* ((wrappoint (funcall plotfunc from to bg-color))
           (plotted-to (car wrappoint))
           (plotted-width (cdr wrappoint)))

-      (setq from plotted-to)
-      (setq ps-width-remaining (- ps-width-remaining plotted-width))
+      (setq from plotted-to
+           ps-width-remaining (- ps-width-remaining plotted-width))

       (if (< from to)
          (ps-continue-line))))
   (if ps-razzle-dazzle
       (let* ((q-todo (- (point-max) (point-min)))
             (q-done (- (point) (point-min)))
             (chunkfrac (/ q-todo 8))
       (if (< from to)
          (ps-continue-line))))
   (if ps-razzle-dazzle
       (let* ((q-todo (- (point-max) (point-min)))
             (q-done (- (point) (point-min)))
             (chunkfrac (/ q-todo 8))

-            (chunksize (if (> chunkfrac 1000) 1000 chunkfrac)))
+            (chunksize (min chunkfrac 1000)))

        (if (> (- q-done ps-razchunk) chunksize)
        (if (> (- q-done ps-razchunk) chunksize)

-           (let (foo)
+           (progn

              (setq ps-razchunk q-done)
              (setq ps-razchunk q-done)

-             (setq foo
-                   (if (< q-todo 100)
-                       (/ (* 100 q-done) q-todo)
-                     (/ q-done (/ q-todo 100))))
-             (message "Formatting...%3d%%" foo))))))
+             (message "Formatting...%3d%%"
+                      (if (< q-todo 100)
+                          (/ (* 100 q-done) q-todo)
+                        (/ q-done (/ q-todo 100)))
+                      ))))))

 
 (defun ps-set-font (font)
 
 (defun ps-set-font (font)

-  (setq ps-current-font font)
-  (ps-output (format "/f%d F\n" ps-current-font)))
+  (ps-output (format "/f%d F\n" (setq ps-current-font font))))

 
 (defun ps-set-bg (color)
   (if (setq ps-current-bg color)
 
 (defun ps-set-bg (color)
   (if (setq ps-current-bg color)

-      (ps-output (format ps-color-format (nth 0 color) (nth 1 color)
-                        (nth 2 color))
+      (ps-output (format ps-color-format
+                        (nth 0 color) (nth 1 color) (nth 2 color))

                 " true BG\n")
     (ps-output "false BG\n")))
 
 (defun ps-set-color (color)
                 " true BG\n")
     (ps-output "false BG\n")))
 
 (defun ps-set-color (color)

-  (if (setq ps-current-color color)
-      nil
-    (setq ps-current-color ps-default-fg))
-  (ps-output (format ps-color-format (nth 0 ps-current-color)
+  (setq ps-current-color (or color ps-default-fg))
+  (ps-output (format ps-color-format
+                    (nth 0 ps-current-color)

                     (nth 1 ps-current-color) (nth 2 ps-current-color))
             " FG\n"))
 
                     (nth 1 ps-current-color) (nth 2 ps-current-color))
             " FG\n"))
 


@@ -3212,15 +3514,15 @@ EndDSCPage\n"))
 (defun ps-plot-region (from to font &optional fg-color bg-color effects)
   (if (not (equal font ps-current-font))
       (ps-set-font font))
 (defun ps-plot-region (from to font &optional fg-color bg-color effects)
   (if (not (equal font ps-current-font))
       (ps-set-font font))

-  
+

   ;; Specify a foreground color only if one's specified and it's
   ;; different than the current.
   (if (not (equal fg-color ps-current-color))
       (ps-set-color fg-color))
   ;; Specify a foreground color only if one's specified and it's
   ;; different than the current.
   (if (not (equal fg-color ps-current-color))
       (ps-set-color fg-color))

-  
+

   (if (not (equal bg-color ps-current-bg))
       (ps-set-bg bg-color))
   (if (not (equal bg-color ps-current-bg))
       (ps-set-bg bg-color))

-  
+

   ;; Specify effects (underline, overline, box, etc)
   (cond
    ((not (integerp effects))
   ;; Specify effects (underline, overline, box, etc)
   (cond
    ((not (integerp effects))


@@ -3237,50 +3539,67 @@ EndDSCPage\n"))
     ;; ...break the region up into chunks separated by tabs, linefeeds,
     ;; pagefeeds, control characters, and plot each chunk.
     (while (< from to)
     ;; ...break the region up into chunks separated by tabs, linefeeds,
     ;; pagefeeds, control characters, and plot each chunk.
     (while (< from to)

-      (if (re-search-forward "[\000-\037\177-\377]" to t)
-         ;; region whith some control characters
-         (let ((match (char-after (match-beginning 0))))
-           (if (= match ?\t)           ; tab
-               (let ((linestart
-                      (save-excursion (beginning-of-line) (point))))
-                 (ps-plot 'ps-basic-plot-string from (- (point) 1)
-                          bg-color)
-                 (forward-char -1)
-                 (setq from (+ linestart (current-column)))
-                 (if (re-search-forward "[ \t]+" to t)
-                     (ps-plot 'ps-basic-plot-whitespace
-                              from (+ linestart (current-column))
-                              bg-color)))
-             ;; any other control character except tab
-             (ps-plot 'ps-basic-plot-string from (- (point) 1) bg-color)
-             (cond
-              ((= match ?\n)           ; newline
-               (ps-next-line))
-
-              ((= match ?\f)           ; form feed
-               (ps-next-page))
-
-              ((<= match ?\037)        ; characters from ^@ to ^_
-               (ps-control-character (format "^%c" (+ match ?@))))
-
-              ((= match ?\177)         ; del (127) is printed ^?
-               (ps-control-character "^?"))
-
-              (t                       ; characters from 128 to 255
-               (ps-control-character (format "\\%o" match)))))
+      (if (re-search-forward ps-control-or-escape-regexp to t)
+         ;; region with some control characters
+         (let* ((match-point (match-beginning 0))
+                (match (char-after match-point)))
+           (ps-plot 'ps-basic-plot-string from (1- (point)) bg-color)
+           (cond
+            ((= match ?\t)             ; tab
+             (let ((linestart (save-excursion (beginning-of-line) (point))))
+               (forward-char -1)
+               (setq from (+ linestart (current-column)))
+               (if (re-search-forward "[ \t]+" to t)
+                   (ps-plot 'ps-basic-plot-whitespace
+                            from (+ linestart (current-column))
+                            bg-color))))
+
+            ((= match ?\n)             ; newline
+             (ps-next-line))
+
+            ((= match ?\f)             ; form feed
+             ;; do not skip page if previous character is NEWLINE and
+             ;; it is a beginning of page.
+             (or (and (= (char-after (1- match-point)) ?\n)
+                      (= ps-height-remaining ps-print-height))
+                 (ps-next-page)))
+                                       ; characters from ^@ to ^_ and
+            (t                         ; characters from 127 to 255
+             (ps-control-character match)))

            (setq from (point)))
        ;; region without control characters
        (ps-plot 'ps-basic-plot-string from to bg-color)
        (setq from to)))))
 
            (setq from (point)))
        ;; region without control characters
        (ps-plot 'ps-basic-plot-string from to bg-color)
        (setq from to)))))
 

-(defun ps-control-character (str)
-  (let* ((from (1- (point)))
+(defvar ps-string-control-codes
+  (let ((table (make-vector 256 nil))
+       (char ?\000))
+    ;; control character
+    (while (<= char ?\037)
+      (aset table char (format "^%c" (+ char ?@)))
+      (setq char (1+ char)))
+    ;; printable character
+    (while (< char ?\177)
+      (aset table char (format "%c" char))
+      (setq char (1+ char)))
+    ;; DEL
+    (aset table char "^?")
+    ;; 8-bit character
+    (while (<= (setq char (1+ char)) ?\377)
+      (aset table char (format "\\%o" char)))
+    table)
+  "Vector used to map characters to a printable string.")
+
+(defun ps-control-character (char)
+  (let* ((str (aref ps-string-control-codes char))
+        (from (1- (point)))

         (len (length str))
         (to (+ from len))
         (len (length str))
         (to (+ from len))

-        (wrappoint (ps-find-wrappoint from to ps-avg-char-width)))
+        (char-width (ps-avg-char-width 'ps-font-for-text))
+        (wrappoint (ps-find-wrappoint from to char-width)))

     (if (< (car wrappoint) to)
        (ps-continue-line))
     (if (< (car wrappoint) to)
        (ps-continue-line))

-    (setq ps-width-remaining (- ps-width-remaining (* len ps-avg-char-width)))
+    (setq ps-width-remaining (- ps-width-remaining (* len char-width)))

     (ps-output-string str)
     (ps-output " S\n")))
 
     (ps-output-string str)
     (ps-output " S\n")))
 


@@ -3291,53 +3610,43 @@ EndDSCPage\n"))
 (defun ps-color-values (x-color)
   (cond ((fboundp 'x-color-values)
         (x-color-values x-color))
 (defun ps-color-values (x-color)
   (cond ((fboundp 'x-color-values)
         (x-color-values x-color))

-       ((fboundp 'pixel-components)
-        (pixel-components x-color))
+       ((and (fboundp 'color-instance-rgb-components)
+             (ps-color-device))
+        (color-instance-rgb-components
+         (if (color-instance-p x-color)
+             x-color
+           (make-color-instance
+            (if (color-specifier-p x-color)
+                (color-name x-color)
+              x-color)))))

        (t (error "No available function to determine X color values."))))
 
 
        (t (error "No available function to determine X color values."))))
 
 

-(defun ps-get-face (face)
-  "Return face description on `ps-print-face-extension-alist'.
+(defun ps-face-attributes (face)
+  "Return face attribute vector.

 
 

-If FACE is not in `ps-print-face-extension-alist',
-insert it and return the description.
+If FACE is not in `ps-print-face-extension-alist' or in
+`ps-print-face-alist', insert it on `ps-print-face-alist' and
+return the attribute vector.

 
 If FACE is not a valid face name, it is used default face."
 
 If FACE is not a valid face name, it is used default face."

-  (or (assq face ps-print-face-extension-alist)
-      (let* ((the-face (if (facep face) face 'default))
-            (font (face-font the-face t))
-            (new-face
-             (cons the-face
-                   (vector
-                    (logior (if (memq 'bold font) 1 0)
-                            (if (memq 'italic font) 2 0)
-                            (if (face-underline-p the-face) 4 0))
-                    (face-foreground the-face)
-                    (face-background the-face)))))
-       (or (and (eq the-face 'default)
-                (assq the-face ps-print-face-extension-alist))
-           (setq ps-print-face-extension-alist
-                 (cons new-face
-                       ps-print-face-extension-alist)))
-       new-face)))
-
-
-(defun ps-face-attributes (face)
-  (let* ((face-vector (cdr (ps-get-face face)))
-        (effects (logior (aref face-vector 0)
-                         (if (memq face ps-ref-bold-faces) 1 0)
-                         (if (memq face ps-ref-italic-faces) 2 0)
-                         (if (memq face ps-ref-underlined-faces) 4 0))))
-    (vector effects (aref face-vector 1) (aref face-vector 2))))
+  (cdr (or (assq face ps-print-face-extension-alist)
+          (assq face ps-print-face-alist)
+          (let* ((the-face (if (facep face) face 'default))
+                 (new-face (ps-screen-to-bit-face the-face)))
+            (or (and (eq the-face 'default)
+                     (assq the-face ps-print-face-alist))
+                (setq ps-print-face-alist (cons new-face ps-print-face-alist)))
+            new-face))))

 
 
 (defun ps-face-attribute-list (face-or-list)
   (if (listp face-or-list)
       ;; list of faces
 
 
 (defun ps-face-attribute-list (face-or-list)
   (if (listp face-or-list)
       ;; list of faces

-      (let ((effects 0) foreground background face-attr face)
+      (let ((effects 0)
+           foreground background face-attr)

        (while face-or-list
        (while face-or-list

-         (setq face (car face-or-list)
-               face-attr (ps-face-attributes face)
+         (setq face-attr (ps-face-attributes (car face-or-list))

                effects (logior effects (aref face-attr 0)))
          (or foreground (setq foreground (aref face-attr 1)))
          (or background (setq background (aref face-attr 2)))
                effects (logior effects (aref face-attr 0)))
          (or foreground (setq foreground (aref face-attr 1)))
          (or background (setq background (aref face-attr 2)))


@@ -3347,103 +3656,133 @@ If FACE is not a valid face name, it is used default face."
     (ps-face-attributes face-or-list)))
 
 
     (ps-face-attributes face-or-list)))
 
 

+(defconst ps-font-type (vector nil 'bold 'italic 'bold-italic))
+
+

 (defun ps-plot-with-face (from to face)
 (defun ps-plot-with-face (from to face)

-  (if face
-      (let* ((face-bit   (ps-face-attribute-list face))
-            (effect     (aref face-bit 0))
-            (foreground (aref face-bit 1))
-            (background (aref face-bit 2))
-            (fg-color (if (and ps-print-color-p foreground)
-                          (mapcar 'ps-color-value
-                                  (ps-color-values foreground))
-                        ps-default-color))
-            (bg-color (if (and ps-print-color-p background)
-                          (mapcar 'ps-color-value
-                                  (ps-color-values background)))))
-       (ps-plot-region from to (logand effect 3)
-                       fg-color bg-color (lsh effect -2)))
+  (cond
+   ((null face)                                ; print text with null face

     (ps-plot-region from to 0))
     (ps-plot-region from to 0))

+   ((eq face 'emacs--invisible--face)) ; skip invisible text!!!
+   (t                                  ; otherwise, text has a valid face
+    (let* ((face-bit   (ps-face-attribute-list face))
+          (effect     (aref face-bit 0))
+          (foreground (aref face-bit 1))
+          (background (aref face-bit 2))
+          (fg-color (if (and ps-print-color-p foreground (ps-color-device))
+                        (mapcar 'ps-color-value
+                                (ps-color-values foreground))
+                      ps-default-color))
+          (bg-color (and ps-print-color-p background (ps-color-device)
+                         (mapcar 'ps-color-value
+                                 (ps-color-values background)))))
+      (ps-plot-region
+       from to
+       (ps-font-number 'ps-font-for-text
+                      (or (aref ps-font-type (logand effect 3))
+                          face))
+       fg-color bg-color (lsh effect -2)))))

   (goto-char to))
 
 
   (goto-char to))
 
 

-(defun ps-emacs-face-kind-p (face kind kind-regex kind-list)
-  (let ((frame-font (face-font face))
-       (face-defaults (face-font face t)))
-    (or
-     ;; Check FACE defaults:
-     (and (listp face-defaults)
-         (memq kind face-defaults))
-     ;; Check the user's preferences
-     (memq face kind-list))))
-

 (defun ps-xemacs-face-kind-p (face kind kind-regex kind-list)
 (defun ps-xemacs-face-kind-p (face kind kind-regex kind-list)

-  (let* ((frame-font (or (face-font face) (face-font 'default)))
-        (kind-cons (assq kind (x-font-properties frame-font)))
+  (let* ((frame-font (or (face-font-instance face)
+                        (face-font-instance 'default)))
+        (kind-cons (and frame-font
+                        (assq kind (font-instance-properties frame-font))))

         (kind-spec (cdr-safe kind-cons))
         (case-fold-search t))
         (kind-spec (cdr-safe kind-cons))
         (case-fold-search t))

-

     (or (and kind-spec (string-match kind-regex kind-spec))
        ;; Kludge-compatible:
        (memq face kind-list))))
 
 (defun ps-face-bold-p (face)
   (if (eq ps-print-emacs-type 'emacs)
     (or (and kind-spec (string-match kind-regex kind-spec))
        ;; Kludge-compatible:
        (memq face kind-list))))
 
 (defun ps-face-bold-p (face)
   (if (eq ps-print-emacs-type 'emacs)

-      (ps-emacs-face-kind-p face 'bold "-\\(bold\\|demibold\\)-"
-                         ps-bold-faces)
-    (ps-xemacs-face-kind-p face 'WEIGHT_NAME "bold\\|demibold"
-                          ps-bold-faces)))
+      (or (face-bold-p face)
+         (memq face ps-bold-faces))
+    (ps-xemacs-face-kind-p face 'WEIGHT_NAME "bold\\|demibold" ps-bold-faces)))

 
 (defun ps-face-italic-p (face)
   (if (eq ps-print-emacs-type 'emacs)
 
 (defun ps-face-italic-p (face)
   (if (eq ps-print-emacs-type 'emacs)

-      (ps-emacs-face-kind-p face 'italic "-[io]-" ps-italic-faces)
-    (or
-     (ps-xemacs-face-kind-p face 'ANGLE_NAME "i\\|o" ps-italic-faces)
-     (ps-xemacs-face-kind-p face 'SLANT "i\\|o" ps-italic-faces))))
+      (or (face-italic-p face)
+         (memq face ps-italic-faces))
+    (or (ps-xemacs-face-kind-p face 'ANGLE_NAME "i\\|o" ps-italic-faces)
+       (ps-xemacs-face-kind-p face 'SLANT "i\\|o" ps-italic-faces))))

 
 (defun ps-face-underlined-p (face)
   (or (face-underline-p face)
       (memq face ps-underlined-faces)))
 
 
 (defun ps-face-underlined-p (face)
   (or (face-underline-p face)
       (memq face ps-underlined-faces)))
 

+

 ;; Ensure that face-list is fbound.
 (or (fboundp 'face-list) (defalias 'face-list 'list-faces))
 
 ;; Ensure that face-list is fbound.
 (or (fboundp 'face-list) (defalias 'face-list 'list-faces))
 

+

 (defun ps-build-reference-face-lists ()
 (defun ps-build-reference-face-lists ()

+  ;; Ensure that face database is updated with faces on
+  ;; `font-lock-face-attributes' (obsolete stuff)
+  (ps-font-lock-face-attributes)
+  ;; Now, rebuild reference face lists
+  (setq ps-print-face-alist nil)

   (if ps-auto-font-detect
   (if ps-auto-font-detect

-      (let ((faces (face-list))
-           the-face)
-       (setq ps-ref-bold-faces nil
-             ps-ref-italic-faces nil
-             ps-ref-underlined-faces nil)
-       (while faces
-         (setq the-face (car faces))
-         (if (ps-face-italic-p the-face)
-             (setq ps-ref-italic-faces
-                   (cons the-face ps-ref-italic-faces)))
-         (if (ps-face-bold-p the-face)
-             (setq ps-ref-bold-faces
-                   (cons the-face ps-ref-bold-faces)))
-         (if (ps-face-underlined-p the-face)
-             (setq ps-ref-underlined-faces
-                   (cons the-face ps-ref-underlined-faces)))
-         (setq faces (cdr faces))))
-    (setq ps-ref-bold-faces ps-bold-faces)
-    (setq ps-ref-italic-faces ps-italic-faces)
-    (setq ps-ref-underlined-faces ps-underlined-faces))
+      (mapcar 'ps-map-face (face-list))
+    (mapcar 'ps-set-face-bold ps-bold-faces)
+    (mapcar 'ps-set-face-italic ps-italic-faces)
+    (mapcar 'ps-set-face-underline ps-underlined-faces))

   (setq ps-build-face-reference nil))
 
   (setq ps-build-face-reference nil))
 

+
+(defun ps-set-face-bold (face)
+  (ps-set-face-attribute face 1))
+
+(defun ps-set-face-italic (face)
+  (ps-set-face-attribute face 2))
+
+(defun ps-set-face-underline (face)
+  (ps-set-face-attribute face 4))
+
+
+(defun ps-set-face-attribute (face effect)
+  (let ((face-bit (cdr (ps-map-face face))))
+    (aset face-bit 0 (logior (aref face-bit 0) effect))))
+
+
+(defun ps-map-face (face)
+  (let* ((face-map (ps-screen-to-bit-face face))
+        (ps-face-bit (cdr (assq (car face-map) ps-print-face-alist))))
+    (if ps-face-bit
+       ;; if face exists, merge both
+       (let ((face-bit (cdr face-map)))
+         (aset ps-face-bit 0 (logior (aref ps-face-bit 0) (aref face-bit 0)))
+         (or (aref ps-face-bit 1) (aset ps-face-bit 1 (aref face-bit 1)))
+         (or (aref ps-face-bit 2) (aset ps-face-bit 2 (aref face-bit 2))))
+      ;; if face does not exist, insert it
+      (setq ps-print-face-alist (cons face-map ps-print-face-alist)))
+    face-map))
+
+
+(defun ps-screen-to-bit-face (face)
+  (cons face
+       (vector (logior (if (ps-face-bold-p face) 1 0) ; bold
+                       (if (ps-face-italic-p face) 2 0) ; italic
+                       (if (ps-face-underlined-p face) 4 0)) ; underline
+               (face-foreground face)
+               (face-background face))))
+
+

 (defun ps-mapper (extent list)
   (nconc list (list (list (extent-start-position extent) 'push extent)
 (defun ps-mapper (extent list)
   (nconc list (list (list (extent-start-position extent) 'push extent)

-                    (list (extent-end-position extent) 'pull extent)))
+                   (list (extent-end-position extent) 'pull extent)))

   nil)
 
 (defun ps-extent-sorter (a b)
   (< (extent-priority a) (extent-priority b)))
 
 (defun ps-print-ensure-fontified (start end)
   nil)
 
 (defun ps-extent-sorter (a b)
   (< (extent-priority a) (extent-priority b)))
 
 (defun ps-print-ensure-fontified (start end)

-  (if (and (boundp 'lazy-lock-mode) lazy-lock-mode)
-      (if (fboundp 'lazy-lock-fontify-region)
-          (lazy-lock-fontify-region start end) ; the new
-        (lazy-lock-fontify-buffer))))         ; the old
+  (and (boundp 'lazy-lock-mode) (symbol-value 'lazy-lock-mode)
+       (if (fboundp 'lazy-lock-fontify-region)
+          (lazy-lock-fontify-region start end) ; the new
+        (lazy-lock-fontify-buffer))))  ; the old

 
 (defun ps-generate-postscript-with-faces (from to)
   ;; Some initialization...
 
 (defun ps-generate-postscript-with-faces (from to)
   ;; Some initialization...


@@ -3459,7 +3798,7 @@ If FACE is not a valid face name, it is used default face."
   ;; that ps-print can be dumped into emacs.  This expression can't be
   ;; evaluated at dump-time because X isn't initialized.
   (setq ps-print-color-scale
   ;; that ps-print can be dumped into emacs.  This expression can't be
   ;; evaluated at dump-time because X isn't initialized.
   (setq ps-print-color-scale

-       (if ps-print-color-p
+       (if (and ps-print-color-p (ps-color-device))

            (float (car (ps-color-values "white")))
          1.0))
   ;; Generate some PostScript.
            (float (car (ps-color-values "white")))
          1.0))
   ;; Generate some PostScript.


@@ -3475,21 +3814,20 @@ If FACE is not a valid face name, it is used default face."
        (let ((a (cons 'dummy nil))
              record type extent extent-list)
          (map-extents 'ps-mapper nil from to a)
        (let ((a (cons 'dummy nil))
              record type extent extent-list)
          (map-extents 'ps-mapper nil from to a)

-         (setq a (sort (cdr a) 'car-less-than-car))
-
-         (setq extent-list nil)
+         (setq a (sort (cdr a) 'car-less-than-car)
+               extent-list nil)

 
          ;; Loop through the extents...
          (while a
 
          ;; Loop through the extents...
          (while a

-           (setq record (car a))
+           (setq record (car a)

 
 

-           (setq position (car record))
-           (setq record (cdr record))
+                 position (car record)
+                 record (cdr record)

 
 

-           (setq type (car record))
-           (setq record (cdr record))
+                 type (car record)
+                 record (cdr record)

 
 

-           (setq extent (car record))
+                 extent (car record))

 
            ;; Plot up to this record.
            ;; XEmacs 19.12: for some reason, we're getting into a
 
            ;; Plot up to this record.
            ;; XEmacs 19.12: for some reason, we're getting into a


@@ -3498,9 +3836,8 @@ If FACE is not a valid face name, it is used default face."
            ;; the buffer, this'll generate errors.  This is a
            ;; hack, but don't call ps-plot-with-face unless from >
            ;; point-min.
            ;; the buffer, this'll generate errors.  This is a
            ;; hack, but don't call ps-plot-with-face unless from >
            ;; point-min.

-           (if (and (>= from (point-min))
-                    (<= position (point-max)))
-               (ps-plot-with-face from position face))
+           (and (>= from (point-min)) (<= position (point-max))
+                (ps-plot-with-face from position face))

 
            (cond
             ((eq type 'push)
 
            (cond
             ((eq type 'push)


@@ -3515,10 +3852,10 @@ If FACE is not a valid face name, it is used default face."
            (setq face
                  (if extent-list
                      (extent-face (car extent-list))
            (setq face
                  (if extent-list
                      (extent-face (car extent-list))

-                   'default))
+                   'default)

 
 

-           (setq from position)
-           (setq a (cdr a)))))
+                 from position
+                 a (cdr a)))))

 
        ((eq ps-print-emacs-type 'emacs)
        (let ((property-change from)
 
        ((eq ps-print-emacs-type 'emacs)
        (let ((property-change from)


@@ -3547,7 +3884,7 @@ If FACE is not a valid face name, it is used default face."
                               (not (null prop))
                             (or (memq prop buffer-invisibility-spec)
                                 (assq prop buffer-invisibility-spec))))
                               (not (null prop))
                             (or (memq prop buffer-invisibility-spec)
                                 (assq prop buffer-invisibility-spec))))

-                        nil)
+                        'emacs--invisible--face)

                        ((get-text-property from 'face))
                        (t 'default)))
            (let ((overlays (overlays-at from))
                        ((get-text-property from 'face))
                        (t 'default)))
            (let ((overlays (overlays-at from))


@@ -3559,17 +3896,17 @@ If FACE is not a valid face name, it is used default face."
                       (overlay-priority (or (overlay-get overlay
                                                          'priority)
                                             0)))
                       (overlay-priority (or (overlay-get overlay
                                                          'priority)
                                             0)))

-                 (if (and (or overlay-invisible overlay-face)
-                          (> overlay-priority face-priority))
-                     (setq face (cond ((if (eq buffer-invisibility-spec t)
-                                           (not (null overlay-invisible))
-                                         (or (memq overlay-invisible
-                                                   buffer-invisibility-spec)
-                                             (assq overlay-invisible
-                                                   buffer-invisibility-spec)))
-                                       nil)
-                                      ((and face overlay-face)))
-                           face-priority overlay-priority)))
+                 (and (or overlay-invisible overlay-face)
+                      (> overlay-priority face-priority)
+                      (setq face (cond ((if (eq buffer-invisibility-spec t)
+                                            (not (null overlay-invisible))
+                                          (or (memq overlay-invisible
+                                                    buffer-invisibility-spec)
+                                              (assq overlay-invisible
+                                                    buffer-invisibility-spec)))
+                                        nil)
+                                       ((and face overlay-face)))
+                            face-priority overlay-priority)))

                (setq overlays (cdr overlays))))
            ;; Plot up to this record.
            (ps-plot-with-face from position face)
                (setq overlays (cdr overlays))))
            ;; Plot up to this record.
            (ps-plot-with-face from position face)


@@ -3588,17 +3925,17 @@ If FACE is not a valid face name, it is used default face."
          (inhibit-read-only t))
       (save-restriction
        (narrow-to-region from to)
          (inhibit-read-only t))
       (save-restriction
        (narrow-to-region from to)

-       (if ps-razzle-dazzle
-           (message "Formatting...%3d%%" (setq ps-razchunk 0)))
+       (and ps-razzle-dazzle
+            (message "Formatting...%3d%%" (setq ps-razchunk 0)))

        (set-buffer buffer)
        (set-buffer buffer)

-       (setq ps-source-buffer buffer)
-       (setq ps-spool-buffer (get-buffer-create ps-spool-buffer-name))
+       (setq ps-source-buffer buffer
+             ps-spool-buffer (get-buffer-create ps-spool-buffer-name))

        (ps-init-output-queue)
        (let (safe-marker completed-safely needs-begin-file)
          (unwind-protect
              (progn
                (set-buffer ps-spool-buffer)
        (ps-init-output-queue)
        (let (safe-marker completed-safely needs-begin-file)
          (unwind-protect
              (progn
                (set-buffer ps-spool-buffer)

-
+               (set-buffer-multibyte nil)

                ;; Get a marker and make it point to the current end of the
                ;; buffer,  If an error occurs, we'll delete everything from
                ;; the end of this marker onwards.
                ;; Get a marker and make it point to the current end of the
                ;; buffer,  If an error occurs, we'll delete everything from
                ;; the end of this marker onwards.


@@ -3606,9 +3943,8 @@ If FACE is not a valid face name, it is used default face."
                (set-marker safe-marker (point-max))
 
                (goto-char (point-min))
                (set-marker safe-marker (point-max))
 
                (goto-char (point-min))

-               (if (looking-at (regexp-quote ps-adobe-tag))
-                   nil
-                 (setq needs-begin-file t))
+               (or (looking-at (regexp-quote ps-adobe-tag))
+                   (setq needs-begin-file t))

                (save-excursion
                  (set-buffer ps-source-buffer)
                  (if needs-begin-file (ps-begin-file))
                (save-excursion
                  (set-buffer ps-source-buffer)
                  (if needs-begin-file (ps-begin-file))


@@ -3618,78 +3954,117 @@ If FACE is not a valid face name, it is used default face."
                (funcall genfunc from to)
                (ps-end-page)
 
                (funcall genfunc from to)
                (ps-end-page)
 

-               (if (and ps-spool-duplex
-                        (= (mod ps-page-count 2) 1))
-                   (ps-dummy-page))
+               (and ps-spool-duplex (= (mod ps-page-count 2) 1)
+                    (ps-dummy-page))
+               (ps-end-file)

                (ps-flush-output)
 
                ;; Back to the PS output buffer to set the page count
                (ps-flush-output)
 
                ;; Back to the PS output buffer to set the page count

-               (set-buffer ps-spool-buffer)
-               (goto-char (point-max))
-               (while (re-search-backward "^/PageCount 0 def$" nil t)
-                 (replace-match (format "/PageCount %d def" ps-page-count) t))
+               (let ((total-lines (if ps-printing-region
+                                      (cdr ps-printing-region)
+                                    (ps-count-lines (point-min) (point-max))))
+                     (total-pages (if ps-print-only-one-header
+                                      (ps-page-number)
+                                    ps-page-count)))
+                 (set-buffer ps-spool-buffer)
+                 (goto-char (point-min))
+                 (while (re-search-forward "^/Lines 0 def\n/PageCount 0 def$"
+                                           nil t)
+                   (replace-match (format "/Lines %d def\n/PageCount %d def"
+                                          total-lines total-pages) t)))

 
                ;; Setting this variable tells the unwind form that the
 
                ;; Setting this variable tells the unwind form that the

-               ;; the postscript was generated without error.
+               ;; the PostScript was generated without error.

                (setq completed-safely t))
 
            ;; Unwind form: If some bad mojo occurred while generating
                (setq completed-safely t))
 
            ;; Unwind form: If some bad mojo occurred while generating

-           ;; postscript, delete all the postscript that was generated.
+           ;; PostScript, delete all the PostScript that was generated.

            ;; This protects the previously spooled files from getting
            ;; corrupted.
            ;; This protects the previously spooled files from getting
            ;; corrupted.

-           (if (and (markerp safe-marker) (not completed-safely))
-               (progn
-                 (set-buffer ps-spool-buffer)
-                 (delete-region (marker-position safe-marker) (point-max))))))
+           (and (markerp safe-marker) (not completed-safely)
+                (progn
+                  (set-buffer ps-spool-buffer)
+                  (delete-region (marker-position safe-marker) (point-max))))))

 
 

-       (if ps-razzle-dazzle
-           (message "Formatting...done"))))))
+       (and ps-razzle-dazzle (message "Formatting...done"))))))

 
 

+;; Permit dynamic evaluation at print time of `ps-lpr-switches'.

 (defun ps-do-despool (filename)
   (if (or (not (boundp 'ps-spool-buffer))
          (not (symbol-value 'ps-spool-buffer)))
       (message "No spooled PostScript to print")
 (defun ps-do-despool (filename)
   (if (or (not (boundp 'ps-spool-buffer))
          (not (symbol-value 'ps-spool-buffer)))
       (message "No spooled PostScript to print")

-    (ps-end-file)
-    (ps-flush-output)

     (if filename
        (save-excursion
     (if filename
        (save-excursion

-         (if ps-razzle-dazzle
-             (message "Saving..."))
+         (and ps-razzle-dazzle (message "Saving..."))

          (set-buffer ps-spool-buffer)
          (setq filename (expand-file-name filename))
          (set-buffer ps-spool-buffer)
          (setq filename (expand-file-name filename))

-         (write-region (point-min) (point-max) filename)
-         (if ps-razzle-dazzle
-             (message "Wrote %s" filename)))
+         (let ((coding-system-for-write 'raw-text-unix))
+           (write-region (point-min) (point-max) filename))
+         (and ps-razzle-dazzle (message "Wrote %s" filename)))

       ;; Else, spool to the printer
       ;; Else, spool to the printer

-      (if ps-razzle-dazzle
-         (message "Printing..."))
+      (and ps-razzle-dazzle (message "Printing..."))

       (save-excursion
        (set-buffer ps-spool-buffer)
       (save-excursion
        (set-buffer ps-spool-buffer)

-       (if (and (eq system-type 'ms-dos)
-                (stringp (symbol-value 'dos-ps-printer)))
-           (write-region (point-min) (point-max)
-                         (symbol-value 'dos-ps-printer) t 0)
-         (let ((binary-process-input t)) ; for MS-DOS
+       (let* ((coding-system-for-write 'raw-text-unix)
+              (ps-printer-name (or ps-printer-name printer-name))
+              (ps-lpr-switches
+               (append
+                (and (stringp ps-printer-name)
+                     (list (concat "-P" ps-printer-name)))
+                ps-lpr-switches)))
+         (if (and (memq system-type '(ms-dos windows-nt))
+                  (or (and (boundp 'dos-ps-printer)
+                           (stringp (symbol-value 'dos-ps-printer)))
+                      (stringp (symbol-value 'ps-printer-name))))
+             (write-region (point-min) (point-max)
+                           (or (and (boundp 'dos-ps-printer)
+                                    (stringp (symbol-value 'dos-ps-printer))
+                                    (symbol-value 'dos-ps-printer))
+                               (symbol-value 'ps-printer-name))
+                           t 0)

            (apply 'call-process-region
                   (point-min) (point-max) ps-lpr-command nil
            (apply 'call-process-region
                   (point-min) (point-max) ps-lpr-command nil

-                  (if (fboundp 'start-process) 0 nil)
+                  (and (fboundp 'start-process) 0)

                   nil
                   nil

-                  ps-lpr-switches))))
-      (if ps-razzle-dazzle
-         (message "Printing...done")))
+                  (ps-flatten-list     ; dynamic evaluation
+                   (mapcar 'ps-eval-switch ps-lpr-switches))))))
+      (and ps-razzle-dazzle (message "Printing...done")))

     (kill-buffer ps-spool-buffer)))
 
     (kill-buffer ps-spool-buffer)))
 

+;; Dynamic evaluation
+(defun ps-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)))
+
+;; `ps-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.
+
+;; (ps-flatten-list '((a . b) c (d . e) (f g h) i . j))
+;; => (a b c d e f g h i j)
+
+(defun ps-flatten-list (&rest list)
+  (ps-flatten-list-1 list))
+
+(defun ps-flatten-list-1 (list)
+  (cond ((null list) nil)
+       ((consp list) (append (ps-flatten-list-1 (car list))
+                             (ps-flatten-list-1 (cdr list))))
+       (t (list list))))
+

 (defun ps-kill-emacs-check ()
   (let (ps-buffer)
 (defun ps-kill-emacs-check ()
   (let (ps-buffer)

-    (if (and (setq ps-buffer (get-buffer ps-spool-buffer-name))
-            (buffer-modified-p ps-buffer))
-       (if (y-or-n-p "Unprinted PostScript waiting; print now? ")
-           (ps-despool)))
-    (if (and (setq ps-buffer (get-buffer ps-spool-buffer-name))
-            (buffer-modified-p ps-buffer))
-       (if (yes-or-no-p "Unprinted PostScript waiting; exit anyway? ")
-           nil
-         (error "Unprinted PostScript")))))
+    (and (setq ps-buffer (get-buffer ps-spool-buffer-name))
+        (buffer-modified-p ps-buffer)
+        (y-or-n-p "Unprinted PostScript waiting; print now? ")
+        (ps-despool))
+    (and (setq ps-buffer (get-buffer ps-spool-buffer-name))
+        (buffer-modified-p ps-buffer)
+        (not (yes-or-no-p "Unprinted PostScript waiting; exit anyway? "))
+        (error "Unprinted PostScript"))))

 
 (if (fboundp 'add-hook)
     (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check)
 
 (if (fboundp 'add-hook)
     (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check)


@@ -3713,6 +4088,33 @@ If FACE is not a valid face name, it is used default face."
 (defmacro ps-s-prsc ()
   `(if (eq ps-print-emacs-type 'emacs) [S-f22] '(shift f22)))
 
 (defmacro ps-s-prsc ()
   `(if (eq ps-print-emacs-type 'emacs) [S-f22] '(shift f22)))
 

+;; A hook to bind to `rmail-mode-hook' to locally bind prsc and set the
+;; `ps-left-headers' specially for mail messages.
+(defun ps-rmail-mode-hook ()
+  (local-set-key (ps-prsc) 'ps-rmail-print-message-from-summary)
+  (setq ps-header-lines 3
+       ps-left-header
+       ;; The left headers will display the message's subject, its
+       ;; author, and the name of the folder it was in.
+       '(ps-article-subject ps-article-author buffer-name)))
+
+;; See `ps-gnus-print-article-from-summary'.  This function does the
+;; same thing for rmail.
+(defun ps-rmail-print-message-from-summary ()
+  (interactive)
+  (ps-print-message-from-summary 'rmail-summary-buffer "RMAIL"))
+
+;; Used in `ps-rmail-print-article-from-summary',
+;; `ps-gnus-print-article-from-summary' and `ps-vm-print-message-from-summary'.
+(defun ps-print-message-from-summary (summary-buffer summary-default)
+  (let ((ps-buf (or (and (boundp summary-buffer)
+                        (symbol-value summary-buffer))
+                   summary-default)))
+    (and (get-buffer ps-buf)
+        (save-excursion
+          (set-buffer ps-buf)
+          (ps-spool-buffer-with-faces)))))
+

 ;; Look in an article or mail message for the Subject: line.  To be
 ;; placed in `ps-left-headers'.
 (defun ps-article-subject ()
 ;; Look in an article or mail message for the Subject: line.  To be
 ;; placed in `ps-left-headers'.
 (defun ps-article-subject ()


@@ -3747,29 +4149,28 @@ If FACE is not a valid face name, it is used default face."
           (t fromstring)))
       "From ???")))
 
           (t fromstring)))
       "From ???")))
 

-;; A hook to bind to gnus-Article-prepare-hook.  This will set the
+;; A hook to bind to `gnus-article-prepare-hook'.  This will set the

 ;; `ps-left-headers' specially for gnus articles.  Unfortunately,
 ;; `gnus-article-mode-hook' is called only once, the first time the *Article*
 ;; buffer enters that mode, so it would only work for the first time
 ;; we ran gnus.  The second time, this hook wouldn't get set up.  The
 ;; only alternative is `gnus-article-prepare-hook'.
 (defun ps-gnus-article-prepare-hook ()
 ;; `ps-left-headers' specially for gnus articles.  Unfortunately,
 ;; `gnus-article-mode-hook' is called only once, the first time the *Article*
 ;; buffer enters that mode, so it would only work for the first time
 ;; we ran gnus.  The second time, this hook wouldn't get set up.  The
 ;; only alternative is `gnus-article-prepare-hook'.
 (defun ps-gnus-article-prepare-hook ()

-  (setq ps-header-lines 3)
-  (setq ps-left-header
+  (setq ps-header-lines 3
+       ps-left-header

        ;; The left headers will display the article's subject, its
        ;; author, and the newsgroup it was in.
        ;; The left headers will display the article's subject, its
        ;; author, and the newsgroup it was in.

-       (list 'ps-article-subject 'ps-article-author 'gnus-newsgroup-name)))
+       '(ps-article-subject ps-article-author gnus-newsgroup-name)))

 
 

-;; A hook to bind to vm-mode-hook to locally bind prsc and set the
-;; ps-left-headers specially for mail messages.  This header setup would
-;; also work, I think, for RMAIL.
+;; A hook to bind to `vm-mode-hook' to locally bind prsc and set the
+;; `ps-left-headers' specially for mail messages.

 (defun ps-vm-mode-hook ()
   (local-set-key (ps-prsc) 'ps-vm-print-message-from-summary)
 (defun ps-vm-mode-hook ()
   (local-set-key (ps-prsc) 'ps-vm-print-message-from-summary)

-  (setq ps-header-lines 3)
-  (setq ps-left-header
+  (setq ps-header-lines 3
+       ps-left-header

        ;; The left headers will display the message's subject, its
        ;; author, and the name of the folder it was in.
        ;; The left headers will display the message's subject, its
        ;; author, and the name of the folder it was in.

-       (list 'ps-article-subject 'ps-article-author 'buffer-name)))
+       '(ps-article-subject ps-article-author buffer-name)))

 
 ;; Every now and then I forget to switch from the *Summary* buffer to
 ;; the *Article* before hitting prsc, and a nicely formatted list of
 
 ;; Every now and then I forget to switch from the *Summary* buffer to
 ;; the *Article* before hitting prsc, and a nicely formatted list of


@@ -3779,22 +4180,13 @@ If FACE is not a valid face name, it is used default face."
 ;; sb:  Updated for Gnus 5.
 (defun ps-gnus-print-article-from-summary ()
   (interactive)
 ;; sb:  Updated for Gnus 5.
 (defun ps-gnus-print-article-from-summary ()
   (interactive)

-  (let ((ps-buf (or (and (boundp 'gnus-article-buffer)
-                        (symbol-value 'gnus-article-buffer))
-                   "*Article*")))
-    (if (get-buffer ps-buf)
-       (save-excursion
-         (set-buffer ps-buf)
-         (ps-spool-buffer-with-faces)))))
+  (ps-print-message-from-summary 'gnus-article-buffer "*Article*"))

 
 ;; See `ps-gnus-print-article-from-summary'.  This function does the
 ;; same thing for vm.
 (defun ps-vm-print-message-from-summary ()
   (interactive)
 
 ;; See `ps-gnus-print-article-from-summary'.  This function does the
 ;; same thing for vm.
 (defun ps-vm-print-message-from-summary ()
   (interactive)

-  (if (and (boundp 'vm-mail-buffer) (symbol-value 'vm-mail-buffer))
-      (save-excursion
-       (set-buffer (symbol-value 'vm-mail-buffer))
-       (ps-spool-buffer-with-faces))))
+  (ps-print-message-from-summary 'vm-mail-buffer ""))

 
 ;; A hook to bind to bind to `gnus-summary-setup-buffer' to locally bind
 ;; prsc.
 
 ;; A hook to bind to bind to `gnus-summary-setup-buffer' to locally bind
 ;; prsc.


@@ -3822,7 +4214,7 @@ If FACE is not a valid face name, it is used default face."
 (defun ps-info-mode-hook ()
   (setq ps-left-header
        ;; The left headers will display the node name and file name.
 (defun ps-info-mode-hook ()
   (setq ps-left-header
        ;; The left headers will display the node name and file name.

-       (list 'ps-info-node 'ps-info-file)))
+       '(ps-info-node ps-info-file)))

 
 ;; WARNING! The following function is a *sample* only, and is *not*
 ;; meant to be used as a whole unless you understand what the effects
 
 ;; WARNING! The following function is a *sample* only, and is *not*
 ;; meant to be used as a whole unless you understand what the effects


@@ -3839,10 +4231,10 @@ If FACE is not a valid face name, it is used default face."
   (add-hook 'vm-mode-hook 'ps-vm-mode-hook)
   (add-hook 'vm-mode-hooks 'ps-vm-mode-hook)
   (add-hook 'Info-mode-hook 'ps-info-mode-hook)
   (add-hook 'vm-mode-hook 'ps-vm-mode-hook)
   (add-hook 'vm-mode-hooks 'ps-vm-mode-hook)
   (add-hook 'Info-mode-hook 'ps-info-mode-hook)

-  (setq ps-spool-duplex t)
-  (setq ps-print-color-p nil)
-  (setq ps-lpr-command "lpr")
-  (setq ps-lpr-switches '("-Jjct,duplex_long"))
+  (setq ps-spool-duplex t
+       ps-print-color-p nil
+       ps-lpr-command "lpr"
+       ps-lpr-switches '("-Jjct,duplex_long"))

   'ps-jts-ps-setup)
 
 ;; WARNING! The following function is a *sample* only, and is *not*
   'ps-jts-ps-setup)
 
 ;; WARNING! The following function is a *sample* only, and is *not*


@@ -3854,7 +4246,7 @@ If FACE is not a valid face name, it is used default face."
 (defun ps-jack-setup ()
   (setq ps-print-color-p  nil
        ps-lpr-command    "lpr"
 (defun ps-jack-setup ()
   (setq ps-print-color-p  nil
        ps-lpr-command    "lpr"

-       ps-lpr-switches   (list)
+       ps-lpr-switches   nil

 
        ps-paper-type        'a4
        ps-landscape-mode    t
 
        ps-paper-type        'a4
        ps-landscape-mode    t