7 files changed, 69 insertions, 34 deletions
diff --git a/man/TIFFGetField.3t b/man/TIFFGetField.3t
index fa8f8ec5..9768658e 100644
--- a/man/TIFFGetField.3t
+++ b/man/TIFFGetField.3t
@@ -1,4 +1,4 @@
-.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFGetField.3t,v 1.16 1995/10/11 19:45:29 sam Exp $
+.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFGetField.3t,v 1.17 1996/12/13 05:25:58 sam Exp $
 .\"
 .\" Copyright (c) 1988-1995 Sam Leffler
 .\" Copyright (c) 1991-1995 Silicon Graphics, Inc.
@@ -179,11 +179,17 @@ TIFFTAG_YCBCRPOSITIONING	1	uint16*
 TIFFTAG_YCBCRSUBSAMPLING	2	uint16*
 TIFFTAG_YPOSITION	1	float*
 TIFFTAG_YRESOLUTION	1	float*
+TIFFTAG_ICCPROFILE	2	uint32*,void**	count, profile data\(dd
 .fi
 \(dg If
 .I SamplesPerPixel
 is one, then a single array is returned; otherwise three arrays are
 returned.
+.fi
+\(dd The contents of this field are quite complex.  See 
+.IR "The ICC Profile Format Specification" ,
+Annex B.3 "Embedding ICC Profiles in TIFF Files"
+(available at http://www.color.org) for an explanation.
 .SH "RETURN VALUES"
 1 is returned if the tag is defined in the current
 directory; otherwise a 0 is returned.
diff --git a/man/TIFFOpen.3t b/man/TIFFOpen.3t
index d33394a8..5e98c301 100644
--- a/man/TIFFOpen.3t
+++ b/man/TIFFOpen.3t
@@ -1,4 +1,4 @@
-.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFOpen.3t,v 1.14 1996/01/09 22:45:06 sam Exp $
+.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFOpen.3t,v 1.15 1997/01/27 23:46:06 sam Exp $
 .\"
 .\" Copyright (c) 1988-1995 Sam Leffler
 .\" Copyright (c) 1991-1995 Silicon Graphics, Inc.
@@ -186,18 +186,19 @@ Disable the use of memory-mapped files.
 Enable the use of ``strip chopping'' when reading images
 that are comprised of a single strip or tile of uncompressed data.
 Strip chopping is a mechanism by which the library will automatically
-convert the single-strip [-tile] image to multiple strips [tiles],
+convert the single-strip image to multiple strips,
 each of which has about 8 Kilobytes of data.
 This facility can be useful in reducing the amount of memory used
-to read an image because the library normally reads each strip [tile]
+to read an image because the library normally reads each strip
 in its entirety.
 Strip chopping does however alter the apparent contents of the
 image because when an image is divided into multiple strips it
 looks as though the underlying file contains multiple separate
-strips [tiles].
-Finally, note that strip chopping is an optional compile-time
-feature of the library; just because its use is enabled by an
-application does not mean that it may be present in the library.
+strips.
+Finally, note that default handling of strip chopping is a compile-time
+configuration parameter.
+The default behaviour, for backwards compatibility, is to enable
+strip chopping.
 .TP
 .B c
 Disable the use of strip chopping when reading images.
diff --git a/man/TIFFSetField.3t b/man/TIFFSetField.3t
index f292733a..0c7a29d3 100644
--- a/man/TIFFSetField.3t
+++ b/man/TIFFSetField.3t
@@ -1,4 +1,4 @@
-.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFSetField.3t,v 1.15 1995/10/11 19:45:29 sam Exp $
+.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFSetField.3t,v 1.16 1996/12/13 05:25:58 sam Exp $
 .\"
 .\" Copyright (c) 1988-1995 Sam Leffler
 .\" Copyright (c) 1991-1995 Silicon Graphics, Inc.
@@ -89,6 +89,9 @@ is an unsigned 16-bit value;
 is an unsigned 32-bit value;
 .I uint16*
 is an array of unsigned 16-bit values.
+.I void*
+is an array of data values of unspecified type.
+
 Consult the
 .SM TIFF
 specification for information on the meaning of each tag.
@@ -161,15 +164,23 @@ TIFFTAG_YCBCRPOSITIONING	1	uint16	\(dg
 TIFFTAG_YCBCRSAMPLING	2	uint16	\(dg
 TIFFTAG_YPOSITION	1	float
 TIFFTAG_YRESOLUTION	1	float
+TIFFTAG_ICCPROFILE	2	uint32,void*	count, profile data*
 .fi
 .sp 5p
 \(dg Tag may not have its values changed once data is written.
 .br
+.fi
 \(dd
 If
 .I SamplesPerPixel
 is one, then a single array is passed; otherwise three arrays should be
 passed.
+.fi
+* The contents of this field are quite complex.  See 
+.IR "The ICC Profile Format Specification" ,
+Annex B.3 "Embedding ICC Profiles in TIFF Files"
+(available at http://www.color.org) for an explanation.
+.br
 .SH "RETURN VALUES"
 1 is returned if the tag is defined in the current
 directory; otherwise a 0 is returned.
diff --git a/man/libtiff.3t b/man/libtiff.3t
index 085729eb..411a4659 100644
--- a/man/libtiff.3t
+++ b/man/libtiff.3t
@@ -1,4 +1,4 @@
-.\" $Header: /usr/people/sam/tiff/man/RCS/libtiff.3t,v 1.22 1996/01/09 22:47:08 sam Exp $
+.\" $Header: /usr/people/sam/tiff/man/RCS/libtiff.3t,v 1.23 1996/08/01 19:10:20 sam Exp $
 .\"
 .\" Copyright (c) 1988-1995 Sam Leffler
 .\" Copyright (c) 1991-1995 Silicon Graphics, Inc.
@@ -23,7 +23,7 @@
 .\" OF THIS SOFTWARE.
 .\"
 .if n .po 0
-.TH INTRO 3T "October 15, 1995"
+.TH INTRO 3T "August 1, 1996"
 .SH NAME
 libtiff \- introduction to
 .IR libtiff ,
@@ -285,6 +285,7 @@ MaxSampleValue	281	R/W
 MinSampleValue	280	R/W
 Model	272	R/W
 NewSubFileType	254	R/W	called SubFileType in spec
+NumberOfInks	334	R/W
 Orientation	274	R/W
 PageName	285	R/W
 PageNumber	297	R/W
diff --git a/man/tiff2ps.1 b/man/tiff2ps.1
index 5085ec5d..d636524b 100644
--- a/man/tiff2ps.1
+++ b/man/tiff2ps.1
@@ -1,4 +1,4 @@
-.\"	$Header: /usr/people/sam/tiff/man/RCS/tiff2ps.1,v 1.18 1995/10/11 19:42:04 sam Exp $
+.\"	$Header: /usr/people/sam/tiff/man/RCS/tiff2ps.1,v 1.19 1997/01/27 23:48:56 sam Exp $
 .\"
 .\" Copyright (c) 1988-1995 Sam Leffler
 .\" Copyright (c) 1991-1995 Silicon Graphics, Inc.
@@ -23,11 +23,12 @@
 .\" OF THIS SOFTWARE.
 .\"
 .if n .po 0
-.TH TIFF2PS 1 "October 15, 1995"
+.ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2
+.TH TIFF2PS 1 "January 27, 1997"
 .SH NAME
 tiff2ps \- convert a
 .SM TIFF
-image to PostScript\(tm
+image to \*(Ps\(tm
 .SH SYNOPSIS
 .B tiff2ps
 [
@@ -38,17 +39,17 @@ image to PostScript\(tm
 .I tiff2ps
 reads
 .SM TIFF
-images and writes PostScript or Encapsulated PostScript (EPS)
+images and writes \*(Ps or Encapsulated \*(Ps (EPS)
 on the standard output.
 By default,
 .I tiff2ps
-writes Encapsulated PostScript for the first image in the specified
+writes Encapsulated \*(Ps for the first image in the specified
 .SM TIFF
 image file.
 .PP
 By default,
 .I tiff2ps
-will generate PostScript that fills a printed area specified
+will generate \*(Ps that fills a printed area specified
 by the 
 .SM TIFF
 tags in the input file.
@@ -67,22 +68,22 @@ overriding any relevant
 .SM TIFF
 tags.
 .PP
-The PostScript generated for
+The \*(Ps generated for
 .SM RGB,
 palette, and
 .SM CMYK
 images uses the
 .I colorimage
 operator.
-The PostScript generated for
+The \*(Ps generated for
 greyscale and bilevel images
 uses the
 .I image
 operator.
 When the
 .I colorimage
-operator is used, PostScript code to emulate this operator
-on older PostScript printers is also generated.
+operator is used, \*(Ps code to emulate this operator
+on older \*(Ps printers is also generated.
 Note that this emulation code can be very slow.
 .PP
 Color images with associated alpha data are composited over
@@ -90,10 +91,10 @@ a white background.
 .SH OPTIONS
 .TP
 .B \-1
-Generate PostScript Level I (the default).
+Generate \*(Ps Level I (the default).
 .TP
 .B \-2
-Generate PostScript Level II.
+Generate \*(Ps Level II.
 .TP
 .B \-a
 Generate output for all IFDs (pages) in the input file.
@@ -107,7 +108,7 @@ This option is useful for selecting individual pages in a
 multi-page (e.g. facsimile) file.
 .TP
 .B \-e
-Force the generation of Encapsulated PostScript.
+Force the generation of Encapsulated \*(Ps.
 .TP
 .B \-h
 Specify the vertical size of the printed area (in inches).
@@ -122,15 +123,24 @@ This option is useful for selecting thumbnail images and the
 like which are hidden using the SubIFD tag.
 .TP
 .B \-p
-Force the generation of (non-Encapsulated) PostScript.
+Force the generation of (non-Encapsulated) \*(Ps.
 .TP
 .B \-s
 Generate output for a single IFD (page) in the input file.
 .TP
 .B \-w
 Specify the horizontal size of the printed area (in inches).
+.TP
+.B \-z
+When generating \*(Ps Level II, data is scaled so that it does not
+image into the 
+.I deadzone
+on a page (the outer margin that the printing device is unable to mark).
+This option suppresses this behaviour.
+When \*(Ps Level I is generated, data is imaged to the entire printed
+page and this option has no affect.
 .SH EXAMPLES
-The following generates PostScript Level II for all pages of a facsimile:
+The following generates \*(Ps Level II for all pages of a facsimile:
 .RS
 .nf
 tiff2ps -a2 fax.tif | lpr
@@ -139,7 +149,7 @@ tiff2ps -a2 fax.tif | lpr
 Note also that if you have version 2.6.1 or newer of Ghostscript then you
 can efficiently preview facsimile generated with the above command.
 .PP
-To generate Encapsulated PostScript for a the image at directory 2
+To generate Encapsulated \*(Ps for a the image at directory 2
 of an image use:
 .RS
 .nf
@@ -148,8 +158,8 @@ tiff2ps -d 1 foo.tif
 .RE
 (notice that directories are numbered starting at zero.)
 .SH BUGS
-Because PostScript does not support the notion of a colormap,
-8-bit palette images produce 24-bit PostScript images.
+Because \*(Ps does not support the notion of a colormap,
+8-bit palette images produce 24-bit \*(Ps images.
 This conversion results in output that is six times
 bigger than the original image and which takes a long time
 to send to a printer over a serial line.
diff --git a/man/tiffcp.1 b/man/tiffcp.1
index e928c866..e0cc4ef4 100644
--- a/man/tiffcp.1
+++ b/man/tiffcp.1
@@ -1,4 +1,4 @@
-.\"	$Header: /usr/people/sam/tiff/man/RCS/tiffcp.1,v 1.23 1996/01/10 00:01:03 sam Exp $
+.\"	$Header: /usr/people/sam/tiff/man/RCS/tiffcp.1,v 1.24 1996/08/07 00:01:40 sam Exp $
 .\"
 .\" Copyright (c) 1988-1995 Sam Leffler
 .\" Copyright (c) 1991-1995 Silicon Graphics, Inc.
@@ -64,6 +64,7 @@ the image data content in any way.
 Force output to be written with Big-Endian byte order.
 This option only has an effect when the output file is created or
 overwritten and not when it is appended to.
+.TP
 .B \-C
 Suppress the use of ``strip chopping'' when reading images
 that have a single strip/tile of uncompressed data.
@@ -134,21 +135,23 @@ will create a new file with the same fill order as the original.
 Specifying
 .B "\-f lsb2msb"
 will force data to be written with the FillOrder tag set to
-.SM LSB2MSB ,
+.SM LSB2MSB,
 while
 .B "\-f msb2lsb"
 will force data to be written with the FillOrder tag set to
-.SM MSB2LSB .
+.SM MSB2LSB.
 .TP
 .B \-l
 Specify the length of a tile (in pixels).
 .I tiffcp
 attempts to set the tile dimensions so
 that no more than 8 kilobytes of data appear in a tile.
+.TP
 .B \-L
 Force output to be written with Little-Endian byte order.
 This option only has an effect when the output file is created or
 overwritten and not when it is appended to.
+.TP
 .B \-M
 Suppress the use of memory-mapped files when reading images.
 .TP
diff --git a/man/tiffinfo.1 b/man/tiffinfo.1
index b46ab504..550efcbd 100644
--- a/man/tiffinfo.1
+++ b/man/tiffinfo.1
@@ -1,4 +1,4 @@
-.\"	$Header: /usr/people/sam/tiff/man/RCS/tiffinfo.1,v 1.17 1995/10/11 19:42:08 sam Exp $
+.\"	$Header: /usr/people/sam/tiff/man/RCS/tiffinfo.1,v 1.18 1997/01/27 23:49:18 sam Exp $
 .\"
 .\" Copyright (c) 1988-1995 Sam Leffler
 .\" Copyright (c) 1991-1995 Silicon Graphics, Inc.
@@ -23,7 +23,7 @@
 .\" OF THIS SOFTWARE.
 .\"
 .if n .po 0
-.TH TIFFINFO 1 "May 2, 1990"
+.TH TIFFINFO 1 "January 27, 1997"
 .SH NAME
 tiffinfo \- print information about
 .SM TIFF
@@ -69,6 +69,9 @@ i.e. a leading ``0x'' for hexadecimal and a leading ``0'' for octal.
 .B \-s
 Display the offsets and byte counts for each data strip in a directory.
 .TP
+.B \-z
+Enable strip chopping when reading image data.
+.TP
 .B \-#
 Set the initial
 .SM TIFF