Usenet 1994 October/usenetsourcesnewsgroupsinfomagicoctober1994disk2.iso/misc/volume14/mp-2.4.5/patch04

Text File | 1990-09-20 | 29KB | 1,030 lines

Newsgroups: comp.sources.misc
X-UNIX-From: [e-mail]
subject: v14i099: Official patch #9 for mp v2.4; please apply it.
from: [e-mail] (Rich Burridge)
Sender: [e-mail] (Brandon S. Allbery - comp.sources.misc)

Posting-number: Volume 14, Issue 99
Submitted-by: [e-mail] (Rich Burridge)
Archive-name: mp-2.4.5/patch04

Mp is a Postscript pretty printer for mail,news and ordinary files.

This is official patch #9 for mp v2.4.

** Mp v2.4 was posted to comp.sources.misc two weeks ago at patchlevel #5. **

It makes the following changes:

    *  From Paul Eggert <[e-mail]>
       From Larry W. Virden <[e-mail]>
       From Rick Rodgers <[e-mail]>
       The SunOS v4.1 /bin/make doesn't like blank lines half way through a
       Makefile rule.

    *  From Larry W. Virden <[e-mail]>
       The SYSV definition was not added to the CFLAGS line in Makefile.dist.
       It also needs to be added to the section in the README file, that
       describes settable Makefile definitions.

    *  From Rick Gunderson <[e-mail]>
       The mp.pro.ps file won't center the page number in the gray bar if
       ``leftedge'' is non-zero. We set left-edge to 0.5 inches so that there
       is a margin at the left of the page for punched holes.

    *  From Larry W. Virden <[e-mail]>
       Some slight changes to the mailp shell script for -s subject handling.

    *  From Larry W. Virden <[e-mail]>
       From Rick Rodgers <[e-mail]>
       Some adjustments to the mp manual pages.

    *  From Peter Collinson <[e-mail]>
       I have my own machine and printer and KNOW that the mail is for
       me.. I would like to have the header say

                Mail from ........

       The -F flag has been added for this option. The manual page has also
       been updated.

Apply the patch with Larry Wall's patch program. Copy Makefile.dist to
Makefile and adjust for your site. Then do a "make". Check the paper size
in each of the prologue files that you use is correct for your site (US
Letter or A4), then do a "make install". You might wish to reread the
installation section in the README file to make sure you've adjusted
everything in the Makefile that you need to.

If you need to get patches 6-8, then they can be obtained from the automatic
mail archive server, by sending a message to [e-mail]
containing the line:

send mp patchn

where n is the patch number you require.

If this is all getting too confusing for you, then the latest complete mp
distribution can be obtained from the same address, by sending a message
containing the lines:

send mp part1
send mp part2

If the mail is likely to go back through any sites that impose a size limit,
then I suggest you divide the above request up into two separate mail
messages.

You can also include a path line in these requests to indicate the mail
path that the archive server should use to send the files to you. Such a
path line could be:

path uunet.uu.net!hostname!user

Note that this is uunet.uu.net and not just uunet. Sun.COM doesn't recognise
just uunet.

[NOTE: When unpacking the shars generated by the automatic mail service,
       it is possible you will get error messages for incorrect length.
       Please ignore; hopefully the files should still unpack correctly.
       I'm currently looking into this problem].

Rich Burridge,          DOMAIN: [e-mail]
Sun Microsystems.       ACSNET: [e-mail]
PHONE: [phone]   UUCP:   {uunet,mcvax,ukc}!munnari!sunaus.oz!richb

------CUT HERE------patch.9------CUT HERE------

------- README -------
*** /tmp/da06432    Mon Sep 17 09:41:09 1990
--- README    Mon Sep 17 09:05:32 1990
***************
*** 52,57 ****
--- 52,58 ----
  GECOSLENGTH - Maximum number of characters extracted from the gecos field.
  NOINDEX     - uncomment if you don't have the index() function.
  PROLOGUE    - Location of the mp prologue file (default: /usr/local/lib)
+ SYSV        - uncomment if you are running Unix System V.

  See the Makefile for a detailed description of each of these definitions.

***************
*** 152,159 ****
  Maureen Chew, Brian Kohn, Walter Underwood, Mike Khaw, Rick Gunderson, Johan
  Vromans, Brachet, Pierre Mareschal, Roger Riggs, Larry Tsui, Mike Bundschuh,
  Amos Shapir, Bruce G Barnett, Pauline van Winsen, James F. Blake, Bruno
! Pillard, Rainer Klute, Ran Ever-Hadani, Lupe Christoph, John Little and
! Bill Houle for bug reports and/or bug fixes plus enhancements.

  My thanks also goes to Glenn Reid from Adobe Systems for the backspacefont.ps
  code used in the prologue files. I'm grateful to all these people, plus
--- 153,161 ----
  Maureen Chew, Brian Kohn, Walter Underwood, Mike Khaw, Rick Gunderson, Johan
  Vromans, Brachet, Pierre Mareschal, Roger Riggs, Larry Tsui, Mike Bundschuh,
  Amos Shapir, Bruce G Barnett, Pauline van Winsen, James F. Blake, Bruno
! Pillard, Rainer Klute, Ran Ever-Hadani, Lupe Christoph, John Little, Bill
! Houle, Paul Eggert, Larry W. Virden and Peter Collinson for bug reports
! and/or bug fixes plus enhancements.

  My thanks also goes to Glenn Reid from Adobe Systems for the backspacefont.ps
  code used in the prologue files. I'm grateful to all these people, plus

------- mp.pro.ps -------
*** /tmp/da06435    Mon Sep 17 09:41:09 1990
--- mp.pro.ps    Mon Sep 17 08:16:25 1990
***************
*** 99,105 ****
      rightedge 50 sub topedge 36 sub    % top rt corner
      graybox
      newpath
!       rightedge leftedge sub 2 div topedge 46 sub 15 0 360 arc
        gsave
          1 setgray fill
        grestore
--- 99,105 ----
      rightedge 50 sub topedge 36 sub    % top rt corner
      graybox
      newpath
!       leftedge rightedge leftedge sub 2 div add topedge 46 sub 15 0 360 arc
        gsave
          1 setgray fill
        grestore
***************
*** 115,121 ****
      fontN
      dup stringwidth
         topedge 52 sub exch sub                % y-centered
!        exch 2 div rightedge leftedge sub 2 div exch sub    % x-centered
         exch moveto show
      fontH
      leftedge 50 add bottomedge 50 add    % bottom lt corner
--- 115,122 ----
      fontN
      dup stringwidth
         topedge 52 sub exch sub                % y-centered
!        exch 2 div rightedge leftedge sub 2 div exch sub
!        leftedge add                    % x-centered
         exch moveto show
      fontH
      leftedge 50 add bottomedge 50 add    % bottom lt corner

------- mp.1 -------
*** /tmp/da06438    Mon Sep 17 09:41:10 1990
--- mp.1    Mon Sep 17 09:35:58 1990
***************
*** 1,80 ****
! .\" %Z%%M% %I% %E%
  .TH MP 1L "14 September 1990"
  .SH NAME
! mp \- Postscript pretty printer
  .SH SYNOPSIS
  .B mp
  [
  .B \-a
! ]
! [
  .B \-d
! ]
! [
  .B \-f
! ]
! [
  .B \-l
! ]
! [
  .B \-m
! ]
! [
  .B \-o
! ]
! [
  .B \-p
  .I prologue
! ]
! [
  .B \-s
  .I subject
! ]
! [
  .B \-tm
! ]
! [
  .B \-ts
! ]
! [
  .B \-v
! ]
! [
  .B \-?
! ]
! [
  .IR filename .\|.\|.
  ]
  .SH DESCRIPTION
! .B mp
! will read each
  .I filename
! in sequence and generate a Postscript file on standard output,
! which is a pretty print of the original. If no filename argument is given
! .B mp
! reads from the standard input. If the standard input is a terminal, input
! is terminated by an
  .SM EOF
  signal, usually
  .SM CTRL-D\s0.
  .LP
! The input files to
! .B mp
! can be mail items, news articles or ordinary ASCII files. It is also
! possible to print out complete mail folders and digests.
! .PP
! The format adopted has textured areas containing banner information
  at the top and bottom of every page.
! .PP
! .B mp
! was originally designed to be used in conjunction with the print
! button in the
! .B "mailtool (1)"
! program, or the
! .B pipe
! command from within mail. Add (or alter) the following two line in your
! .B .mailrc
  file:
  .in +1.0i
  .nf
  \fCset printmail='mp | lpr'
--- 1,73 ----
! .\" @(#)mp.1 1.13 90/04/12
  .TH MP 1L "14 September 1990"
+ .ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2
  .SH NAME
! mp \- POSTSCRIPT pretty printer
  .SH SYNOPSIS
  .B mp
  [
+ .B \-F
+ ] [
  .B \-a
! ] [
  .B \-d
! ] [
  .B \-f
! ] [
  .B \-l
! ] [
  .B \-m
! ] [
  .B \-o
! ] [
  .B \-p
  .I prologue
! ] [
  .B \-s
  .I subject
! ] [
  .B \-tm
! ] [
  .B \-ts
! ] [
  .B \-v
! ] [
  .B \-?
! ] [
  .IR filename .\|.\|.
  ]
  .SH DESCRIPTION
! The
! .I mp
! program reads each
  .I filename
! in sequence and generates a prettified version of the contents in
! \*(Ps format, sent to standard output.
! If no filename argument is provided,
! .I mp
! reads the standard input.
! If the standard input is a terminal, input is terminated by an
  .SM EOF
  signal, usually
  .SM CTRL-D\s0.
  .LP
! Mail items, news articles, ordinary ASCII files, complete mail folders,
! and digests are all acceptable input formats for
! .IR mp .
! The output format includes grayscale lozenges containing banner information
  at the top and bottom of every page.
! .LP
! The program is conveniently used in conjunction with the print button of the
! .RI SunView/ xnews (1)
! .IR mailtool (1)
! programs, or the
! .I pipe
! command provided by
! .IR mail (1).
! Add the following two lines to your
! .I .mailrc
  file:
+ .br
  .in +1.0i
  .nf
  \fCset printmail='mp | lpr'
***************
*** 81,94 ****
  set cmd="mp | lpr &"\fP
  .fi
  .in -1.0i
! .PP
  Source the
! .B .mailrc
! file again, and you are ready.
! .PP
! A useful alias to use used in conjunction with your
  .I .cshrc
! file for printing out ordinary text files is:
  .in +1.0i
  .nf
  \fCalias print 'mp -o -s "\\!*" <\\!* | lpr'\fP
--- 74,88 ----
  set cmd="mp | lpr &"\fP
  .fi
  .in -1.0i
! .LP
  Source the
! .I .mailrc
! file, and you are ready to use
! .IR mp .
! For printing ordinary ASCII files, the following alias (to be placed in your
  .I .cshrc
! file) may also prove useful:
! .br
  .in +1.0i
  .nf
  \fCalias print 'mp -o -s "\\!*" <\\!* | lpr'\fP
***************
*** 96,237 ****
  .in -1.0i
  .SH OPTIONS
  .TP
  .B \-a
! The file on standard input is a news article, and should be printed with
  "Article from
  .I newsgroup
! " in the top banner, where
  .I newsgroup
  is the first news group found on the Newsgroups: line.
  .TP
  .B \-d
! The file on standard input is a digest so print accordingly.
  .TP
  .B \-f
! The file on standard input is printed specifically for use with the
! Filofax personal organiser.
  .TP
  .B \-l
! Prints output in landscape mode. Two pages of text will be printed per
! sheet of paper.
  .TP
  .B \-m
! The file on standard input is a mail folder, so print out multiple messages.
  .TP
  .B \-o
! The file on standard input is an ASCII file so print accordingly.
  .TP
! .BI \-p " prologue filename"
! Employ
! .I "prologue filename"
! as the Postscript prologue file. This overrides any previously defined
! prologue values.
! The
! .I mp
! prologue file is determined by first looking for the environment variable
! .IR MP_PROLOGUE .
! This will be the directory where the mp prologue files are to be found.
! Five different prologue files are used. Normally the prologue file is
! .I mp.pro.ps
! but if the
! .I \-f
! option is used, then the prologue file is called
! .I mp.pro.filofax.ps
! or if the
! .I \-tm
! option is used, then the prologue file is
! .I mp.pro.timeman.ps
! or if the
! .I \-ts
! option is used, then the prologue file is
! .I mp.pro.timesys.ps.
! There is an alternative "standard" prologue file called
! .I mp.pro.alt.ps
! which outputs the page number in the right corner of the bottom banner.
! If
! .I MP_PROLOGUE
! isn't found, then the default location is used. The default location is
! .IR /usr/local/lib/mp.pro.ps .
  .TP
  .BI \-s " subject"
  Use
  .I " subject"
! as the new subject for the printout. If you are printing ordinary text
  files which have been specified on the command line, the the subject will
  default to the name of each of these files.
  .TP
  .B \-tm
! The file on standard input is printed specifically for use with the
! Time Manager personal organiser.
  .TP
  .B \-ts
! The file on standard input is printed specifically for use with the
! Time/System International personal organiser.
  .TP
  .B \-v
! Print the version number of this release of the
! .B mp
! program.
  .TP
  .B \-?
! Print the usage line for this program. Note that the
  .B ?
! character should be escaped if running from
! .BR csh (1).
  .SH FILES
  .TP
! .B /usr/local/bin/mp
  executable
  .TP
! .B /usr/local/lib/mp.pro.ps
! PostScript prologue to define required vocabulary for mail printing.
! Editing this file will allow you to introduce some stylistic variation
! in the printing of mail.
  .TP
! .B /usr/local/lib/mp.pro.l.ps
! The PostScript prologue file for outputing in landscape format.
  .TP
! .B /usr/local/lib/mp.pro.alt.ps
! An alternative "standard" PostScript prologue file which outputs page
! numbers in the bottom right corner of each page.
  .TP
! .B /usr/local/lib/mp.pro.filofax.ps
! Postscript prologue used to print out files in Filofax format.
  .TP
! .B /usr/local/lib/mp.pro.timeman.ps
! PostScript prologue used to print out files in Time Manager format.
  .TP
! .B /usr/local/lib/mp.pro.timesys.ps
! PostScript prologue used to print out files in Time/System International
  format.
  .SH "SEE ALSO"
! mail(1)
  .SH AUTHORS
  Original version by Steve Holden.
! .PP
! Converted to C, modified and maintained by Rich Burridge, Sun Microsystems Australia,
! .PP
  Original modified to handle net news articles and MH mail by Bruno Pillard, Chorus Systemes, France,
! .PP
  Handling of mail digests added by Dave Glowacki of Public Works Computer Services, St Paul, MN.
! .PP
! Manual page for the initial version revised by Rick Rodgers, UCSF School of Pharmacy, San Francicso.
! .PP
  Support for Personal Organiser printing style added by Douglas Buchanan,
  Sun Microsystems Europe.
! .PP
  Substantial modifications to header parsing by Jeremy Webber,
  Computer Science Department, University of Adelaide, Australia.
! .PP
  Support for printing multiple files and subject line filename print for
! ordinary files added by Sam Manoharan, Edinburgh University.
! .PP
  Support for landscape mode written by Michael Tuciarone.
! .PP
! Revision of the PostScript structuring and the way that the prologue files
  are handled was included by Johan Vromans
! .PP
  Rich Burridge,             Domain: [e-mail]
  .nf
  PHONE: [phone]   Path: {uunet,mcvax,ukc}!munnari!sunaus.oz!richb
  .fi
--- 90,257 ----
  .in -1.0i
  .SH OPTIONS
  .TP
+ .B \-F
+ Instead of printing who the mail article is for, the top header will
+ contain who the mail article is from. A useful option for people with
+ their own personal printer.
+ .TP
  .B \-a
! Format the file as a news article.
! The top banner contains the text:
  "Article from
  .I newsgroup
! ", where
  .I newsgroup
  is the first news group found on the Newsgroups: line.
  .TP
  .B \-d
! Format the file as a digest.
  .TP
  .B \-f
! Format the file for use with a Filofax personal organiser.
  .TP
  .B \-l
! Format output in landscape mode.
! Two pages of text will be printed per sheet of paper.
  .TP
  .B \-m
! Format the file as a mail folder, printing multiple messages.
  .TP
  .B \-o
! Format the file as an ordinary ASCII file.
  .TP
! .BI \-p " prologue"
! Employ the file
! .I prologue
! as the \*(Ps prologue file,
! overriding any previously defined file names.
  .TP
  .BI \-s " subject"
  Use
  .I " subject"
! as the new subject for the printout. If you are printing ordinary ASCII
  files which have been specified on the command line, the the subject will
  default to the name of each of these files.
  .TP
  .B \-tm
! Format the file for use with the Time Manager personal organiser.
  .TP
  .B \-ts
! format the file for use with the Time/System International personal organiser.
  .TP
  .B \-v
! Print the version number of this release of
! .IR mp .
  .TP
  .B \-?
! Print the usage line for
! .I mp
! (note that the
  .B ?
! character must be escaped if using
! .IR csh (1)).
! .SH "ENVIRONMENT VARIABLES"
! The
! .I mp
! prologue file is determined by first looking for the environment variable
! .IR MP_PROLOGUE ,
! which specifies the directory where
! .I mp
! prologue files are to be found.
! If
! .I MP_PROLOGUE
! is not found, then the default directory is assumed
! .RI ( /usr/local/lib/mp.pro.ps ).
! .SH "SUPPLIED PROLOGUE FILES"
! Five different prologue files are provided:
! .RS
! .TP
! .I mp.pro.ps
! Used by default
! .TP
! .I mp.pro.filofax.ps
! Used if the
! .B \-f
! option is in effect
! .TP
! .I mp.pro.timeman.ps
! Used if the
! .B \-tm
! option is in effect
! .TP
! .I mp.pro.timesys.ps
! Used if the
! .B \-ts
! option is in effect
! .TP
! .I mp.pro.alt.ps
! An alternative modification of the default prologue file which outputs the
! page number in the right corner of the bottom banner.
! .RE
  .SH FILES
  .TP
! .I .cshrc
! initialization file for
! .IR csh (1)
! .TP
! .I .mailrc
! initialization file for
! .IR mail (1)
! .TP
! .I /usr/local/bin/mp
  executable
  .TP
! .I /usr/local/lib/mp.pro.ps
! \*(Ps prologue for mail printing
  .TP
! .I /usr/local/lib/mp.pro.l.ps
! \*(Ps prologue for landscape format
  .TP
! .I /usr/local/lib/mp.pro.alt.ps
! alternative "default" \*(Ps prologue, inserts page
! numbers in the bottom right corner of each page
  .TP
! .I /usr/local/lib/mp.pro.filofax.ps
! \*(Ps prologue for Filofax format
  .TP
! .I /usr/local/lib/mp.pro.timeman.ps
! \*(Ps prologue for Time Manager format
  .TP
! .I /usr/local/lib/mp.pro.timesys.ps
! \*(Ps prologue for Time/System International
  format.
  .SH "SEE ALSO"
! mail(1),
! mailtool(1),
! xnews(1)
  .SH AUTHORS
  Original version by Steve Holden.
! .LP
! Converted to C, modified and maintained by Rich Burridge, Sun Microsystems,
! Australia.
! .LP
  Original modified to handle net news articles and MH mail by Bruno Pillard, Chorus Systemes, France,
! .LP
  Handling of mail digests added by Dave Glowacki of Public Works Computer Services, St Paul, MN.
! .LP
! Manual page revised by Rick Rodgers, UCSF School of Pharmacy, San Francicso.
! .LP
  Support for Personal Organiser printing style added by Douglas Buchanan,
  Sun Microsystems Europe.
! .LP
  Substantial modifications to header parsing by Jeremy Webber,
  Computer Science Department, University of Adelaide, Australia.
! .LP
  Support for printing multiple files and subject line filename print for
! ordinary ASCII files added by Sam Manoharan, Edinburgh University.
! .LP
  Support for landscape mode written by Michael Tuciarone.
! .LP
! Revision of the \*(Ps structuring and the way that the prologue files
  are handled was included by Johan Vromans
! .LP
  Rich Burridge,             Domain: [e-mail]
  .nf
  PHONE: [phone]   Path: {uunet,mcvax,ukc}!munnari!sunaus.oz!richb
  .fi
+ .\" end of man page

------- mailp -------
*** /tmp/da06441    Mon Sep 17 09:41:11 1990
--- mailp    Mon Sep 17 09:19:30 1990
***************
*** 8,23 ****
  #
  #  Original: Bruno Pillard - October 1988.
  #  Modified: Rich Burridge - June 1989.
- #

  BIN=/usr/local/bin

  FLAG=''
  case $0 in
!     *mailp)    PROG=mp       ;;
      *newsp)       PROG="mp -a"  ;;
      *digestp)  PROG="mp -d"     ;;
!     *filep)       PROG="mp -o"  FLAG='-s $1' ;;
      *filofaxp) PROG="mp -f"     ;;
      *timemanp) PROG="mp -tm" ;;
      *timesysp) PROG="mp -ts" ;;
--- 8,22 ----
  #
  #  Original: Bruno Pillard - October 1988.
  #  Modified: Rich Burridge - June 1989.

  BIN=/usr/local/bin

  FLAG=''
  case $0 in
!     *mailp)    PROG="mp"     ;;
      *newsp)       PROG="mp -a"  ;;
      *digestp)  PROG="mp -d"     ;;
!     *filep)       PROG="mp -o"  FLAG='$1' ;;
      *filofaxp) PROG="mp -f"     ;;
      *timemanp) PROG="mp -tm" ;;
      *timesysp) PROG="mp -ts" ;;
***************
*** 29,35 ****
      case    "$1" in
      -s*)
          if [ "$1" = "-s" ] ; then
!             FLAG="-s $2"
              shift ; shift
          else
              FLAG="$1"
--- 28,34 ----
      case    "$1" in
      -s*)
          if [ "$1" = "-s" ] ; then
!             FLAG="$2"
              shift ; shift
          else
              FLAG="$1"
***************
*** 36,41 ****
--- 35,43 ----
              shift
          fi
          ;;
+     -F)
+         PROG="$PROG -F"
+         ;;
      * )
          ;;
      esac
***************
*** 43,50 ****

  if    [ $# -eq 0 ]
  then
!     set - " - "
!     FLAG='-s "stdin"'
  fi

  #  NOTE: Banner printing is disabled below, by the inclusion of the -h
--- 45,52 ----

  if    [ $# -eq 0 ]
  then
!     set --  -
!     FLAG='"stdin"'
  fi

  #  NOTE: Banner printing is disabled below, by the inclusion of the -h
***************
*** 54,59 ****

  while [ $# -gt 0 ]
  do
!     /bin/cat $1 | eval ${BIN}/${PROG} $FLAG | lpr -h -P${PRINTER:-ps}
      shift
  done
--- 56,62 ----

  while [ $# -gt 0 ]
  do
!     /bin/cat $1 | eval ${BIN}/${PROG} -s $FLAG | \
!               eval lpr -h -J"$FLAG" -P${PRINTER:-ps}
      shift
  done

------- main.c -------
*** /tmp/da06444    Mon Sep 17 09:41:11 1990
--- main.c    Mon Sep 17 09:20:58 1990
***************
*** 54,59 ****
--- 54,60 ----
  bool digest   = FALSE ;       /* Are we are printing a mail digest (-d) */
  bool folder   = FALSE ;       /* Set if we are printing a mail folder. */
  bool landscape = FALSE ;      /* Set if we are printing in landscape mode. */
+ bool print_orig = FALSE ;     /* Print From rather than To in mail header. */
  bool text_doc = FALSE ;       /* Printing normal text (-o) */

  /* Header definitions. */

------- misc.c -------
*** /tmp/da06447    Mon Sep 17 09:41:12 1990
--- misc.c    Mon Sep 17 09:32:51 1990
***************
*** 101,107 ****
  {
    int opch ;

!   while ((opch = get_opt(argc, argv, "adflmop:s:tv")) != -1)
      switch (opch)
        {
          case 'a' : article = TRUE ;      /* "Article from" format. */
--- 101,107 ----
  {
    int opch ;

!   while ((opch = get_opt(argc, argv, "adfFlmop:s:tv")) != -1)
      switch (opch)
        {
          case 'a' : article = TRUE ;      /* "Article from" format. */
***************
*** 108,113 ****
--- 108,115 ----
                     break ;
          case 'd' : digest = TRUE ;       /* Print digest. */
                     break ;
+         case 'F' : print_orig = TRUE ;   /* Print originators name. */
+                    break ;
          case 'f' :                       /* Filofax output. */
                     SPRINTF(proname, "%s/mp.pro.filofax.ps", prologue) ;
                     break ;
***************
*** 241,248 ****
  usage()     /* Print usage message and exit. */
  {
    FPRINTF(stderr, "%s version 2.4.%1d\n\n", progname, PATCHLEVEL) ;
!   FPRINTF(stderr, "Usage: %s [-a] [-d] [-f] [-l] [-m] [-o]\n", progname) ;
!   FPRINTF(stderr, "\t[-p prologue] [-s subject] [-t] [-v] [-?]\n") ;
    exit(1) ;
  }

--- 243,251 ----
  usage()     /* Print usage message and exit. */
  {
    FPRINTF(stderr, "%s version 2.4.%1d\n\n", progname, PATCHLEVEL) ;
!   FPRINTF(stderr, "Usage: %s [-F] [-a] [-d] [-f] [-l] [-m] [-o]\n", progname) ;
!   FPRINTF(stderr, "\t[-p prologue] [-s subject] [-tm] [-ts] [-v]\n") ;
!   FPRINTF(stderr, "\t[-?] filename ...\n") ;
    exit(1) ;
  }


------- print.c -------
*** /tmp/da06450    Mon Sep 17 09:41:13 1990
--- print.c    Mon Sep 17 09:27:45 1990
***************
*** 118,123 ****
--- 118,125 ----

    if (article == TRUE)
      STRCPY(message_for, "Article from") ;             /* MailFor. */
+   else if (print_orig == TRUE)
+     STRCPY(message_for, "From") ;
    psdef("MailFor", message_for) ;

    if (article == TRUE && newsgroups != NULL)          /* User. */
***************
*** 129,134 ****
--- 131,144 ----
        STRNCPY(owner, newsgroups, i) ;
        owner[i] = '\0' ;
      }
+   else if (print_orig == TRUE)
+     {
+       i = strlen(from) ;
+       owner = (char *) realloc(owner, (unsigned int) i) ;
+       STRNCPY(owner, from, i) ;
+       owner[i] = '\0' ;
+     }
+
    psdef("User", owner) ;

    do_date() ;                                         /* TimeNow. */

------- CHANGES -------
*** /tmp/da06453    Mon Sep 17 09:41:13 1990
--- CHANGES    Mon Sep 17 08:48:42 1990
***************
*** 277,279 ****
--- 277,313 ----
         [For now, I've detailed this problem in the TODO file. When the next
          version of mp is released, I'll make sure that all the filenames are
          below 14 characters - Rich].
+
+ v2.4 - patchlevel 9. - 17th September 1990.
+
+     *  From Paul Eggert <[e-mail]>
+        From Larry W. Virden <[e-mail]>
+        From Rick Rodgers <[e-mail]>
+        The SunOS v4.1 /bin/make doesn't like blank lines half way through a
+        Makefile rule.
+
+     *  From Larry W. Virden <[e-mail]>
+        The SYSV definition was not added to the CFLAGS line in Makefile.dist.
+        It also needs to be added to the section in the README file, that
+        describes settable Makefile definitions.
+
+     *  From Rick Gunderson <[e-mail]>
+        The mp.pro.ps file won't center the page number in the gray bar if
+        ``leftedge'' is non-zero. We set left-edge to 0.5 inches so that there
+        is a margin at the left of the page for punched holes.
+
+     *  From Larry W. Virden <[e-mail]>
+        Some slight changes to the mailp shell script for -s subject handling.
+
+     *  From Larry W. Virden <[e-mail]>
+        From Rick Rodgers <[e-mail]>
+        Some adjustments to the mp manual pages.
+
+     *  From Peter Collinson <[e-mail]>
+        I have my own machine and printer and KNOW that the mail is for
+        me.. I would like to have the header say
+
+                 Mail from ........
+
+        The -F flag has been added for this option. The manual page has also
+        been updated.

------- patchlevel.h -------
*** /tmp/da06456    Mon Sep 17 09:41:14 1990
--- patchlevel.h    Mon Sep 17 07:51:15 1990
***************
*** 14,17 ****
   *  reported to me then an attempt will be made to fix them.
   */

! #define  PATCHLEVEL  8
--- 14,17 ----
   *  reported to me then an attempt will be made to fix them.
   */

! #define  PATCHLEVEL  9

------- extern.h -------
*** /tmp/da06459    Mon Sep 17 09:41:14 1990
--- extern.h    Mon Sep 17 09:16:02 1990
***************
*** 63,68 ****
--- 63,69 ----
  extern bool digest ;         /* Are we are printing a mail digest (-d) */
  extern bool folder ;         /* Set if we are printing a mail folder. */
  extern bool landscape ;      /* Set if we are printing in landscape mode. */
+ extern bool print_orig ;     /* Print originators name rather then Mail for. */
  extern bool text_doc ;       /* Printing normal text (-o) */

  extern bool end_of_file ;    /* EOF indicator */

------- Makefile.dist -------
*** /tmp/da06462    Mon Sep 17 09:41:15 1990
--- Makefile.dist    Mon Sep 17 07:58:25 1990
***************
*** 67,73 ****
  #---------------------------------------------------------------------
  #  Compilation flags and standard macro definitions.
  #
! CFLAGS   = -g $(GECOSFIELDS) $(GECOSLENGTH) $(NOINDEX) $(PROLOGUE)
  LDFLAGS  =
  #=================================================================

--- 67,73 ----
  #---------------------------------------------------------------------
  #  Compilation flags and standard macro definitions.
  #
! CFLAGS   = -g $(GECOSFIELDS) $(GECOSLENGTH) $(NOINDEX) $(PROLOGUE) $(SYSV)
  LDFLAGS  =
  #=================================================================

***************
*** 112,122 ****
         -install -c -m 644 mp.pro.timeman.ps $(LIBDIR)
         -install -c -m 644 mp.pro.timesys.ps $(LIBDIR)
         -install -c -m 755 mailp $(BINDIR)
-
  #
  #  NOTE: If you don't want the newsp, filep ... shell scripts installed,
  #        then you should comment out the following seven lines.
!
         @echo Making mailp links
         -@for name in $(MAILPNAMES); do \
          echo -n $$name " "; \
--- 112,121 ----
         -install -c -m 644 mp.pro.timeman.ps $(LIBDIR)
         -install -c -m 644 mp.pro.timesys.ps $(LIBDIR)
         -install -c -m 755 mailp $(BINDIR)
  #
  #  NOTE: If you don't want the newsp, filep ... shell scripts installed,
  #        then you should comment out the following seven lines.
! #
         @echo Making mailp links
         -@for name in $(MAILPNAMES); do \
          echo -n $$name " "; \

------- TODO -------
*** /tmp/da06465    Mon Sep 17 09:41:15 1990
--- TODO    Mon Sep 17 09:06:56 1990
***************
*** 66,72 ****

     In the next release of mp, I will make the following changes:

!      mp.pro.filofax.ps ==> mp.pro.f.ps
       mp.pro.timeman.ps ==> mp.pro.tm.ps
       mp.pro.timesys.ps ==> mp.pro.ts.ps

--- 66,72 ----

     In the next release of mp, I will make the following changes:

!      mp.pro.filofax.ps ==> mp.pro.ff.ps
       mp.pro.timeman.ps ==> mp.pro.tm.ps
       mp.pro.timesys.ps ==> mp.pro.ts.ps

***************
*** 79,81 ****
--- 79,91 ----

      Of course, you have to change the name of mp.1 to mp.man in the
      distribution and all occurrence of /usr/local/lib by LIBDIR.
+
+ 11/ From Peter Collinson <[e-mail]>
+     With regards to the -F (Mail from .....) option:
+     A more general solution might be to allow a specification on the command
+     line - I envisage something like
+
+         -f 'Mail from %from%'
+         -f 'Subject: %subject%'
+
+     of course `f' isn't available but you get the drift.