diff -urN apsfilter-cvs/ANNOUNCE apsfilter/ANNOUNCE
--- apsfilter-cvs/ANNOUNCE Sat Nov 17 16:21:49 2001
+++ apsfilter/ANNOUNCE Sat Nov 17 22:45:45 2001
@@ -71,6 +71,8 @@
- ghostscript 7.00 support
+ - support for lzop (de)compression
+
- full support for gimp-print/stp, omni, hpijs, pips
- support for many more third-party drivers (gs add-ons or via
@@ -90,9 +92,10 @@
(which is the same as 11x17; now we clearly state that "ledger"
is 17x11 in SETUP)
- - print summaries of AR, RPM, TAR, CPIO, CAB and ZIP files
+ - print file listings of various archive formats
- - support for X window dumps and Windows Metafiles
+ - support for X window dumps, Windows Metafiles, TGIF drawings,
+ PAM pixmaps ("xv" thumbnails -- does anyone want to print these?)
- non-printer devices (e.g. image creation or PDF distiller) for
print-to-file mode
diff -urN apsfilter-cvs/INSTALL apsfilter/INSTALL
--- apsfilter-cvs/INSTALL Sat Nov 17 16:21:50 2001
+++ apsfilter/INSTALL Sat Nov 17 22:46:42 2001
@@ -18,6 +18,9 @@
- convert from the ImageMagick package or
- nconvert from XnView or
- the pbmplus / netpbm tools
+ for archives (will print file listing):
+ ar, arc/unarc, unarj, cabextract, cpio, lha, rar/unrar,
+ rpm, tar, unzip, zoo
for ASCII files:
- a2ps or
- mpage or
@@ -29,10 +32,12 @@
- html2ps or htmldoc for HTML files
- sk2ps for Sketch and XFig files
- groff for *roff files
+ - tgif for Tgif files
+ - wmftopng/wmftofig for Windows Metafiles
- optional: acroread or pdftops for PDF files
* compression tools if you want to handle packed files:
- gzip, bzip2, compress, freeze, pack
+ gzip, bzip2, compress, freeze, pack, lzop
diff -urN apsfilter-cvs/bin/apsfilter apsfilter/bin/apsfilter
--- apsfilter-cvs/bin/apsfilter Sat Nov 17 16:21:52 2001
+++ apsfilter/bin/apsfilter Mon Nov 19 13:51:21 2001
@@ -18,15 +18,15 @@
#
# Supported filetypes
#
-# archives (ar, cab, cpio, rpm, tar, zip), ASCII, BMP, data (PCL etc.),
-# DVI, FBM, FIG, FITS, GIF, Group 3 fax, HTML, IFF ILBM, JPEG, Kodak
-# Photo CD, MGR, MIFF, PBM/PGM/PNM/PPM, PDF, PNG, PostScript, RLE, SGI,
-# Sketch, Sun raster, Targa, TIFF, troff, WMF, WordPerfect graphics,
-# XCF, X pixmap, X window dump
+# archives (print summary of various types), ASCII, BMP, data (PCL
+# etc.), DVI, FBM, FIG, FITS, GIF, Group 3 fax, HTML, IFF ILBM, JPEG,
+# Kodak Photo CD, MGR, MIFF, PAM/PBM/PGM/PNM/PPM, PDF, PNG, PostScript,
+# RLE, SGI, Sketch, Sun raster, Targa, TGIF, TIFF, troff, WMF,
+# WordPerfect graphics, XCF (gimp), X pixmap, X window dump
#
# Supported compression types
#
-# bzip2, gzip, compress, freeze, pack
+# bzip2, gzip, compress, freeze, pack, lzop
#
##############################################################################
@@ -272,9 +272,12 @@
{
local opts
- [ "$COLOR" != full ] && opts="-colorspace GRAY"
+ case "$COLOR" in
+ gray) opts="-colorspace GRAY" ;;
+ mono) opts="-monochrome" ;;
+ esac
eval convert -rotate '"-90>"' -page '"${WIDTH_POINTS}x${HEIGHT_POINTS}>"' \
- $opts ${1:+${1}:}- ps2:- | print_ps
+ $opts ${1:+${1}:}- ps:- | print_ps
}
#=============================================================================
@@ -301,13 +304,42 @@
print_ar()
{
find_filter ar || fatal_filter ar
-
cat > "$APS_TMPDIR/ar"
ar -tv "$APS_TMPDIR/ar" | print_ascii
rm -f "$APS_TMPDIR/ar"
}
#=============================================================================
+# print_arc
+#
+# Print a summary of an ARC archive.
+#=============================================================================
+
+print_arc()
+{
+ if find_filter unarc; then
+ unarc v /dev/stdin | print_ascii
+ else
+ find_filter arc || fatal_filter arc
+ arc v /dev/stdin | print_ascii
+ fi
+}
+
+#=============================================================================
+# print_arj
+#
+# Print a summary of an ARJ archive.
+#=============================================================================
+
+print_arj()
+{
+ find_filter unarj || fatal_filter unarj
+ cat > "$APS_TMPDIR/archive.arj"
+ unarj l "$APS_TMPDIR/archive.arj" | print_ascii
+ rm -f "$APS_TMPDIR/archive.arj"
+}
+
+#=============================================================================
# print_ascii
#
# Print ASCII files.
@@ -472,83 +504,103 @@
print_auto()
{
- # those patterns which might include a filename or some other
- # user-supplied string must be at the top of the list to avoid a mismatch
+ # these patterns are based on the magic database of file-3.37,
+ # with some additions
case "$FILE_TYPE" in
- xwd*)
- print_xwd ;;
- rpm*)
- print_rpm ;;
- sgi*image*)
- print_sgi ;;
-
- *dvi*)
- print_dvi ;;
- *fbm*)
+ arc\ archive*)
+ print_arc ;;
+ arj\ archive*)
+ print_arj ;;
+ fbm\ image*)
print_fbm ;;
- *fig*)
+ fig\ image*)
print_fig ;;
- *fits*)
+ fits\ image*)
print_fits ;;
- *gif*)
+ gif\ image*)
print_gif ;;
- *group*3*fax*|*raw*g3*data*)
+ gimp\ xcf\ image*)
+ print_xcf ;;
+ group\ 3\ fax*|raw\ g3\ data*)
print_g3 ;;
- *html*)
+ html\ document*|exported\ sgml*)
print_html ;;
- *ilbm*)
+ iff*ilbm*)
print_ilbm ;;
- *jpeg*)
+ jpeg\ image*)
print_jpeg ;;
- *kodak*photo*cd*)
+ kodak\ photo\ cd*)
print_pcd ;;
- *mgr*)
+ lha*archive*)
+ print_lha ;;
+ mgr\ bitmap*)
print_mgr ;;
- *miff*)
+ microsoft\ cabinet*)
+ print_cab ;;
+ miff\ image*)
print_miff ;;
- pc*bitmap*data*)
+ ms-windows*wmf*)
+ print_wmf ;;
+ pam*image*|netpbm\ pam*image*)
+ print_pam ;;
+ pbm*image*|netpbm\ pbm*image*|\
+ pnm*image*|netpbm\ pnm*image*|\
+ ppm*image*|netpbm\ ppm*image*)
+ print_pnm ;;
+ pc\ bitmap*)
print_bmp ;;
- *pdf*)
+ pdf\ document*)
print_pdf ;;
- *pgm*)
+ pgm*image*|netpbm\ pgm*image*)
print_pgm ;;
- *png*)
+ png\ image*)
print_png ;;
- *pnm*|*pbm*|*ppm*)
- print_pnm ;;
- postscript*)
+ posix\ tar\ archive*|gnu\ tar\ archive*)
+ print_tar ;;
+ postscript\ document*)
print_ps ;;
- rle*image*)
+ rar\ archive*)
+ print_rar ;;
+ rle\ image*)
print_rle ;;
- *sketch*)
+ rpm*)
+ print_rpm ;;
+ sgi\ image*)
+ print_sgi ;;
+ sketch\ document*)
print_sketch ;;
- sun*raster*|*rasterfile*)
+ sun\ raster\ image*|rasterfile*)
print_ras ;;
- *targa*)
+ targa\ image*)
print_tga ;;
- *tiff*)
+ tex\ dvi*)
+ print_dvi ;;
+ tiff\ image*)
print_tiff ;;
- *troff*)
+ tgif\ file*)
+ print_tgif ;;
+ troff*)
print_troff ;;
- *windows*wmf*)
- print_wmf ;;
- *wordperfect*graphic*)
+ wordperfect\ graphic*)
print_wpg ;;
- *xcf*)
- print_xcf ;;
- x*pixmap*)
+ x\ pixmap\ image*)
print_xpm ;;
- *tar\ archive*)
- print_tar ;;
+ xwd*image*)
+ print_xwd ;;
+ zip\ archive*)
+ print_zip ;;
+ zoo\ archive*)
+ print_zoo ;;
+
+ # patterns which might cause a mismatch (mostly via strings in
+ # file(1)'s output that appear in free form)
*ar\ archive*)
print_ar ;;
*cpio\ archive*)
print_cpio ;;
- zip\ archive*)
- print_zip ;;
- microsoft\ cabinet*)
- print_cab ;;
+
+ # generic patterns
*mail*|*news*|*ascii*|*text*|*english*|*script*)
print_ascii ;;
*data*|*escape*|*pcl*|*pjl*|*printer*job*language*|*ms*windows*)
@@ -585,7 +637,6 @@
print_cab()
{
find_filter cabextract || fatal_filter cabextract
-
cat > "$APS_TMPDIR/cab"
cabextract -l "$APS_TMPDIR/cab" | print_ascii
rm -f "$APS_TMPDIR/cab"
@@ -600,7 +651,6 @@
print_cpio()
{
find_filter cpio || fatal_filter cpio
-
cpio -tv --quiet | print_ascii
}
@@ -721,37 +771,24 @@
# print_fits
#
# Print FITS images.
+#
+# Note: Should 3-axes-files be handled as three grayscale images (convert) or
+# as RGB input, resulting in one color image (nconvert, fitstopnm)?
#=============================================================================
print_fits()
{
- if find_filter convert; then
- do_convert fits
- elif find_filter fitstopnm; then
- fitstopnm | print_pnm
- else
- find_filter nconvert || fatal_filter nconvert
+ if find_filter nconvert; then
cat > "$APS_TMPDIR/fits"
do_nconvert -in fits < "$APS_TMPDIR/fits"
rm -f "$APS_TMPDIR/fits"
- fi
-}
-
-#=============================================================================
-# print_gif
-#
-# Print GIF images.
-#=============================================================================
-
-print_gif()
-{
- if find_filter convert; then
- do_convert gif
- elif find_filter nconvert; then
- do_nconvert -in gif
+ elif find_filter fitstopnm; then
+ # fitstopnm output "may" need to be flipped top for bottom, according
+ # to the man page -- you gotta be kidding...
+ fitstopnm | print_pnm
else
- find_filter giftopnm || fatal_filter giftopnm
- giftopnm | print_pnm
+ find_filter convert || fatal_filter convert
+ do_convert fits
fi
}
@@ -784,6 +821,24 @@
}
#=============================================================================
+# print_gif
+#
+# Print GIF images.
+#=============================================================================
+
+print_gif()
+{
+ if find_filter convert; then
+ do_convert gif
+ elif find_filter nconvert; then
+ do_nconvert -in gif
+ else
+ find_filter giftopnm || fatal_filter giftopnm
+ giftopnm | print_pnm
+ fi
+}
+
+#=============================================================================
# print_html
#
# Print HTML files.
@@ -854,6 +909,18 @@
}
#=============================================================================
+# print_lha
+#
+# Print a summary of a LHa(rc) archive.
+#=============================================================================
+
+print_lha()
+{
+ find_filter lha || fatal_filter lha
+ lha v - | print_ascii
+}
+
+#=============================================================================
# print_mgr
#
# Print MGR images.
@@ -880,7 +947,9 @@
print_miff()
{
if find_filter convert; then
- do_convert miff
+ # convert doesn't seem to like an explicit "miff" here, at least for
+ # images with an alpha (matte) channel -- wierd
+ do_convert
else
find_filter nconvert || fatal_filter nconvert
do_nconvert -in miff
@@ -888,6 +957,28 @@
}
#=============================================================================
+# print_pam
+#
+# Print PAM (xv thumbnail) images.
+#=============================================================================
+
+print_pam()
+{
+ if find_filter convert; then
+ do_convert p7
+ elif find_filter xvminitoppm; then
+ xvminitoppm | print_pnm
+ elif find_filter xvpictoppm; then
+ xvpictoppm | print_pnm
+ else
+ find_filter nconvert || fatal_filter nconvert
+ cat > "$APS_TMPDIR/pam"
+ do_nconvert -in p7 < "$APS_TMPDIR/pam"
+ rm -f "$APS_TMPDIR/pam"
+ fi
+}
+
+#=============================================================================
# print_pcd
#
# Print Kodak Photo CD images.
@@ -1217,6 +1308,24 @@
}
#=============================================================================
+# print_rar
+#
+# Print a summary of a RAR archive.
+#=============================================================================
+
+print_rar()
+{
+ cat > "$APS_TMPDIR/rar"
+ if find_filter unrar; then
+ unrar v "$APS_TMPDIR/rar" | print_ascii
+ else
+ find_filter rar || fatal_filter rar
+ rar v "$APS_TMPDIR/rar" | print_ascii
+ fi
+ rm -f "$APS_TMPDIR/rar"
+}
+
+#=============================================================================
# print_ras
#
# Print Sun RasterFiles.
@@ -1350,8 +1459,7 @@
print_tar()
{
find_filter tar || fatal_filter tar
-
- tar tvvf - | print_ascii
+ tar tvf - | print_ascii
}
#=============================================================================
@@ -1373,6 +1481,24 @@
}
#=============================================================================
+# print_tgif
+#
+# Print TGIF drawings.
+#=============================================================================
+
+print_tgif()
+{
+ local opts
+
+ find_filter tgif || fatal_filter tgif
+ cat > "$APS_TMPDIR/tgif.obj"
+ [ "$COLOR" = full ] && opts="-color" || opts="-gray"
+ tgif -print -adobe -ps -stdout $opts "$APS_TMPDIR/tgif.obj" 2> /dev/null \
+ | print_ps
+ rm -f "$APS_TMPDIR/tgif.obj"
+}
+
+#=============================================================================
# print_tiff
#
# Print TIFF images.
@@ -1380,23 +1506,19 @@
print_tiff()
{
+ cat > "$APS_TMPDIR/tiff"
if find_filter tiff2ps; then
- cat > "$APS_TMPDIR/tiff"
tiff2ps -a2 -w $WIDTH_INCHES -h $HEIGHT_INCHES "$APS_TMPDIR/tiff" | \
print_ps
- rm -f "$APS_TMPDIR/tiff"
elif find_filter convert; then
- do_convert tiff
+ do_convert tiff < "$APS_TMPDIR/tiff"
elif find_filter nconvert; then
- cat > "$APS_TMPDIR/tiff"
do_nconvert -in tiff < "$APS_TMPDIR/tiff"
- rm -f "$APS_TMPDIR/tiff"
else
find_filter tifftopnm || fatal_filter tifftopnm
- cat > "$APS_TMPDIR/tiff"
tifftopnm "$APS_TMPDIR/tiff" | print_pnm
- rm -f "$APS_TMPDIR/tiff"
fi
+ rm -f "$APS_TMPDIR/tiff"
}
#=============================================================================
@@ -1509,13 +1631,26 @@
print_zip()
{
find_filter unzip || fatal_filter unzip
-
cat > "$APS_TMPDIR/zip"
unzip -v "$APS_TMPDIR/zip" | print_ascii
rm -f "$APS_TMPDIR/zip"
}
#=============================================================================
+# print_zoo
+#
+# Print a summary of a Zoo archive.
+#=============================================================================
+
+print_zoo()
+{
+ find_filter zoo || fatal_filter zoo
+ cat > "$APS_TMPDIR/zoo"
+ zoo l "$APS_TMPDIR/zoo" | print_ascii
+ rm -f "$APS_TMPDIR/zoo"
+}
+
+#=============================================================================
# unpack HANDLER
#
# Unpack input and pass it on to HANDLER.
@@ -1523,7 +1658,7 @@
unpack()
{
- local HEADER FILE_TYPE unpacker
+ local HEADER FILE_TYPE unpacker unpacker_opts
DEPTH=$(($DEPTH + 1))
HEADER="$APS_TMPDIR/header$DEPTH"
@@ -1534,17 +1669,19 @@
unpacker=
case "$FILE_TYPE" in
bzip*)
- unpacker=bunzip2 ;;
- gzip*|packed*)
- unpacker=gunzip ;;
+ unpacker=bzip2 ; unpacker_opts=-d ;;
+ gzip*|packed*|old\ packed*)
+ unpacker=gzip ; unpacker_opts=-d ;;
compress*)
- unpacker=zcat ;;
+ unpacker=zcat ; unpacker_opts= ;;
frozen*)
- unpacker=fcat ;;
+ unpacker=fcat ; unpacker_opts= ;;
+ lzop*)
+ unpacker=lzop ; unpacker_opts=-d ;;
esac
if [ "$unpacker" ]; then
find_filter $unpacker || fatal_unpacker $unpacker
- cat "$HEADER" - | $unpacker | unpack "$@"
+ cat "$HEADER" - | $unpacker $unpacker_opts | unpack "$@"
else
cat "$HEADER" - | eval "$@"
fi
@@ -1849,7 +1986,7 @@
case "$PRINTER" in
*.upp)
# uniprint profile -- everything is hard-coded
- ;;
+ ;;
*)
DRIVER_SCRIPT="$PRINTER"
diff -urN apsfilter-cvs/doc/Makefile apsfilter/doc/Makefile
--- apsfilter-cvs/doc/Makefile Sat Nov 17 16:21:53 2001
+++ apsfilter/doc/Makefile Sat Nov 17 23:11:17 2001
@@ -4,9 +4,6 @@
HTMLDOC_OPTS=--book --size a4 --color --numbered --titleimage apsfilter4.gif --footer c.1
-HTML_DUMP_CMD=w3m -dump
-
-
OBJS=handbook.html handbook.pdf handbook.ps handbook.txt
@@ -28,7 +25,7 @@
# we take the indexed html version as the source here
txt handbook.txt: handbook.html
@echo creating plain text edition...
- $(HTML_DUMP_CMD) handbook.html | sed 's/ *$$//' > handbook.txt
+ w3m -dump handbook.html | sed 's/ *$$//' > handbook.txt
clean:
$(RM) $(OBJS) *~
diff -urN apsfilter-cvs/doc/handbook.html apsfilter/doc/handbook.html
--- apsfilter-cvs/doc/handbook.html Sat Nov 17 16:21:53 2001
+++ apsfilter/doc/handbook.html Mon Nov 19 14:49:11 2001
@@ -213,8 +213,8 @@
of various conversion tools): ASCII (more precisely: all
sorts of text), BMP, DVI, FBM, FIG, FITS, GIF, Group 3 fax, HTML, IFF
ILBM, JPEG, Kodak Photo CD, MGR, MIFF, PDF, PNG, PNM, PostScript, RLE,
- SGI, Sketch, Sun raster, Targa, TIFF, troff, WordPerfect graphics, XCF,
- X pixmap
+ SGI, Sketch, Sun raster, Targa, TGIF, TIFF, troff, WMF, WordPerfect
+ graphics, XCF, X pixmap, X window dump
it works: more precisely, it works right out of the box -- no
compilation necessary
it's extendable: new file formats, new drivers, new converters have
@@ -297,8 +297,8 @@
, pdftops, sk2ps
Transparent handling of compressed files is supported for the
- gzip, bzip2, compress, freeze and
- pack compression styles.
+ gzip, bzip2, compress, freeze, pack
+ and lzop compression styles.
Error reporting and notification messages need a working
sendmail installation, although it is possible to do without it.
However, you wont't be able to use "fake duplex mode".
@@ -477,7 +477,7 @@
The main menu is the central screen during the setup -- here you can
see the current settings (in square brackets), adjust them, install
printers, print test pages etc. Enter one of the keys displayed in
- parantheses to change certain values or perform actions.
+ parentheses to change certain values or perform actions.
Any printer driver (with the single exception of a true PostScript
printer) needs to be included in the ghostscript binary gs
@@ -725,8 +725,8 @@
SETUP creates a comment for all entries in printcap
which will be displayed by lpq. It shows the default settings
for quality, resolution etc., but you can change it to whatever fits
- you. For non-printer devices, it might be useful to explicitely state
- that the printer queue is primarily targetted at "print-to-file" mode.
+ you. For non-printer devices, it might be useful to explicitly state
+ that the printer queue is primarily targeted at "print-to-file" mode.
As every input filter for printer spoolers, apsfilter is
@@ -1011,12 +1011,12 @@
when there were no command line options to apsfilter and
printing to a file via a locally installed apsfilter was
impossible.
- The user can provide arbritrary settings in a file in his home
+
The user can provide arbitrary settings in a file in his home
directory, specifically ~/.apsfilter/apsfilterrc.QUEUE for the
printer named QUEUE. However, since apsfilter might
run under a privileged account (e.g. daemon or even root
), this is considered harmful (far worse than a goto statement)
- and needs to be activated by the administrator by explicitely setting
+ and needs to be activated by the administrator by explicitly setting
USE_USER_CODE. You don't want to do that.
A secure, but less flexible way to have users supply their favourite
options is the file /usr/local/etc/apsfilter/QUEUE/apsfilterrc.USER
@@ -1107,8 +1107,8 @@
- Specifiying command line options to apsfilter is the
- easiest way to control the printout. The parameters are driver
+ Specifying command line options to apsfilter is the easiest
+ way to control the printout. The parameters are driver
independent and case sensitive. Options are
always valid for all files on the same command line;
later options in the parameter list override previous values of the
@@ -1533,7 +1533,7 @@
Q: Why is my DVI file messed up? It should be
in landscape mode, but the right border is chopped off!
A: The problem is that dvips doesn't know if the
- file is in landscape mode or not. You have to explicitely use the
+ file is in landscape mode or not. You have to explicitly use the
"landscape" command line option.
The first and most important link is of course the Apsfilter
@@ -1555,17 +1555,34 @@
acroread
http://www.adobe.com/products/acrobat/readermain.html
+ar (part of binutils)
+
+http://sourceware.cygnus.com/binutils/
+
+
bzip2
http://www.muraroa.demon.co.uk/
+cabextract
+
+http://www.kyz.uklinux.net/cabextract.php3
convert (part of ImageMagick)
http://www.imagemagick.org/
+cpio
+
+http://www.gnu.org/software/cpio/
dvips (part of teTeX)
http://www.tug.org/teTeX/
enscript
http://www.ngs.fi/mtr/genscript/index.html
+Epson printer drivers
+
+http://www.epkowa.co.jp/english/linux_e/pips_e.html ("pips")
+
+ http://www.epkowa.co.jp/english/linux_e/lpd_e.html (laser
+ printers)
fig2dev (part of transfig)
http://www.xfig.org/
file
@@ -1606,11 +1623,17 @@
http://oss.software.ibm.com/developer/opensource/linux/projects/omni/
+lha
+
+http://www2m.meshnet.or.jp/~dolphin/lha/lha-unix.htm
lpd (BSD-style)
http://sourceforge.net/projects/lpr/
LPRng
http://www.lprng.com/
+lzop
+
+http://wildsau.idv.uni-linz.ac.at/mfx/lzop.html
mktemp
http://www.courtesan.com/mktemp/
@@ -1625,6 +1648,9 @@
pap (part of netatalk)
http://www.umich.edu/~rsug/netatalk/
+pcdtoppm (part of xpcd)
+http://bytesex.org/xpcd.html
+
pcl3
http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
@@ -1637,9 +1663,13 @@
psutils
http://www.dcs.ed.ac.uk/home/ajcd/psutils/
+rar, unrar
+http://www.rarsoft.com/
recode
http://www.iro.umontreal.ca/contrib/recode/HTML/
+rpm
+http://www.rpm.org/
sendmail
http://www.sendmail.org/
sk2ps (part of sketch)
@@ -1647,6 +1677,23 @@
http://sketch.sourceforge.net/
smbclient (part of samba)
http://www.samba.org/
+tar
+
+http://www.gnu.org/software/tar/tar.html
+tgif
+
+http://bourbon.cs.umd.edu:8001/tgif/
+wmftofig, wmftopng (part of libwmf)
+
+http://www.wvware.com/libwmf.html
+unarj
+http://testcase.newmail.ru/
+
+unzip
+
+http://www.info-zip.org/UnZip.html
+
+
Other driver packages that can be made to work with apsfilter
include:
diff -urN apsfilter-cvs/doc/paper apsfilter/doc/paper
--- apsfilter-cvs/doc/paper Sat Nov 17 16:21:53 2001
+++ apsfilter/doc/paper Sat Nov 17 23:12:46 2001
@@ -87,4 +87,4 @@
Notes:
* pdf2ps is (more or less) equivalent to gs
-* ras2ps, sk2ps, groff are not handled yet
+* ras2ps, sk2ps, groff, tgif are not handled yet
diff -urN apsfilter-cvs/doc/source.html apsfilter/doc/source.html
--- apsfilter-cvs/doc/source.html Sat Nov 17 16:21:53 2001
+++ apsfilter/doc/source.html Mon Nov 19 14:48:20 2001
@@ -126,8 +126,8 @@
ASCII (more precisely: all sorts of text), BMP, DVI, FBM, FIG, FITS, GIF,
Group 3 fax, HTML, IFF ILBM, JPEG, Kodak Photo CD, MGR, MIFF, PDF, PNG,
- PNM, PostScript, RLE, SGI, Sketch, Sun raster, Targa, TIFF, troff,
- WordPerfect graphics, XCF, X pixmap
+ PNM, PostScript, RLE, SGI, Sketch, Sun raster, Targa, TGIF, TIFF, troff,
+ WMF, WordPerfect graphics, XCF, X pixmap, X window dump
it works: more precisely, it works right out of the box -- no compilation
necessary
@@ -232,8 +232,8 @@
Transparent handling of compressed files is supported for the gzip,
-bzip2, compress, freeze and pack
-compression styles.
+bzip2, compress, freeze, pack and
+lzop compression styles.
Error reporting and notification messages need a working sendmail
@@ -477,7 +477,7 @@
The main menu is the central screen during the setup -- here you can see the
current settings (in square brackets), adjust them, install printers, print
-test pages etc. Enter one of the keys displayed in parantheses to change
+test pages etc. Enter one of the keys displayed in parentheses to change
certain values or perform actions.
Available drivers
@@ -851,8 +851,8 @@
SETUP creates a comment for all entries in printcap which
will be displayed by lpq. It shows the default settings for quality,
resolution etc., but you can change it to whatever fits you. For non-printer
-devices, it might be useful to explicitely state that the printer queue is
-primarily targetted at "print-to-file" mode.
+devices, it might be useful to explicitly state that the printer queue is
+primarily targeted at "print-to-file" mode.
Usage
@@ -1218,12 +1218,12 @@
a locally installed apsfilter was impossible.
-The user can provide arbritrary settings in a file in his home directory,
+The user can provide arbitrary settings in a file in his home directory,
specifically ~/.apsfilter/apsfilterrc.QUEUE for the printer named
QUEUE. However, since apsfilter might run under a privileged
account (e.g. daemon or even root), this is considered
harmful (far worse than a goto statement) and needs to be activated
-by the administrator by explicitely setting USE_USER_CODE. You don't
+by the administrator by explicitly setting USE_USER_CODE. You don't
want to do that.
@@ -1335,7 +1335,7 @@
-Specifiying command line options to apsfilter is the easiest way to
+Specifying command line options to apsfilter is the easiest way to
control the printout. The parameters are driver independent
and case sensitive. Options are always valid for
all files on the same command line; later options in the
@@ -1824,7 +1824,7 @@
Q: Why is my DVI file messed up? It should be in landscape
mode, but the right border is chopped off!
A: The problem is that dvips doesn't know if the file is in
-landscape mode or not. You have to explicitely use the "landscape"
+landscape mode or not. You have to explicitly use the "landscape"
command line option.
@@ -1852,14 +1852,24 @@
http://www.inf.enst.fr/~demaille/a2ps/
acroread
http://www.adobe.com/products/acrobat/readermain.html
+ ar (part of binutils)
+ http://sourceware.cygnus.com/binutils/
+
bzip2
http://www.muraroa.demon.co.uk/
+ cabextract
+ http://www.kyz.uklinux.net/cabextract.php3
convert (part of ImageMagick)
http://www.imagemagick.org/
+ cpio
+ http://www.gnu.org/software/cpio/
dvips (part of teTeX)
http://www.tug.org/teTeX/
enscript
http://www.ngs.fi/mtr/genscript/index.html
+ Epson printer drivers
+ http://www.epkowa.co.jp/english/linux_e/pips_e.html ("pips")
+ http://www.epkowa.co.jp/english/linux_e/lpd_e.html (laser printers)
fig2dev (part of transfig)
http://www.xfig.org/
file
@@ -1886,10 +1896,14 @@
http://www.easysw.com/htmldoc/
IBM Omni drivers
http://oss.software.ibm.com/developer/opensource/linux/projects/omni/
+ lha
+ http://www2m.meshnet.or.jp/~dolphin/lha/lha-unix.htm
lpd (BSD-style)
http://sourceforge.net/projects/lpr/
LPRng
http://www.lprng.com/
+ lzop
+ http://wildsau.idv.uni-linz.ac.at/mfx/lzop.html
mktemp
http://www.courtesan.com/mktemp/
mpage
@@ -1900,6 +1914,8 @@
http://sourceforge.net/projects/netpbm/
pap (part of netatalk)
http://www.umich.edu/~rsug/netatalk/
+ pcdtoppm (part of xpcd)
+ http://bytesex.org/xpcd.html
pcl3
http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
pdftops (part of xpdf)
@@ -1908,14 +1924,29 @@
http://sourceforge.net/projects/pnm2ppa/
psutils
http://www.dcs.ed.ac.uk/home/ajcd/psutils/
+ rar, unrar
+ http://www.rarsoft.com/
recode
http://www.iro.umontreal.ca/contrib/recode/HTML/
+ rpm
+ http://www.rpm.org/
sendmail
http://www.sendmail.org/
sk2ps (part of sketch)
http://sketch.sourceforge.net/
smbclient (part of samba)
http://www.samba.org/
+ tar
+ http://www.gnu.org/software/tar/tar.html
+ tgif
+ http://bourbon.cs.umd.edu:8001/tgif/
+ wmftofig, wmftopng (part of libwmf)
+ http://www.wvware.com/libwmf.html
+ unarj
+ http://testcase.newmail.ru/
+ unzip
+ http://www.info-zip.org/UnZip.html
+
diff -urN apsfilter-cvs/driver/MAPPING apsfilter/driver/MAPPING
--- apsfilter-cvs/driver/MAPPING Sat Nov 17 16:21:54 2001
+++ apsfilter/driver/MAPPING Sat Nov 17 23:15:42 2001
@@ -91,6 +91,7 @@
stp/escp2-c70:stp/escp2-c80:
stp/escp2-pro:stp/escp2-pro-xl:
stp/lexmark-4076:stp/pcl-2:stp/pcl-3:stp/pcl-4l:stp/pcl-500:stp/pcl-520:
+stp/lexmark-z52:stp/lexmark-z42:
stp/pcl-1100:stp/pcl-1120:stp/pcl-850:stp/pcl-855:stp/pcl-870:stp/pcl-890:
stp/pcl-1200:stp/pcl-1600:stp/pcl-340:stp/pcl-400:stp/pcl-501:stp/pcl-540:stp/pcl-550:stp/pcl-560:
stp/pcl-1220:stp/pcl-2000:stp/pcl-2500:stp/pcl-4:stp/pcl-4v:stp/pcl-5:stp/pcl-5si:stp/pcl-6:stp/pcl-900:stp/pcl-P1000:stp/pcl-P1100:
diff -urN apsfilter-cvs/driver/omni/Okidata_OL1200 apsfilter/driver/omni/Okidata_OL1200
--- apsfilter-cvs/driver/omni/Okidata_OL1200 Sat Nov 17 16:21:59 2001
+++ apsfilter/driver/omni/Okidata_OL1200 Sat Nov 17 23:17:24 2001
@@ -14,9 +14,9 @@
esac
case "$COLOR" in
- full) props="$propf printmode=PRINT_MODE_24_RGB" ;;
- gray) props="$propf printmode=PRINT_MODE_8_RGB" ;;
- mono) props="$propf printmode=PRINT_MODE_1_ANY" ;;
+ full) props="$props printmode=PRINT_MODE_24_RGB" ;;
+ gray) props="$props printmode=PRINT_MODE_8_RGB" ;;
+ mono) props="$props printmode=PRINT_MODE_1_ANY" ;;
esac
case "$PAPERSIZE" in
diff -urN apsfilter-cvs/driver/omni/Okidata_OL400e apsfilter/driver/omni/Okidata_OL400e
--- apsfilter-cvs/driver/omni/Okidata_OL400e Sat Nov 17 16:21:59 2001
+++ apsfilter/driver/omni/Okidata_OL400e Sat Nov 17 23:17:47 2001
@@ -12,9 +12,9 @@
esac
case "$COLOR" in
- full) props="$propf printmode=PRINT_MODE_24_RGB" ;;
- gray) props="$propf printmode=PRINT_MODE_8_RGB" ;;
- mono) props="$propf printmode=PRINT_MODE_1_ANY" ;;
+ full) props="$props printmode=PRINT_MODE_24_RGB" ;;
+ gray) props="$props printmode=PRINT_MODE_8_RGB" ;;
+ mono) props="$props printmode=PRINT_MODE_1_ANY" ;;
esac
case "$PAPERSIZE" in
diff -urN apsfilter-cvs/driver/omni/Panasonic_KX_P1124 apsfilter/driver/omni/Panasonic_KX_P1124
--- apsfilter-cvs/driver/omni/Panasonic_KX_P1124 Sat Nov 17 16:21:59 2001
+++ apsfilter/driver/omni/Panasonic_KX_P1124 Sat Nov 17 23:18:05 2001
@@ -12,9 +12,9 @@
esac
case "$COLOR" in
- full) props="$propf printmode=PRINT_MODE_24_CMYK" ;;
- gray) props="$propf printmode=PRINT_MODE_8_CMYK" ;;
- mono) props="$propf printmode=PRINT_MODE_1_ANY" ;;
+ full) props="$props printmode=PRINT_MODE_24_CMYK" ;;
+ gray) props="$props printmode=PRINT_MODE_8_CMYK" ;;
+ mono) props="$props printmode=PRINT_MODE_1_ANY" ;;
esac
case "$PAPERSIZE" in
diff -urN apsfilter-cvs/setup/printer-stp apsfilter/setup/printer-stp
--- apsfilter-cvs/setup/printer-stp Sat Nov 17 16:22:04 2001
+++ apsfilter/setup/printer-stp Sat Nov 17 23:19:21 2001
@@ -131,4 +131,5 @@
Lexmark 3200|stp/lexmark-3200
Lexmark 4076|stp/lexmark-4076
Lexmark Z31|stp/lexmark-z31
+Lexmark Z42|stp/lexmark-z42
Lexmark Z52|stp/lexmark-z52