Attachment 103471 Details for Bug 81761 – Patches for manuals

Patches for manuals

poppler-utils.patches (text/plain), 36.77 KB, created by bjarniig on 2014-07-25 20:11:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bjarniig

Created: 2014-07-25 20:11:49 UTC

Size: 36.77 KB

patch

obsolete

>
>diff -auprd --recursive -- poppler-0.26.2/utils/pdfdetach.1 develop/utils/pdfdetach.1
>--- poppler-0.26.2/utils/pdfdetach.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdfdetach.1	2014-07-18 00:15:04.000000000 +0000
>@@ -73,7 +73,7 @@ Error related to PDF permissions.
> 99
> Other error.
> .SH AUTHOR
>-The pdfinfo software and documentation are copyright 1996-2011 Glyph &
>+The pdfinfo software and documentation are copyright 1996\(en2011 Glyph &
> Cog, LLC.
> .SH "SEE ALSO"
> .BR pdfimages (1),
>diff -auprd --recursive -- poppler-0.26.2/utils/pdffonts.1 develop/utils/pdffonts.1
>--- poppler-0.26.2/utils/pdffonts.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdffonts.1	2014-07-18 00:16:00.000000000 +0000
>@@ -19,7 +19,7 @@ the font name, exactly as given in the P
> a subset prefix)
> .TP
> .B type
>-the font type -- see below for details
>+the font type \(em see below for details
> .TP
> .B encoding
> the font encoding
>@@ -44,7 +44,7 @@ PDF files can contain the following type
> Type 1
> .RE
> .RS
>-Type 1C -- aka Compact Font Format (CFF)
>+Type 1C \(em aka Compact Font Format (CFF)
> .RE
> .RS
> Type 3
>@@ -53,13 +53,13 @@ Type 3
> TrueType
> .RE
> .RS
>-CID Type 0 -- 16-bit font with no specified type
>+CID Type 0 \(em 16-bit font with no specified type
> .RE
> .RS
>-CID Type 0C -- 16-bit PostScript CFF font
>+CID Type 0C \(em 16-bit PostScript CFF font
> .RE
> .RS
>-CID TrueType -- 16-bit TrueType font
>+CID TrueType \(em 16-bit TrueType font
> .RE
> .SH OPTIONS
> .TP
>@@ -106,7 +106,7 @@ Error related to PDF permissions.
> 99
> Other error.
> .SH AUTHOR
>-The pdffonts software and documentation are copyright 1996-2011 Glyph
>+The pdffonts software and documentation are copyright 1996\(en2011 Glyph
> & Cog, LLC.
> .SH "SEE ALSO"
> .BR pdfdetach (1),
>diff -auprd --recursive -- poppler-0.26.2/utils/pdfimages.1 develop/utils/pdfimages.1
>--- poppler-0.26.2/utils/pdfimages.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdfimages.1	2014-07-18 00:16:10.000000000 +0000
>@@ -21,15 +21,17 @@ where
> .I nnn
> is the image number and
> .I xxx
>-is the image type (.ppm, .pbm, .png, .tif, .jpg, jp2, jb2e, or jb2g).
>+is the image type (ppm, pbm, png, tif, jpg, jp2, jb2e, or jb2g).
> .PP
> The default output format is PBM (for monochrome images) or PPM for
>-non-monochrome. The \-png or \-tiff options change to default output
>-to PNG or TIFF respectively. If both \-png and \-tiff are specified,
>-CMYK images will be written as TIFF and all other images will be
>-written as PNG. In addition the \-j, \-jp2, and \-jbig2 options will
>-cause JPEG, JPEG2000, and JBIG2, respectively, images in the PDF file
>-to be written in their native format.
>+non-monochrome.
>+The \-png or \-tiff options change to default output to PNG or TIFF
>+respectively.
>+If both \-png and \-tiff are specified, CMYK images will be written as
>+TIFF and all other images will be written as PNG.
>+In addition the \-j, \-jp2, and \-jbig2 options will cause JPEG,
>+JPEG2000, and JBIG2, respectively, images in the PDF file to be written
>+in their native format.
> .SH OPTIONS
> .TP
> .BI \-f " number"
>@@ -45,21 +47,34 @@ Change the default output format to PNG.
> Change the default output format to TIFF.
> .TP
> .B \-j
>-Write images in JPEG format as JPEG files instead of the default format. The JPEG file is identical to the JPEG data stored in the PDF.
>+Write images in JPEG format as JPEG files instead of the default format.
>+The JPEG file is identical to the JPEG data stored in the PDF.
> .TP
> .B \-jp2
>-Write images in JPEG2000 format as JP2 files instead of the default format. The JP2 file is identical to the JPEG2000 data stored in the PDF.
>+Write images in JPEG2000 format as JP2 files instead of the default
>+format.
>+The JP2 file is identical to the JPEG2000 data stored in the PDF.
> .TP
> .B \-jbig2
>-Write images in JBIG2 format as JBIG2 files instead of the default format. JBIG2 data in PDF is of the embedded type. The embedded type of JBIG2 has an optional separate file containing global data. The embedded data is written with the extension .jb2e and the global data (if available) will be written to the same image number with the extension .jb2g. The content of both these files is indentical to the JBIG2 data in the PDF.
>+Write images in JBIG2 format as JBIG2 files instead of the default
>+format.
>+JBIG2 data in PDF is of the embedded type.
>+The embedded type of JBIG2 has an optional separate file containing global
>+data.
>+The embedded data is written with the extension \&.jb2e and the global
>+data (if available) will be written to the same image number with the
>+extension \&.jb2g.
>+The content of both these files is identical to the JBIG2 data in the PDF.
> .TP
> .B \-ccitt
> Write images in CCITT format as CCITT files instead of the default
>-format. The CCITT file is identical to the CCITT data stored in the
>-PDF. PDF files contain additional parameters specifying
>-how to decode the CCITT data. These parameters are translated to
>-fax2tiff input options and written to a .params file with the same image
>-number. The parameters are:
>+format.
>+The CCITT file is identical to the CCITT data stored in the PDF.
>+PDF files contain additional parameters specifying how to decode the
>+CCITT data.
>+These parameters are translated to fax2tiff input options and written
>+to a \&.params file with the same image number.
>+The parameters are:
> .RS
> .TP
> .B \-1
>@@ -91,12 +106,17 @@ Input data fills from most significant b
> .RE
> .TP
> .B \-all
>-Write JPEG, JPEG2000, JBIG2, and CCITT images in their native format. CMYK files are written as TIFF files. All other images are written as PNG files.
>-This is equivalent to specifying the options \-png \-tiff \-j \-jp2 \-jbig2 \-ccitt.
>+Write JPEG, JPEG2000, JBIG2, and CCITT images in their native format.
>+CMYK files are written as TIFF files.
>+All other images are written as PNG files.
>+This is equivalent to specifying the options \-png \-tiff \-j \-jp2
>+\-jbig2 \-ccitt.
> .TP
> .B \-list
>-Instead of writing the images, list the images along with various information for each image. Do not specify an
>-.IR image-root
>+Instead of writing the images, list the images along with various
>+information for each image.
>+Do not specify an
>+.I image-root
> with this option.
> .IP
> The following information is listed for each image:
>@@ -112,20 +132,22 @@ the image number
> the image type:
> .PP
> .RS
>-image - an opaque image
>+image \(en an opaque image
> .RE
> .RS
>-mask - a monochrome mask image
>+mask \(en a monochrome mask image
> .RE
> .RS
>-smask - a soft-mask image
>+smask \(en a soft-mask image
> .RE
> .RS
>-stencil - a monochrome mask image used for painting a color or pattern
>+stencil \(en a monochrome mask image used for painting a color or pattern
> .RE
> .PP
>-Note: Tranparency in images is represented in PDF using a separate image for the image and the mask/smask.
>-The mask/smask used as part of a transparent image always immediately follows the image in the image list.
>+Note: Transparency in images is represented in PDF using a separate
>+image for the image and the mask/smask.
>+The mask/smask used as part of a transparent image always immediately
>+follows the image in the image list.
> .TP
> .B width
> image width (in pixels)
>@@ -133,34 +155,35 @@ image width (in pixels)
> .B height
> image height (in pixels)
> .PP
>-Note: the image width/height is the size of the embedded image, not the size the image will be rendered at.
>+Note: the image width/height is the size of the embedded image, not
>+the size the image will be rendered at.
> .TP
> .B color
> image color space:
> .PP
> .RS
>-gray - Gray
>+gray \(en Gray
> .RE
> .RS
>-rgb - RGB
>+rgb \(en RGB
> .RE
> .RS
>-cmyk - CMYK
>+cmyk \(en CMYK
> .RE
> .RS
>-lab - L*a*b
>+lab \(en L*a*b
> .RE
> .RS
>-icc - ICC Based
>+icc \(en ICC Based
> .RE
> .RS
>-index - Indexed Color
>+index \(en Indexed Color
> .RE
> .RS
>-sep - Separation
>+sep \(en Separation
> .RE
> .RS
>-devn - DeviceN
>+devn \(en DeviceN
> .RE
> .TP
> .B comp
>@@ -173,19 +196,20 @@ bits per component
> encoding:
> .PP
> .RS
>-image - raster image (may be Flate or LZW compressed but does not use an image encoding)
>+image \(en raster image (may be Flate or LZW compressed but does not
>+use an image encoding)
> .RE
> .RS
>-jpeg - Joint Photographic Experts Group
>+jpeg \(en Joint Photographic Experts Group
> .RE
> .RS
>-jp2 - JPEG2000
>+jp2 \(en JPEG2000
> .RE
> .RS
>-jbig2 - Joint Bi-Level Image Experts Group
>+jbig2 \(en Joint Bi-Level Image Experts Group
> .RE
> .RS
>-ccitt - CCITT Group 3 or Group 4 Fax
>+ccitt \(en CCITT Group 3 or Group 4 Fax
> .RE
> .TP
> .B interp
>@@ -194,22 +218,31 @@ ccitt - CCITT Group 3 or Group 4 Fax
> .B object ID
> the image dictionary object ID (number and generation)
> .TP
>-.B x\-ppi
>-The horizontal resolution of the image (in pixels per inch) when rendered on the pdf page.
>+.B x-ppi
>+The horizontal resolution of the image (in pixels per inch) when
>+rendered on the pdf page.
> .TP
>-.B y\-ppi
>-The vertical resolution of the image (in pixels per inch) when rendered on the pdf page.
>+.B y-ppi
>+The vertical resolution of the image (in pixels per inch) when
>+rendered on the pdf page.
> .TP
> .B size
>-The size of the embedded image in the pdf file. The following suffixes are used: 'B' bytes, 'K' kilobytes, 'M' megabytes, and 'G' gigabytes.
>+The size of the embedded image in the pdf file.
>+.\" FIXME
>+.\" The suffixes should contain the unit, so 'kB', 'MB', 'GB' if the
>+.\" prefixes mean SI (metric, decimal), otherwise 'KiB', 'MiB', 'GiB' if they
>+.\" mean binary prefixes.
>+.\" Fix the corresponding pdfimages.c file
>+The following suffixes are used: 'B' bytes, 'K' kilobytes, 'M'
>+megabytes, and 'G' gigabytes.
> .TP
> .B ratio
> The compression ratio of the embedded image.
> .RE
> .TP
> .BI \-opw " password"
>-Specify the owner password for the PDF file.  Providing this will
>-bypass all security restrictions.
>+Specify the owner password for the PDF file.
>+Providing this will bypass all security restrictions.
> .TP
> .BI \-upw " password"
> Specify the user password for the PDF file.
>@@ -247,7 +280,7 @@ Error related to PDF permissions.
> 99
> Other error.
> .SH AUTHOR
>-The pdfimages software and documentation are copyright 1998-2011 Glyph
>+The pdfimages software and documentation are copyright 1998\(en2011 Glyph
> & Cog, LLC.
> .SH "SEE ALSO"
> .BR pdfdetach (1)
>diff -auprd --recursive -- poppler-0.26.2/utils/pdfinfo.1 develop/utils/pdfinfo.1
>--- poppler-0.26.2/utils/pdfinfo.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdfinfo.1	2014-07-18 00:16:18.000000000 +0000
>@@ -1,4 +1,7 @@
> .\" Copyright 1999-2011 Glyph & Cog, LLC
>+.\" Do not use dirctional quotes (non-ASCII)
>+.\" print ' as a quotesingle (apostrophe quote)
>+.tr '\(aq
> .TH pdfinfo 1 "15 August 2011"
> .SH NAME
> pdfinfo \- Portable Document Format (PDF) document information
>@@ -9,10 +12,10 @@ extractor (version 3.03)
> .RI [ PDF-file ]
> .SH DESCRIPTION
> .B Pdfinfo
>-prints the contents of the \'Info' dictionary (plus some other useful
>+prints the contents of the 'Info' dictionary (plus some other useful
> information) from a Portable Document Format (PDF) file.
> .PP
>-The \'Info' dictionary contains the following values:
>+The 'Info' dictionary contains the following values:
> .PP
> .RS
> title
>@@ -93,14 +96,15 @@ TrimBox, and ArtBox.
> Prints document-level metadata.  (This is the "Metadata" stream from
> the PDF file's Catalog object.)
> .TP
>-+.B \-js
>-+Prints all JavaScript in the PDF.
>-+.TP
>+.B \-js
>+Prints all JavaScript in the PDF.
>+.TP
> .B \-rawdates
> Prints the raw (undecoded) date strings, directly from the PDF file.
> .TP
> .BI \-enc " encoding-name"
>-Sets the encoding to use for text output. This defaults to "UTF-8".
>+Sets the encoding to use for text output.
>+This defaults to "UTF-8".
> .TP
> .B \-listenc
> Lits the available encodings
>@@ -139,7 +143,7 @@ Error related to PDF permissions.
> 99
> Other error.
> .SH AUTHOR
>-The pdfinfo software and documentation are copyright 1996-2011 Glyph &
>+The pdfinfo software and documentation are copyright 1996\(en2011 Glyph &
> Cog, LLC.
> .SH "SEE ALSO"
> .BR pdfdetach (1),
>diff -auprd --recursive -- poppler-0.26.2/utils/pdfseparate.1 develop/utils/pdfseparate.1
>--- poppler-0.26.2/utils/pdfseparate.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdfseparate.1	2014-07-18 00:16:36.000000000 +0000
>@@ -22,10 +22,12 @@ The PDF-file should not be encrypted.
> .SH OPTIONS
> .TP
> .BI \-f " number"
>-Specifies the first page to extract. If \-f is omitted, extraction starts with page 1.
>+Specifies the first page to extract.
>+If \-f is omitted, extraction starts with page 1.
> .TP
> .BI \-l " number"
>-Specifies the last page to extract. If \-l is omitted, extraction ends with the last page.
>+Specifies the last page to extract.
>+If \-l is omitted, extraction ends with the last page.
> .TP
> .B \-v
> Print copyright and version information.
>@@ -39,11 +41,13 @@ are equivalent.)
> .SH EXAMPLE
> pdfseparate sample.pdf sample-%d.pdf
> .TP
>-extracts all pages from sample.pdf, if i.e. sample.pdf has 3 pages, it produces
>+extracts all pages from sample.pdf, if i.e.\& sample.pdf has 3 pages,
>+it produces
> .TP
> sample-1.pdf, sample-2.pdf, sample-3.pdf
> .SH AUTHOR
>-The pdfseparate software and documentation are copyright 1996-2004 Glyph
>-& Cog, LLC and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
>+The pdfseparate software and documentation are copyright 1996\(en2004
>+Glyph & Cog, LLC and copyright 2005\(en2011 The Poppler Developers \(en
>+http://poppler.freedesktop.org
> .SH "SEE ALSO"
>-.BR pdfunite (1),
>+.BR pdfunite (1)
>diff -auprd --recursive -- poppler-0.26.2/utils/pdftocairo.1 develop/utils/pdftocairo.1
>--- poppler-0.26.2/utils/pdftocairo.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdftocairo.1	2014-07-18 00:17:00.000000000 +0000
>@@ -1,14 +1,17 @@
>-.TH pdftoppm 1
>+.TH pdftocairo 1
> .SH NAME
>-pdftocairo \- Portable Document Format (PDF) to PNG/JPEG/TIFF/PDF/PS/EPS/SVG using cairo
>+pdftocairo \- Portable Document Format (PDF) to
>+PNG/JPEG/TIFF/PDF/PS/EPS/SVG using cairo
> .SH SYNOPSIS
> .B pdftocairo
> [options]
>-.IR PDF-file
>+.I PDF-file
> .RI [ output-file ]
> .SH DESCRIPTION
> .B pdftocairo
>-converts Portable Document Format (PDF) files, using the cairo output device of the poppler PDF library, to any of the following output formats:
>+converts Portable Document Format (PDF) files, using the cairo output
>+device of the poppler PDF library, to any of the following output
>+formats:
> .IP \(bu
> Portable Network Graphics (PNG)
> .IP \(bu
>@@ -22,75 +25,83 @@ PostScript (PS)
> .IP \(bu
> Encapsulated PostScript (EPS)
> .IP \(bu
>-Scalable Vector Graphics (SVG)
>+Scalable Vector Graphics (SVG).
> .PP
> .B pdftocairo
> reads the PDF file,
> .IR PDF-file ,
> and writes to
> .IR output-file .
>-The image formats (PNG, JPEG, and TIFF) generate one file per page with the page number and file type appended to
>-.IR output-file
>+The image formats (PNG, JPEG, and TIFF) generate one file per page
>+with the page number and file type appended to
>+.I output-file
> (except when \-singlefile is used).
>-When the output format is a vector format (PDF, PS, EPS, and SVG) or when \-singlefile is used,
>-.IR output-file
>+When the output format is a vector format (PDF, PS, EPS, or SVG) or
>+when \-singlefile is used,
>+.I output-file
> is the full filename.
>-
> If the
>-.IR PDF-file
>-is \*(lq\-\*(rq , the PDF is read from stdin.
>+.I PDF-file
>+is \*(lq\-\*(rq, the PDF is read from stdin.
> If the
>-.IR output-file
>-is \*(lq\-\*(rq , the output file will be written to stdout. Using stdout is not valid with image formats unless \-singlefile is used.
>+.I output-file
>+is \*(lq\-\*(rq, the output file will be written to stdout.
>+Using stdout is not valid with image formats unless \-singlefile is used.
> If
>-.IR output-file
>+.I output-file
> is not used, the output filename will be derived from the
>-.IR PDF-file
>+.I PDF-file
> filename.
> .PP
>-Not all options are valid with all output formats. One (and only one) of the output format options (\-png, \-jpeg, \-tiff, \-pdf, \-ps, \-eps, or \-svg) must be used.
>+Not all options are valid with all output formats.
>+One (and only one) of the output format options (\-png, \-jpeg,
>+\-tiff, \-pdf, \-ps, \-eps, or \-svg) must be used.
> .PP
> The resolution options (\-r, \-rx, \-ry) set the resolution of the
>-image output formats. The image dimensions will depend on the PDF page
>-size and the resolution. For the vector outputs, regions of the page
>-that can not be represented natively in the output format (eg
>-translucency in PS) will be rasterized at the resolution specified by
>-the resolution options.
>+image output formats.
>+The image dimensions will depend on the PDF page size and the
>+resolution.
>+For the vector outputs, regions of the page that can not be
>+represented natively in the output format (eg.\& translucency in PS)
>+will be rasterized at the resolution specified by the resolution
>+options.
> .PP
>-The \-scale-to options may be used to set a fixed image size. The
>-image resolution will vary with the page size.
>+The \-scale-to options may be used to set a fixed image size.
>+The image resolution will vary with the page size.
> .PP
> The cropping options (\-x, \-y, \-W, and \-H) use units of pixels with
> the image formats and PostScript points (1/72 inch) with the vector
>-formats. When cropping is used with vector output the cropped region is
>+formats.
>+When cropping is used with vector output the cropped region is
> centered unless \-nocenter is used in which case the cropped region is
> at the top left (SVG) or bottom left (PDF, PS, EPS).
> .PP
> .SH OPTIONS
> .TP
>-.BI \-png
>-Generates a PNG file(s)
>+.B \-png
>+Generates a PNG file(s).
> .TP
>-.BI \-jpeg
>-Generates a JPEG file(s)
>+.B \-jpeg
>+Generates a JPEG file(s).
> .TP
>-.BI \-tiff
>-Generates a TIFF file(s)
>+.B \-tiff
>+Generates a TIFF file(s).
> .TP
>-.BI \-pdf
>-Generates a PDF file
>+.B \-pdf
>+Generates a PDF file.
> .TP
>-.BI \-ps
>-Generate a PS file
>+.B \-ps
>+Generate a PS file.
> .TP
>-.BI \-eps
>-Generate an EPS file. An EPS file contains a single image, so if you
>-use this option with a multi-page PDF file, you must use \-f and \-l
>-to specify a single page.  The page size options (\-origpagesizes,
>-\-paper, \-paperw, \-paperh) can not be used with this option.
>+.B \-eps
>+Generate an EPS file.
>+An EPS file contains a single image, so if you use this option with a
>+multi-page PDF file, you must use \-f and \-l to specify a single page.
>+The page size options (\-origpagesizes, \-paper, \-paperw, \-paperh)
>+can not be used with this option.
> .TP
>-.BI \-svg
>-Generate a SVG (Scalable Vector Graphics) file
>+.B \-svg
>+Generate a SVG (Scalable Vector Graphics) file.
> .TP
> .BI \-f " number"
> Specifies the first page to convert.
>@@ -104,50 +115,63 @@ Generates only the odd numbered pages.
> .B \-e
> Generates only the even numbered pages.
> .TP
>-.BI \-singlefile
>+.B \-singlefile
> Writes only the first page and does not add digits.
> .TP
> .BI \-r " number"
>-Specifies the X and Y resolution, in pixels per inch of image files (or rasterized regions in vector output). The default is 150 PPI.
>+Specifies the X and Y resolution, in pixels per inch of image files
>+(or rasterized regions in vector output).
>+The default is 150 PPI.
> .TP
> .BI \-rx " number"
>-Specifies the X resolution, in pixels per inch of image files (or rasterized regions in vector output). The default is 150 PPI.
>+Specifies the X resolution, in pixels per inch of image files (or
>+rasterized regions in vector output).
>+The default is 150 PPI.
> .TP
> .BI \-ry " number"
>-Specifies the Y resolution, in pixels per inch of image files (or rasterized regions in vector output). The default is 150 PPI.
>+Specifies the Y resolution, in pixels per inch of image files (or
>+rasterized regions in vector output).
>+The default is 150 PPI.
> .TP
> .BI \-scale-to " number"
> Scales the long side of each page (width for landscape pages, height
>-for portrait pages) to fit in scale-to pixels. The size of the short
>-side will be determined by the aspect ratio of the page (PNG/JPEG/TIFF only).
>+for portrait pages) to fit in scale-to pixels.
>+The size of the short side will be determined by the aspect ratio of
>+the page (PNG/JPEG/TIFF only).
> .TP
> .BI \-scale-to-x " number"
>-Scales each page horizontally to fit in scale-to-x pixels. If
>-scale-to-y is set to -1, the vertical size will determined by the
>+Scales each page horizontally to fit in scale-to-x pixels.
>+If scale-to-y is set to \-1, the vertical size will determined by the
> aspect ratio of the page (PNG/JPEG/TIFF only).
> .TP
> .BI \-scale-to-y " number"
>-Scales each page vertically to fit in scale-to-y pixels. If scale-to-x
>-is set to -1, the horizontal size will determined by the aspect ratio
>-of the page (PNG/JPEG/TIFF only).
>+Scales each page vertically to fit in scale-to-y pixels.
>+If scale-to-x is set to \-1, the horizontal size will determined by
>+the aspect ratio of the page (PNG/JPEG/TIFF only).
> .TP
> .BI \-x " number"
>-Specifies the x-coordinate of the crop area top left corner in pixels (image output) or points (vector output)
>+Specifies the x-coordinate of the crop area top left corner in pixels
>+(image output) or points (vector output).
> .TP
> .BI \-y " number"
>-Specifies the y-coordinate of the crop area top left corner in pixels (image output) or points (vector output)
>+Specifies the y-coordinate of the crop area top left corner in pixels
>+(image output) or points (vector output).
> .TP
> .BI \-W " number"
>-Specifies the width of crop area in pixels (image output) or points (vector output)  (default is 0)
>+Specifies the width of crop area in pixels (image output) or points
>+(vector output) (default is 0).
> .TP
> .BI \-H " number"
>-Specifies the height of crop area in pixels (image output) or points (vector output)  (default is 0)
>+Specifies the height of crop area in pixels (image output) or points
>+(vector output) (default is 0).
> .TP
> .BI \-sz " number"
>-Specifies the size of crop square in pixels (image output) or points (vector output)  (sets \-W and \-H)
>+Specifies the size of crop square in pixels (image output) or points
>+(vector output) (sets \-W and \-H).
> .TP
> .B \-cropbox
>-Uses the crop box rather than media box when generating the files (PNG/JPEG/TIFF only)
>+Uses the crop box rather than media box when generating the files
>+(PNG/JPEG/TIFF only).
> .TP
> .B \-mono
> Generate a monochrome file (PNG and TIFF only).
>@@ -159,55 +183,64 @@ Generate a grayscale file (PNG, JPEG, an
> Use a transparent page color instead of white (PNG and TIFF only).
> .TP
> .BI \-icc " icc-file"
>-Use the specified ICC file as the output profile (PNG only). The profile will be embedded in the PNG file.
>+Use the specified ICC file as the output profile (PNG only).
>+The profile will be embedded in the PNG file.
> .TP
> .B \-level2
> Generate Level 2 PostScript (PS only).
> .TP
> .B \-level3
>-Generate Level 3 PostScript (PS only). This enables all Level 2 features plus
>-shading patterns and masked images. This is the default setting.
>+Generate Level 3 PostScript (PS only).
>+This enables all Level 2 features plus shading patterns and masked
>+images.
>+This is the default setting.
> .TP
> .B \-origpagesizes
> This option is the same as "\-paper match".
> .TP
> .BI \-paper " size"
>-Set the paper size to one of "letter", "legal", "A4", or "A3"
>-(PS,PDF,SVG only).  This can also be set to "match", which will set
>-the paper size of each page to match the size specified in the PDF
>-file. If none the \-paper, \-paperw, or \-paperh options are
>-specified the default is to match the paper size.
>+Set the paper size to one of "letter", "legal", "A4", or "A3" (PS,
>+PDF, and SVG only).
>+This can also be set to "match", which will set the paper size of each
>+page to match the size specified in the PDF file.
>+If none the \-paper, \-paperw, or \-paperh options are specified the
>+default is to match the paper size.
> .TP
> .BI \-paperw " size"
>-Set the paper width, in points (PS,PDF,SVG only).
>+Set the paper width, in points (PS, PDF, and SVG only).
> .TP
> .BI \-paperh " size"
>-Set the paper height, in points (PS,PDF,SVG only).
>+Set the paper height, in points (PS, PDF, and SVG only).
> .TP
> .B \-nocrop
> By default, printing output is cropped to the CropBox specified in the PDF
>-file.  This option disables cropping (PS,PDF,SVG only).
>+file.
>+This option disables cropping (PS, PDF, and SVG only).
> .TP
> .B \-expand
>-Expand PDF pages smaller than the paper to fill the paper (PS,PDF,SVG only).  By
>-default, these pages are not scaled.
>+Expand PDF pages smaller than the paper to fill the paper (PS, PDF,
>+and SVG only).
>+By default, these pages are not scaled.
> .TP
> .B \-noshrink
>-Don't scale PDF pages which are larger than the paper (PS,PDF,SVG only).  By default,
>-pages larger than the paper are shrunk to fit.
>+Don't scale PDF pages which are larger than the paper (PS, PDF, and
>+SVG only).
>+By default, pages larger than the paper are shrunk to fit.
> .TP
> .B \-nocenter
> By default, PDF pages smaller than the paper (after any scaling) are
>-centered on the paper.  This option causes them to be aligned to the
>-lower-left corner of the paper instead (PS,PDF,SVG only).
>+centered on the paper.
>+This option causes them to be aligned to the lower-left corner of the
>+paper instead (PS, PDF, and SVG only).
> .TP
> .B \-duplex
> Adds the %%IncludeFeature: *Duplex DuplexNoTumble DSC comment to the
>-PostScript file (PS only).  This tells the print manager to enable duplexing.
>+PostScript file (PS only).
>+This tells the print manager to enable duplexing.
> .TP
> .BI \-opw " password"
>-Specify the owner password for the PDF file.  Providing this will
>-bypass all security restrictions.
>+Specify the owner password for the PDF file.
>+Providing this will bypass all security restrictions.
> .TP
> .BI \-upw " password"
> Specify the user password for the PDF file.
>@@ -245,8 +278,8 @@ Error related to ICC profile.
> 99
> Other error.
> .SH AUTHOR
>-The pdftocairo software and documentation are copyright 1996-2004 Glyph
>-& Cog, LLC and copyright 2005-2011 The Poppler Developers.
>+The pdftocairo software and documentation are copyright 1996\(en2004 Glyph
>+& Cog, LLC and copyright 2005\(en2011 The Poppler Developers.
> .SH "SEE ALSO"
> .BR pdfdetach (1),
> .BR pdffonts (1),
>@@ -255,4 +288,4 @@ The pdftocairo software and documentatio
> .BR pdftohtml (1),
> .BR pdftoppm (1),
> .BR pdftops (1),
>-.BR pdftotext (1)
>+.BR pdftotext (1).
>diff -auprd --recursive -- poppler-0.26.2/utils/pdftohtml.1 develop/utils/pdftohtml.1
>--- poppler-0.26.2/utils/pdftohtml.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdftohtml.1	2014-07-18 00:17:09.000000000 +0000
>@@ -2,20 +2,20 @@
> .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
> .\" other parms are allowed: see man(7), man(1)
> .SH NAME
>-pdftohtml \- program to convert PDF files into HTML, XML and PNG images
>+pdftohtml \- program to convert PDF files into HTML, XML, and PNG images
> .SH SYNOPSIS
> .B pdftohtml
> .I "[options] <PDF-file> [<HTML-file> <XML-file>]"
> .SH "DESCRIPTION"
> This manual page documents briefly the
>-.BR pdftohtml 
>+.B pdftohtml
> command.
> This manual page was written for the Debian GNU/Linux distribution
> because the original program does not have a manual page.
> .PP
> .B pdftohtml
>-is a program that converts PDF documents into HTML. It generates its output in
>-the current working directory.
>+is a program that converts PDF documents into HTML.
>+It generates its output in the current working directory.
> .SH OPTIONS
> A summary of options are included below.
> .TP
>@@ -35,7 +35,7 @@ do not print any messages or errors
> print copyright and version info
> .TP
> .B \-p
>-exchange .pdf links with .html
>+exchange \&.pdf links with \&.html
> .TP
> .B \-c
> generate complex output
>@@ -47,11 +47,12 @@ generate single HTML that includes all p
> ignore images
> .TP
> .B \-noframes
>-generate no frames. Not supported in complex output mode.
>+generate no frames.
>+Not supported in complex output mode.
> .TP
> .B \-stdout
> use standard output
>-.TP 
>+.TP
> .B \-zoom <fp>
> zoom the PDF document (default 1.5)
> .TP
>@@ -72,8 +73,8 @@ force hidden text extraction
> .TP
> .B \-fmt
> image file format for Splash output (png or jpg).
>-If complex is selected, but \-fmt is not specified,
>-\-fmt png will be assumed
>+If complex is selected, but \-fmt is not specified, \-fmt png will be
>+assumed.
> .TP
> .B \-nomerge
> do not merge paragraphs
>@@ -82,18 +83,16 @@ do not merge paragraphs
> override document DRM settings
> .TP
> .B \-wbt <fp>
>-adjust the word break threshold percent. Default is 10.
>+adjust the word break threshold percent.
>+Default is 10.
> Word break occurs when distance between two adjacent characters is
> greater than this percent of character height.
> .TP
> .B \-fontfullname
> outputs the font name without any substitutions.
>-
> .SH AUTHOR
>-
>-Pdftohtml was developed by Gueorgui Ovtcharov and Rainer Dorsch. It is
>-based and benefits a lot from Derek Noonburg's xpdf package.
>-
>+Pdftohtml was developed by Gueorgui Ovtcharov and Rainer Dorsch.
>+It is based and benefits a lot from Derek Noonburg's xpdf package.
> This manual page was written by SÃ¸ren Boll Overgaard <boll@debian.org>,
> for the Debian GNU/Linux system (but may be used by others).
> .SH "SEE ALSO"
>diff -auprd --recursive -- poppler-0.26.2/utils/pdftoppm.1 develop/utils/pdftoppm.1
>--- poppler-0.26.2/utils/pdftoppm.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdftoppm.1	2014-07-06 22:23:22.000000000 +0000
>@@ -35,7 +35,7 @@ Generates only the odd numbered pages.
> .B \-e
> Generates only the even numbered pages.
> .TP
>-.BI \-singlefile
>+.B \-singlefile
> Writes only the first page and does not add digits.
> .TP
> .BI \-r " number"
>@@ -49,17 +49,17 @@ Specifies the Y resolution, in DPI.  The
> .TP
> .BI \-scale-to " number"
> Scales the long side of each page (width for landscape pages, height
>-for portrait pages) to fit in scale-to pixels. The size of the short
>+for portrait pages) to fit in scale-to pixels.  The size of the short
> side will be determined by the aspect ratio of the page.
> .TP
> .BI \-scale-to-x " number"
>-Scales each page horizontally to fit in scale-to-x pixels. If
>-scale-to-y is set to -1, the vertical size will determined by the
>+Scales each page horizontally to fit in scale-to-x pixels.
>+If scale-to-y is set to \-1, the vertical size will determined by the
> aspect ratio of the page.
> .TP
> .BI \-scale-to-y " number"
>-Scales each page vertically to fit in scale-to-y pixels. If scale-to-x
>-is set to -1, the horizontal size will determined by the aspect ratio
>+Scales each page vertically to fit in scale-to-y pixels.  If scale-to-x
>+is set to \-1, the horizontal size will determined by the aspect ratio
> of the page.
> .TP
> .BI \-x " number"
>@@ -103,14 +103,14 @@ Enable or disable FreeType (a TrueType /
> This defaults to "yes".
> .TP
> .BI \-thinlinemode " none | solid | shape"
>-Specifies the thin line mode. This defaults to "none".
>+Specifies the thin line mode.  This defaults to "none".
> .TP
>-"solid": 
>-adjust lines with a width less than one pixel to pixel boundary 
>+"solid":
>+adjust lines with a width less than one pixel to pixel boundary
> and paint it with a width of one pixel.
> .TP
>-"shape": 
>-adjust lines with a width less than one pixel to pixel boundary 
>+"shape":
>+adjust lines with a width less than one pixel to pixel boundary
> and paint it with a width of one pixel but with a shape in proportion
> to its width.
> .TP
>@@ -157,7 +157,7 @@ Error related to PDF permissions.
> 99
> Other error.
> .SH AUTHOR
>-The pdftoppm software and documentation are copyright 1996-2011 Glyph
>+The pdftoppm software and documentation are copyright 1996\(en2011 Glyph
> & Cog, LLC.
> .SH "SEE ALSO"
> .BR pdfdetach (1),
>diff -auprd --recursive -- poppler-0.26.2/utils/pdftops.1 develop/utils/pdftops.1
>--- poppler-0.26.2/utils/pdftops.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdftops.1	2014-07-18 00:20:10.000000000 +0000
>@@ -1,4 +1,6 @@
> .\" Copyright 1996-2011 Glyph & Cog, LLC
>+.\" Use nondirectional single quotes (quotesingle, apostrophe quote)
>+.tr '\(aq
> .TH pdftops 1 "15 August 2011"
> .SH NAME
> pdftops \- Portable Document Format (PDF) to PostScript converter
>@@ -6,8 +8,8 @@ pdftops \- Portable Document Format (PDF
> .SH SYNOPSIS
> .B pdftops
> [options]
>-.RI <PDF-file>
>-.RI [<PS-file>]
>+.I <PDF-file>
>+.RI [ <PS-file> ]
> .SH DESCRIPTION
> .B Pdftops
> converts Portable Document Format (PDF) files to PostScript so they
>@@ -27,7 +29,7 @@ to
> .I file.eps
> with the \-eps option).  If
> .I PS-file
>-is \'-', the PostScript is sent to stdout.
>+is '\-', the PostScript is sent to stdout.
> .SH OPTIONS
> .TP
> .BI \-f " number"
>@@ -76,8 +78,7 @@ Generate a PostScript form which can be
> understands forms.  A form contains a single page, so if you use this
> option with a multi-page PDF file, you must use \-f and \-l to specify a
> single page.  The \-level1 option cannot be used with \-form.  No more
>-than one of the mode options (\-eps, \-form) may be
>-given.
>+than one of the mode options (\-eps, \-form) may be given.
> .TP
> .B \-opi
> Generate OPI comments for all images and forms which have OPI
>@@ -132,10 +133,11 @@ through to the PostScript file.
> preload images and forms
> .TP
> .BI \-paper " size"
>-Set the paper size to one of "letter", "legal", "A4", or "A3".  This
>-can also be set to "match", which will set the paper size of each page to match the
>-size specified in the PDF file. If none the \-paper, \-paperw, or \-paperh
>-options are spoecified the default is to match the paper size.
>+Set the paper size to one of "letter", "legal", "A4", or "A3".
>+This can also be set to "match", which will set the paper size of each
>+page to match the size specified in the PDF file.
>+If none the \-paper, \-paperw, or \-paperh options are specified the
>+default is to match the paper size.
> .TP
> .BI \-paperw " size"
> Set the paper width, in points.
>@@ -151,8 +153,8 @@ By default, output is cropped to the Cro
> file.  This option disables cropping.
> .TP
> .B \-expand
>-Expand PDF pages smaller than the paper to fill the paper.  By
>-default, these pages are not scaled.
>+Expand PDF pages smaller than the paper to fill the paper.
>+By default, these pages are not scaled.
> .TP
> .B \-noshrink
> Don't scale PDF pages which are larger than the paper.  By default,
>@@ -204,7 +206,7 @@ Error related to PDF permissions.
> 99
> Other error.
> .SH AUTHOR
>-The pdftops software and documentation are copyright 1996-2011 Glyph &
>+The pdftops software and documentation are copyright 1996\(en2011 Glyph &
> Cog, LLC.
> .SH "SEE ALSO"
> .BR pdfdetach (1),
>diff -auprd --recursive -- poppler-0.26.2/utils/pdftotext.1 develop/utils/pdftotext.1
>--- poppler-0.26.2/utils/pdftotext.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdftotext.1	2014-07-18 00:20:33.000000000 +0000
>@@ -1,13 +1,15 @@
> .\" Copyright 1997-2011 Glyph & Cog, LLC
> .TH pdftotext 1 "15 August 2011"
>+.\" Use nondirectional single quotes (quotesingle, apostrophe quote)
>+.tr '\(aq
> .SH NAME
> pdftotext \- Portable Document Format (PDF) to text converter
> (version 3.03)
> .SH SYNOPSIS
> .B pdftotext
> [options]
>-.RI [ PDF-file
>-.RI [ text-file ]]
>+.I PDF-file
>+.RI [ text-file ]
> .SH DESCRIPTION
> .B Pdftotext
> converts Portable Document Format (PDF) files to plain text.
>@@ -22,9 +24,9 @@ is not specified, pdftotext converts
> .I file.pdf
> to
> .IR file.txt .
>-If 
>+If
> .I text-file
>-is \'-', the text is sent to stdout.
>+is '\-', the text is sent to stdout.
> .SH OPTIONS
> .TP
> .BI \-f " number"
>@@ -50,8 +52,8 @@ Specifies the height of crop area in pix
> .TP
> .B \-layout
> Maintain (as best as possible) the original physical layout of the
>-text.  The default is to \'undo' physical layout (columns,
>-hyphenation, etc.) and output the text in reading order.
>+text.  The default is to 'undo' physical layout (columns,
>+hyphenation, etc.\&) and output the text in reading order.
> .TP
> .BI \-fixed " number"
> Assume fixed-pitch (or tabular) text, with the specified character
>@@ -72,7 +74,7 @@ Generate an XHTML file containing boundi
> word in the file.
> .TP
> .BI \-enc " encoding-name"
>-Sets the encoding to use for text output. This defaults to "UTF-8".
>+Sets the encoding to use for text output.  This defaults to "UTF-8".
> .TP
> .B \-listenc
> Lits the available encodings
>@@ -124,7 +126,7 @@ Error related to PDF permissions.
> 99
> Other error.
> .SH AUTHOR
>-The pdftotext software and documentation are copyright 1996-2011 Glyph
>+The pdftotext software and documentation are copyright 1996\(en2011 Glyph
> & Cog, LLC.
> .SH "SEE ALSO"
> .BR pdfdetach (1),
>diff -auprd --recursive -- poppler-0.26.2/utils/pdfunite.1 develop/utils/pdfunite.1
>--- poppler-0.26.2/utils/pdfunite.1	2014-04-26 15:37:22.000000000 +0000
>+++ develop/utils/pdfunite.1	2014-07-18 00:20:44.000000000 +0000
>@@ -8,7 +8,8 @@ pdfunite \- Portable Document Format (PD
> .I PDF-sourcefile1..PDF-sourcefilen PDF-destfile
> .SH DESCRIPTION
> .B pdfunite
>-merges several PDF (Portable Document Format)  files in order of their occurence on command line to one PDF result file.
>+merges several PDF (Portable Document Format) files in order of their
>+occurrence on command line to one PDF result file.
> .TP
> Neither of the PDF-sourcefile1 to PDF-sourcefilen should be encrypted.
> .SH OPTIONS
>@@ -25,9 +26,11 @@ are equivalent.)
> .SH EXAMPLE
> pdfunite sample1.pdf sample2.pdf sample.pdf
> .TP
>-merges all pages from sample1.pdf and sample2.pdf (in that order) and creates sample.pdf
>+merges all pages from sample1.pdf and sample2.pdf (in that order) and
>+creates sample.pdf
> .SH AUTHOR
>-The pdfunite software and documentation are copyright 1996-2004 Glyph & Cog, LLC
>-and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
>+The pdfunite software and documentation are copyright 1996\(en2004 Glyph
>+& Cog, LLC and copyright 2005\(en2011 The Poppler Developers \(en
>+http://poppler.freedesktop.org
> .SH "SEE ALSO"
> .BR pdfseparate (1),

Actions: View

Attachments on bug 81761: 103471

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.