0001 - update SEE ALSO of man pages
0002 - add Glyph & Cog copyright to pdfmerge & pdfextract man pages
0003 - update .gitignore
0004 - render cairo regtests at 72ppi
>From 4e97d8c59e8902c50d04a7cd20f99d95727ede81 Mon Sep 17 00:00:00 2001
From: Adrian Johnson <[email protected]>
Date: Mon, 19 Sep 2011 21:52:38 +0930
Subject: [PATCH 1/4] utils: Update SEE ALSO section of man pages

---
 utils/pdfextract.1 |    8 ++++++++
 utils/pdffonts.1   |    2 ++
 utils/pdfimages.1  |    2 ++
 utils/pdfinfo.1    |    2 ++
 utils/pdfmerge.1   |    8 ++++++++
 utils/pdftocairo.1 |    2 ++
 utils/pdftohtml.1  |    2 ++
 utils/pdftoppm.1   |    2 ++
 utils/pdftops.1    |    2 ++
 utils/pdftotext.1  |    2 ++
 10 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/utils/pdfextract.1 b/utils/pdfextract.1
index 429e66d..1d35b10 100644
--- a/utils/pdfextract.1
+++ b/utils/pdfextract.1
@@ -45,4 +45,12 @@ sample-1.pdf, sample-2.pdf, sample-3.pdf
 .SH AUTHOR
 The pdfextract software and documentation are copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
 .SH "SEE ALSO"
+.BR pdffonts (1),
+.BR pdfimages (1),
+.BR pdfinfo (1),
 .BR pdfmerge (1),
+.BR pdftocairo (1),
+.BR pdftohtml (1),
+.BR pdftoppm (1),
+.BR pdftops (1),
+.BR pdftotext (1)
diff --git a/utils/pdffonts.1 b/utils/pdffonts.1
index e125cfd..427089a 100644
--- a/utils/pdffonts.1
+++ b/utils/pdffonts.1
@@ -103,8 +103,10 @@ Other error.
 The pdffonts software and documentation are copyright 1996-2004 Glyph
 & Cog, LLC.
 .SH "SEE ALSO"
+.BR pdfextract (1),
 .BR pdfimages (1),
 .BR pdfinfo (1),
+.BR pdfmerge (1),
 .BR pdftocairo (1),
 .BR pdftohtml (1),
 .BR pdftoppm (1),
diff --git a/utils/pdfimages.1 b/utils/pdfimages.1
index 3f9d816..0e801b6 100644
--- a/utils/pdfimages.1
+++ b/utils/pdfimages.1
@@ -78,8 +78,10 @@ Other error.
 The pdfimages software and documentation are copyright 1998-2004 Glyph
 & Cog, LLC.
 .SH "SEE ALSO"
+.BR pdfextract (1),
 .BR pdffonts (1),
 .BR pdfinfo (1),
+.BR pdfmerge (1),
 .BR pdftocairo (1),
 .BR pdftohtml (1),
 .BR pdftoppm (1),
diff --git a/utils/pdfinfo.1 b/utils/pdfinfo.1
index 274767e..238ecee 100644
--- a/utils/pdfinfo.1
+++ b/utils/pdfinfo.1
@@ -130,8 +130,10 @@ Other error.
 The pdfinfo software and documentation are copyright 1996-2004 Glyph &
 Cog, LLC.
 .SH "SEE ALSO"
+.BR pdfextract (1),
 .BR pdffonts (1),
 .BR pdfimages (1),
+.BR pdfmerge (1),
 .BR pdftocairo (1),
 .BR pdftohtml (1),
 .BR pdftoppm (1),
diff --git a/utils/pdfmerge.1 b/utils/pdfmerge.1
index a6571d1..9f3053a 100644
--- a/utils/pdfmerge.1
+++ b/utils/pdfmerge.1
@@ -30,3 +30,11 @@ merges all pages from sample1.pdf and sample2.pdf (in that order) and creates sa
 The pdfmerge software and documentation are copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
 .SH "SEE ALSO"
 .BR pdfextract (1),
+.BR pdffonts (1),
+.BR pdfimages (1),
+.BR pdfinfo (1),
+.BR pdftocairo (1),
+.BR pdftohtml (1),
+.BR pdftoppm (1),
+.BR pdftops (1),
+.BR pdftotext (1)
diff --git a/utils/pdftocairo.1 b/utils/pdftocairo.1
index 1502003..8d96114 100644
--- a/utils/pdftocairo.1
+++ b/utils/pdftocairo.1
@@ -245,9 +245,11 @@ Other error.
 The pdftocairo software and documentation are copyright 1996-2004 Glyph
 & Cog, LLC and copyright 2005-2011 The Poppler Developers.
 .SH "SEE ALSO"
+.BR pdfextract (1),
 .BR pdffonts (1),
 .BR pdfimages (1),
 .BR pdfinfo (1),
+.BR pdfmerge (1),
 .BR pdftohtml (1),
 .BR pdftoppm (1),
 .BR pdftops (1),
diff --git a/utils/pdftohtml.1 b/utils/pdftohtml.1
index f5c6bb6..608494e 100644
--- a/utils/pdftohtml.1
+++ b/utils/pdftohtml.1
@@ -93,9 +93,11 @@ based and benefits a lot from Derek Noonburg's xpdf package.
 This manual page was written by Søren Boll Overgaard <[email protected]>,
 for the Debian GNU/Linux system (but may be used by others).
 .SH "SEE ALSO"
+.BR pdfextract (1),
 .BR pdffonts (1),
 .BR pdfimages (1),
 .BR pdfinfo (1),
+.BR pdfmerge (1),
 .BR pdftocairo (1),
 .BR pdftoppm (1),
 .BR pdftops (1),
diff --git a/utils/pdftoppm.1 b/utils/pdftoppm.1
index e84c87d..b4e8093 100644
--- a/utils/pdftoppm.1
+++ b/utils/pdftoppm.1
@@ -142,9 +142,11 @@ Other error.
 The pdftoppm software and documentation are copyright 1996-2004 Glyph
 & Cog, LLC.
 .SH "SEE ALSO"
+.BR pdfextract (1),
 .BR pdffonts (1),
 .BR pdfimages (1),
 .BR pdfinfo (1),
+.BR pdfmerge (1),
 .BR pdftocairo (1),
 .BR pdftohtml (1),
 .BR pdftops (1),
diff --git a/utils/pdftops.1 b/utils/pdftops.1
index d508f13..78764cc 100644
--- a/utils/pdftops.1
+++ b/utils/pdftops.1
@@ -217,9 +217,11 @@ Other error.
 The pdftops software and documentation are copyright 1996-2004 Glyph &
 Cog, LLC.
 .SH "SEE ALSO"
+.BR pdfextract (1),
 .BR pdffonts (1),
 .BR pdfimages (1),
 .BR pdfinfo (1),
+.BR pdfmerge (1),
 .BR pdftocairo (1),
 .BR pdftohtml (1),
 .BR pdftoppm (1),
diff --git a/utils/pdftotext.1 b/utils/pdftotext.1
index 164e618..bdae427 100644
--- a/utils/pdftotext.1
+++ b/utils/pdftotext.1
@@ -122,9 +122,11 @@ Other error.
 .SH AUTHOR
 The pdftotext software and documentation are copyright 1996-2004 Glyph
 & Cog, LLC.
+.BR pdfextract (1),
 .BR pdffonts (1),
 .BR pdfimages (1),
 .BR pdfinfo (1),
+.BR pdfmerge (1),
 .BR pdftocairo (1),
 .BR pdftohtml (1),
 .BR pdftoppm (1),
-- 
1.7.4.1

>From 5e731c7cf9f01b1440b7de3a19fec9165ae1d49e Mon Sep 17 00:00:00 2001
From: Adrian Johnson <[email protected]>
Date: Mon, 19 Sep 2011 21:57:07 +0930
Subject: [PATCH 2/4] utils: Add Glyph & Cog copyright to pdfmerge and pdfextract man pages

---
 utils/pdfextract.1 |    3 ++-
 utils/pdfmerge.1   |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils/pdfextract.1 b/utils/pdfextract.1
index 1d35b10..4907abe 100644
--- a/utils/pdfextract.1
+++ b/utils/pdfextract.1
@@ -43,7 +43,8 @@ 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 pdfextract software and documentation are copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
+The pdfextract software and documentation are copyright 1996-2004 Glyph
+& Cog, LLC and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
 .SH "SEE ALSO"
 .BR pdffonts (1),
 .BR pdfimages (1),
diff --git a/utils/pdfmerge.1 b/utils/pdfmerge.1
index 9f3053a..26739b1 100644
--- a/utils/pdfmerge.1
+++ b/utils/pdfmerge.1
@@ -27,7 +27,8 @@ pdfmerge sample1.pdf sample2.pdf sample.pdf
 .TP
 merges all pages from sample1.pdf and sample2.pdf (in that order) and creates sample.pdf
 .SH AUTHOR
-The pdfmerge software and documentation are copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
+The pdfmerge software and documentation are copyright 1996-2004 Glyph & Cog, LLC
+and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
 .SH "SEE ALSO"
 .BR pdfextract (1),
 .BR pdffonts (1),
-- 
1.7.4.1

>From 8d70d712bf86679f32978a81cd87987575e5edbd Mon Sep 17 00:00:00 2001
From: Adrian Johnson <[email protected]>
Date: Mon, 19 Sep 2011 22:00:34 +0930
Subject: [PATCH 3/4] Update .gitignore

---
 regtest/.gitignore |    1 +
 utils/.gitignore   |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
 create mode 100644 regtest/.gitignore

diff --git a/regtest/.gitignore b/regtest/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/regtest/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/utils/.gitignore b/utils/.gitignore
index d8a48f4..d18e8c9 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -2,9 +2,11 @@
 .libs
 Makefile
 Makefile.in
+pdfextract
 pdffonts
 pdfimages
 pdfinfo
+pdfmerge
 pdftohtml
 pdftoppm
 pdftops
-- 
1.7.4.1

>From 54a9819e1f4d13596814ea2ee3e5efbcda9e131e Mon Sep 17 00:00:00 2001
From: Adrian Johnson <[email protected]>
Date: Mon, 19 Sep 2011 22:04:27 +0930
Subject: [PATCH 4/4] regtest: render cairo at 72ppi

For consistency with splash. It is faster and easier to compare with splash results.
---
 regtest/backends/cairo.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/regtest/backends/cairo.py b/regtest/backends/cairo.py
index 0ec361f..a990ddf 100644
--- a/regtest/backends/cairo.py
+++ b/regtest/backends/cairo.py
@@ -28,8 +28,8 @@ class Cairo(Backend):
 
     def create_refs(self, doc_path, refs_path):
         out_path = os.path.join(refs_path, 'cairo')
-        p1 = subprocess.Popen([self._pdftocairo, '-cropbox', '-e', '-png', doc_path, out_path], stderr = subprocess.PIPE)
-        p2 = subprocess.Popen([self._pdftocairo, '-cropbox', '-o', '-png', doc_path, out_path], stderr = subprocess.PIPE)
+        p1 = subprocess.Popen([self._pdftocairo, '-cropbox', '-r', '72', '-e', '-png', doc_path, out_path], stderr = subprocess.PIPE)
+        p2 = subprocess.Popen([self._pdftocairo, '-cropbox', '-r', '72', '-o', '-png', doc_path, out_path], stderr = subprocess.PIPE)
         return self._check_exit_status2(p1, p2, out_path)
 
     def _create_diff(self, ref_path, result_path):
-- 
1.7.4.1

_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler

Reply via email to