aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2021-02-12 09:44:12 +0100
committerJay Berkenbilt <ejb@ql.org>2021-02-13 08:30:00 +0100
commit07f40bd25442f25c0af948ae1b0dac7fdff1688c (patch)
tree3fca13d92b02bc3712d98c3c43f9612ae4c56cf1
parent8fbc8579f2481dc3eeb962e99522047291e16fbe (diff)
downloadqpdf-07f40bd25442f25c0af948ae1b0dac7fdff1688c.tar.zst
QUtil::double_to_string: trim trailing zeroes with option to disable
-rw-r--r--ChangeLog12
-rw-r--r--examples/qtest/double-page-size/out.pdf20
-rw-r--r--examples/qtest/filter-tokens/a.pdfbin53518 -> 53344 bytes
-rw-r--r--examples/qtest/filter-tokens/out.pdfbin53518 -> 53344 bytes
-rw-r--r--examples/qtest/overlay-page/out.pdfbin3361 -> 3345 bytes
-rw-r--r--examples/qtest/set-form-values/form-out.pdfbin32268 -> 32259 bytes
-rw-r--r--include/qpdf/QPDFObjectHandle.hh5
-rw-r--r--include/qpdf/QUtil.hh9
-rw-r--r--libqpdf/QPDFObjectHandle.cc11
-rw-r--r--libqpdf/QPDF_Real.cc5
-rw-r--r--libqpdf/QUtil.cc25
-rw-r--r--libqpdf/qpdf/QPDF_Real.hh2
-rw-r--r--libtests/json.cc4
-rw-r--r--libtests/matrix.cc28
-rw-r--r--libtests/qtest/qutil/qutil.out6
-rw-r--r--libtests/qutil.cc12
-rw-r--r--manual/qpdf-manual.xml38
-rw-r--r--qpdf/qpdf-ctest.c2
-rw-r--r--qpdf/qtest/qpdf/appearances-1.pdf400
-rw-r--r--qpdf/qtest/qpdf/appearances-11.pdf400
-rw-r--r--qpdf/qtest/qpdf/appearances-12.pdf400
-rw-r--r--qpdf/qtest/qpdf/appearances-2.pdf400
-rw-r--r--qpdf/qtest/qpdf/appearances-a-more.pdf374
-rw-r--r--qpdf/qtest/qpdf/appearances-a-more2.pdf386
-rw-r--r--qpdf/qtest/qpdf/appearances-a.pdf380
-rw-r--r--qpdf/qtest/qpdf/appearances-b.pdf400
-rw-r--r--qpdf/qtest/qpdf/appearances-quack.pdf400
-rw-r--r--qpdf/qtest/qpdf/boxes-flattened.pdf320
-rw-r--r--qpdf/qtest/qpdf/c-object-handles-out.pdf2
-rw-r--r--qpdf/qtest/qpdf/comment-annotation-direct-out.pdf14
-rw-r--r--qpdf/qtest/qpdf/comment-annotation-out.pdf14
-rw-r--r--qpdf/qtest/qpdf/form-filled-by-acrobat-out.pdf132
-rw-r--r--qpdf/qtest/qpdf/form-xobjects-out.pdf382
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-56.pdf320
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-57.pdf466
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-58.pdf320
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-59.pdf464
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-64.pdf48
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-65.pdf48
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-66.pdf48
-rw-r--r--qpdf/qtest/qpdf/fx-overlay-67.pdf48
-rw-r--r--qpdf/qtest/qpdf/manual-appearances-out.pdf320
-rw-r--r--qpdf/qtest/qpdf/manual-appearances-print-out.pdf316
-rw-r--r--qpdf/qtest/qpdf/manual-appearances-screen-out.pdf316
-rw-r--r--qpdf/qtest/qpdf/need-appearances-more-out.pdf302
-rw-r--r--qpdf/qtest/qpdf/need-appearances-out.pdf302
-rw-r--r--qpdf/qtest/qpdf/sample-form-out.pdf35
-rw-r--r--qpdf/qtest/qpdf/uo-1.pdf688
-rw-r--r--qpdf/qtest/qpdf/uo-2.pdf632
-rw-r--r--qpdf/qtest/qpdf/uo-3.pdf410
-rw-r--r--qpdf/qtest/qpdf/uo-4.pdf262
-rw-r--r--qpdf/qtest/qpdf/uo-5.pdf160
-rw-r--r--qpdf/qtest/qpdf/uo-6.pdf74
-rw-r--r--qpdf/qtest/qpdf/uo-7.pdf320
-rw-r--r--qpdf/test_driver.cc2
55 files changed, 5294 insertions, 5190 deletions
diff --git a/ChangeLog b/ChangeLog
index 169be4f7..ec8fe4bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2021-02-12 Jay Berkenbilt <ejb@ql.org>
+
+ * QUtil::double_to_string: trim trailing zeroes by default, and
+ add option to not trim trailing zeroes. This causes a syntactic
+ but semantically preserving change in output when doubles are
+ converted to strings. The library uses double_to_string in only a
+ few places. In practice, output will be different (trailing zeroes
+ removed) in code that creates form XObjects (mostly generation of
+ appearance streams for form fields as well as overlay and
+ underlay) and in the flatten rotation code that was added in qpdf
+ 10.1.
+
2021-02-10 Jay Berkenbilt <ejb@ql.org>
* Require a C++-14 compiler.
diff --git a/examples/qtest/double-page-size/out.pdf b/examples/qtest/double-page-size/out.pdf
index e27706ca..8642fca2 100644
--- a/examples/qtest/double-page-size/out.pdf
+++ b/examples/qtest/double-page-size/out.pdf
@@ -7,10 +7,10 @@ endobj
<< /Count 2 /Kids [ 3 0 R 4 0 R ] /Type /Pages >>
endobj
3 0 obj
-<< /Contents [ 5 0 R 6 0 R ] /MediaBox [ 0.00 0.00 1224.00 1584.00 ] /Parent 2 0 R /Resources << /Font << /F1 7 0 R >> /ProcSet 8 0 R >> /Type /Page >>
+<< /Contents [ 5 0 R 6 0 R ] /MediaBox [ 0 0 1224 1584 ] /Parent 2 0 R /Resources << /Font << /F1 7 0 R >> /ProcSet 8 0 R >> /Type /Page >>
endobj
4 0 obj
-<< /Contents [ 9 0 R 10 0 R ] /MediaBox [ 0.00 0.00 1224.00 1584.00 ] /Parent 2 0 R /Resources << /Font << /F1 7 0 R >> /ProcSet 8 0 R >> /Type /Page >>
+<< /Contents [ 9 0 R 10 0 R ] /MediaBox [ 0 0 1224 1584 ] /Parent 2 0 R /Resources << /Font << /F1 7 0 R >> /ProcSet 8 0 R >> /Type /Page >>
endobj
5 0 obj
<< /Length 15 >>
@@ -56,14 +56,14 @@ xref
0000000015 00000 n
0000000064 00000 n
0000000129 00000 n
-0000000296 00000 n
-0000000464 00000 n
-0000000528 00000 n
-0000000621 00000 n
-0000000728 00000 n
-0000000758 00000 n
-0000000822 00000 n
+0000000284 00000 n
+0000000440 00000 n
+0000000504 00000 n
+0000000597 00000 n
+0000000704 00000 n
+0000000734 00000 n
+0000000798 00000 n
trailer << /Root 1 0 R /Size 11 /ID [<071a6499182be9cfc990b11d0c4e5bc0><31415926535897932384626433832795>] >>
startxref
-915
+891
%%EOF
diff --git a/examples/qtest/filter-tokens/a.pdf b/examples/qtest/filter-tokens/a.pdf
index ef7cdbce..2b368c7d 100644
--- a/examples/qtest/filter-tokens/a.pdf
+++ b/examples/qtest/filter-tokens/a.pdf
Binary files differ
diff --git a/examples/qtest/filter-tokens/out.pdf b/examples/qtest/filter-tokens/out.pdf
index ef7cdbce..2b368c7d 100644
--- a/examples/qtest/filter-tokens/out.pdf
+++ b/examples/qtest/filter-tokens/out.pdf
Binary files differ
diff --git a/examples/qtest/overlay-page/out.pdf b/examples/qtest/overlay-page/out.pdf
index b589d2c4..2b0bbb2b 100644
--- a/examples/qtest/overlay-page/out.pdf
+++ b/examples/qtest/overlay-page/out.pdf
Binary files differ
diff --git a/examples/qtest/set-form-values/form-out.pdf b/examples/qtest/set-form-values/form-out.pdf
index 5e673533..2e8ff93f 100644
--- a/examples/qtest/set-form-values/form-out.pdf
+++ b/examples/qtest/set-form-values/form-out.pdf
Binary files differ
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index 4c986af7..41646b79 100644
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@@ -476,6 +476,11 @@ class QPDFObjectHandle
static QPDFObjectHandle newReal(std::string const& value);
QPDF_DLL
static QPDFObjectHandle newReal(double value, int decimal_places = 0);
+ // ABI: combine with other newReal by adding trim_trailing_zeroes
+ // above as an optional parameter with a default of true.
+ QPDF_DLL
+ static QPDFObjectHandle newReal(double value, int decimal_places,
+ bool trim_trailing_zeroes);
QPDF_DLL
static QPDFObjectHandle newName(std::string const& name);
QPDF_DLL
diff --git a/include/qpdf/QUtil.hh b/include/qpdf/QUtil.hh
index 5b1f8aae..769c5fd7 100644
--- a/include/qpdf/QUtil.hh
+++ b/include/qpdf/QUtil.hh
@@ -47,9 +47,16 @@ namespace QUtil
QPDF_DLL
std::string int_to_string_base(long long, int base, int length = 0);
QPDF_DLL
- std::string uint_to_string_base(unsigned long long, int base, int length = 0);
+ std::string uint_to_string_base(unsigned long long, int base,
+ int length = 0);
QPDF_DLL
std::string double_to_string(double, int decimal_places = 0);
+ // ABI: combine with other double_to_string by adding
+ // trim_trailing_zeroes above as an optional parameter with a
+ // default of true.
+ QPDF_DLL
+ std::string double_to_string(double, int decimal_places,
+ bool trim_trailing_zeroes);
// These string to number methods throw std::runtime_error on
// underflow/overflow.
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 15907f6e..94875e13 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -2422,7 +2422,16 @@ QPDFObjectHandle::newReal(std::string const& value)
QPDFObjectHandle
QPDFObjectHandle::newReal(double value, int decimal_places)
{
- return QPDFObjectHandle(new QPDF_Real(value, decimal_places));
+ return QPDFObjectHandle(
+ new QPDF_Real(value, decimal_places, true));
+}
+
+QPDFObjectHandle
+QPDFObjectHandle::newReal(double value, int decimal_places,
+ bool trim_trailing_zeroes)
+{
+ return QPDFObjectHandle(
+ new QPDF_Real(value, decimal_places, trim_trailing_zeroes));
}
QPDFObjectHandle
diff --git a/libqpdf/QPDF_Real.cc b/libqpdf/QPDF_Real.cc
index 396ea25f..55f61b35 100644
--- a/libqpdf/QPDF_Real.cc
+++ b/libqpdf/QPDF_Real.cc
@@ -7,8 +7,9 @@ QPDF_Real::QPDF_Real(std::string const& val) :
{
}
-QPDF_Real::QPDF_Real(double value, int decimal_places) :
- val(QUtil::double_to_string(value, decimal_places))
+QPDF_Real::QPDF_Real(double value, int decimal_places,
+ bool trim_trailing_zeroes) :
+ val(QUtil::double_to_string(value, decimal_places, trim_trailing_zeroes))
{
}
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 4b86c0d4..a3fa94f4 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -324,10 +324,17 @@ QUtil::uint_to_string_base(unsigned long long num, int base, int length)
std::string
QUtil::double_to_string(double num, int decimal_places)
{
+ return double_to_string(num, decimal_places, true);
+}
+
+std::string
+QUtil::double_to_string(double num, int decimal_places,
+ bool trim_trailing_zeroes)
+{
// Backward compatibility -- this code used to use sprintf and
// treated decimal_places <= 0 to mean to use the default, which
- // was six decimal places. Also sprintf with %*.f interprets the
- // length as fixed point rather than significant figures.
+ // was six decimal places. Starting in 10.2, we trim trailing
+ // zeroes by default.
if (decimal_places <= 0)
{
decimal_places = 6;
@@ -335,7 +342,19 @@ QUtil::double_to_string(double num, int decimal_places)
std::ostringstream buf;
buf.imbue(std::locale::classic());
buf << std::setprecision(decimal_places) << std::fixed << num;
- return buf.str();
+ std::string result = buf.str();
+ if (trim_trailing_zeroes)
+ {
+ while ((result.length() > 1) && (result.back() == '0'))
+ {
+ result.pop_back();
+ }
+ if ((result.length() > 1) && (result.back() == '.'))
+ {
+ result.pop_back();
+ }
+ }
+ return result;
}
long long
diff --git a/libqpdf/qpdf/QPDF_Real.hh b/libqpdf/qpdf/QPDF_Real.hh
index dbc03de6..793990c0 100644
--- a/libqpdf/qpdf/QPDF_Real.hh
+++ b/libqpdf/qpdf/QPDF_Real.hh
@@ -7,7 +7,7 @@ class QPDF_Real: public QPDFObject
{
public:
QPDF_Real(std::string const& val);
- QPDF_Real(double value, int decimal_places = 0);
+ QPDF_Real(double value, int decimal_places, bool trim_trailing_zeroes);
virtual ~QPDF_Real();
virtual std::string unparse();
virtual JSON getJSON();
diff --git a/libtests/json.cc b/libtests/json.cc
index 1ee7a5d3..d788ab4e 100644
--- a/libtests/json.cc
+++ b/libtests/json.cc
@@ -36,7 +36,7 @@ static void test_main()
" \"a\\tb\",\n"
" null,\n"
" 16059,\n"
- " 3.141590,\n"
+ " 3.14159,\n"
" 2.1e5\n"
"]");
JSON jmap = JSON::makeDictionary();
@@ -56,7 +56,7 @@ static void test_main()
" \"a\\tb\",\n"
" null,\n"
" 16059,\n"
- " 3.141590,\n"
+ " 3.14159,\n"
" 2.1e5\n"
" ],\n"
" \"b\": \"a\\tb\",\n"
diff --git a/libtests/matrix.cc b/libtests/matrix.cc
index 77a058ee..ecaa02a0 100644
--- a/libtests/matrix.cc
+++ b/libtests/matrix.cc
@@ -44,39 +44,39 @@ static void check_rect(QPDFObjectHandle::Rectangle const& r,
int main()
{
QPDFMatrix m;
- check(m, "1.00000 0.00000 0.00000 1.00000 0.00000 0.00000");
+ check(m, "1 0 0 1 0 0");
m.translate(10, 20);
- check(m, "1.00000 0.00000 0.00000 1.00000 10.00000 20.00000");
+ check(m, "1 0 0 1 10 20");
m.scale(1.5, 2);
- check(m, "1.50000 0.00000 0.00000 2.00000 10.00000 20.00000");
+ check(m, "1.5 0 0 2 10 20");
double xp = 0;
double yp = 0;
m.transform(10, 100, xp, yp);
- check_xy(xp, yp, "25.00 220.00");
+ check_xy(xp, yp, "25 220");
m.translate(30, 40);
- check(m, "1.50000 0.00000 0.00000 2.00000 55.00000 100.00000");
+ check(m, "1.5 0 0 2 55 100");
m.transform(10, 100, xp, yp);
- check_xy(xp, yp, "70.00 300.00");
+ check_xy(xp, yp, "70 300");
m.concat(QPDFMatrix(1, 2, 3, 4, 5, 6));
- check(m, "1.50000 4.00000 4.50000 8.00000 62.50000 112.00000");
+ check(m, "1.5 4 4.5 8 62.5 112");
m.rotatex90(90);
- check(m, "4.50000 8.00000 -1.50000 -4.00000 62.50000 112.00000");
+ check(m, "4.5 8 -1.5 -4 62.5 112");
m.rotatex90(180);
- check(m, "-4.50000 -8.00000 1.50000 4.00000 62.50000 112.00000");
+ check(m, "-4.5 -8 1.5 4 62.5 112");
m.rotatex90(270);
- check(m, "-1.50000 -4.00000 -4.50000 -8.00000 62.50000 112.00000");
+ check(m, "-1.5 -4 -4.5 -8 62.5 112");
m.rotatex90(180);
- check(m, "1.50000 4.00000 4.50000 8.00000 62.50000 112.00000");
+ check(m, "1.5 4 4.5 8 62.5 112");
m.rotatex90(12345);
- check(m, "1.50000 4.00000 4.50000 8.00000 62.50000 112.00000");
+ check(m, "1.5 4 4.5 8 62.5 112");
m.transform(240, 480, xp, yp);
- check_xy(xp, yp, "2582.50 4912.00");
+ check_xy(xp, yp, "2582.5 4912");
check(QPDFMatrix(
QPDFObjectHandle::parse(
"[3 1 4 1 5 9.26535]").getArrayAsMatrix()),
- "3.00000 1.00000 4.00000 1.00000 5.00000 9.26535");
+ "3 1 4 1 5 9.26535");
m = QPDFMatrix();
m.rotatex90(90);
diff --git a/libtests/qtest/qutil/qutil.out b/libtests/qtest/qutil/qutil.out
index a5b79e7f..7dded2e3 100644
--- a/libtests/qtest/qutil/qutil.out
+++ b/libtests/qtest/qutil/qutil.out
@@ -9,6 +9,12 @@
0.00012
0.12346
0.00012
+1.0102
+1
+1
+1.00000
+10.00
+10
16059
37273
3ebb
diff --git a/libtests/qutil.cc b/libtests/qutil.cc
index 965c4352..abe05f35 100644
--- a/libtests/qutil.cc
+++ b/libtests/qutil.cc
@@ -117,13 +117,19 @@ void string_conversion_test()
std::cout << QUtil::int_to_string(16059) << std::endl
<< QUtil::int_to_string(16059, 7) << std::endl
<< QUtil::int_to_string(16059, -7) << std::endl
- << QUtil::double_to_string(3.14159) << std::endl
+ << QUtil::double_to_string(3.14159, 0, false) << std::endl
<< QUtil::double_to_string(3.14159, 3) << std::endl
- << QUtil::double_to_string(1000.123, -1024) << std::endl
- << QUtil::double_to_string(.1234, 5) << std::endl
+ << QUtil::double_to_string(1000.123, -1024, false) << std::endl
+ << QUtil::double_to_string(.1234, 5, false) << std::endl
<< QUtil::double_to_string(.0001234, 5) << std::endl
<< QUtil::double_to_string(.123456, 5) << std::endl
<< QUtil::double_to_string(.000123456, 5) << std::endl
+ << QUtil::double_to_string(1.01020, 5, true) << std::endl
+ << QUtil::double_to_string(1.00000, 5, true) << std::endl
+ << QUtil::double_to_string(1, 5, true) << std::endl
+ << QUtil::double_to_string(1, 5, false) << std::endl
+ << QUtil::double_to_string(10, 2, false) << std::endl
+ << QUtil::double_to_string(10, 2, true) << std::endl
<< QUtil::int_to_string_base(16059, 10) << std::endl
<< QUtil::int_to_string_base(16059, 8) << std::endl
<< QUtil::int_to_string_base(16059, 16) << std::endl
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index c14d0bdf..241431b9 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -5070,13 +5070,40 @@ print "\n";
<itemizedlist>
<listitem>
<para>
+ Note: the changes in this section cause differences in
+ output in some cases. These differences change the syntax of
+ the PDF but do not change the semantics (meaning). I make a
+ strong effort to avoid gratuitous changes in qpdf's output
+ so that qpdf changes don't break people's tests. In this
+ case, the changes significantly improve the readability of
+ the generated PDF and don't affect any output that's
+ generated by simple transformation. If you are annoyed by
+ having to update test files, please rest assured that
+ changes like this have been and will continue to be rare
+ events.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<function>QPDFObjectHandle::newUnicodeString</function> now
uses whichever of ASCII, PDFDocEncoding, of UTF-16 is
sufficient to encode all the characters in the string. This
reduces needless encoding in UTF-16 of strings that can be
encoded in ASCII. This change may cause qpdf to generate
different output than before when form field values are set
- using <classname>QPDFFormFieldObjectHelper</classname>.
+ using <classname>QPDFFormFieldObjectHelper</classname> but
+ does not change the meaning of the output.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The code that places form XObjects and also the code that
+ flattens rotations trim trailing zeroes from real numbers
+ that they calculate. This causes slight (but semantically
+ equivalent) differences in generated appearance streams and
+ form XObject invocations in overlay/underlay code or in user
+ code that calls the methods that place form XObjects on a
+ page.
</para>
</listitem>
</itemizedlist>
@@ -5184,6 +5211,15 @@ print "\n";
contents of a file through a pipeline as binary data.
</para>
</listitem>
+ <listitem>
+ <para>
+ Add option to <function>QUtil::double_to_string</function>
+ to trim trailing zeroes, which is on by default. Within the
+ qpdf library, this causes changes to output the from code
+ that places form XObjects and the code that flattens
+ rotations.
+ </para>
+ </listitem>
</itemizedlist>
</listitem>
<listitem>
diff --git a/qpdf/qpdf-ctest.c b/qpdf/qpdf-ctest.c
index 361a2070..2a051171 100644
--- a/qpdf/qpdf-ctest.c
+++ b/qpdf/qpdf-ctest.c
@@ -634,7 +634,7 @@ static void test24(char const* infile,
qpdf_oh_new_name(qpdf, "/Quack"));
qpdf_oh_append_item(
qpdf, new_array,
- qpdf_oh_new_real_from_double(qpdf, 4.0, 2));
+ qpdf_oh_new_real_from_double(qpdf, 4.123, 2));
qpdf_oh_append_item(
qpdf, new_array,
qpdf_oh_new_real_from_string(qpdf, "5.0"));
diff --git a/qpdf/qtest/qpdf/appearances-1.pdf b/qpdf/qtest/qpdf/appearances-1.pdf
index c73afae5..4c33bb48 100644
--- a/qpdf/qtest/qpdf/appearances-1.pdf
+++ b/qpdf/qtest/qpdf/appearances-1.pdf
@@ -483,7 +483,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -492,7 +492,7 @@ endstream
endobj
20 0 obj
-89
+77
endobj
21 0 obj
@@ -872,7 +872,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.175000 Td
+1 4.175 Td
(salad ÷??) Tj
ET
Q
@@ -881,7 +881,7 @@ endstream
endobj
41 0 obj
-95
+85
endobj
42 0 obj
@@ -903,22 +903,22 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 62.100000 62.550000 12.000000 re f
+0 62.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 64.100000 Td
+1 64.1 Td
(1) Tj
-0 -12.000000 Td
+0 -12 Td
(2) Tj
-0 -12.000000 Td
+0 -12 Td
(3) Tj
-0 -12.000000 Td
+0 -12 Td
(4) Tj
-0 -12.000000 Td
+0 -12 Td
(five) Tj
-0 -12.000000 Td
+0 -12 Td
(six) Tj
ET
Q
@@ -927,7 +927,7 @@ endstream
endobj
43 0 obj
-308
+238
endobj
44 0 obj
@@ -950,7 +950,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -959,7 +959,7 @@ endstream
endobj
45 0 obj
-128
+117
endobj
46 0 obj
@@ -982,7 +982,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -991,7 +991,7 @@ endstream
endobj
47 0 obj
-124
+114
endobj
48 0 obj
@@ -1014,7 +1014,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -1023,7 +1023,7 @@ endstream
endobj
49 0 obj
-125
+114
endobj
50 0 obj
@@ -3650,187 +3650,187 @@ xref
0000005238 00000 n
0000005388 00000 n
0000005478 00000 n
-0000005722 00000 n
-0000005742 00000 n
-0000006108 00000 n
-0000006472 00000 n
-0000006838 00000 n
-0000007006 00000 n
-0000007026 00000 n
-0000007264 00000 n
-0000007284 00000 n
-0000007365 00000 n
-0000007533 00000 n
-0000007553 00000 n
-0000007791 00000 n
-0000007811 00000 n
-0000007979 00000 n
-0000007999 00000 n
-0000008237 00000 n
-0000008257 00000 n
-0000008623 00000 n
-0000008987 00000 n
-0000009353 00000 n
-0000009605 00000 n
-0000009625 00000 n
-0000010088 00000 n
-0000010109 00000 n
-0000010392 00000 n
-0000010413 00000 n
-0000010693 00000 n
-0000010714 00000 n
-0000010993 00000 n
-0000011014 00000 n
-0000011346 00000 n
-0000011510 00000 n
-0000016336 00000 n
-0000016358 00000 n
-0000017146 00000 n
-0000017547 00000 n
-0000017998 00000 n
-0000019915 00000 n
-0000020285 00000 n
-0000022199 00000 n
-0000022575 00000 n
-0000022596 00000 n
-0000022764 00000 n
-0000022784 00000 n
-0000023160 00000 n
-0000023181 00000 n
-0000023349 00000 n
-0000023369 00000 n
-0000023745 00000 n
-0000023766 00000 n
-0000023934 00000 n
-0000023954 00000 n
-0000024330 00000 n
-0000024351 00000 n
-0000024519 00000 n
-0000024539 00000 n
-0000024915 00000 n
-0000024936 00000 n
-0000025104 00000 n
-0000025124 00000 n
-0000025500 00000 n
-0000025521 00000 n
-0000025689 00000 n
-0000025709 00000 n
-0000026932 00000 n
-0000026953 00000 n
-0000027066 00000 n
-0000027162 00000 n
-0000027275 00000 n
-0000027371 00000 n
-0000027484 00000 n
-0000027580 00000 n
-0000027676 00000 n
-0000027772 00000 n
-0000027868 00000 n
-0000027964 00000 n
-0000028060 00000 n
-0000028173 00000 n
-0000028269 00000 n
-0000028365 00000 n
-0000028462 00000 n
-0000028559 00000 n
-0000028656 00000 n
-0000028753 00000 n
-0000028850 00000 n
-0000028947 00000 n
-0000029044 00000 n
-0000029141 00000 n
-0000029255 00000 n
-0000029352 00000 n
-0000029449 00000 n
-0000029546 00000 n
-0000029643 00000 n
-0000029740 00000 n
-0000029837 00000 n
-0000029934 00000 n
-0000030031 00000 n
-0000030128 00000 n
-0000030225 00000 n
-0000030339 00000 n
-0000030436 00000 n
-0000030533 00000 n
-0000030630 00000 n
-0000030750 00000 n
-0000030847 00000 n
-0000030944 00000 n
-0000031041 00000 n
-0000031138 00000 n
-0000031235 00000 n
-0000031355 00000 n
-0000031453 00000 n
-0000031551 00000 n
-0000031649 00000 n
-0000031747 00000 n
-0000031845 00000 n
-0000031943 00000 n
-0000032041 00000 n
-0000032139 00000 n
-0000032237 00000 n
-0000032335 00000 n
-0000032433 00000 n
-0000032531 00000 n
-0000032629 00000 n
-0000032727 00000 n
-0000032825 00000 n
-0000033070 00000 n
-0000033831 00000 n
-0000033853 00000 n
-0000034069 00000 n
-0000034313 00000 n
-0000034954 00000 n
-0000034976 00000 n
-0000035191 00000 n
-0000035248 00000 n
-0000035305 00000 n
-0000035362 00000 n
-0000035419 00000 n
-0000035476 00000 n
-0000035533 00000 n
-0000035590 00000 n
-0000035647 00000 n
-0000035704 00000 n
-0000035761 00000 n
-0000035818 00000 n
-0000035875 00000 n
-0000035932 00000 n
-0000035989 00000 n
-0000036046 00000 n
-0000036103 00000 n
-0000036160 00000 n
-0000036217 00000 n
-0000036274 00000 n
-0000036331 00000 n
-0000036388 00000 n
-0000036445 00000 n
-0000036502 00000 n
-0000036559 00000 n
-0000036616 00000 n
-0000036673 00000 n
-0000036730 00000 n
-0000036787 00000 n
-0000036844 00000 n
-0000036901 00000 n
-0000036958 00000 n
-0000037015 00000 n
-0000037072 00000 n
-0000037129 00000 n
-0000037186 00000 n
-0000037243 00000 n
-0000037300 00000 n
-0000037357 00000 n
-0000037414 00000 n
-0000037471 00000 n
-0000037528 00000 n
-0000037585 00000 n
-0000037642 00000 n
-0000037699 00000 n
-0000053981 00000 n
-0000054005 00000 n
-0000065191 00000 n
+0000005710 00000 n
+0000005730 00000 n
+0000006096 00000 n
+0000006460 00000 n
+0000006826 00000 n
+0000006994 00000 n
+0000007014 00000 n
+0000007252 00000 n
+0000007272 00000 n
+0000007353 00000 n
+0000007521 00000 n
+0000007541 00000 n
+0000007779 00000 n
+0000007799 00000 n
+0000007967 00000 n
+0000007987 00000 n
+0000008225 00000 n
+0000008245 00000 n
+0000008611 00000 n
+0000008975 00000 n
+0000009341 00000 n
+0000009583 00000 n
+0000009603 00000 n
+0000009996 00000 n
+0000010017 00000 n
+0000010289 00000 n
+0000010310 00000 n
+0000010580 00000 n
+0000010601 00000 n
+0000010869 00000 n
+0000010890 00000 n
+0000011222 00000 n
+0000011386 00000 n
+0000016212 00000 n
+0000016234 00000 n
+0000017022 00000 n
+0000017423 00000 n
+0000017874 00000 n
+0000019791 00000 n
+0000020161 00000 n
+0000022075 00000 n
+0000022451 00000 n
+0000022472 00000 n
+0000022640 00000 n
+0000022660 00000 n
+0000023036 00000 n
+0000023057 00000 n
+0000023225 00000 n
+0000023245 00000 n
+0000023621 00000 n
+0000023642 00000 n
+0000023810 00000 n
+0000023830 00000 n
+0000024206 00000 n
+0000024227 00000 n
+0000024395 00000 n
+0000024415 00000 n
+0000024791 00000 n
+0000024812 00000 n
+0000024980 00000 n
+0000025000 00000 n
+0000025376 00000 n
+0000025397 00000 n
+0000025565 00000 n
+0000025585 00000 n
+0000026808 00000 n
+0000026829 00000 n
+0000026942 00000 n
+0000027038 00000 n
+0000027151 00000 n
+0000027247 00000 n
+0000027360 00000 n
+0000027456 00000 n
+0000027552 00000 n
+0000027648 00000 n
+0000027744 00000 n
+0000027840 00000 n
+0000027936 00000 n
+0000028049 00000 n
+0000028145 00000 n
+0000028241 00000 n
+0000028338 00000 n
+0000028435 00000 n
+0000028532 00000 n
+0000028629 00000 n
+0000028726 00000 n
+0000028823 00000 n
+0000028920 00000 n
+0000029017 00000 n
+0000029131 00000 n
+0000029228 00000 n
+0000029325 00000 n
+0000029422 00000 n
+0000029519 00000 n
+0000029616 00000 n
+0000029713 00000 n
+0000029810 00000 n
+0000029907 00000 n
+0000030004 00000 n
+0000030101 00000 n
+0000030215 00000 n
+0000030312 00000 n
+0000030409 00000 n
+0000030506 00000 n
+0000030626 00000 n
+0000030723 00000 n
+0000030820 00000 n
+0000030917 00000 n
+0000031014 00000 n
+0000031111 00000 n
+0000031231 00000 n
+0000031329 00000 n
+0000031427 00000 n
+0000031525 00000 n
+0000031623 00000 n
+0000031721 00000 n
+0000031819 00000 n
+0000031917 00000 n
+0000032015 00000 n
+0000032113 00000 n
+0000032211 00000 n
+0000032309 00000 n
+0000032407 00000 n
+0000032505 00000 n
+0000032603 00000 n
+0000032701 00000 n
+0000032946 00000 n
+0000033707 00000 n
+0000033729 00000 n
+0000033945 00000 n
+0000034189 00000 n
+0000034830 00000 n
+0000034852 00000 n
+0000035067 00000 n
+0000035124 00000 n
+0000035181 00000 n
+0000035238 00000 n
+0000035295 00000 n
+0000035352 00000 n
+0000035409 00000 n
+0000035466 00000 n
+0000035523 00000 n
+0000035580 00000 n
+0000035637 00000 n
+0000035694 00000 n
+0000035751 00000 n
+0000035808 00000 n
+0000035865 00000 n
+0000035922 00000 n
+0000035979 00000 n
+0000036036 00000 n
+0000036093 00000 n
+0000036150 00000 n
+0000036207 00000 n
+0000036264 00000 n
+0000036321 00000 n
+0000036378 00000 n
+0000036435 00000 n
+0000036492 00000 n
+0000036549 00000 n
+0000036606 00000 n
+0000036663 00000 n
+0000036720 00000 n
+0000036777 00000 n
+0000036834 00000 n
+0000036891 00000 n
+0000036948 00000 n
+0000037005 00000 n
+0000037062 00000 n
+0000037119 00000 n
+0000037176 00000 n
+0000037233 00000 n
+0000037290 00000 n
+0000037347 00000 n
+0000037404 00000 n
+0000037461 00000 n
+0000037518 00000 n
+0000037575 00000 n
+0000053857 00000 n
+0000053881 00000 n
+0000065067 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3839,5 +3839,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-65215
+65091
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-11.pdf b/qpdf/qtest/qpdf/appearances-11.pdf
index 25a5c95f..58058cf0 100644
--- a/qpdf/qtest/qpdf/appearances-11.pdf
+++ b/qpdf/qtest/qpdf/appearances-11.pdf
@@ -483,7 +483,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -492,7 +492,7 @@ endstream
endobj
20 0 obj
-89
+77
endobj
21 0 obj
@@ -872,7 +872,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.175000 Td
+1 4.175 Td
(salad ÷??) Tj
ET
Q
@@ -881,7 +881,7 @@ endstream
endobj
41 0 obj
-95
+85
endobj
42 0 obj
@@ -903,22 +903,22 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 14.100000 62.550000 12.000000 re f
+0 14.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 64.100000 Td
+1 64.1 Td
(seven) Tj
-0 -12.000000 Td
+0 -12 Td
(eight) Tj
-0 -12.000000 Td
+0 -12 Td
(9) Tj
-0 -12.000000 Td
+0 -12 Td
<3130f7> Tj
-0 -12.000000 Td
+0 -12 Td
(11) Tj
-0 -12.000000 Td
+0 -12 Td
(12) Tj
ET
Q
@@ -927,7 +927,7 @@ endstream
endobj
43 0 obj
-318
+248
endobj
44 0 obj
@@ -950,7 +950,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -959,7 +959,7 @@ endstream
endobj
45 0 obj
-128
+117
endobj
46 0 obj
@@ -982,7 +982,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -991,7 +991,7 @@ endstream
endobj
47 0 obj
-124
+114
endobj
48 0 obj
@@ -1014,7 +1014,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -1023,7 +1023,7 @@ endstream
endobj
49 0 obj
-125
+114
endobj
50 0 obj
@@ -3650,187 +3650,187 @@ xref
0000005239 00000 n
0000005389 00000 n
0000005479 00000 n
-0000005723 00000 n
-0000005743 00000 n
-0000006109 00000 n
-0000006473 00000 n
-0000006839 00000 n
-0000007007 00000 n
-0000007027 00000 n
-0000007265 00000 n
-0000007285 00000 n
-0000007366 00000 n
-0000007534 00000 n
-0000007554 00000 n
-0000007792 00000 n
-0000007812 00000 n
-0000007980 00000 n
-0000008000 00000 n
-0000008238 00000 n
-0000008258 00000 n
-0000008624 00000 n
-0000008988 00000 n
-0000009354 00000 n
-0000009606 00000 n
-0000009626 00000 n
-0000010099 00000 n
-0000010120 00000 n
-0000010403 00000 n
-0000010424 00000 n
-0000010704 00000 n
-0000010725 00000 n
-0000011004 00000 n
-0000011025 00000 n
-0000011357 00000 n
-0000011521 00000 n
-0000016347 00000 n
-0000016369 00000 n
-0000017157 00000 n
-0000017558 00000 n
-0000018009 00000 n
-0000019926 00000 n
-0000020296 00000 n
-0000022210 00000 n
-0000022586 00000 n
-0000022607 00000 n
-0000022775 00000 n
-0000022795 00000 n
-0000023171 00000 n
-0000023192 00000 n
-0000023360 00000 n
-0000023380 00000 n
-0000023756 00000 n
-0000023777 00000 n
-0000023945 00000 n
-0000023965 00000 n
-0000024341 00000 n
-0000024362 00000 n
-0000024530 00000 n
-0000024550 00000 n
-0000024926 00000 n
-0000024947 00000 n
-0000025115 00000 n
-0000025135 00000 n
-0000025511 00000 n
-0000025532 00000 n
-0000025700 00000 n
-0000025720 00000 n
-0000026943 00000 n
-0000026964 00000 n
-0000027077 00000 n
-0000027173 00000 n
-0000027286 00000 n
-0000027382 00000 n
-0000027495 00000 n
-0000027591 00000 n
-0000027687 00000 n
-0000027783 00000 n
-0000027879 00000 n
-0000027975 00000 n
-0000028071 00000 n
-0000028184 00000 n
-0000028280 00000 n
-0000028376 00000 n
-0000028473 00000 n
-0000028570 00000 n
-0000028667 00000 n
-0000028764 00000 n
-0000028861 00000 n
-0000028958 00000 n
-0000029055 00000 n
-0000029152 00000 n
-0000029266 00000 n
-0000029363 00000 n
-0000029460 00000 n
-0000029557 00000 n
-0000029654 00000 n
-0000029751 00000 n
-0000029848 00000 n
-0000029945 00000 n
-0000030042 00000 n
-0000030139 00000 n
-0000030236 00000 n
-0000030350 00000 n
-0000030447 00000 n
-0000030544 00000 n
-0000030641 00000 n
-0000030761 00000 n
-0000030858 00000 n
-0000030955 00000 n
-0000031052 00000 n
-0000031149 00000 n
-0000031246 00000 n
-0000031366 00000 n
-0000031464 00000 n
-0000031562 00000 n
-0000031660 00000 n
-0000031758 00000 n
-0000031856 00000 n
-0000031954 00000 n
-0000032052 00000 n
-0000032150 00000 n
-0000032248 00000 n
-0000032346 00000 n
-0000032444 00000 n
-0000032542 00000 n
-0000032640 00000 n
-0000032738 00000 n
-0000032836 00000 n
-0000033081 00000 n
-0000033842 00000 n
-0000033864 00000 n
-0000034080 00000 n
-0000034324 00000 n
-0000034965 00000 n
-0000034987 00000 n
-0000035202 00000 n
-0000035259 00000 n
-0000035316 00000 n
-0000035373 00000 n
-0000035430 00000 n
-0000035487 00000 n
-0000035544 00000 n
-0000035601 00000 n
-0000035658 00000 n
-0000035715 00000 n
-0000035772 00000 n
-0000035829 00000 n
-0000035886 00000 n
-0000035943 00000 n
-0000036000 00000 n
-0000036057 00000 n
-0000036114 00000 n
-0000036171 00000 n
-0000036228 00000 n
-0000036285 00000 n
-0000036342 00000 n
-0000036399 00000 n
-0000036456 00000 n
-0000036513 00000 n
-0000036570 00000 n
-0000036627 00000 n
-0000036684 00000 n
-0000036741 00000 n
-0000036798 00000 n
-0000036855 00000 n
-0000036912 00000 n
-0000036969 00000 n
-0000037026 00000 n
-0000037083 00000 n
-0000037140 00000 n
-0000037197 00000 n
-0000037254 00000 n
-0000037311 00000 n
-0000037368 00000 n
-0000037425 00000 n
-0000037482 00000 n
-0000037539 00000 n
-0000037596 00000 n
-0000037653 00000 n
-0000037710 00000 n
-0000053992 00000 n
-0000054016 00000 n
-0000065202 00000 n
+0000005711 00000 n
+0000005731 00000 n
+0000006097 00000 n
+0000006461 00000 n
+0000006827 00000 n
+0000006995 00000 n
+0000007015 00000 n
+0000007253 00000 n
+0000007273 00000 n
+0000007354 00000 n
+0000007522 00000 n
+0000007542 00000 n
+0000007780 00000 n
+0000007800 00000 n
+0000007968 00000 n
+0000007988 00000 n
+0000008226 00000 n
+0000008246 00000 n
+0000008612 00000 n
+0000008976 00000 n
+0000009342 00000 n
+0000009584 00000 n
+0000009604 00000 n
+0000010007 00000 n
+0000010028 00000 n
+0000010300 00000 n
+0000010321 00000 n
+0000010591 00000 n
+0000010612 00000 n
+0000010880 00000 n
+0000010901 00000 n
+0000011233 00000 n
+0000011397 00000 n
+0000016223 00000 n
+0000016245 00000 n
+0000017033 00000 n
+0000017434 00000 n
+0000017885 00000 n
+0000019802 00000 n
+0000020172 00000 n
+0000022086 00000 n
+0000022462 00000 n
+0000022483 00000 n
+0000022651 00000 n
+0000022671 00000 n
+0000023047 00000 n
+0000023068 00000 n
+0000023236 00000 n
+0000023256 00000 n
+0000023632 00000 n
+0000023653 00000 n
+0000023821 00000 n
+0000023841 00000 n
+0000024217 00000 n
+0000024238 00000 n
+0000024406 00000 n
+0000024426 00000 n
+0000024802 00000 n
+0000024823 00000 n
+0000024991 00000 n
+0000025011 00000 n
+0000025387 00000 n
+0000025408 00000 n
+0000025576 00000 n
+0000025596 00000 n
+0000026819 00000 n
+0000026840 00000 n
+0000026953 00000 n
+0000027049 00000 n
+0000027162 00000 n
+0000027258 00000 n
+0000027371 00000 n
+0000027467 00000 n
+0000027563 00000 n
+0000027659 00000 n
+0000027755 00000 n
+0000027851 00000 n
+0000027947 00000 n
+0000028060 00000 n
+0000028156 00000 n
+0000028252 00000 n
+0000028349 00000 n
+0000028446 00000 n
+0000028543 00000 n
+0000028640 00000 n
+0000028737 00000 n
+0000028834 00000 n
+0000028931 00000 n
+0000029028 00000 n
+0000029142 00000 n
+0000029239 00000 n
+0000029336 00000 n
+0000029433 00000 n
+0000029530 00000 n
+0000029627 00000 n
+0000029724 00000 n
+0000029821 00000 n
+0000029918 00000 n
+0000030015 00000 n
+0000030112 00000 n
+0000030226 00000 n
+0000030323 00000 n
+0000030420 00000 n
+0000030517 00000 n
+0000030637 00000 n
+0000030734 00000 n
+0000030831 00000 n
+0000030928 00000 n
+0000031025 00000 n
+0000031122 00000 n
+0000031242 00000 n
+0000031340 00000 n
+0000031438 00000 n
+0000031536 00000 n
+0000031634 00000 n
+0000031732 00000 n
+0000031830 00000 n
+0000031928 00000 n
+0000032026 00000 n
+0000032124 00000 n
+0000032222 00000 n
+0000032320 00000 n
+0000032418 00000 n
+0000032516 00000 n
+0000032614 00000 n
+0000032712 00000 n
+0000032957 00000 n
+0000033718 00000 n
+0000033740 00000 n
+0000033956 00000 n
+0000034200 00000 n
+0000034841 00000 n
+0000034863 00000 n
+0000035078 00000 n
+0000035135 00000 n
+0000035192 00000 n
+0000035249 00000 n
+0000035306 00000 n
+0000035363 00000 n
+0000035420 00000 n
+0000035477 00000 n
+0000035534 00000 n
+0000035591 00000 n
+0000035648 00000 n
+0000035705 00000 n
+0000035762 00000 n
+0000035819 00000 n
+0000035876 00000 n
+0000035933 00000 n
+0000035990 00000 n
+0000036047 00000 n
+0000036104 00000 n
+0000036161 00000 n
+0000036218 00000 n
+0000036275 00000 n
+0000036332 00000 n
+0000036389 00000 n
+0000036446 00000 n
+0000036503 00000 n
+0000036560 00000 n
+0000036617 00000 n
+0000036674 00000 n
+0000036731 00000 n
+0000036788 00000 n
+0000036845 00000 n
+0000036902 00000 n
+0000036959 00000 n
+0000037016 00000 n
+0000037073 00000 n
+0000037130 00000 n
+0000037187 00000 n
+0000037244 00000 n
+0000037301 00000 n
+0000037358 00000 n
+0000037415 00000 n
+0000037472 00000 n
+0000037529 00000 n
+0000037586 00000 n
+0000053868 00000 n
+0000053892 00000 n
+0000065078 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3839,5 +3839,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-65226
+65102
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-12.pdf b/qpdf/qtest/qpdf/appearances-12.pdf
index 008dd7a7..5f7f89d4 100644
--- a/qpdf/qtest/qpdf/appearances-12.pdf
+++ b/qpdf/qtest/qpdf/appearances-12.pdf
@@ -483,7 +483,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -492,7 +492,7 @@ endstream
endobj
20 0 obj
-89
+77
endobj
21 0 obj
@@ -872,7 +872,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.175000 Td
+1 4.175 Td
(salad ÷??) Tj
ET
Q
@@ -881,7 +881,7 @@ endstream
endobj
41 0 obj
-95
+85
endobj
42 0 obj
@@ -903,22 +903,22 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 2.100000 62.550000 12.000000 re f
+0 2.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 64.100000 Td
+1 64.1 Td
(seven) Tj
-0 -12.000000 Td
+0 -12 Td
(eight) Tj
-0 -12.000000 Td
+0 -12 Td
(9) Tj
-0 -12.000000 Td
+0 -12 Td
<3130f7> Tj
-0 -12.000000 Td
+0 -12 Td
(11) Tj
-0 -12.000000 Td
+0 -12 Td
(12) Tj
ET
Q
@@ -927,7 +927,7 @@ endstream
endobj
43 0 obj
-317
+247
endobj
44 0 obj
@@ -950,7 +950,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -959,7 +959,7 @@ endstream
endobj
45 0 obj
-128
+117
endobj
46 0 obj
@@ -982,7 +982,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -991,7 +991,7 @@ endstream
endobj
47 0 obj
-124
+114
endobj
48 0 obj
@@ -1014,7 +1014,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -1023,7 +1023,7 @@ endstream
endobj
49 0 obj
-125
+114
endobj
50 0 obj
@@ -3650,187 +3650,187 @@ xref
0000005239 00000 n
0000005389 00000 n
0000005479 00000 n
-0000005723 00000 n
-0000005743 00000 n
-0000006109 00000 n
-0000006473 00000 n
-0000006839 00000 n
-0000007007 00000 n
-0000007027 00000 n
-0000007265 00000 n
-0000007285 00000 n
-0000007366 00000 n
-0000007534 00000 n
-0000007554 00000 n
-0000007792 00000 n
-0000007812 00000 n
-0000007980 00000 n
-0000008000 00000 n
-0000008238 00000 n
-0000008258 00000 n
-0000008624 00000 n
-0000008988 00000 n
-0000009354 00000 n
-0000009606 00000 n
-0000009626 00000 n
-0000010098 00000 n
-0000010119 00000 n
-0000010402 00000 n
-0000010423 00000 n
-0000010703 00000 n
-0000010724 00000 n
-0000011003 00000 n
-0000011024 00000 n
-0000011356 00000 n
-0000011520 00000 n
-0000016346 00000 n
-0000016368 00000 n
-0000017156 00000 n
-0000017557 00000 n
-0000018008 00000 n
-0000019925 00000 n
-0000020295 00000 n
-0000022209 00000 n
-0000022585 00000 n
-0000022606 00000 n
-0000022774 00000 n
-0000022794 00000 n
-0000023170 00000 n
-0000023191 00000 n
-0000023359 00000 n
-0000023379 00000 n
-0000023755 00000 n
-0000023776 00000 n
-0000023944 00000 n
-0000023964 00000 n
-0000024340 00000 n
-0000024361 00000 n
-0000024529 00000 n
-0000024549 00000 n
-0000024925 00000 n
-0000024946 00000 n
-0000025114 00000 n
-0000025134 00000 n
-0000025510 00000 n
-0000025531 00000 n
-0000025699 00000 n
-0000025719 00000 n
-0000026942 00000 n
-0000026963 00000 n
-0000027076 00000 n
-0000027172 00000 n
-0000027285 00000 n
-0000027381 00000 n
-0000027494 00000 n
-0000027590 00000 n
-0000027686 00000 n
-0000027782 00000 n
-0000027878 00000 n
-0000027974 00000 n
-0000028070 00000 n
-0000028183 00000 n
-0000028279 00000 n
-0000028375 00000 n
-0000028472 00000 n
-0000028569 00000 n
-0000028666 00000 n
-0000028763 00000 n
-0000028860 00000 n
-0000028957 00000 n
-0000029054 00000 n
-0000029151 00000 n
-0000029265 00000 n
-0000029362 00000 n
-0000029459 00000 n
-0000029556 00000 n
-0000029653 00000 n
-0000029750 00000 n
-0000029847 00000 n
-0000029944 00000 n
-0000030041 00000 n
-0000030138 00000 n
-0000030235 00000 n
-0000030349 00000 n
-0000030446 00000 n
-0000030543 00000 n
-0000030640 00000 n
-0000030760 00000 n
-0000030857 00000 n
-0000030954 00000 n
-0000031051 00000 n
-0000031148 00000 n
-0000031245 00000 n
-0000031365 00000 n
-0000031463 00000 n
-0000031561 00000 n
-0000031659 00000 n
-0000031757 00000 n
-0000031855 00000 n
-0000031953 00000 n
-0000032051 00000 n
-0000032149 00000 n
-0000032247 00000 n
-0000032345 00000 n
-0000032443 00000 n
-0000032541 00000 n
-0000032639 00000 n
-0000032737 00000 n
-0000032835 00000 n
-0000033080 00000 n
-0000033841 00000 n
-0000033863 00000 n
-0000034079 00000 n
-0000034323 00000 n
-0000034964 00000 n
-0000034986 00000 n
-0000035201 00000 n
-0000035258 00000 n
-0000035315 00000 n
-0000035372 00000 n
-0000035429 00000 n
-0000035486 00000 n
-0000035543 00000 n
-0000035600 00000 n
-0000035657 00000 n
-0000035714 00000 n
-0000035771 00000 n
-0000035828 00000 n
-0000035885 00000 n
-0000035942 00000 n
-0000035999 00000 n
-0000036056 00000 n
-0000036113 00000 n
-0000036170 00000 n
-0000036227 00000 n
-0000036284 00000 n
-0000036341 00000 n
-0000036398 00000 n
-0000036455 00000 n
-0000036512 00000 n
-0000036569 00000 n
-0000036626 00000 n
-0000036683 00000 n
-0000036740 00000 n
-0000036797 00000 n
-0000036854 00000 n
-0000036911 00000 n
-0000036968 00000 n
-0000037025 00000 n
-0000037082 00000 n
-0000037139 00000 n
-0000037196 00000 n
-0000037253 00000 n
-0000037310 00000 n
-0000037367 00000 n
-0000037424 00000 n
-0000037481 00000 n
-0000037538 00000 n
-0000037595 00000 n
-0000037652 00000 n
-0000037709 00000 n
-0000053991 00000 n
-0000054015 00000 n
-0000065201 00000 n
+0000005711 00000 n
+0000005731 00000 n
+0000006097 00000 n
+0000006461 00000 n
+0000006827 00000 n
+0000006995 00000 n
+0000007015 00000 n
+0000007253 00000 n
+0000007273 00000 n
+0000007354 00000 n
+0000007522 00000 n
+0000007542 00000 n
+0000007780 00000 n
+0000007800 00000 n
+0000007968 00000 n
+0000007988 00000 n
+0000008226 00000 n
+0000008246 00000 n
+0000008612 00000 n
+0000008976 00000 n
+0000009342 00000 n
+0000009584 00000 n
+0000009604 00000 n
+0000010006 00000 n
+0000010027 00000 n
+0000010299 00000 n
+0000010320 00000 n
+0000010590 00000 n
+0000010611 00000 n
+0000010879 00000 n
+0000010900 00000 n
+0000011232 00000 n
+0000011396 00000 n
+0000016222 00000 n
+0000016244 00000 n
+0000017032 00000 n
+0000017433 00000 n
+0000017884 00000 n
+0000019801 00000 n
+0000020171 00000 n
+0000022085 00000 n
+0000022461 00000 n
+0000022482 00000 n
+0000022650 00000 n
+0000022670 00000 n
+0000023046 00000 n
+0000023067 00000 n
+0000023235 00000 n
+0000023255 00000 n
+0000023631 00000 n
+0000023652 00000 n
+0000023820 00000 n
+0000023840 00000 n
+0000024216 00000 n
+0000024237 00000 n
+0000024405 00000 n
+0000024425 00000 n
+0000024801 00000 n
+0000024822 00000 n
+0000024990 00000 n
+0000025010 00000 n
+0000025386 00000 n
+0000025407 00000 n
+0000025575 00000 n
+0000025595 00000 n
+0000026818 00000 n
+0000026839 00000 n
+0000026952 00000 n
+0000027048 00000 n
+0000027161 00000 n
+0000027257 00000 n
+0000027370 00000 n
+0000027466 00000 n
+0000027562 00000 n
+0000027658 00000 n
+0000027754 00000 n
+0000027850 00000 n
+0000027946 00000 n
+0000028059 00000 n
+0000028155 00000 n
+0000028251 00000 n
+0000028348 00000 n
+0000028445 00000 n
+0000028542 00000 n
+0000028639 00000 n
+0000028736 00000 n
+0000028833 00000 n
+0000028930 00000 n
+0000029027 00000 n
+0000029141 00000 n
+0000029238 00000 n
+0000029335 00000 n
+0000029432 00000 n
+0000029529 00000 n
+0000029626 00000 n
+0000029723 00000 n
+0000029820 00000 n
+0000029917 00000 n
+0000030014 00000 n
+0000030111 00000 n
+0000030225 00000 n
+0000030322 00000 n
+0000030419 00000 n
+0000030516 00000 n
+0000030636 00000 n
+0000030733 00000 n
+0000030830 00000 n
+0000030927 00000 n
+0000031024 00000 n
+0000031121 00000 n
+0000031241 00000 n
+0000031339 00000 n
+0000031437 00000 n
+0000031535 00000 n
+0000031633 00000 n
+0000031731 00000 n
+0000031829 00000 n
+0000031927 00000 n
+0000032025 00000 n
+0000032123 00000 n
+0000032221 00000 n
+0000032319 00000 n
+0000032417 00000 n
+0000032515 00000 n
+0000032613 00000 n
+0000032711 00000 n
+0000032956 00000 n
+0000033717 00000 n
+0000033739 00000 n
+0000033955 00000 n
+0000034199 00000 n
+0000034840 00000 n
+0000034862 00000 n
+0000035077 00000 n
+0000035134 00000 n
+0000035191 00000 n
+0000035248 00000 n
+0000035305 00000 n
+0000035362 00000 n
+0000035419 00000 n
+0000035476 00000 n
+0000035533 00000 n
+0000035590 00000 n
+0000035647 00000 n
+0000035704 00000 n
+0000035761 00000 n
+0000035818 00000 n
+0000035875 00000 n
+0000035932 00000 n
+0000035989 00000 n
+0000036046 00000 n
+0000036103 00000 n
+0000036160 00000 n
+0000036217 00000 n
+0000036274 00000 n
+0000036331 00000 n
+0000036388 00000 n
+0000036445 00000 n
+0000036502 00000 n
+0000036559 00000 n
+0000036616 00000 n
+0000036673 00000 n
+0000036730 00000 n
+0000036787 00000 n
+0000036844 00000 n
+0000036901 00000 n
+0000036958 00000 n
+0000037015 00000 n
+0000037072 00000 n
+0000037129 00000 n
+0000037186 00000 n
+0000037243 00000 n
+0000037300 00000 n
+0000037357 00000 n
+0000037414 00000 n
+0000037471 00000 n
+0000037528 00000 n
+0000037585 00000 n
+0000053867 00000 n
+0000053891 00000 n
+0000065077 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3839,5 +3839,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-65225
+65101
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-2.pdf b/qpdf/qtest/qpdf/appearances-2.pdf
index 79d96606..813a5299 100644
--- a/qpdf/qtest/qpdf/appearances-2.pdf
+++ b/qpdf/qtest/qpdf/appearances-2.pdf
@@ -483,7 +483,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -492,7 +492,7 @@ endstream
endobj
20 0 obj
-89
+77
endobj
21 0 obj
@@ -872,7 +872,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.175000 Td
+1 4.175 Td
(salad ÷??) Tj
ET
Q
@@ -881,7 +881,7 @@ endstream
endobj
41 0 obj
-95
+85
endobj
42 0 obj
@@ -903,22 +903,22 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 50.100000 62.550000 12.000000 re f
+0 50.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 64.100000 Td
+1 64.1 Td
(1) Tj
-0 -12.000000 Td
+0 -12 Td
(2) Tj
-0 -12.000000 Td
+0 -12 Td
(3) Tj
-0 -12.000000 Td
+0 -12 Td
(4) Tj
-0 -12.000000 Td
+0 -12 Td
(five) Tj
-0 -12.000000 Td
+0 -12 Td
(six) Tj
ET
Q
@@ -927,7 +927,7 @@ endstream
endobj
43 0 obj
-308
+238
endobj
44 0 obj
@@ -950,7 +950,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -959,7 +959,7 @@ endstream
endobj
45 0 obj
-128
+117
endobj
46 0 obj
@@ -982,7 +982,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -991,7 +991,7 @@ endstream
endobj
47 0 obj
-124
+114
endobj
48 0 obj
@@ -1014,7 +1014,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -1023,7 +1023,7 @@ endstream
endobj
49 0 obj
-125
+114
endobj
50 0 obj
@@ -3650,187 +3650,187 @@ xref
0000005238 00000 n
0000005388 00000 n
0000005478 00000 n
-0000005722 00000 n
-0000005742 00000 n
-0000006108 00000 n
-0000006472 00000 n
-0000006838 00000 n
-0000007006 00000 n
-0000007026 00000 n
-0000007264 00000 n
-0000007284 00000 n
-0000007365 00000 n
-0000007533 00000 n
-0000007553 00000 n
-0000007791 00000 n
-0000007811 00000 n
-0000007979 00000 n
-0000007999 00000 n
-0000008237 00000 n
-0000008257 00000 n
-0000008623 00000 n
-0000008987 00000 n
-0000009353 00000 n
-0000009605 00000 n
-0000009625 00000 n
-0000010088 00000 n
-0000010109 00000 n
-0000010392 00000 n
-0000010413 00000 n
-0000010693 00000 n
-0000010714 00000 n
-0000010993 00000 n
-0000011014 00000 n
-0000011346 00000 n
-0000011510 00000 n
-0000016336 00000 n
-0000016358 00000 n
-0000017146 00000 n
-0000017547 00000 n
-0000017998 00000 n
-0000019915 00000 n
-0000020285 00000 n
-0000022199 00000 n
-0000022575 00000 n
-0000022596 00000 n
-0000022764 00000 n
-0000022784 00000 n
-0000023160 00000 n
-0000023181 00000 n
-0000023349 00000 n
-0000023369 00000 n
-0000023745 00000 n
-0000023766 00000 n
-0000023934 00000 n
-0000023954 00000 n
-0000024330 00000 n
-0000024351 00000 n
-0000024519 00000 n
-0000024539 00000 n
-0000024915 00000 n
-0000024936 00000 n
-0000025104 00000 n
-0000025124 00000 n
-0000025500 00000 n
-0000025521 00000 n
-0000025689 00000 n
-0000025709 00000 n
-0000026932 00000 n
-0000026953 00000 n
-0000027066 00000 n
-0000027162 00000 n
-0000027275 00000 n
-0000027371 00000 n
-0000027484 00000 n
-0000027580 00000 n
-0000027676 00000 n
-0000027772 00000 n
-0000027868 00000 n
-0000027964 00000 n
-0000028060 00000 n
-0000028173 00000 n
-0000028269 00000 n
-0000028365 00000 n
-0000028462 00000 n
-0000028559 00000 n
-0000028656 00000 n
-0000028753 00000 n
-0000028850 00000 n
-0000028947 00000 n
-0000029044 00000 n
-0000029141 00000 n
-0000029255 00000 n
-0000029352 00000 n
-0000029449 00000 n
-0000029546 00000 n
-0000029643 00000 n
-0000029740 00000 n
-0000029837 00000 n
-0000029934 00000 n
-0000030031 00000 n
-0000030128 00000 n
-0000030225 00000 n
-0000030339 00000 n
-0000030436 00000 n
-0000030533 00000 n
-0000030630 00000 n
-0000030750 00000 n
-0000030847 00000 n
-0000030944 00000 n
-0000031041 00000 n
-0000031138 00000 n
-0000031235 00000 n
-0000031355 00000 n
-0000031453 00000 n
-0000031551 00000 n
-0000031649 00000 n
-0000031747 00000 n
-0000031845 00000 n
-0000031943 00000 n
-0000032041 00000 n
-0000032139 00000 n
-0000032237 00000 n
-0000032335 00000 n
-0000032433 00000 n
-0000032531 00000 n
-0000032629 00000 n
-0000032727 00000 n
-0000032825 00000 n
-0000033070 00000 n
-0000033831 00000 n
-0000033853 00000 n
-0000034069 00000 n
-0000034313 00000 n
-0000034954 00000 n
-0000034976 00000 n
-0000035191 00000 n
-0000035248 00000 n
-0000035305 00000 n
-0000035362 00000 n
-0000035419 00000 n
-0000035476 00000 n
-0000035533 00000 n
-0000035590 00000 n
-0000035647 00000 n
-0000035704 00000 n
-0000035761 00000 n
-0000035818 00000 n
-0000035875 00000 n
-0000035932 00000 n
-0000035989 00000 n
-0000036046 00000 n
-0000036103 00000 n
-0000036160 00000 n
-0000036217 00000 n
-0000036274 00000 n
-0000036331 00000 n
-0000036388 00000 n
-0000036445 00000 n
-0000036502 00000 n
-0000036559 00000 n
-0000036616 00000 n
-0000036673 00000 n
-0000036730 00000 n
-0000036787 00000 n
-0000036844 00000 n
-0000036901 00000 n
-0000036958 00000 n
-0000037015 00000 n
-0000037072 00000 n
-0000037129 00000 n
-0000037186 00000 n
-0000037243 00000 n
-0000037300 00000 n
-0000037357 00000 n
-0000037414 00000 n
-0000037471 00000 n
-0000037528 00000 n
-0000037585 00000 n
-0000037642 00000 n
-0000037699 00000 n
-0000053981 00000 n
-0000054005 00000 n
-0000065191 00000 n
+0000005710 00000 n
+0000005730 00000 n
+0000006096 00000 n
+0000006460 00000 n
+0000006826 00000 n
+0000006994 00000 n
+0000007014 00000 n
+0000007252 00000 n
+0000007272 00000 n
+0000007353 00000 n
+0000007521 00000 n
+0000007541 00000 n
+0000007779 00000 n
+0000007799 00000 n
+0000007967 00000 n
+0000007987 00000 n
+0000008225 00000 n
+0000008245 00000 n
+0000008611 00000 n
+0000008975 00000 n
+0000009341 00000 n
+0000009583 00000 n
+0000009603 00000 n
+0000009996 00000 n
+0000010017 00000 n
+0000010289 00000 n
+0000010310 00000 n
+0000010580 00000 n
+0000010601 00000 n
+0000010869 00000 n
+0000010890 00000 n
+0000011222 00000 n
+0000011386 00000 n
+0000016212 00000 n
+0000016234 00000 n
+0000017022 00000 n
+0000017423 00000 n
+0000017874 00000 n
+0000019791 00000 n
+0000020161 00000 n
+0000022075 00000 n
+0000022451 00000 n
+0000022472 00000 n
+0000022640 00000 n
+0000022660 00000 n
+0000023036 00000 n
+0000023057 00000 n
+0000023225 00000 n
+0000023245 00000 n
+0000023621 00000 n
+0000023642 00000 n
+0000023810 00000 n
+0000023830 00000 n
+0000024206 00000 n
+0000024227 00000 n
+0000024395 00000 n
+0000024415 00000 n
+0000024791 00000 n
+0000024812 00000 n
+0000024980 00000 n
+0000025000 00000 n
+0000025376 00000 n
+0000025397 00000 n
+0000025565 00000 n
+0000025585 00000 n
+0000026808 00000 n
+0000026829 00000 n
+0000026942 00000 n
+0000027038 00000 n
+0000027151 00000 n
+0000027247 00000 n
+0000027360 00000 n
+0000027456 00000 n
+0000027552 00000 n
+0000027648 00000 n
+0000027744 00000 n
+0000027840 00000 n
+0000027936 00000 n
+0000028049 00000 n
+0000028145 00000 n
+0000028241 00000 n
+0000028338 00000 n
+0000028435 00000 n
+0000028532 00000 n
+0000028629 00000 n
+0000028726 00000 n
+0000028823 00000 n
+0000028920 00000 n
+0000029017 00000 n
+0000029131 00000 n
+0000029228 00000 n
+0000029325 00000 n
+0000029422 00000 n
+0000029519 00000 n
+0000029616 00000 n
+0000029713 00000 n
+0000029810 00000 n
+0000029907 00000 n
+0000030004 00000 n
+0000030101 00000 n
+0000030215 00000 n
+0000030312 00000 n
+0000030409 00000 n
+0000030506 00000 n
+0000030626 00000 n
+0000030723 00000 n
+0000030820 00000 n
+0000030917 00000 n
+0000031014 00000 n
+0000031111 00000 n
+0000031231 00000 n
+0000031329 00000 n
+0000031427 00000 n
+0000031525 00000 n
+0000031623 00000 n
+0000031721 00000 n
+0000031819 00000 n
+0000031917 00000 n
+0000032015 00000 n
+0000032113 00000 n
+0000032211 00000 n
+0000032309 00000 n
+0000032407 00000 n
+0000032505 00000 n
+0000032603 00000 n
+0000032701 00000 n
+0000032946 00000 n
+0000033707 00000 n
+0000033729 00000 n
+0000033945 00000 n
+0000034189 00000 n
+0000034830 00000 n
+0000034852 00000 n
+0000035067 00000 n
+0000035124 00000 n
+0000035181 00000 n
+0000035238 00000 n
+0000035295 00000 n
+0000035352 00000 n
+0000035409 00000 n
+0000035466 00000 n
+0000035523 00000 n
+0000035580 00000 n
+0000035637 00000 n
+0000035694 00000 n
+0000035751 00000 n
+0000035808 00000 n
+0000035865 00000 n
+0000035922 00000 n
+0000035979 00000 n
+0000036036 00000 n
+0000036093 00000 n
+0000036150 00000 n
+0000036207 00000 n
+0000036264 00000 n
+0000036321 00000 n
+0000036378 00000 n
+0000036435 00000 n
+0000036492 00000 n
+0000036549 00000 n
+0000036606 00000 n
+0000036663 00000 n
+0000036720 00000 n
+0000036777 00000 n
+0000036834 00000 n
+0000036891 00000 n
+0000036948 00000 n
+0000037005 00000 n
+0000037062 00000 n
+0000037119 00000 n
+0000037176 00000 n
+0000037233 00000 n
+0000037290 00000 n
+0000037347 00000 n
+0000037404 00000 n
+0000037461 00000 n
+0000037518 00000 n
+0000037575 00000 n
+0000053857 00000 n
+0000053881 00000 n
+0000065067 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3839,5 +3839,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-65215
+65091
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-a-more.pdf b/qpdf/qtest/qpdf/appearances-a-more.pdf
index ebd02e95..4afe32f1 100644
--- a/qpdf/qtest/qpdf/appearances-a-more.pdf
+++ b/qpdf/qtest/qpdf/appearances-a-more.pdf
@@ -387,70 +387,70 @@ stream
Q
q
-1.00001 0.00000 0.00000 0.99986 123.49900 689.90100 cm
+1.00001 0 0 0.99986 123.499 689.901 cm
/Fxo1 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 152.74900 648.50100 cm
+1.00017 0 0 0.99983 152.749 648.501 cm
/Fxo2 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 152.74900 627.30100 cm
+1.00017 0 0 0.99983 152.749 627.301 cm
/Fxo3 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 151.39900 606.50100 cm
+1.00017 0 0 0.99983 151.399 606.501 cm
/Fxo4 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 527.75100 cm
+1.00017 0 0 0.99983 118.649 527.751 cm
/Fxo5 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 500.50100 cm
+1.00017 0 0 0.99983 118.649 500.501 cm
/Fxo6 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 388.10100 cm
+1.00017 0 0 0.99983 118.649 388.101 cm
/Fxo7 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 119.34900 362.20100 cm
+1.00017 0 0 0.99983 119.349 362.201 cm
/Fxo8 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 119.34900 333.55100 cm
+1.00017 0 0 0.99983 119.349 333.551 cm
/Fxo9 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 113.64900 260.15100 cm
+1 0 0 1 113.649 260.151 cm
/Fxo10 Do
Q
q
-1.00004 0.00000 0.00000 0.99997 403.94900 159.40100 cm
+1.00004 0 0 0.99997 403.949 159.401 cm
/Fxo11 Do
Q
q
-1.00003 0.00000 0.00000 0.99997 158.44900 156.65100 cm
+1.00003 0 0 0.99997 158.449 156.651 cm
/Fxo12 Do
Q
q
-1.00002 0.00000 0.00000 0.99992 159.14900 107.25100 cm
+1.00002 0 0 0.99992 159.149 107.251 cm
/Fxo13 Do
Q
q
-1.00003 0.00000 0.00000 0.99994 404.59900 101.45100 cm
+1.00003 0 0 0.99994 404.599 101.451 cm
/Fxo14 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 435.00000 703.00000 cm
+1 0 0 1 435 703 cm
/Fxo15 Do
Q
endstream
endobj
11 0 obj
-1029
+757
endobj
12 0 obj
@@ -493,7 +493,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -503,16 +503,16 @@ endobj
%QDF: ignore_newline
14 0 obj
-88
+76
endobj
15 0 obj
<<
/BBox [
- 0.000000
- 0.000000
- 237.452000
- 17.948000
+ 0
+ 0
+ 237.452
+ 17.948
]
/Resources <<
/Font <<
@@ -536,7 +536,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.174000 Td
+1 4.174 Td
(salad ÷??) Tj
ET
Q
@@ -545,7 +545,7 @@ endstream
endobj
16 0 obj
-95
+85
endobj
17 0 obj
@@ -580,7 +580,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -589,7 +589,7 @@ endstream
endobj
18 0 obj
-124
+114
endobj
19 0 obj
@@ -623,18 +623,18 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 38.100000 62.550000 12.000000 re f
+0 38.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 52.100000 Td
+1 52.1 Td
(five) Tj
-0 -12.000000 Td
+0 -12 Td
(six) Tj
-0 -12.000000 Td
+0 -12 Td
(seven) Tj
-0 -12.000000 Td
+0 -12 Td
(eight) Tj
ET
Q
@@ -643,7 +643,7 @@ endstream
endobj
20 0 obj
-270
+214
endobj
21 0 obj
@@ -678,7 +678,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -687,7 +687,7 @@ endstream
endobj
22 0 obj
-128
+117
endobj
23 0 obj
@@ -722,7 +722,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -731,7 +731,7 @@ endstream
endobj
24 0 obj
-125
+114
endobj
25 0 obj
@@ -3031,161 +3031,161 @@ xref
0000001453 00000 n
0000006277 00000 n
0000006321 00000 n
-0000007407 00000 n
-0000007429 00000 n
-0000007519 00000 n
-0000007937 00000 n
-0000007957 00000 n
-0000008384 00000 n
-0000008404 00000 n
-0000008837 00000 n
-0000008858 00000 n
-0000009436 00000 n
-0000009457 00000 n
-0000009893 00000 n
-0000009914 00000 n
-0000010346 00000 n
-0000010367 00000 n
-0000011590 00000 n
-0000011611 00000 n
-0000011932 00000 n
-0000011952 00000 n
-0000012481 00000 n
-0000012502 00000 n
-0000012823 00000 n
-0000012843 00000 n
-0000013234 00000 n
-0000013254 00000 n
-0000013575 00000 n
-0000013595 00000 n
-0000013916 00000 n
-0000013936 00000 n
-0000014465 00000 n
-0000014486 00000 n
-0000014807 00000 n
-0000014827 00000 n
-0000014901 00000 n
-0000015652 00000 n
-0000016042 00000 n
-0000016493 00000 n
-0000018410 00000 n
-0000018780 00000 n
-0000020694 00000 n
-0000020775 00000 n
-0000020887 00000 n
-0000020982 00000 n
-0000021094 00000 n
-0000021189 00000 n
-0000021301 00000 n
-0000021396 00000 n
-0000021491 00000 n
-0000021586 00000 n
-0000021681 00000 n
-0000021776 00000 n
-0000021871 00000 n
-0000021983 00000 n
-0000022078 00000 n
-0000022173 00000 n
-0000022268 00000 n
-0000022363 00000 n
-0000022458 00000 n
-0000022553 00000 n
-0000022648 00000 n
-0000022743 00000 n
-0000022838 00000 n
-0000022933 00000 n
-0000023045 00000 n
-0000023140 00000 n
-0000023235 00000 n
-0000023330 00000 n
-0000023425 00000 n
-0000023520 00000 n
-0000023615 00000 n
-0000023710 00000 n
-0000023805 00000 n
-0000023900 00000 n
-0000023995 00000 n
+0000007135 00000 n
+0000007156 00000 n
+0000007246 00000 n
+0000007652 00000 n
+0000007672 00000 n
+0000008069 00000 n
+0000008089 00000 n
+0000008512 00000 n
+0000008533 00000 n
+0000009055 00000 n
+0000009076 00000 n
+0000009501 00000 n
+0000009522 00000 n
+0000009943 00000 n
+0000009964 00000 n
+0000011187 00000 n
+0000011208 00000 n
+0000011529 00000 n
+0000011549 00000 n
+0000012078 00000 n
+0000012099 00000 n
+0000012420 00000 n
+0000012440 00000 n
+0000012831 00000 n
+0000012851 00000 n
+0000013172 00000 n
+0000013192 00000 n
+0000013513 00000 n
+0000013533 00000 n
+0000014062 00000 n
+0000014083 00000 n
+0000014404 00000 n
+0000014424 00000 n
+0000014498 00000 n
+0000015249 00000 n
+0000015639 00000 n
+0000016090 00000 n
+0000018007 00000 n
+0000018377 00000 n
+0000020291 00000 n
+0000020372 00000 n
+0000020484 00000 n
+0000020579 00000 n
+0000020691 00000 n
+0000020786 00000 n
+0000020898 00000 n
+0000020993 00000 n
+0000021088 00000 n
+0000021183 00000 n
+0000021278 00000 n
+0000021373 00000 n
+0000021468 00000 n
+0000021580 00000 n
+0000021675 00000 n
+0000021770 00000 n
+0000021865 00000 n
+0000021960 00000 n
+0000022055 00000 n
+0000022150 00000 n
+0000022245 00000 n
+0000022340 00000 n
+0000022435 00000 n
+0000022530 00000 n
+0000022642 00000 n
+0000022737 00000 n
+0000022832 00000 n
+0000022927 00000 n
+0000023022 00000 n
+0000023117 00000 n
+0000023212 00000 n
+0000023307 00000 n
+0000023402 00000 n
+0000023497 00000 n
+0000023592 00000 n
+0000023704 00000 n
+0000023799 00000 n
+0000023894 00000 n
+0000023989 00000 n
0000024107 00000 n
0000024202 00000 n
0000024297 00000 n
0000024392 00000 n
-0000024510 00000 n
-0000024605 00000 n
+0000024487 00000 n
+0000024582 00000 n
0000024700 00000 n
-0000024795 00000 n
-0000024890 00000 n
-0000024985 00000 n
-0000025103 00000 n
-0000025199 00000 n
-0000025295 00000 n
-0000025391 00000 n
-0000025487 00000 n
-0000025583 00000 n
-0000025680 00000 n
-0000025777 00000 n
-0000025874 00000 n
-0000025971 00000 n
-0000026068 00000 n
-0000026165 00000 n
-0000026262 00000 n
-0000026359 00000 n
-0000026456 00000 n
-0000026553 00000 n
-0000026798 00000 n
-0000027559 00000 n
-0000027581 00000 n
-0000027797 00000 n
-0000028041 00000 n
-0000028682 00000 n
-0000028704 00000 n
-0000028919 00000 n
-0000028976 00000 n
-0000029033 00000 n
-0000029090 00000 n
-0000029147 00000 n
-0000029204 00000 n
-0000029261 00000 n
-0000029318 00000 n
-0000029375 00000 n
-0000029432 00000 n
-0000029489 00000 n
-0000029546 00000 n
-0000029603 00000 n
-0000029660 00000 n
-0000029717 00000 n
-0000029774 00000 n
-0000029831 00000 n
-0000029888 00000 n
-0000029945 00000 n
-0000030002 00000 n
-0000030059 00000 n
-0000030116 00000 n
-0000030173 00000 n
-0000030230 00000 n
-0000030287 00000 n
-0000030344 00000 n
-0000030401 00000 n
-0000030458 00000 n
-0000030515 00000 n
-0000030572 00000 n
-0000030629 00000 n
-0000030686 00000 n
-0000030743 00000 n
-0000030800 00000 n
-0000030857 00000 n
-0000030914 00000 n
-0000030971 00000 n
-0000031028 00000 n
-0000031085 00000 n
-0000031142 00000 n
-0000031199 00000 n
-0000031256 00000 n
-0000031313 00000 n
-0000031370 00000 n
-0000031427 00000 n
-0000047709 00000 n
-0000047733 00000 n
-0000058919 00000 n
+0000024796 00000 n
+0000024892 00000 n
+0000024988 00000 n
+0000025084 00000 n
+0000025180 00000 n
+0000025277 00000 n
+0000025374 00000 n
+0000025471 00000 n
+0000025568 00000 n
+0000025665 00000 n
+0000025762 00000 n
+0000025859 00000 n
+0000025956 00000 n
+0000026053 00000 n
+0000026150 00000 n
+0000026395 00000 n
+0000027156 00000 n
+0000027178 00000 n
+0000027394 00000 n
+0000027638 00000 n
+0000028279 00000 n
+0000028301 00000 n
+0000028516 00000 n
+0000028573 00000 n
+0000028630 00000 n
+0000028687 00000 n
+0000028744 00000 n
+0000028801 00000 n
+0000028858 00000 n
+0000028915 00000 n
+0000028972 00000 n
+0000029029 00000 n
+0000029086 00000 n
+0000029143 00000 n
+0000029200 00000 n
+0000029257 00000 n
+0000029314 00000 n
+0000029371 00000 n
+0000029428 00000 n
+0000029485 00000 n
+0000029542 00000 n
+0000029599 00000 n
+0000029656 00000 n
+0000029713 00000 n
+0000029770 00000 n
+0000029827 00000 n
+0000029884 00000 n
+0000029941 00000 n
+0000029998 00000 n
+0000030055 00000 n
+0000030112 00000 n
+0000030169 00000 n
+0000030226 00000 n
+0000030283 00000 n
+0000030340 00000 n
+0000030397 00000 n
+0000030454 00000 n
+0000030511 00000 n
+0000030568 00000 n
+0000030625 00000 n
+0000030682 00000 n
+0000030739 00000 n
+0000030796 00000 n
+0000030853 00000 n
+0000030910 00000 n
+0000030967 00000 n
+0000031024 00000 n
+0000047306 00000 n
+0000047330 00000 n
+0000058516 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3194,5 +3194,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-58943
+58540
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-a-more2.pdf b/qpdf/qtest/qpdf/appearances-a-more2.pdf
index f452b9c9..6ec62a75 100644
--- a/qpdf/qtest/qpdf/appearances-a-more2.pdf
+++ b/qpdf/qtest/qpdf/appearances-a-more2.pdf
@@ -387,70 +387,70 @@ stream
Q
q
-1.00001 0.00000 0.00000 0.99986 123.49900 689.90100 cm
+1.00001 0 0 0.99986 123.499 689.901 cm
/Fxo1 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 152.74900 648.50100 cm
+1.00017 0 0 0.99983 152.749 648.501 cm
/Fxo2 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 152.74900 627.30100 cm
+1.00017 0 0 0.99983 152.749 627.301 cm
/Fxo3 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 151.39900 606.50100 cm
+1.00017 0 0 0.99983 151.399 606.501 cm
/Fxo4 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 527.75100 cm
+1.00017 0 0 0.99983 118.649 527.751 cm
/Fxo5 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 500.50100 cm
+1.00017 0 0 0.99983 118.649 500.501 cm
/Fxo6 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 388.10100 cm
+1.00017 0 0 0.99983 118.649 388.101 cm
/Fxo7 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 119.34900 362.20100 cm
+1.00017 0 0 0.99983 119.349 362.201 cm
/Fxo8 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 119.34900 333.55100 cm
+1.00017 0 0 0.99983 119.349 333.551 cm
/Fxo9 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 113.64900 260.15100 cm
+1 0 0 1 113.649 260.151 cm
/Fxo10 Do
Q
q
-1.00004 0.00000 0.00000 0.99997 403.94900 159.40100 cm
+1.00004 0 0 0.99997 403.949 159.401 cm
/Fxo11 Do
Q
q
-1.00003 0.00000 0.00000 0.99997 158.44900 156.65100 cm
+1.00003 0 0 0.99997 158.449 156.651 cm
/Fxo12 Do
Q
q
-1.00002 0.00000 0.00000 0.99992 159.14900 107.25100 cm
+1.00002 0 0 0.99992 159.149 107.251 cm
/Fxo13 Do
Q
q
-1.00003 0.00000 0.00000 0.99994 404.59900 101.45100 cm
+1.00003 0 0 0.99994 404.599 101.451 cm
/Fxo14 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 435.00000 703.00000 cm
+1 0 0 1 435 703 cm
/Fxo15 Do
Q
endstream
endobj
11 0 obj
-1029
+757
endobj
12 0 obj
@@ -492,8 +492,8 @@ stream
/Tx BMC
q
BT
-0.18039 0.20392 0.21176 rg /F2 11.000000 Tf
-1.000000 3.000000 Td
+0.18039 0.20392 0.21176 rg /F2 11 Tf
+1 3 Td
(abc) Tj
ET
Q
@@ -503,16 +503,16 @@ endobj
%QDF: ignore_newline
14 0 obj
-95
+74
endobj
15 0 obj
<<
/BBox [
- 0.000000
- 0.000000
- 237.452000
- 17.948000
+ 0
+ 0
+ 237.452
+ 17.948
]
/Resources <<
/Font <<
@@ -536,7 +536,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.174000 Td
+1 4.174 Td
(salad ÷??) Tj
ET
Q
@@ -545,7 +545,7 @@ endstream
endobj
16 0 obj
-95
+85
endobj
17 0 obj
@@ -580,7 +580,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -589,7 +589,7 @@ endstream
endobj
18 0 obj
-124
+114
endobj
19 0 obj
@@ -623,18 +623,18 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 38.100000 62.550000 12.000000 re f
+0 38.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 52.100000 Td
+1 52.1 Td
(five) Tj
-0 -12.000000 Td
+0 -12 Td
(six) Tj
-0 -12.000000 Td
+0 -12 Td
(seven) Tj
-0 -12.000000 Td
+0 -12 Td
(eight) Tj
ET
Q
@@ -643,7 +643,7 @@ endstream
endobj
20 0 obj
-270
+214
endobj
21 0 obj
@@ -678,7 +678,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -687,7 +687,7 @@ endstream
endobj
22 0 obj
-128
+117
endobj
23 0 obj
@@ -722,7 +722,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -731,7 +731,7 @@ endstream
endobj
24 0 obj
-125
+114
endobj
25 0 obj
@@ -3031,161 +3031,161 @@ xref
0000001453 00000 n
0000006277 00000 n
0000006321 00000 n
-0000007407 00000 n
-0000007429 00000 n
-0000007519 00000 n
-0000007944 00000 n
-0000007964 00000 n
-0000008391 00000 n
-0000008411 00000 n
-0000008844 00000 n
-0000008865 00000 n
-0000009443 00000 n
-0000009464 00000 n
-0000009900 00000 n
-0000009921 00000 n
-0000010353 00000 n
-0000010374 00000 n
-0000011597 00000 n
-0000011618 00000 n
-0000011939 00000 n
-0000011959 00000 n
-0000012488 00000 n
-0000012509 00000 n
-0000012830 00000 n
-0000012850 00000 n
-0000013241 00000 n
-0000013261 00000 n
-0000013582 00000 n
-0000013602 00000 n
-0000013923 00000 n
-0000013943 00000 n
-0000014472 00000 n
-0000014493 00000 n
-0000014814 00000 n
-0000014834 00000 n
-0000014908 00000 n
-0000015659 00000 n
-0000016049 00000 n
-0000016500 00000 n
-0000018417 00000 n
-0000018787 00000 n
-0000020701 00000 n
-0000020782 00000 n
-0000020894 00000 n
-0000020989 00000 n
-0000021101 00000 n
-0000021196 00000 n
-0000021308 00000 n
-0000021403 00000 n
-0000021498 00000 n
-0000021593 00000 n
-0000021688 00000 n
-0000021783 00000 n
-0000021878 00000 n
-0000021990 00000 n
-0000022085 00000 n
-0000022180 00000 n
-0000022275 00000 n
-0000022370 00000 n
-0000022465 00000 n
-0000022560 00000 n
-0000022655 00000 n
-0000022750 00000 n
-0000022845 00000 n
-0000022940 00000 n
-0000023052 00000 n
-0000023147 00000 n
-0000023242 00000 n
-0000023337 00000 n
-0000023432 00000 n
-0000023527 00000 n
-0000023622 00000 n
-0000023717 00000 n
-0000023812 00000 n
-0000023907 00000 n
-0000024002 00000 n
-0000024114 00000 n
-0000024209 00000 n
-0000024304 00000 n
-0000024399 00000 n
-0000024517 00000 n
-0000024612 00000 n
-0000024707 00000 n
-0000024802 00000 n
-0000024897 00000 n
-0000024992 00000 n
-0000025110 00000 n
-0000025206 00000 n
-0000025302 00000 n
-0000025398 00000 n
-0000025494 00000 n
-0000025590 00000 n
-0000025687 00000 n
-0000025784 00000 n
-0000025881 00000 n
-0000025978 00000 n
-0000026075 00000 n
-0000026172 00000 n
-0000026269 00000 n
-0000026366 00000 n
-0000026463 00000 n
-0000026560 00000 n
-0000026805 00000 n
-0000027566 00000 n
-0000027588 00000 n
-0000027804 00000 n
-0000028048 00000 n
-0000028689 00000 n
-0000028711 00000 n
-0000028926 00000 n
-0000028983 00000 n
-0000029040 00000 n
-0000029097 00000 n
-0000029154 00000 n
-0000029211 00000 n
-0000029268 00000 n
-0000029325 00000 n
-0000029382 00000 n
-0000029439 00000 n
-0000029496 00000 n
-0000029553 00000 n
-0000029610 00000 n
-0000029667 00000 n
-0000029724 00000 n
-0000029781 00000 n
-0000029838 00000 n
-0000029895 00000 n
-0000029952 00000 n
-0000030009 00000 n
-0000030066 00000 n
-0000030123 00000 n
-0000030180 00000 n
-0000030237 00000 n
-0000030294 00000 n
-0000030351 00000 n
-0000030408 00000 n
-0000030465 00000 n
-0000030522 00000 n
-0000030579 00000 n
-0000030636 00000 n
-0000030693 00000 n
-0000030750 00000 n
-0000030807 00000 n
-0000030864 00000 n
-0000030921 00000 n
-0000030978 00000 n
-0000031035 00000 n
-0000031092 00000 n
-0000031149 00000 n
-0000031206 00000 n
-0000031263 00000 n
-0000031320 00000 n
-0000031377 00000 n
-0000031434 00000 n
-0000047716 00000 n
-0000047740 00000 n
-0000058926 00000 n
+0000007135 00000 n
+0000007156 00000 n
+0000007246 00000 n
+0000007650 00000 n
+0000007670 00000 n
+0000008067 00000 n
+0000008087 00000 n
+0000008510 00000 n
+0000008531 00000 n
+0000009053 00000 n
+0000009074 00000 n
+0000009499 00000 n
+0000009520 00000 n
+0000009941 00000 n
+0000009962 00000 n
+0000011185 00000 n
+0000011206 00000 n
+0000011527 00000 n
+0000011547 00000 n
+0000012076 00000 n
+0000012097 00000 n
+0000012418 00000 n
+0000012438 00000 n
+0000012829 00000 n
+0000012849 00000 n
+0000013170 00000 n
+0000013190 00000 n
+0000013511 00000 n
+0000013531 00000 n
+0000014060 00000 n
+0000014081 00000 n
+0000014402 00000 n
+0000014422 00000 n
+0000014496 00000 n
+0000015247 00000 n
+0000015637 00000 n
+0000016088 00000 n
+0000018005 00000 n
+0000018375 00000 n
+0000020289 00000 n
+0000020370 00000 n
+0000020482 00000 n
+0000020577 00000 n
+0000020689 00000 n
+0000020784 00000 n
+0000020896 00000 n
+0000020991 00000 n
+0000021086 00000 n
+0000021181 00000 n
+0000021276 00000 n
+0000021371 00000 n
+0000021466 00000 n
+0000021578 00000 n
+0000021673 00000 n
+0000021768 00000 n
+0000021863 00000 n
+0000021958 00000 n
+0000022053 00000 n
+0000022148 00000 n
+0000022243 00000 n
+0000022338 00000 n
+0000022433 00000 n
+0000022528 00000 n
+0000022640 00000 n
+0000022735 00000 n
+0000022830 00000 n
+0000022925 00000 n
+0000023020 00000 n
+0000023115 00000 n
+0000023210 00000 n
+0000023305 00000 n
+0000023400 00000 n
+0000023495 00000 n
+0000023590 00000 n
+0000023702 00000 n
+0000023797 00000 n
+0000023892 00000 n
+0000023987 00000 n
+0000024105 00000 n
+0000024200 00000 n
+0000024295 00000 n
+0000024390 00000 n
+0000024485 00000 n
+0000024580 00000 n
+0000024698 00000 n
+0000024794 00000 n
+0000024890 00000 n
+0000024986 00000 n
+0000025082 00000 n
+0000025178 00000 n
+0000025275 00000 n
+0000025372 00000 n
+0000025469 00000 n
+0000025566 00000 n
+0000025663 00000 n
+0000025760 00000 n
+0000025857 00000 n
+0000025954 00000 n
+0000026051 00000 n
+0000026148 00000 n
+0000026393 00000 n
+0000027154 00000 n
+0000027176 00000 n
+0000027392 00000 n
+0000027636 00000 n
+0000028277 00000 n
+0000028299 00000 n
+0000028514 00000 n
+0000028571 00000 n
+0000028628 00000 n
+0000028685 00000 n
+0000028742 00000 n
+0000028799 00000 n
+0000028856 00000 n
+0000028913 00000 n
+0000028970 00000 n
+0000029027 00000 n
+0000029084 00000 n
+0000029141 00000 n
+0000029198 00000 n
+0000029255 00000 n
+0000029312 00000 n
+0000029369 00000 n
+0000029426 00000 n
+0000029483 00000 n
+0000029540 00000 n
+0000029597 00000 n
+0000029654 00000 n
+0000029711 00000 n
+0000029768 00000 n
+0000029825 00000 n
+0000029882 00000 n
+0000029939 00000 n
+0000029996 00000 n
+0000030053 00000 n
+0000030110 00000 n
+0000030167 00000 n
+0000030224 00000 n
+0000030281 00000 n
+0000030338 00000 n
+0000030395 00000 n
+0000030452 00000 n
+0000030509 00000 n
+0000030566 00000 n
+0000030623 00000 n
+0000030680 00000 n
+0000030737 00000 n
+0000030794 00000 n
+0000030851 00000 n
+0000030908 00000 n
+0000030965 00000 n
+0000031022 00000 n
+0000047304 00000 n
+0000047328 00000 n
+0000058514 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3194,5 +3194,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-58950
+58538
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-a.pdf b/qpdf/qtest/qpdf/appearances-a.pdf
index 6f24b497..92808094 100644
--- a/qpdf/qtest/qpdf/appearances-a.pdf
+++ b/qpdf/qtest/qpdf/appearances-a.pdf
@@ -388,74 +388,74 @@ stream
Q
q
-1.00001 0.00000 0.00000 0.99986 123.49900 689.90100 cm
+1.00001 0 0 0.99986 123.499 689.901 cm
/Fxo1 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 152.74900 648.50100 cm
+1.00017 0 0 0.99983 152.749 648.501 cm
/Fxo2 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 152.74900 627.30100 cm
+1.00017 0 0 0.99983 152.749 627.301 cm
/Fxo3 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 151.39900 606.50100 cm
+1.00017 0 0 0.99983 151.399 606.501 cm
/Fxo4 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 554.30100 cm
+1.00017 0 0 0.99983 118.649 554.301 cm
/Fxo5 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 527.75100 cm
+1.00017 0 0 0.99983 118.649 527.751 cm
/Fxo6 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 500.50100 cm
+1.00017 0 0 0.99983 118.649 500.501 cm
/Fxo7 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 118.64900 388.10100 cm
+1.00017 0 0 0.99983 118.649 388.101 cm
/Fxo8 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 119.34900 362.20100 cm
+1.00017 0 0 0.99983 119.349 362.201 cm
/Fxo9 Do
Q
q
-1.00017 0.00000 0.00000 0.99983 119.34900 333.55100 cm
+1.00017 0 0 0.99983 119.349 333.551 cm
/Fxo10 Do
Q
q
-1.00001 0.00000 0.00000 0.99989 113.64900 260.15100 cm
+1.00001 0 0 0.99989 113.649 260.151 cm
/Fxo11 Do
Q
q
-1.00004 0.00000 0.00000 0.99997 403.94900 159.40100 cm
+1.00004 0 0 0.99997 403.949 159.401 cm
/Fxo12 Do
Q
q
-1.00003 0.00000 0.00000 0.99997 158.44900 156.65100 cm
+1.00003 0 0 0.99997 158.449 156.651 cm
/Fxo13 Do
Q
q
-1.00002 0.00000 0.00000 0.99992 159.14900 107.25100 cm
+1.00002 0 0 0.99992 159.149 107.251 cm
/Fxo14 Do
Q
q
-1.00003 0.00000 0.00000 0.99994 404.59900 101.45100 cm
+1.00003 0 0 0.99994 404.599 101.451 cm
/Fxo15 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 435.00000 703.00000 cm
+1 0 0 1 435 703 cm
/Fxo16 Do
Q
endstream
endobj
11 0 obj
-1098
+822
endobj
12 0 obj
@@ -498,7 +498,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -507,7 +507,7 @@ endstream
endobj
14 0 obj
-89
+77
endobj
15 0 obj
@@ -575,7 +575,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.175000 Td
+1 4.175 Td
(salad ÷??) Tj
ET
Q
@@ -584,7 +584,7 @@ endstream
endobj
18 0 obj
-95
+85
endobj
19 0 obj
@@ -619,7 +619,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -628,7 +628,7 @@ endstream
endobj
20 0 obj
-124
+114
endobj
21 0 obj
@@ -662,18 +662,18 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 38.100000 62.550000 12.000000 re f
+0 38.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 52.100000 Td
+1 52.1 Td
(five) Tj
-0 -12.000000 Td
+0 -12 Td
(six) Tj
-0 -12.000000 Td
+0 -12 Td
(seven) Tj
-0 -12.000000 Td
+0 -12 Td
(eight) Tj
ET
Q
@@ -682,7 +682,7 @@ endstream
endobj
22 0 obj
-270
+214
endobj
23 0 obj
@@ -717,7 +717,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -726,7 +726,7 @@ endstream
endobj
24 0 obj
-128
+117
endobj
25 0 obj
@@ -761,7 +761,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -770,7 +770,7 @@ endstream
endobj
26 0 obj
-125
+114
endobj
27 0 obj
@@ -3070,163 +3070,163 @@ xref
0000001473 00000 n
0000006297 00000 n
0000006341 00000 n
-0000007496 00000 n
-0000007518 00000 n
-0000007608 00000 n
-0000008005 00000 n
-0000008025 00000 n
-0000008346 00000 n
-0000008366 00000 n
-0000008771 00000 n
-0000008791 00000 n
-0000009224 00000 n
-0000009245 00000 n
-0000009823 00000 n
-0000009844 00000 n
-0000010280 00000 n
-0000010301 00000 n
-0000010733 00000 n
-0000010754 00000 n
-0000011977 00000 n
-0000011998 00000 n
-0000012319 00000 n
-0000012339 00000 n
-0000012868 00000 n
-0000012889 00000 n
-0000013210 00000 n
-0000013230 00000 n
-0000013551 00000 n
-0000013571 00000 n
-0000013962 00000 n
-0000013982 00000 n
-0000014303 00000 n
-0000014323 00000 n
-0000014644 00000 n
-0000014664 00000 n
-0000015193 00000 n
-0000015214 00000 n
-0000015288 00000 n
-0000016041 00000 n
-0000016433 00000 n
-0000016884 00000 n
-0000018801 00000 n
-0000019171 00000 n
-0000021085 00000 n
-0000021166 00000 n
-0000021278 00000 n
-0000021373 00000 n
-0000021485 00000 n
-0000021580 00000 n
-0000021692 00000 n
-0000021787 00000 n
-0000021882 00000 n
-0000021977 00000 n
-0000022072 00000 n
-0000022167 00000 n
-0000022262 00000 n
-0000022374 00000 n
-0000022469 00000 n
-0000022564 00000 n
-0000022659 00000 n
-0000022754 00000 n
-0000022849 00000 n
-0000022944 00000 n
-0000023039 00000 n
-0000023134 00000 n
-0000023229 00000 n
-0000023324 00000 n
-0000023436 00000 n
-0000023531 00000 n
-0000023626 00000 n
-0000023721 00000 n
-0000023816 00000 n
-0000023911 00000 n
-0000024006 00000 n
-0000024101 00000 n
-0000024196 00000 n
-0000024291 00000 n
-0000024386 00000 n
-0000024498 00000 n
-0000024593 00000 n
-0000024688 00000 n
-0000024783 00000 n
-0000024901 00000 n
-0000024996 00000 n
-0000025091 00000 n
-0000025186 00000 n
-0000025281 00000 n
-0000025376 00000 n
-0000025494 00000 n
-0000025590 00000 n
+0000007220 00000 n
+0000007241 00000 n
+0000007331 00000 n
+0000007716 00000 n
+0000007736 00000 n
+0000008057 00000 n
+0000008077 00000 n
+0000008472 00000 n
+0000008492 00000 n
+0000008915 00000 n
+0000008936 00000 n
+0000009458 00000 n
+0000009479 00000 n
+0000009904 00000 n
+0000009925 00000 n
+0000010346 00000 n
+0000010367 00000 n
+0000011590 00000 n
+0000011611 00000 n
+0000011932 00000 n
+0000011952 00000 n
+0000012481 00000 n
+0000012502 00000 n
+0000012823 00000 n
+0000012843 00000 n
+0000013164 00000 n
+0000013184 00000 n
+0000013575 00000 n
+0000013595 00000 n
+0000013916 00000 n
+0000013936 00000 n
+0000014257 00000 n
+0000014277 00000 n
+0000014806 00000 n
+0000014827 00000 n
+0000014901 00000 n
+0000015654 00000 n
+0000016046 00000 n
+0000016497 00000 n
+0000018414 00000 n
+0000018784 00000 n
+0000020698 00000 n
+0000020779 00000 n
+0000020891 00000 n
+0000020986 00000 n
+0000021098 00000 n
+0000021193 00000 n
+0000021305 00000 n
+0000021400 00000 n
+0000021495 00000 n
+0000021590 00000 n
+0000021685 00000 n
+0000021780 00000 n
+0000021875 00000 n
+0000021987 00000 n
+0000022082 00000 n
+0000022177 00000 n
+0000022272 00000 n
+0000022367 00000 n
+0000022462 00000 n
+0000022557 00000 n
+0000022652 00000 n
+0000022747 00000 n
+0000022842 00000 n
+0000022937 00000 n
+0000023049 00000 n
+0000023144 00000 n
+0000023239 00000 n
+0000023334 00000 n
+0000023429 00000 n
+0000023524 00000 n
+0000023619 00000 n
+0000023714 00000 n
+0000023809 00000 n
+0000023904 00000 n
+0000023999 00000 n
+0000024111 00000 n
+0000024206 00000 n
+0000024301 00000 n
+0000024396 00000 n
+0000024514 00000 n
+0000024609 00000 n
+0000024704 00000 n
+0000024799 00000 n
+0000024894 00000 n
+0000024989 00000 n
+0000025107 00000 n
+0000025203 00000 n
+0000025299 00000 n
+0000025395 00000 n
+0000025492 00000 n
+0000025589 00000 n
0000025686 00000 n
-0000025782 00000 n
-0000025879 00000 n
-0000025976 00000 n
-0000026073 00000 n
-0000026170 00000 n
-0000026267 00000 n
-0000026364 00000 n
-0000026461 00000 n
-0000026558 00000 n
-0000026655 00000 n
-0000026752 00000 n
-0000026849 00000 n
-0000026946 00000 n
-0000027191 00000 n
-0000027952 00000 n
-0000027974 00000 n
-0000028190 00000 n
-0000028434 00000 n
-0000029075 00000 n
-0000029097 00000 n
-0000029312 00000 n
-0000029369 00000 n
-0000029426 00000 n
-0000029483 00000 n
-0000029540 00000 n
-0000029597 00000 n
-0000029654 00000 n
-0000029711 00000 n
-0000029768 00000 n
-0000029825 00000 n
-0000029882 00000 n
-0000029939 00000 n
-0000029996 00000 n
-0000030053 00000 n
-0000030110 00000 n
-0000030167 00000 n
-0000030224 00000 n
-0000030281 00000 n
-0000030338 00000 n
-0000030395 00000 n
-0000030452 00000 n
-0000030509 00000 n
-0000030566 00000 n
-0000030623 00000 n
-0000030680 00000 n
-0000030737 00000 n
-0000030794 00000 n
-0000030851 00000 n
-0000030908 00000 n
-0000030965 00000 n
-0000031022 00000 n
-0000031079 00000 n
-0000031136 00000 n
-0000031193 00000 n
-0000031250 00000 n
-0000031307 00000 n
-0000031364 00000 n
-0000031421 00000 n
-0000031478 00000 n
-0000031535 00000 n
-0000031592 00000 n
-0000031649 00000 n
-0000031706 00000 n
-0000031763 00000 n
-0000031820 00000 n
-0000048102 00000 n
-0000048126 00000 n
-0000059312 00000 n
+0000025783 00000 n
+0000025880 00000 n
+0000025977 00000 n
+0000026074 00000 n
+0000026171 00000 n
+0000026268 00000 n
+0000026365 00000 n
+0000026462 00000 n
+0000026559 00000 n
+0000026804 00000 n
+0000027565 00000 n
+0000027587 00000 n
+0000027803 00000 n
+0000028047 00000 n
+0000028688 00000 n
+0000028710 00000 n
+0000028925 00000 n
+0000028982 00000 n
+0000029039 00000 n
+0000029096 00000 n
+0000029153 00000 n
+0000029210 00000 n
+0000029267 00000 n
+0000029324 00000 n
+0000029381 00000 n
+0000029438 00000 n
+0000029495 00000 n
+0000029552 00000 n
+0000029609 00000 n
+0000029666 00000 n
+0000029723 00000 n
+0000029780 00000 n
+0000029837 00000 n
+0000029894 00000 n
+0000029951 00000 n
+0000030008 00000 n
+0000030065 00000 n
+0000030122 00000 n
+0000030179 00000 n
+0000030236 00000 n
+0000030293 00000 n
+0000030350 00000 n
+0000030407 00000 n
+0000030464 00000 n
+0000030521 00000 n
+0000030578 00000 n
+0000030635 00000 n
+0000030692 00000 n
+0000030749 00000 n
+0000030806 00000 n
+0000030863 00000 n
+0000030920 00000 n
+0000030977 00000 n
+0000031034 00000 n
+0000031091 00000 n
+0000031148 00000 n
+0000031205 00000 n
+0000031262 00000 n
+0000031319 00000 n
+0000031376 00000 n
+0000031433 00000 n
+0000047715 00000 n
+0000047739 00000 n
+0000058925 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3235,5 +3235,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-59336
+58949
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-b.pdf b/qpdf/qtest/qpdf/appearances-b.pdf
index a1995ae2..fa766e9d 100644
--- a/qpdf/qtest/qpdf/appearances-b.pdf
+++ b/qpdf/qtest/qpdf/appearances-b.pdf
@@ -483,7 +483,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -492,7 +492,7 @@ endstream
endobj
20 0 obj
-89
+77
endobj
21 0 obj
@@ -872,7 +872,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.175000 Td
+1 4.175 Td
(salad ÷??) Tj
ET
Q
@@ -881,7 +881,7 @@ endstream
endobj
41 0 obj
-95
+85
endobj
42 0 obj
@@ -903,22 +903,22 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 50.100000 62.550000 12.000000 re f
+0 50.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 64.100000 Td
+1 64.1 Td
(five) Tj
-0 -12.000000 Td
+0 -12 Td
(six) Tj
-0 -12.000000 Td
+0 -12 Td
(seven) Tj
-0 -12.000000 Td
+0 -12 Td
(eight) Tj
-0 -12.000000 Td
+0 -12 Td
(9) Tj
-0 -12.000000 Td
+0 -12 Td
<3130f7> Tj
ET
Q
@@ -927,7 +927,7 @@ endstream
endobj
43 0 obj
-321
+251
endobj
44 0 obj
@@ -950,7 +950,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -959,7 +959,7 @@ endstream
endobj
45 0 obj
-128
+117
endobj
46 0 obj
@@ -982,7 +982,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -991,7 +991,7 @@ endstream
endobj
47 0 obj
-124
+114
endobj
48 0 obj
@@ -1014,7 +1014,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -1023,7 +1023,7 @@ endstream
endobj
49 0 obj
-125
+114
endobj
50 0 obj
@@ -3650,187 +3650,187 @@ xref
0000005253 00000 n
0000005403 00000 n
0000005493 00000 n
-0000005737 00000 n
-0000005757 00000 n
-0000006123 00000 n
-0000006487 00000 n
-0000006853 00000 n
-0000007021 00000 n
-0000007041 00000 n
-0000007279 00000 n
-0000007299 00000 n
-0000007380 00000 n
-0000007548 00000 n
-0000007568 00000 n
-0000007806 00000 n
-0000007826 00000 n
-0000007994 00000 n
-0000008014 00000 n
-0000008252 00000 n
-0000008272 00000 n
-0000008638 00000 n
-0000009002 00000 n
-0000009368 00000 n
-0000009620 00000 n
-0000009640 00000 n
-0000010116 00000 n
-0000010137 00000 n
-0000010420 00000 n
-0000010441 00000 n
-0000010721 00000 n
-0000010742 00000 n
-0000011021 00000 n
-0000011042 00000 n
-0000011374 00000 n
-0000011538 00000 n
-0000016364 00000 n
-0000016386 00000 n
-0000017174 00000 n
-0000017575 00000 n
-0000018026 00000 n
-0000019943 00000 n
-0000020313 00000 n
-0000022227 00000 n
-0000022603 00000 n
-0000022624 00000 n
-0000022792 00000 n
-0000022812 00000 n
-0000023188 00000 n
-0000023209 00000 n
-0000023377 00000 n
-0000023397 00000 n
-0000023773 00000 n
-0000023794 00000 n
-0000023962 00000 n
-0000023982 00000 n
-0000024358 00000 n
-0000024379 00000 n
-0000024547 00000 n
-0000024567 00000 n
-0000024943 00000 n
-0000024964 00000 n
-0000025132 00000 n
-0000025152 00000 n
-0000025528 00000 n
-0000025549 00000 n
-0000025717 00000 n
-0000025737 00000 n
-0000026960 00000 n
-0000026981 00000 n
-0000027094 00000 n
-0000027190 00000 n
-0000027303 00000 n
-0000027399 00000 n
-0000027512 00000 n
-0000027608 00000 n
-0000027704 00000 n
-0000027800 00000 n
-0000027896 00000 n
-0000027992 00000 n
-0000028088 00000 n
-0000028201 00000 n
-0000028297 00000 n
-0000028393 00000 n
-0000028490 00000 n
-0000028587 00000 n
-0000028684 00000 n
-0000028781 00000 n
-0000028878 00000 n
-0000028975 00000 n
-0000029072 00000 n
-0000029169 00000 n
-0000029283 00000 n
-0000029380 00000 n
-0000029477 00000 n
-0000029574 00000 n
-0000029671 00000 n
-0000029768 00000 n
-0000029865 00000 n
-0000029962 00000 n
-0000030059 00000 n
-0000030156 00000 n
-0000030253 00000 n
-0000030367 00000 n
-0000030464 00000 n
-0000030561 00000 n
-0000030658 00000 n
-0000030778 00000 n
-0000030875 00000 n
-0000030972 00000 n
-0000031069 00000 n
-0000031166 00000 n
-0000031263 00000 n
-0000031383 00000 n
-0000031481 00000 n
-0000031579 00000 n
-0000031677 00000 n
-0000031775 00000 n
-0000031873 00000 n
-0000031971 00000 n
-0000032069 00000 n
-0000032167 00000 n
-0000032265 00000 n
-0000032363 00000 n
-0000032461 00000 n
-0000032559 00000 n
-0000032657 00000 n
-0000032755 00000 n
-0000032853 00000 n
-0000033098 00000 n
-0000033859 00000 n
-0000033881 00000 n
-0000034097 00000 n
-0000034341 00000 n
-0000034982 00000 n
-0000035004 00000 n
-0000035219 00000 n
-0000035276 00000 n
-0000035333 00000 n
-0000035390 00000 n
-0000035447 00000 n
-0000035504 00000 n
-0000035561 00000 n
-0000035618 00000 n
-0000035675 00000 n
-0000035732 00000 n
-0000035789 00000 n
-0000035846 00000 n
-0000035903 00000 n
-0000035960 00000 n
-0000036017 00000 n
-0000036074 00000 n
-0000036131 00000 n
-0000036188 00000 n
-0000036245 00000 n
-0000036302 00000 n
-0000036359 00000 n
-0000036416 00000 n
-0000036473 00000 n
-0000036530 00000 n
-0000036587 00000 n
-0000036644 00000 n
-0000036701 00000 n
-0000036758 00000 n
-0000036815 00000 n
-0000036872 00000 n
-0000036929 00000 n
-0000036986 00000 n
-0000037043 00000 n
-0000037100 00000 n
-0000037157 00000 n
-0000037214 00000 n
-0000037271 00000 n
-0000037328 00000 n
-0000037385 00000 n
-0000037442 00000 n
-0000037499 00000 n
-0000037556 00000 n
-0000037613 00000 n
-0000037670 00000 n
-0000037727 00000 n
-0000054009 00000 n
-0000054033 00000 n
-0000065219 00000 n
+0000005725 00000 n
+0000005745 00000 n
+0000006111 00000 n
+0000006475 00000 n
+0000006841 00000 n
+0000007009 00000 n
+0000007029 00000 n
+0000007267 00000 n
+0000007287 00000 n
+0000007368 00000 n
+0000007536 00000 n
+0000007556 00000 n
+0000007794 00000 n
+0000007814 00000 n
+0000007982 00000 n
+0000008002 00000 n
+0000008240 00000 n
+0000008260 00000 n
+0000008626 00000 n
+0000008990 00000 n
+0000009356 00000 n
+0000009598 00000 n
+0000009618 00000 n
+0000010024 00000 n
+0000010045 00000 n
+0000010317 00000 n
+0000010338 00000 n
+0000010608 00000 n
+0000010629 00000 n
+0000010897 00000 n
+0000010918 00000 n
+0000011250 00000 n
+0000011414 00000 n
+0000016240 00000 n
+0000016262 00000 n
+0000017050 00000 n
+0000017451 00000 n
+0000017902 00000 n
+0000019819 00000 n
+0000020189 00000 n
+0000022103 00000 n
+0000022479 00000 n
+0000022500 00000 n
+0000022668 00000 n
+0000022688 00000 n
+0000023064 00000 n
+0000023085 00000 n
+0000023253 00000 n
+0000023273 00000 n
+0000023649 00000 n
+0000023670 00000 n
+0000023838 00000 n
+0000023858 00000 n
+0000024234 00000 n
+0000024255 00000 n
+0000024423 00000 n
+0000024443 00000 n
+0000024819 00000 n
+0000024840 00000 n
+0000025008 00000 n
+0000025028 00000 n
+0000025404 00000 n
+0000025425 00000 n
+0000025593 00000 n
+0000025613 00000 n
+0000026836 00000 n
+0000026857 00000 n
+0000026970 00000 n
+0000027066 00000 n
+0000027179 00000 n
+0000027275 00000 n
+0000027388 00000 n
+0000027484 00000 n
+0000027580 00000 n
+0000027676 00000 n
+0000027772 00000 n
+0000027868 00000 n
+0000027964 00000 n
+0000028077 00000 n
+0000028173 00000 n
+0000028269 00000 n
+0000028366 00000 n
+0000028463 00000 n
+0000028560 00000 n
+0000028657 00000 n
+0000028754 00000 n
+0000028851 00000 n
+0000028948 00000 n
+0000029045 00000 n
+0000029159 00000 n
+0000029256 00000 n
+0000029353 00000 n
+0000029450 00000 n
+0000029547 00000 n
+0000029644 00000 n
+0000029741 00000 n
+0000029838 00000 n
+0000029935 00000 n
+0000030032 00000 n
+0000030129 00000 n
+0000030243 00000 n
+0000030340 00000 n
+0000030437 00000 n
+0000030534 00000 n
+0000030654 00000 n
+0000030751 00000 n
+0000030848 00000 n
+0000030945 00000 n
+0000031042 00000 n
+0000031139 00000 n
+0000031259 00000 n
+0000031357 00000 n
+0000031455 00000 n
+0000031553 00000 n
+0000031651 00000 n
+0000031749 00000 n
+0000031847 00000 n
+0000031945 00000 n
+0000032043 00000 n
+0000032141 00000 n
+0000032239 00000 n
+0000032337 00000 n
+0000032435 00000 n
+0000032533 00000 n
+0000032631 00000 n
+0000032729 00000 n
+0000032974 00000 n
+0000033735 00000 n
+0000033757 00000 n
+0000033973 00000 n
+0000034217 00000 n
+0000034858 00000 n
+0000034880 00000 n
+0000035095 00000 n
+0000035152 00000 n
+0000035209 00000 n
+0000035266 00000 n
+0000035323 00000 n
+0000035380 00000 n
+0000035437 00000 n
+0000035494 00000 n
+0000035551 00000 n
+0000035608 00000 n
+0000035665 00000 n
+0000035722 00000 n
+0000035779 00000 n
+0000035836 00000 n
+0000035893 00000 n
+0000035950 00000 n
+0000036007 00000 n
+0000036064 00000 n
+0000036121 00000 n
+0000036178 00000 n
+0000036235 00000 n
+0000036292 00000 n
+0000036349 00000 n
+0000036406 00000 n
+0000036463 00000 n
+0000036520 00000 n
+0000036577 00000 n
+0000036634 00000 n
+0000036691 00000 n
+0000036748 00000 n
+0000036805 00000 n
+0000036862 00000 n
+0000036919 00000 n
+0000036976 00000 n
+0000037033 00000 n
+0000037090 00000 n
+0000037147 00000 n
+0000037204 00000 n
+0000037261 00000 n
+0000037318 00000 n
+0000037375 00000 n
+0000037432 00000 n
+0000037489 00000 n
+0000037546 00000 n
+0000037603 00000 n
+0000053885 00000 n
+0000053909 00000 n
+0000065095 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3839,5 +3839,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-65243
+65119
%%EOF
diff --git a/qpdf/qtest/qpdf/appearances-quack.pdf b/qpdf/qtest/qpdf/appearances-quack.pdf
index 9f3380ba..866c9283 100644
--- a/qpdf/qtest/qpdf/appearances-quack.pdf
+++ b/qpdf/qtest/qpdf/appearances-quack.pdf
@@ -483,7 +483,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 2.600000 Td
+1 2.6 Td
(abc) Tj
ET
Q
@@ -492,7 +492,7 @@ endstream
endobj
20 0 obj
-89
+77
endobj
21 0 obj
@@ -872,7 +872,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F2 12 Tf
-1.000000 4.175000 Td
+1 4.175 Td
(salad ÷??) Tj
ET
Q
@@ -881,7 +881,7 @@ endstream
endobj
41 0 obj
-95
+85
endobj
42 0 obj
@@ -903,22 +903,22 @@ stream
/Tx BMC
q
0.85 0.85 0.85 rg
-0.000000 62.100000 62.550000 12.000000 re f
+0 62.1 62.55 12 re f
Q
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 64.100000 Td
+1 64.1 Td
(quack) Tj
-0 -12.000000 Td
+0 -12 Td
(1) Tj
-0 -12.000000 Td
+0 -12 Td
(2) Tj
-0 -12.000000 Td
+0 -12 Td
(3) Tj
-0 -12.000000 Td
+0 -12 Td
(4) Tj
-0 -12.000000 Td
+0 -12 Td
(five) Tj
ET
Q
@@ -927,7 +927,7 @@ endstream
endobj
43 0 obj
-310
+240
endobj
44 0 obj
@@ -950,7 +950,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 7.850000 Td
+1 7.85 Td
(elephant) Tj
ET
Q
@@ -959,7 +959,7 @@ endstream
endobj
45 0 obj
-128
+117
endobj
46 0 obj
@@ -982,7 +982,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 32.725000 Td
+1 32.725 Td
(pi) Tj
ET
Q
@@ -991,7 +991,7 @@ endstream
endobj
47 0 obj
-124
+114
endobj
48 0 obj
@@ -1014,7 +1014,7 @@ stream
q
BT
0.18039 0.20392 0.21176 rg /F4 10 Tf
-1.000000 12.950000 Td
+1 12.95 Td
(delta) Tj
ET
Q
@@ -1023,7 +1023,7 @@ endstream
endobj
49 0 obj
-125
+114
endobj
50 0 obj
@@ -3650,187 +3650,187 @@ xref
0000005242 00000 n
0000005392 00000 n
0000005482 00000 n
-0000005726 00000 n
-0000005746 00000 n
-0000006112 00000 n
-0000006476 00000 n
-0000006842 00000 n
-0000007010 00000 n
-0000007030 00000 n
-0000007268 00000 n
-0000007288 00000 n
-0000007369 00000 n
-0000007537 00000 n
-0000007557 00000 n
-0000007795 00000 n
-0000007815 00000 n
-0000007983 00000 n
-0000008003 00000 n
-0000008241 00000 n
-0000008261 00000 n
-0000008627 00000 n
-0000008991 00000 n
-0000009357 00000 n
-0000009609 00000 n
-0000009629 00000 n
-0000010094 00000 n
-0000010115 00000 n
-0000010398 00000 n
-0000010419 00000 n
-0000010699 00000 n
-0000010720 00000 n
-0000010999 00000 n
-0000011020 00000 n
-0000011352 00000 n
-0000011516 00000 n
-0000016342 00000 n
-0000016364 00000 n
-0000017152 00000 n
-0000017553 00000 n
-0000018004 00000 n
-0000019921 00000 n
-0000020291 00000 n
-0000022205 00000 n
-0000022581 00000 n
-0000022602 00000 n
-0000022770 00000 n
-0000022790 00000 n
-0000023166 00000 n
-0000023187 00000 n
-0000023355 00000 n
-0000023375 00000 n
-0000023751 00000 n
-0000023772 00000 n
-0000023940 00000 n
-0000023960 00000 n
-0000024336 00000 n
-0000024357 00000 n
-0000024525 00000 n
-0000024545 00000 n
-0000024921 00000 n
-0000024942 00000 n
-0000025110 00000 n
-0000025130 00000 n
-0000025506 00000 n
-0000025527 00000 n
-0000025695 00000 n
-0000025715 00000 n
-0000026938 00000 n
-0000026959 00000 n
-0000027072 00000 n
-0000027168 00000 n
-0000027281 00000 n
-0000027377 00000 n
-0000027490 00000 n
-0000027586 00000 n
-0000027682 00000 n
-0000027778 00000 n
-0000027874 00000 n
-0000027970 00000 n
-0000028066 00000 n
-0000028179 00000 n
-0000028275 00000 n
-0000028371 00000 n
-0000028468 00000 n
-0000028565 00000 n
-0000028662 00000 n
-0000028759 00000 n
-0000028856 00000 n
-0000028953 00000 n
-0000029050 00000 n
-0000029147 00000 n
-0000029261 00000 n
-0000029358 00000 n
-0000029455 00000 n
-0000029552 00000 n
-0000029649 00000 n
-0000029746 00000 n
-0000029843 00000 n
-0000029940 00000 n
-0000030037 00000 n
-0000030134 00000 n
-0000030231 00000 n
-0000030345 00000 n
-0000030442 00000 n
-0000030539 00000 n
-0000030636 00000 n
-0000030756 00000 n
-0000030853 00000 n
-0000030950 00000 n
-0000031047 00000 n
-0000031144 00000 n
-0000031241 00000 n
-0000031361 00000 n
-0000031459 00000 n
-0000031557 00000 n
-0000031655 00000 n
-0000031753 00000 n
-0000031851 00000 n
-0000031949 00000 n
-0000032047 00000 n
-0000032145 00000 n
-0000032243 00000 n
-0000032341 00000 n
-0000032439 00000 n
-0000032537 00000 n
-0000032635 00000 n
-0000032733 00000 n
-0000032831 00000 n
-0000033076 00000 n
-0000033837 00000 n
-0000033859 00000 n
-0000034075 00000 n
-0000034319 00000 n
-0000034960 00000 n
-0000034982 00000 n
-0000035197 00000 n
-0000035254 00000 n
-0000035311 00000 n
-0000035368 00000 n
-0000035425 00000 n
-0000035482 00000 n
-0000035539 00000 n
-0000035596 00000 n
-0000035653 00000 n
-0000035710 00000 n
-0000035767 00000 n
-0000035824 00000 n
-0000035881 00000 n
-0000035938 00000 n
-0000035995 00000 n
-0000036052 00000 n
-0000036109 00000 n
-0000036166 00000 n
-0000036223 00000 n
-0000036280 00000 n
-0000036337 00000 n
-0000036394 00000 n
-0000036451 00000 n
-0000036508 00000 n
-0000036565 00000 n
-0000036622 00000 n
-0000036679 00000 n
-0000036736 00000 n
-0000036793 00000 n
-0000036850 00000 n
-0000036907 00000 n
-0000036964 00000 n
-0000037021 00000 n
-0000037078 00000 n
-0000037135 00000 n
-0000037192 00000 n
-0000037249 00000 n
-0000037306 00000 n
-0000037363 00000 n
-0000037420 00000 n
-0000037477 00000 n
-0000037534 00000 n
-0000037591 00000 n
-0000037648 00000 n
-0000037705 00000 n
-0000053987 00000 n
-0000054011 00000 n
-0000065197 00000 n
+0000005714 00000 n
+0000005734 00000 n
+0000006100 00000 n
+0000006464 00000 n
+0000006830 00000 n
+0000006998 00000 n
+0000007018 00000 n
+0000007256 00000 n
+0000007276 00000 n
+0000007357 00000 n
+0000007525 00000 n
+0000007545 00000 n
+0000007783 00000 n
+0000007803 00000 n
+0000007971 00000 n
+0000007991 00000 n
+0000008229 00000 n
+0000008249 00000 n
+0000008615 00000 n
+0000008979 00000 n
+0000009345 00000 n
+0000009587 00000 n
+0000009607 00000 n
+0000010002 00000 n
+0000010023 00000 n
+0000010295 00000 n
+0000010316 00000 n
+0000010586 00000 n
+0000010607 00000 n
+0000010875 00000 n
+0000010896 00000 n
+0000011228 00000 n
+0000011392 00000 n
+0000016218 00000 n
+0000016240 00000 n
+0000017028 00000 n
+0000017429 00000 n
+0000017880 00000 n
+0000019797 00000 n
+0000020167 00000 n
+0000022081 00000 n
+0000022457 00000 n
+0000022478 00000 n
+0000022646 00000 n
+0000022666 00000 n
+0000023042 00000 n
+0000023063 00000 n
+0000023231 00000 n
+0000023251 00000 n
+0000023627 00000 n
+0000023648 00000 n
+0000023816 00000 n
+0000023836 00000 n
+0000024212 00000 n
+0000024233 00000 n
+0000024401 00000 n
+0000024421 00000 n
+0000024797 00000 n
+0000024818 00000 n
+0000024986 00000 n
+0000025006 00000 n
+0000025382 00000 n
+0000025403 00000 n
+0000025571 00000 n
+0000025591 00000 n
+0000026814 00000 n
+0000026835 00000 n
+0000026948 00000 n
+0000027044 00000 n
+0000027157 00000 n
+0000027253 00000 n
+0000027366 00000 n
+0000027462 00000 n
+0000027558 00000 n
+0000027654 00000 n
+0000027750 00000 n
+0000027846 00000 n
+0000027942 00000 n
+0000028055 00000 n
+0000028151 00000 n
+0000028247 00000 n
+0000028344 00000 n
+0000028441 00000 n
+0000028538 00000 n
+0000028635 00000 n
+0000028732 00000 n
+0000028829 00000 n
+0000028926 00000 n
+0000029023 00000 n
+0000029137 00000 n
+0000029234 00000 n
+0000029331 00000 n
+0000029428 00000 n
+0000029525 00000 n
+0000029622 00000 n
+0000029719 00000 n
+0000029816 00000 n
+0000029913 00000 n
+0000030010 00000 n
+0000030107 00000 n
+0000030221 00000 n
+0000030318 00000 n
+0000030415 00000 n
+0000030512 00000 n
+0000030632 00000 n
+0000030729 00000 n
+0000030826 00000 n
+0000030923 00000 n
+0000031020 00000 n
+0000031117 00000 n
+0000031237 00000 n
+0000031335 00000 n
+0000031433 00000 n
+0000031531 00000 n
+0000031629 00000 n
+0000031727 00000 n
+0000031825 00000 n
+0000031923 00000 n
+0000032021 00000 n
+0000032119 00000 n
+0000032217 00000 n
+0000032315 00000 n
+0000032413 00000 n
+0000032511 00000 n
+0000032609 00000 n
+0000032707 00000 n
+0000032952 00000 n
+0000033713 00000 n
+0000033735 00000 n
+0000033951 00000 n
+0000034195 00000 n
+0000034836 00000 n
+0000034858 00000 n
+0000035073 00000 n
+0000035130 00000 n
+0000035187 00000 n
+0000035244 00000 n
+0000035301 00000 n
+0000035358 00000 n
+0000035415 00000 n
+0000035472 00000 n
+0000035529 00000 n
+0000035586 00000 n
+0000035643 00000 n
+0000035700 00000 n
+0000035757 00000 n
+0000035814 00000 n
+0000035871 00000 n
+0000035928 00000 n
+0000035985 00000 n
+0000036042 00000 n
+0000036099 00000 n
+0000036156 00000 n
+0000036213 00000 n
+0000036270 00000 n
+0000036327 00000 n
+0000036384 00000 n
+0000036441 00000 n
+0000036498 00000 n
+0000036555 00000 n
+0000036612 00000 n
+0000036669 00000 n
+0000036726 00000 n
+0000036783 00000 n
+0000036840 00000 n
+0000036897 00000 n
+0000036954 00000 n
+0000037011 00000 n
+0000037068 00000 n
+0000037125 00000 n
+0000037182 00000 n
+0000037239 00000 n
+0000037296 00000 n
+0000037353 00000 n
+0000037410 00000 n
+0000037467 00000 n
+0000037524 00000 n
+0000037581 00000 n
+0000053863 00000 n
+0000053887 00000 n
+0000065073 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3839,5 +3839,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-65221
+65097
%%EOF
diff --git a/qpdf/qtest/qpdf/boxes-flattened.pdf b/qpdf/qtest/qpdf/boxes-flattened.pdf
index 97effcef..8714a246 100644
--- a/qpdf/qtest/qpdf/boxes-flattened.pdf
+++ b/qpdf/qtest/qpdf/boxes-flattened.pdf
@@ -72,10 +72,10 @@ endobj
4 0 obj
<<
/BleedBox [
- 40.000000
- 60.000000
- 712.000000
- 592.000000
+ 40
+ 60
+ 712
+ 592
]
/Contents [
17 0 R
@@ -83,16 +83,16 @@ endobj
21 0 R
]
/CropBox [
- 20.000000
- 30.000000
- 752.000000
- 602.000000
+ 20
+ 30
+ 752
+ 602
]
/MediaBox [
- 0.000000
- 0.000000
- 792.000000
- 612.000000
+ 0
+ 0
+ 792
+ 612
]
/Parent 2 0 R
/Resources <<
@@ -105,10 +105,10 @@ endobj
>>
>>
/TrimBox [
- 60.000000
- 90.000000
- 672.000000
- 582.000000
+ 60
+ 90
+ 672
+ 582
]
/Type /Page
>>
@@ -118,10 +118,10 @@ endobj
5 0 obj
<<
/BleedBox [
- 60.000000
- 80.000000
- 592.000000
- 752.000000
+ 60
+ 80
+ 592
+ 752
]
/Contents [
23 0 R
@@ -129,16 +129,16 @@ endobj
27 0 R
]
/CropBox [
- 30.000000
- 40.000000
- 602.000000
- 772.000000
+ 30
+ 40
+ 602
+ 772
]
/MediaBox [
- 0.000000
- 0.000000
- 612.000000
- 792.000000
+ 0
+ 0
+ 612
+ 792
]
/Parent 2 0 R
/Resources <<
@@ -151,10 +151,10 @@ endobj
>>
>>
/TrimBox [
- 90.000000
- 120.000000
- 582.000000
- 732.000000
+ 90
+ 120
+ 582
+ 732
]
/Type /Page
>>
@@ -164,10 +164,10 @@ endobj
6 0 obj
<<
/BleedBox [
- 80.000000
- 20.000000
- 752.000000
- 552.000000
+ 80
+ 20
+ 752
+ 552
]
/Contents [
29 0 R
@@ -175,16 +175,16 @@ endobj
33 0 R
]
/CropBox [
- 40.000000
- 10.000000
- 772.000000
- 582.000000
+ 40
+ 10
+ 772
+ 582
]
/MediaBox [
- 0.000000
- 0.000000
- 792.000000
- 612.000000
+ 0
+ 0
+ 792
+ 612
]
/Parent 2 0 R
/Resources <<
@@ -197,10 +197,10 @@ endobj
>>
>>
/TrimBox [
- 120.000000
- 30.000000
- 732.000000
- 522.000000
+ 120
+ 30
+ 732
+ 522
]
/Type /Page
>>
@@ -252,10 +252,10 @@ endobj
8 0 obj
<<
/BleedBox [
- 40.000000
- 80.000000
- 712.000000
- 612.000000
+ 40
+ 80
+ 712
+ 612
]
/Contents [
37 0 R
@@ -263,16 +263,16 @@ endobj
41 0 R
]
/CropBox [
- 20.000000
- 50.000000
- 752.000000
- 622.000000
+ 20
+ 50
+ 752
+ 622
]
/MediaBox [
- -20.000000
- -10.000000
- 832.000000
- 642.000000
+ -20
+ -10
+ 832
+ 642
]
/Parent 2 0 R
/Resources <<
@@ -285,10 +285,10 @@ endobj
>>
>>
/TrimBox [
- 60.000000
- 110.000000
- 672.000000
- 602.000000
+ 60
+ 110
+ 672
+ 602
]
/Type /Page
>>
@@ -298,10 +298,10 @@ endobj
9 0 obj
<<
/BleedBox [
- 80.000000
- 100.000000
- 612.000000
- 772.000000
+ 80
+ 100
+ 612
+ 772
]
/Contents [
43 0 R
@@ -309,16 +309,16 @@ endobj
47 0 R
]
/CropBox [
- 50.000000
- 60.000000
- 622.000000
- 792.000000
+ 50
+ 60
+ 622
+ 792
]
/MediaBox [
- -10.000000
- -20.000000
- 642.000000
- 832.000000
+ -10
+ -20
+ 642
+ 832
]
/Parent 2 0 R
/Resources <<
@@ -331,10 +331,10 @@ endobj
>>
>>
/TrimBox [
- 110.000000
- 140.000000
- 602.000000
- 752.000000
+ 110
+ 140
+ 602
+ 752
]
/Type /Page
>>
@@ -344,10 +344,10 @@ endobj
10 0 obj
<<
/BleedBox [
- 100.000000
- 20.000000
- 772.000000
- 552.000000
+ 100
+ 20
+ 772
+ 552
]
/Contents [
49 0 R
@@ -355,16 +355,16 @@ endobj
53 0 R
]
/CropBox [
- 60.000000
- 10.000000
- 792.000000
- 582.000000
+ 60
+ 10
+ 792
+ 582
]
/MediaBox [
- -20.000000
- -10.000000
- 832.000000
- 642.000000
+ -20
+ -10
+ 832
+ 642
]
/Parent 2 0 R
/Resources <<
@@ -377,10 +377,10 @@ endobj
>>
>>
/TrimBox [
- 140.000000
- 30.000000
- 752.000000
- 522.000000
+ 140
+ 30
+ 752
+ 522
]
/Type /Page
>>
@@ -491,12 +491,12 @@ endobj
>>
stream
q
-0.00 -1.00 1.00 0.00 0.00 612.00 cm
+0 -1 1 0 0 612 cm
endstream
endobj
18 0 obj
-38
+20
endobj
%% Contents for page 2
@@ -545,12 +545,12 @@ endobj
>>
stream
q
--1.00 0.00 0.00 -1.00 612.00 792.00 cm
+-1 0 0 -1 612 792 cm
endstream
endobj
24 0 obj
-41
+23
endobj
%% Contents for page 3
@@ -599,12 +599,12 @@ endobj
>>
stream
q
-0.00 1.00 -1.00 0.00 792.00 0.00 cm
+0 1 -1 0 792 0 cm
endstream
endobj
30 0 obj
-38
+20
endobj
%% Contents for page 4
@@ -677,12 +677,12 @@ endobj
>>
stream
q
-0.00 -1.00 1.00 0.00 0.00 632.00 cm
+0 -1 1 0 0 632 cm
endstream
endobj
38 0 obj
-38
+20
endobj
%% Contents for page 6
@@ -731,12 +731,12 @@ endobj
>>
stream
q
--1.00 0.00 0.00 -1.00 632.00 812.00 cm
+-1 0 0 -1 632 812 cm
endstream
endobj
44 0 obj
-41
+23
endobj
%% Contents for page 7
@@ -785,12 +785,12 @@ endobj
>>
stream
q
-0.00 1.00 -1.00 0.00 812.00 0.00 cm
+0 1 -1 0 812 0 cm
endstream
endobj
50 0 obj
-38
+20
endobj
%% Contents for page 8
@@ -846,62 +846,62 @@ xref
0000000079 00000 n
0000000232 00000 n
0000000620 00000 n
-0000001152 00000 n
-0000001685 00000 n
-0000002218 00000 n
-0000002610 00000 n
-0000003147 00000 n
-0000003686 00000 n
-0000004238 00000 n
-0000004410 00000 n
-0000004431 00000 n
-0000004550 00000 n
-0000004586 00000 n
-0000005303 00000 n
-0000005347 00000 n
-0000005442 00000 n
-0000005485 00000 n
-0000005658 00000 n
-0000005702 00000 n
-0000005762 00000 n
-0000005804 00000 n
-0000005902 00000 n
-0000005945 00000 n
-0000006119 00000 n
-0000006163 00000 n
-0000006223 00000 n
-0000006265 00000 n
-0000006360 00000 n
-0000006403 00000 n
-0000006577 00000 n
-0000006621 00000 n
-0000006681 00000 n
-0000006723 00000 n
-0000006914 00000 n
-0000006958 00000 n
-0000007053 00000 n
-0000007096 00000 n
-0000007288 00000 n
-0000007332 00000 n
-0000007392 00000 n
-0000007434 00000 n
-0000007532 00000 n
-0000007575 00000 n
-0000007768 00000 n
-0000007812 00000 n
-0000007872 00000 n
-0000007914 00000 n
-0000008009 00000 n
-0000008052 00000 n
-0000008245 00000 n
-0000008289 00000 n
-0000008349 00000 n
-0000008368 00000 n
+0000001040 00000 n
+0000001461 00000 n
+0000001882 00000 n
+0000002274 00000 n
+0000002699 00000 n
+0000003126 00000 n
+0000003566 00000 n
+0000003738 00000 n
+0000003759 00000 n
+0000003878 00000 n
+0000003914 00000 n
+0000004631 00000 n
+0000004675 00000 n
+0000004752 00000 n
+0000004795 00000 n
+0000004968 00000 n
+0000005012 00000 n
+0000005072 00000 n
+0000005114 00000 n
+0000005194 00000 n
+0000005237 00000 n
+0000005411 00000 n
+0000005455 00000 n
+0000005515 00000 n
+0000005557 00000 n
+0000005634 00000 n
+0000005677 00000 n
+0000005851 00000 n
+0000005895 00000 n
+0000005955 00000 n
+0000005997 00000 n
+0000006188 00000 n
+0000006232 00000 n
+0000006309 00000 n
+0000006352 00000 n
+0000006544 00000 n
+0000006588 00000 n
+0000006648 00000 n
+0000006690 00000 n
+0000006770 00000 n
+0000006813 00000 n
+0000007006 00000 n
+0000007050 00000 n
+0000007110 00000 n
+0000007152 00000 n
+0000007229 00000 n
+0000007272 00000 n
+0000007465 00000 n
+0000007509 00000 n
+0000007569 00000 n
+0000007588 00000 n
trailer <<
/Root 1 0 R
/Size 56
/ID [<42ed290ee4e4c51171853f92a1a7642d><31415926535897932384626433832795>]
>>
startxref
-8404
+7624
%%EOF
diff --git a/qpdf/qtest/qpdf/c-object-handles-out.pdf b/qpdf/qtest/qpdf/c-object-handles-out.pdf
index 596618b4..2e7d9390 100644
--- a/qpdf/qtest/qpdf/c-object-handles-out.pdf
+++ b/qpdf/qtest/qpdf/c-object-handles-out.pdf
@@ -11,7 +11,7 @@
<feff00710077007700f703c0>
/Quack
null
- 4.00
+ 4.12
5.0
6
true
diff --git a/qpdf/qtest/qpdf/comment-annotation-direct-out.pdf b/qpdf/qtest/qpdf/comment-annotation-direct-out.pdf
index 369fe0b7..b1db5871 100644
--- a/qpdf/qtest/qpdf/comment-annotation-direct-out.pdf
+++ b/qpdf/qtest/qpdf/comment-annotation-direct-out.pdf
@@ -88,14 +88,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 235.00000 703.00000 cm
+1 0 0 1 235 703 cm
/Fxo1 Do
Q
endstream
endobj
9 0 obj
-71
+35
endobj
10 0 obj
@@ -159,16 +159,16 @@ xref
0000000548 00000 n
0000000647 00000 n
0000000689 00000 n
-0000000815 00000 n
-0000000834 00000 n
+0000000779 00000 n
+0000000798 00000 n
+0000000917 00000 n
0000000953 00000 n
-0000000989 00000 n
-0000002233 00000 n
+0000002197 00000 n
trailer <<
/Root 1 0 R
/Size 14
/ID [<c5b1999a07a3fdcd0c04cfeed299c25a><31415926535897932384626433832795>]
>>
startxref
-2254
+2218
%%EOF
diff --git a/qpdf/qtest/qpdf/comment-annotation-out.pdf b/qpdf/qtest/qpdf/comment-annotation-out.pdf
index 369fe0b7..b1db5871 100644
--- a/qpdf/qtest/qpdf/comment-annotation-out.pdf
+++ b/qpdf/qtest/qpdf/comment-annotation-out.pdf
@@ -88,14 +88,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 235.00000 703.00000 cm
+1 0 0 1 235 703 cm
/Fxo1 Do
Q
endstream
endobj
9 0 obj
-71
+35
endobj
10 0 obj
@@ -159,16 +159,16 @@ xref
0000000548 00000 n
0000000647 00000 n
0000000689 00000 n
-0000000815 00000 n
-0000000834 00000 n
+0000000779 00000 n
+0000000798 00000 n
+0000000917 00000 n
0000000953 00000 n
-0000000989 00000 n
-0000002233 00000 n
+0000002197 00000 n
trailer <<
/Root 1 0 R
/Size 14
/ID [<c5b1999a07a3fdcd0c04cfeed299c25a><31415926535897932384626433832795>]
>>
startxref
-2254
+2218
%%EOF
diff --git a/qpdf/qtest/qpdf/form-filled-by-acrobat-out.pdf b/qpdf/qtest/qpdf/form-filled-by-acrobat-out.pdf
index 01d1d433..5202d76e 100644
--- a/qpdf/qtest/qpdf/form-filled-by-acrobat-out.pdf
+++ b/qpdf/qtest/qpdf/form-filled-by-acrobat-out.pdf
@@ -369,38 +369,38 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 123.40000 692.09998 cm
+1 0 0 1 123.4 692.09998 cm
/Fxo1 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 149.30000 648.50000 cm
+1.01653 0 0 0.98347 149.3 648.5 cm
/Fxo2 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 152.70000 627.30000 cm
+1.01653 0 0 0.98347 152.7 627.3 cm
/Fxo3 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 151.30000 601.70000 cm
+1.01653 0 0 0.98347 151.3 601.7 cm
/Fxo4 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 121.90000 559.10000 cm
+1.01653 0 0 0.98347 121.9 559.1 cm
/Fxo5 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 118.60000 527.70000 cm
+1.01653 0 0 0.98347 118.6 527.7 cm
/Fxo6 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 118.60000 500.50000 cm
+1.01653 0 0 0.98347 118.6 500.5 cm
/Fxo7 Do
Q
endstream
endobj
10 0 obj
-479
+331
endobj
11 0 obj
@@ -1721,26 +1721,26 @@ stream
Q
q
-1.01653 0.00000 0.00000 0.98347 118.60000 555.70000 cm
+1.01653 0 0 0.98347 118.6 555.7 cm
/Fxo1 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 119.30000 514.80000 cm
+1.01653 0 0 0.98347 119.3 514.8 cm
/Fxo2 Do
Q
q
-1.01653 0.00000 0.00000 0.98347 121.30000 472.50000 cm
+1.01653 0 0 0.98347 121.3 472.5 cm
/Fxo3 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 113.60000 378.50000 cm
+1 0 0 1 113.6 378.5 cm
/Fxo4 Do
Q
endstream
endobj
46 0 obj
-275
+183
endobj
47 0 obj
@@ -2071,58 +2071,58 @@ xref
0000001149 00000 n
0000004926 00000 n
0000004970 00000 n
-0000005505 00000 n
-0000005526 00000 n
-0000005603 00000 n
-0000007427 00000 n
-0000007448 00000 n
-0000007943 00000 n
-0000007964 00000 n
-0000008266 00000 n
-0000008286 00000 n
-0000008588 00000 n
-0000008608 00000 n
-0000008910 00000 n
-0000008930 00000 n
-0000009301 00000 n
-0000009321 00000 n
-0000009623 00000 n
-0000009653 00000 n
-0000009958 00000 n
-0000010384 00000 n
-0000010458 00000 n
-0000010915 00000 n
-0000012831 00000 n
-0000013199 00000 n
-0000013280 00000 n
-0000013523 00000 n
-0000014294 00000 n
-0000014315 00000 n
-0000014557 00000 n
-0000015196 00000 n
-0000015240 00000 n
-0000017953 00000 n
-0000017998 00000 n
-0000018057 00000 n
-0000018099 00000 n
-0000019931 00000 n
-0000019976 00000 n
-0000020308 00000 n
-0000020329 00000 n
-0000020631 00000 n
-0000020651 00000 n
-0000021146 00000 n
-0000021167 00000 n
-0000021469 00000 n
-0000021489 00000 n
-0000021901 00000 n
-0000021921 00000 n
-0000022136 00000 n
-0000039472 00000 n
-0000039495 00000 n
-0000050679 00000 n
-0000050702 00000 n
-0000245585 00000 n
+0000005357 00000 n
+0000005378 00000 n
+0000005455 00000 n
+0000007279 00000 n
+0000007300 00000 n
+0000007795 00000 n
+0000007816 00000 n
+0000008118 00000 n
+0000008138 00000 n
+0000008440 00000 n
+0000008460 00000 n
+0000008762 00000 n
+0000008782 00000 n
+0000009153 00000 n
+0000009173 00000 n
+0000009475 00000 n
+0000009505 00000 n
+0000009810 00000 n
+0000010236 00000 n
+0000010310 00000 n
+0000010767 00000 n
+0000012683 00000 n
+0000013051 00000 n
+0000013132 00000 n
+0000013375 00000 n
+0000014146 00000 n
+0000014167 00000 n
+0000014409 00000 n
+0000015048 00000 n
+0000015092 00000 n
+0000017805 00000 n
+0000017850 00000 n
+0000017909 00000 n
+0000017951 00000 n
+0000019783 00000 n
+0000019828 00000 n
+0000020068 00000 n
+0000020089 00000 n
+0000020391 00000 n
+0000020411 00000 n
+0000020906 00000 n
+0000020927 00000 n
+0000021229 00000 n
+0000021249 00000 n
+0000021661 00000 n
+0000021681 00000 n
+0000021896 00000 n
+0000039232 00000 n
+0000039255 00000 n
+0000050439 00000 n
+0000050462 00000 n
+0000245345 00000 n
trailer <<
/DocChecksum /74403ED4C05B5A117BE5EAA1AB10833F
/Info 2 0 R
@@ -2131,5 +2131,5 @@ trailer <<
/ID [<e2d4e6a0343edf1b377b632e36c1e4df><31415926535897932384626433832795>]
>>
startxref
-245609
+245369
%%EOF
diff --git a/qpdf/qtest/qpdf/form-xobjects-out.pdf b/qpdf/qtest/qpdf/form-xobjects-out.pdf
index 6b8a6f26..b2fd3ebe 100644
--- a/qpdf/qtest/qpdf/form-xobjects-out.pdf
+++ b/qpdf/qtest/qpdf/form-xobjects-out.pdf
@@ -94,12 +94,12 @@ endobj
792
]
/Matrix [
- 2.000000
- 0.000000
- 0.000000
- 2.000000
- 0.000000
- 0.000000
+ 2
+ 0
+ 0
+ 2
+ 0
+ 0
]
/Resources <<
/Font <<
@@ -324,12 +324,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -406,12 +406,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.500000
- 1.500000
- 0.000000
- 0.000000
- 918.000000
+ 0
+ -1.5
+ 1.5
+ 0
+ 0
+ 918
]
/Resources <<
/Font <<
@@ -488,12 +488,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -570,12 +570,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -652,12 +652,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -734,12 +734,12 @@ endobj
792
]
/Matrix [
- -0.750000
- 0.000000
- 0.000000
- -0.750000
- 459.000000
- 594.000000
+ -0.75
+ 0
+ 0
+ -0.75
+ 459
+ 594
]
/Resources <<
/Font <<
@@ -816,12 +816,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -898,12 +898,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -980,12 +980,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1062,12 +1062,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.250000
- -1.250000
- 0.000000
- 990.000000
- 0.000000
+ 0
+ 1.25
+ -1.25
+ 0
+ 990
+ 0
]
/Resources <<
/Font <<
@@ -1144,12 +1144,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1226,12 +1226,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -2121,118 +2121,118 @@ xref
0000000500 00000 n
0000000817 00000 n
0000000865 00000 n
-0000001285 00000 n
-0000001333 00000 n
-0000001659 00000 n
-0000001707 00000 n
-0000002026 00000 n
-0000002075 00000 n
-0000002394 00000 n
-0000002443 00000 n
-0000002762 00000 n
-0000002811 00000 n
-0000003130 00000 n
-0000003179 00000 n
-0000003599 00000 n
-0000003648 00000 n
-0000003971 00000 n
-0000004020 00000 n
-0000004451 00000 n
-0000004500 00000 n
-0000004834 00000 n
-0000004883 00000 n
-0000005303 00000 n
-0000005352 00000 n
-0000005675 00000 n
-0000005724 00000 n
-0000006144 00000 n
-0000006193 00000 n
-0000006516 00000 n
-0000006565 00000 n
-0000006989 00000 n
-0000007038 00000 n
-0000007362 00000 n
-0000007411 00000 n
-0000007848 00000 n
-0000007897 00000 n
-0000008234 00000 n
-0000008283 00000 n
-0000008708 00000 n
-0000008757 00000 n
-0000009082 00000 n
-0000009131 00000 n
-0000009556 00000 n
-0000009605 00000 n
-0000009930 00000 n
-0000009979 00000 n
-0000010401 00000 n
-0000010450 00000 n
-0000010775 00000 n
-0000010824 00000 n
-0000011258 00000 n
-0000011307 00000 n
-0000011644 00000 n
-0000011693 00000 n
-0000012115 00000 n
-0000012164 00000 n
-0000012489 00000 n
-0000012538 00000 n
-0000012960 00000 n
-0000013009 00000 n
-0000013334 00000 n
-0000013382 00000 n
-0000013650 00000 n
-0000013797 00000 n
-0000013870 00000 n
-0000014104 00000 n
-0000014352 00000 n
-0000014607 00000 n
-0000014841 00000 n
-0000015088 00000 n
-0000015351 00000 n
-0000015599 00000 n
-0000015848 00000 n
-0000016099 00000 n
-0000016367 00000 n
-0000016618 00000 n
-0000016869 00000 n
-0000017120 00000 n
-0000017388 00000 n
-0000017639 00000 n
-0000017902 00000 n
-0000018067 00000 n
-0000018139 00000 n
-0000018313 00000 n
-0000018385 00000 n
-0000018487 00000 n
-0000018558 00000 n
-0000018678 00000 n
-0000018749 00000 n
-0000018914 00000 n
-0000018986 00000 n
-0000019155 00000 n
-0000019227 00000 n
-0000019407 00000 n
-0000019479 00000 n
-0000019649 00000 n
-0000019722 00000 n
-0000019893 00000 n
-0000019966 00000 n
-0000020138 00000 n
-0000020212 00000 n
-0000020397 00000 n
-0000020471 00000 n
-0000020644 00000 n
-0000020718 00000 n
-0000020891 00000 n
-0000020965 00000 n
-0000021138 00000 n
-0000021212 00000 n
-0000021397 00000 n
-0000021471 00000 n
-0000021644 00000 n
-0000021718 00000 n
-0000021891 00000 n
+0000001243 00000 n
+0000001291 00000 n
+0000001617 00000 n
+0000001665 00000 n
+0000001984 00000 n
+0000002033 00000 n
+0000002352 00000 n
+0000002401 00000 n
+0000002720 00000 n
+0000002769 00000 n
+0000003088 00000 n
+0000003137 00000 n
+0000003515 00000 n
+0000003564 00000 n
+0000003887 00000 n
+0000003936 00000 n
+0000004329 00000 n
+0000004378 00000 n
+0000004712 00000 n
+0000004761 00000 n
+0000005139 00000 n
+0000005188 00000 n
+0000005511 00000 n
+0000005560 00000 n
+0000005938 00000 n
+0000005987 00000 n
+0000006310 00000 n
+0000006359 00000 n
+0000006741 00000 n
+0000006790 00000 n
+0000007114 00000 n
+0000007163 00000 n
+0000007564 00000 n
+0000007613 00000 n
+0000007950 00000 n
+0000007999 00000 n
+0000008382 00000 n
+0000008431 00000 n
+0000008756 00000 n
+0000008805 00000 n
+0000009188 00000 n
+0000009237 00000 n
+0000009562 00000 n
+0000009611 00000 n
+0000009991 00000 n
+0000010040 00000 n
+0000010365 00000 n
+0000010414 00000 n
+0000010812 00000 n
+0000010861 00000 n
+0000011198 00000 n
+0000011247 00000 n
+0000011627 00000 n
+0000011676 00000 n
+0000012001 00000 n
+0000012050 00000 n
+0000012430 00000 n
+0000012479 00000 n
+0000012804 00000 n
+0000012852 00000 n
+0000013120 00000 n
+0000013267 00000 n
+0000013340 00000 n
+0000013574 00000 n
+0000013822 00000 n
+0000014077 00000 n
+0000014311 00000 n
+0000014558 00000 n
+0000014821 00000 n
+0000015069 00000 n
+0000015318 00000 n
+0000015569 00000 n
+0000015837 00000 n
+0000016088 00000 n
+0000016339 00000 n
+0000016590 00000 n
+0000016858 00000 n
+0000017109 00000 n
+0000017372 00000 n
+0000017537 00000 n
+0000017609 00000 n
+0000017783 00000 n
+0000017855 00000 n
+0000017957 00000 n
+0000018028 00000 n
+0000018148 00000 n
+0000018219 00000 n
+0000018384 00000 n
+0000018456 00000 n
+0000018625 00000 n
+0000018697 00000 n
+0000018877 00000 n
+0000018949 00000 n
+0000019119 00000 n
+0000019192 00000 n
+0000019363 00000 n
+0000019436 00000 n
+0000019608 00000 n
+0000019682 00000 n
+0000019867 00000 n
+0000019941 00000 n
+0000020114 00000 n
+0000020188 00000 n
+0000020361 00000 n
+0000020435 00000 n
+0000020608 00000 n
+0000020682 00000 n
+0000020867 00000 n
+0000020941 00000 n
+0000021114 00000 n
+0000021188 00000 n
+0000021361 00000 n
trailer <<
/QTest [
2 0 R
@@ -2273,5 +2273,5 @@ trailer <<
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-21913
+21383
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-56.pdf b/qpdf/qtest/qpdf/fx-overlay-56.pdf
index d135aa88..a718b846 100644
--- a/qpdf/qtest/qpdf/fx-overlay-56.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-56.pdf
@@ -566,14 +566,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
-66
+30
endobj
%% Original object ID: 21 0
@@ -681,14 +681,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
34 0 obj
-66
+30
endobj
%% Original object ID: 60 0
@@ -791,14 +791,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
44 0 obj
-66
+30
endobj
%% Original object ID: 63 0
@@ -888,14 +888,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
52 0 obj
-66
+30
endobj
%% Original object ID: 66 0
@@ -986,14 +986,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
60 0 obj
-66
+30
endobj
%% Original object ID: 69 0
@@ -1082,14 +1082,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
68 0 obj
-66
+30
endobj
%% Original object ID: 72 0
@@ -1178,14 +1178,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
76 0 obj
-66
+30
endobj
%% Original object ID: 75 0
@@ -1274,14 +1274,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
84 0 obj
-66
+30
endobj
%% Original object ID: 78 0
@@ -1370,14 +1370,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
92 0 obj
-66
+30
endobj
%% Original object ID: 81 0
@@ -1466,14 +1466,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
100 0 obj
-66
+30
endobj
%% Original object ID: 84 0
@@ -1562,14 +1562,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
108 0 obj
-66
+30
endobj
%% Original object ID: 87 0
@@ -1658,14 +1658,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
116 0 obj
-66
+30
endobj
%% Original object ID: 90 0
@@ -1754,14 +1754,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
124 0 obj
-66
+30
endobj
%% Original object ID: 93 0
@@ -1850,14 +1850,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
132 0 obj
-66
+30
endobj
%% Original object ID: 96 0
@@ -1946,14 +1946,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
140 0 obj
-66
+30
endobj
%% Original object ID: 99 0
@@ -2042,14 +2042,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
148 0 obj
-66
+30
endobj
%% Original object ID: 102 0
@@ -2134,140 +2134,140 @@ xref
0000005714 00000 n
0000005879 00000 n
0000005951 00000 n
-0000006074 00000 n
-0000006122 00000 n
-0000006269 00000 n
-0000006333 00000 n
-0000006655 00000 n
-0000006727 00000 n
-0000006786 00000 n
-0000006856 00000 n
-0000007030 00000 n
-0000007102 00000 n
-0000007225 00000 n
-0000007273 00000 n
+0000006038 00000 n
+0000006086 00000 n
+0000006233 00000 n
+0000006297 00000 n
+0000006619 00000 n
+0000006691 00000 n
+0000006750 00000 n
+0000006820 00000 n
+0000006994 00000 n
+0000007066 00000 n
+0000007153 00000 n
+0000007201 00000 n
+0000007527 00000 n
0000007599 00000 n
-0000007671 00000 n
-0000007730 00000 n
-0000007800 00000 n
-0000007902 00000 n
-0000007973 00000 n
-0000008093 00000 n
-0000008164 00000 n
-0000008287 00000 n
-0000008335 00000 n
-0000008700 00000 n
-0000008772 00000 n
-0000008831 00000 n
-0000008901 00000 n
-0000009066 00000 n
-0000009138 00000 n
-0000009261 00000 n
-0000009309 00000 n
-0000009694 00000 n
-0000009766 00000 n
-0000009825 00000 n
-0000009895 00000 n
-0000010064 00000 n
-0000010136 00000 n
-0000010259 00000 n
-0000010307 00000 n
-0000010629 00000 n
-0000010701 00000 n
-0000010760 00000 n
+0000007658 00000 n
+0000007728 00000 n
+0000007830 00000 n
+0000007901 00000 n
+0000008021 00000 n
+0000008092 00000 n
+0000008179 00000 n
+0000008227 00000 n
+0000008592 00000 n
+0000008664 00000 n
+0000008723 00000 n
+0000008793 00000 n
+0000008958 00000 n
+0000009030 00000 n
+0000009117 00000 n
+0000009165 00000 n
+0000009550 00000 n
+0000009622 00000 n
+0000009681 00000 n
+0000009751 00000 n
+0000009920 00000 n
+0000009992 00000 n
+0000010079 00000 n
+0000010127 00000 n
+0000010449 00000 n
+0000010521 00000 n
+0000010580 00000 n
+0000010650 00000 n
0000010830 00000 n
-0000011010 00000 n
-0000011082 00000 n
-0000011205 00000 n
-0000011253 00000 n
-0000011579 00000 n
-0000011651 00000 n
-0000011710 00000 n
-0000011780 00000 n
-0000011949 00000 n
-0000012021 00000 n
-0000012144 00000 n
-0000012192 00000 n
-0000012519 00000 n
-0000012591 00000 n
-0000012650 00000 n
-0000012720 00000 n
-0000012889 00000 n
-0000012961 00000 n
-0000013084 00000 n
-0000013132 00000 n
-0000013459 00000 n
-0000013531 00000 n
-0000013590 00000 n
-0000013660 00000 n
-0000013830 00000 n
-0000013902 00000 n
-0000014025 00000 n
-0000014073 00000 n
-0000014395 00000 n
-0000014468 00000 n
-0000014527 00000 n
-0000014598 00000 n
-0000014781 00000 n
-0000014854 00000 n
-0000014978 00000 n
-0000015027 00000 n
-0000015356 00000 n
-0000015430 00000 n
-0000015491 00000 n
-0000015563 00000 n
-0000015736 00000 n
-0000015810 00000 n
-0000015935 00000 n
-0000015984 00000 n
-0000016314 00000 n
-0000016388 00000 n
-0000016449 00000 n
-0000016521 00000 n
-0000016694 00000 n
-0000016768 00000 n
-0000016893 00000 n
-0000016942 00000 n
-0000017272 00000 n
-0000017346 00000 n
-0000017407 00000 n
-0000017479 00000 n
-0000017652 00000 n
-0000017726 00000 n
-0000017851 00000 n
-0000017900 00000 n
-0000018225 00000 n
-0000018299 00000 n
-0000018360 00000 n
-0000018432 00000 n
-0000018617 00000 n
-0000018691 00000 n
-0000018816 00000 n
-0000018865 00000 n
-0000019205 00000 n
-0000019280 00000 n
-0000019341 00000 n
-0000019413 00000 n
-0000019586 00000 n
-0000019661 00000 n
-0000019786 00000 n
-0000019835 00000 n
-0000020165 00000 n
-0000020240 00000 n
-0000020301 00000 n
-0000020373 00000 n
-0000020546 00000 n
-0000020621 00000 n
-0000020746 00000 n
-0000020796 00000 n
-0000021126 00000 n
-0000021176 00000 n
-0000021324 00000 n
+0000010902 00000 n
+0000010989 00000 n
+0000011037 00000 n
+0000011363 00000 n
+0000011435 00000 n
+0000011494 00000 n
+0000011564 00000 n
+0000011733 00000 n
+0000011805 00000 n
+0000011892 00000 n
+0000011940 00000 n
+0000012267 00000 n
+0000012339 00000 n
+0000012398 00000 n
+0000012468 00000 n
+0000012637 00000 n
+0000012709 00000 n
+0000012796 00000 n
+0000012844 00000 n
+0000013171 00000 n
+0000013243 00000 n
+0000013302 00000 n
+0000013372 00000 n
+0000013542 00000 n
+0000013614 00000 n
+0000013701 00000 n
+0000013749 00000 n
+0000014071 00000 n
+0000014144 00000 n
+0000014203 00000 n
+0000014274 00000 n
+0000014457 00000 n
+0000014530 00000 n
+0000014618 00000 n
+0000014667 00000 n
+0000014996 00000 n
+0000015070 00000 n
+0000015131 00000 n
+0000015203 00000 n
+0000015376 00000 n
+0000015450 00000 n
+0000015539 00000 n
+0000015588 00000 n
+0000015918 00000 n
+0000015992 00000 n
+0000016053 00000 n
+0000016125 00000 n
+0000016298 00000 n
+0000016372 00000 n
+0000016461 00000 n
+0000016510 00000 n
+0000016840 00000 n
+0000016914 00000 n
+0000016975 00000 n
+0000017047 00000 n
+0000017220 00000 n
+0000017294 00000 n
+0000017383 00000 n
+0000017432 00000 n
+0000017757 00000 n
+0000017831 00000 n
+0000017892 00000 n
+0000017964 00000 n
+0000018149 00000 n
+0000018223 00000 n
+0000018312 00000 n
+0000018361 00000 n
+0000018701 00000 n
+0000018776 00000 n
+0000018837 00000 n
+0000018909 00000 n
+0000019082 00000 n
+0000019157 00000 n
+0000019246 00000 n
+0000019295 00000 n
+0000019625 00000 n
+0000019700 00000 n
+0000019761 00000 n
+0000019833 00000 n
+0000020006 00000 n
+0000020081 00000 n
+0000020170 00000 n
+0000020220 00000 n
+0000020550 00000 n
+0000020600 00000 n
+0000020748 00000 n
trailer <<
/Root 1 0 R
/Size 153
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-21361
+20785
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-57.pdf b/qpdf/qtest/qpdf/fx-overlay-57.pdf
index 7dca546c..1a646123 100644
--- a/qpdf/qtest/qpdf/fx-overlay-57.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-57.pdf
@@ -566,14 +566,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
-66
+30
endobj
%% Original object ID: 21 0
@@ -681,14 +681,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
34 0 obj
-68
+50
endobj
%% Original object ID: 60 0
@@ -701,12 +701,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -799,14 +799,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 20.00000 20.00000 cm
+1 0 0 1 20 20 cm
/Fx1 Do
Q
endstream
endobj
44 0 obj
-68
+32
endobj
%% Original object ID: 63 0
@@ -819,12 +819,12 @@ endobj
782
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 592.000000
- 772.000000
+ -1
+ 0
+ 0
+ -1
+ 592
+ 772
]
/Resources <<
/Font <<
@@ -904,14 +904,14 @@ stream
Q
q
-0.81383 0.00000 0.00000 0.81383 16.27660 146.96809 cm
+0.81383 0 0 0.81383 16.2766 146.96809 cm
/Fx1 Do
Q
endstream
endobj
52 0 obj
-69
+56
endobj
%% Original object ID: 66 0
@@ -924,12 +924,12 @@ endobj
772
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 752.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 752
+ 0
]
/Resources <<
/Font <<
@@ -1010,14 +1010,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
60 0 obj
-66
+30
endobj
%% Original object ID: 69 0
@@ -1106,14 +1106,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
68 0 obj
-68
+50
endobj
%% Original object ID: 72 0
@@ -1126,12 +1126,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1210,14 +1210,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
76 0 obj
-66
+30
endobj
%% Original object ID: 75 0
@@ -1230,12 +1230,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1314,14 +1314,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
84 0 obj
-68
+50
endobj
%% Original object ID: 78 0
@@ -1334,12 +1334,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1418,14 +1418,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
92 0 obj
-66
+30
endobj
%% Original object ID: 81 0
@@ -1514,14 +1514,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
100 0 obj
-68
+50
endobj
%% Original object ID: 84 0
@@ -1534,12 +1534,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1618,14 +1618,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
108 0 obj
-66
+30
endobj
%% Original object ID: 87 0
@@ -1638,12 +1638,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1722,14 +1722,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
116 0 obj
-68
+50
endobj
%% Original object ID: 90 0
@@ -1742,12 +1742,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1826,14 +1826,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
124 0 obj
-66
+30
endobj
%% Original object ID: 93 0
@@ -1922,14 +1922,14 @@ stream
Q
q
-0.51515 0.00000 0.00000 0.51515 0.00000 159.54545 cm
+0.51515 0 0 0.51515 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
132 0 obj
-68
+50
endobj
%% Original object ID: 96 0
@@ -1942,12 +1942,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.500000
- 1.500000
- 0.000000
- 0.000000
- 918.000000
+ 0
+ -1.5
+ 1.5
+ 0
+ 0
+ 918
]
/Resources <<
/Font <<
@@ -2026,14 +2026,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
140 0 obj
-66
+30
endobj
%% Original object ID: 99 0
@@ -2046,12 +2046,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -2130,14 +2130,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
148 0 obj
-68
+50
endobj
%% Original object ID: 102 0
@@ -2150,12 +2150,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -2230,140 +2230,140 @@ xref
0000005714 00000 n
0000005879 00000 n
0000005951 00000 n
-0000006074 00000 n
-0000006122 00000 n
-0000006269 00000 n
-0000006333 00000 n
-0000006655 00000 n
-0000006727 00000 n
-0000006786 00000 n
-0000006856 00000 n
-0000007030 00000 n
-0000007102 00000 n
-0000007227 00000 n
-0000007275 00000 n
-0000007698 00000 n
-0000007770 00000 n
-0000007829 00000 n
-0000007899 00000 n
-0000008001 00000 n
-0000008072 00000 n
-0000008192 00000 n
-0000008263 00000 n
-0000008388 00000 n
-0000008436 00000 n
-0000008901 00000 n
-0000008973 00000 n
-0000009032 00000 n
-0000009102 00000 n
-0000009267 00000 n
-0000009339 00000 n
-0000009465 00000 n
-0000009513 00000 n
-0000009995 00000 n
-0000010067 00000 n
-0000010126 00000 n
-0000010196 00000 n
-0000010365 00000 n
-0000010437 00000 n
-0000010560 00000 n
-0000010608 00000 n
-0000010930 00000 n
-0000011002 00000 n
-0000011061 00000 n
-0000011131 00000 n
-0000011311 00000 n
-0000011383 00000 n
-0000011508 00000 n
-0000011556 00000 n
-0000011979 00000 n
-0000012051 00000 n
-0000012110 00000 n
-0000012180 00000 n
-0000012349 00000 n
-0000012421 00000 n
-0000012544 00000 n
-0000012592 00000 n
-0000013019 00000 n
-0000013091 00000 n
-0000013150 00000 n
-0000013220 00000 n
-0000013389 00000 n
-0000013461 00000 n
-0000013586 00000 n
-0000013634 00000 n
-0000014058 00000 n
-0000014130 00000 n
-0000014189 00000 n
-0000014259 00000 n
-0000014429 00000 n
-0000014501 00000 n
-0000014624 00000 n
-0000014672 00000 n
-0000014994 00000 n
-0000015067 00000 n
-0000015126 00000 n
-0000015197 00000 n
-0000015380 00000 n
-0000015453 00000 n
-0000015579 00000 n
-0000015628 00000 n
-0000016054 00000 n
-0000016128 00000 n
-0000016189 00000 n
-0000016261 00000 n
-0000016434 00000 n
-0000016508 00000 n
-0000016633 00000 n
+0000006038 00000 n
+0000006086 00000 n
+0000006233 00000 n
+0000006297 00000 n
+0000006619 00000 n
+0000006691 00000 n
+0000006750 00000 n
+0000006820 00000 n
+0000006994 00000 n
+0000007066 00000 n
+0000007173 00000 n
+0000007221 00000 n
+0000007602 00000 n
+0000007674 00000 n
+0000007733 00000 n
+0000007803 00000 n
+0000007905 00000 n
+0000007976 00000 n
+0000008096 00000 n
+0000008167 00000 n
+0000008256 00000 n
+0000008304 00000 n
+0000008727 00000 n
+0000008799 00000 n
+0000008858 00000 n
+0000008928 00000 n
+0000009093 00000 n
+0000009165 00000 n
+0000009278 00000 n
+0000009326 00000 n
+0000009766 00000 n
+0000009838 00000 n
+0000009897 00000 n
+0000009967 00000 n
+0000010136 00000 n
+0000010208 00000 n
+0000010295 00000 n
+0000010343 00000 n
+0000010665 00000 n
+0000010737 00000 n
+0000010796 00000 n
+0000010866 00000 n
+0000011046 00000 n
+0000011118 00000 n
+0000011225 00000 n
+0000011273 00000 n
+0000011654 00000 n
+0000011726 00000 n
+0000011785 00000 n
+0000011855 00000 n
+0000012024 00000 n
+0000012096 00000 n
+0000012183 00000 n
+0000012231 00000 n
+0000012616 00000 n
+0000012688 00000 n
+0000012747 00000 n
+0000012817 00000 n
+0000012986 00000 n
+0000013058 00000 n
+0000013165 00000 n
+0000013213 00000 n
+0000013595 00000 n
+0000013667 00000 n
+0000013726 00000 n
+0000013796 00000 n
+0000013966 00000 n
+0000014038 00000 n
+0000014125 00000 n
+0000014173 00000 n
+0000014495 00000 n
+0000014568 00000 n
+0000014627 00000 n
+0000014698 00000 n
+0000014881 00000 n
+0000014954 00000 n
+0000015062 00000 n
+0000015111 00000 n
+0000015495 00000 n
+0000015569 00000 n
+0000015630 00000 n
+0000015702 00000 n
+0000015875 00000 n
+0000015949 00000 n
+0000016038 00000 n
+0000016087 00000 n
+0000016475 00000 n
+0000016549 00000 n
+0000016610 00000 n
0000016682 00000 n
-0000017112 00000 n
-0000017186 00000 n
-0000017247 00000 n
-0000017319 00000 n
-0000017492 00000 n
-0000017566 00000 n
-0000017693 00000 n
-0000017742 00000 n
-0000018169 00000 n
-0000018243 00000 n
-0000018304 00000 n
-0000018376 00000 n
-0000018549 00000 n
-0000018623 00000 n
-0000018748 00000 n
-0000018797 00000 n
-0000019122 00000 n
-0000019196 00000 n
-0000019257 00000 n
-0000019329 00000 n
-0000019514 00000 n
-0000019588 00000 n
-0000019715 00000 n
-0000019764 00000 n
-0000020201 00000 n
-0000020276 00000 n
-0000020337 00000 n
-0000020409 00000 n
-0000020582 00000 n
-0000020657 00000 n
-0000020782 00000 n
-0000020831 00000 n
-0000021261 00000 n
-0000021336 00000 n
-0000021397 00000 n
-0000021469 00000 n
-0000021642 00000 n
-0000021717 00000 n
-0000021844 00000 n
-0000021894 00000 n
-0000022321 00000 n
-0000022371 00000 n
-0000022519 00000 n
+0000016855 00000 n
+0000016929 00000 n
+0000017038 00000 n
+0000017087 00000 n
+0000017472 00000 n
+0000017546 00000 n
+0000017607 00000 n
+0000017679 00000 n
+0000017852 00000 n
+0000017926 00000 n
+0000018015 00000 n
+0000018064 00000 n
+0000018389 00000 n
+0000018463 00000 n
+0000018524 00000 n
+0000018596 00000 n
+0000018781 00000 n
+0000018855 00000 n
+0000018964 00000 n
+0000019013 00000 n
+0000019412 00000 n
+0000019487 00000 n
+0000019548 00000 n
+0000019620 00000 n
+0000019793 00000 n
+0000019868 00000 n
+0000019957 00000 n
+0000020006 00000 n
+0000020394 00000 n
+0000020469 00000 n
+0000020530 00000 n
+0000020602 00000 n
+0000020775 00000 n
+0000020850 00000 n
+0000020959 00000 n
+0000021009 00000 n
+0000021394 00000 n
+0000021444 00000 n
+0000021592 00000 n
trailer <<
/Root 1 0 R
/Size 153
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-22556
+21629
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-58.pdf b/qpdf/qtest/qpdf/fx-overlay-58.pdf
index 54594e9a..0386e4ca 100644
--- a/qpdf/qtest/qpdf/fx-overlay-58.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-58.pdf
@@ -566,14 +566,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
-66
+30
endobj
%% Original object ID: 21 0
@@ -681,14 +681,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 153.00000 198.00000 cm
+0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
endstream
endobj
34 0 obj
-70
+38
endobj
%% Original object ID: 60 0
@@ -791,14 +791,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
44 0 obj
-66
+30
endobj
%% Original object ID: 63 0
@@ -888,14 +888,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
52 0 obj
-66
+30
endobj
%% Original object ID: 66 0
@@ -986,14 +986,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
60 0 obj
-71
+53
endobj
%% Original object ID: 69 0
@@ -1082,14 +1082,14 @@ stream
Q
q
-0.00000 0.66667 -0.66667 0.00000 570.00000 192.00000 cm
+0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
endstream
endobj
68 0 obj
-71
+47
endobj
%% Original object ID: 72 0
@@ -1178,14 +1178,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
76 0 obj
-71
+53
endobj
%% Original object ID: 75 0
@@ -1274,14 +1274,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
84 0 obj
-71
+53
endobj
%% Original object ID: 78 0
@@ -1370,14 +1370,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
92 0 obj
-72
+36
endobj
%% Original object ID: 81 0
@@ -1466,14 +1466,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
100 0 obj
-72
+36
endobj
%% Original object ID: 84 0
@@ -1562,14 +1562,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
108 0 obj
-72
+36
endobj
%% Original object ID: 87 0
@@ -1658,14 +1658,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
116 0 obj
-72
+36
endobj
%% Original object ID: 90 0
@@ -1754,14 +1754,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
124 0 obj
-69
+51
endobj
%% Original object ID: 93 0
@@ -1850,14 +1850,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
132 0 obj
-69
+51
endobj
%% Original object ID: 96 0
@@ -1946,14 +1946,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
140 0 obj
-69
+51
endobj
%% Original object ID: 99 0
@@ -2042,14 +2042,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
148 0 obj
-69
+51
endobj
%% Original object ID: 102 0
@@ -2134,140 +2134,140 @@ xref
0000005714 00000 n
0000005879 00000 n
0000005951 00000 n
-0000006074 00000 n
-0000006122 00000 n
-0000006269 00000 n
-0000006333 00000 n
-0000006655 00000 n
-0000006727 00000 n
-0000006786 00000 n
-0000006856 00000 n
-0000007030 00000 n
-0000007102 00000 n
-0000007229 00000 n
-0000007277 00000 n
-0000007603 00000 n
-0000007675 00000 n
-0000007734 00000 n
-0000007804 00000 n
-0000007906 00000 n
-0000007977 00000 n
-0000008097 00000 n
-0000008168 00000 n
-0000008291 00000 n
-0000008339 00000 n
-0000008704 00000 n
-0000008776 00000 n
-0000008835 00000 n
-0000008905 00000 n
-0000009070 00000 n
-0000009142 00000 n
-0000009265 00000 n
-0000009313 00000 n
-0000009698 00000 n
-0000009770 00000 n
-0000009829 00000 n
-0000009899 00000 n
-0000010068 00000 n
-0000010140 00000 n
-0000010268 00000 n
-0000010316 00000 n
-0000010638 00000 n
-0000010710 00000 n
-0000010769 00000 n
-0000010839 00000 n
-0000011019 00000 n
-0000011091 00000 n
-0000011219 00000 n
-0000011267 00000 n
-0000011593 00000 n
-0000011665 00000 n
-0000011724 00000 n
-0000011794 00000 n
+0000006038 00000 n
+0000006086 00000 n
+0000006233 00000 n
+0000006297 00000 n
+0000006619 00000 n
+0000006691 00000 n
+0000006750 00000 n
+0000006820 00000 n
+0000006994 00000 n
+0000007066 00000 n
+0000007161 00000 n
+0000007209 00000 n
+0000007535 00000 n
+0000007607 00000 n
+0000007666 00000 n
+0000007736 00000 n
+0000007838 00000 n
+0000007909 00000 n
+0000008029 00000 n
+0000008100 00000 n
+0000008187 00000 n
+0000008235 00000 n
+0000008600 00000 n
+0000008672 00000 n
+0000008731 00000 n
+0000008801 00000 n
+0000008966 00000 n
+0000009038 00000 n
+0000009125 00000 n
+0000009173 00000 n
+0000009558 00000 n
+0000009630 00000 n
+0000009689 00000 n
+0000009759 00000 n
+0000009928 00000 n
+0000010000 00000 n
+0000010110 00000 n
+0000010158 00000 n
+0000010480 00000 n
+0000010552 00000 n
+0000010611 00000 n
+0000010681 00000 n
+0000010861 00000 n
+0000010933 00000 n
+0000011037 00000 n
+0000011085 00000 n
+0000011411 00000 n
+0000011483 00000 n
+0000011542 00000 n
+0000011612 00000 n
+0000011781 00000 n
+0000011853 00000 n
0000011963 00000 n
-0000012035 00000 n
-0000012163 00000 n
-0000012211 00000 n
-0000012538 00000 n
-0000012610 00000 n
-0000012669 00000 n
-0000012739 00000 n
-0000012908 00000 n
-0000012980 00000 n
-0000013108 00000 n
-0000013156 00000 n
-0000013483 00000 n
-0000013555 00000 n
-0000013614 00000 n
-0000013684 00000 n
-0000013854 00000 n
-0000013926 00000 n
-0000014055 00000 n
-0000014103 00000 n
-0000014425 00000 n
-0000014498 00000 n
+0000012011 00000 n
+0000012338 00000 n
+0000012410 00000 n
+0000012469 00000 n
+0000012539 00000 n
+0000012708 00000 n
+0000012780 00000 n
+0000012890 00000 n
+0000012938 00000 n
+0000013265 00000 n
+0000013337 00000 n
+0000013396 00000 n
+0000013466 00000 n
+0000013636 00000 n
+0000013708 00000 n
+0000013801 00000 n
+0000013849 00000 n
+0000014171 00000 n
+0000014244 00000 n
+0000014303 00000 n
+0000014374 00000 n
0000014557 00000 n
-0000014628 00000 n
-0000014811 00000 n
-0000014884 00000 n
-0000015014 00000 n
-0000015063 00000 n
-0000015392 00000 n
-0000015466 00000 n
-0000015527 00000 n
-0000015599 00000 n
-0000015772 00000 n
-0000015846 00000 n
-0000015977 00000 n
-0000016026 00000 n
-0000016356 00000 n
-0000016430 00000 n
-0000016491 00000 n
-0000016563 00000 n
-0000016736 00000 n
-0000016810 00000 n
-0000016941 00000 n
-0000016990 00000 n
-0000017320 00000 n
-0000017394 00000 n
-0000017455 00000 n
-0000017527 00000 n
-0000017700 00000 n
-0000017774 00000 n
-0000017902 00000 n
-0000017951 00000 n
-0000018276 00000 n
-0000018350 00000 n
-0000018411 00000 n
-0000018483 00000 n
-0000018668 00000 n
-0000018742 00000 n
-0000018870 00000 n
-0000018919 00000 n
-0000019259 00000 n
-0000019334 00000 n
-0000019395 00000 n
-0000019467 00000 n
-0000019640 00000 n
-0000019715 00000 n
-0000019843 00000 n
-0000019892 00000 n
-0000020222 00000 n
-0000020297 00000 n
-0000020358 00000 n
-0000020430 00000 n
-0000020603 00000 n
-0000020678 00000 n
-0000020806 00000 n
-0000020856 00000 n
-0000021186 00000 n
-0000021236 00000 n
-0000021384 00000 n
+0000014630 00000 n
+0000014724 00000 n
+0000014773 00000 n
+0000015102 00000 n
+0000015176 00000 n
+0000015237 00000 n
+0000015309 00000 n
+0000015482 00000 n
+0000015556 00000 n
+0000015651 00000 n
+0000015700 00000 n
+0000016030 00000 n
+0000016104 00000 n
+0000016165 00000 n
+0000016237 00000 n
+0000016410 00000 n
+0000016484 00000 n
+0000016579 00000 n
+0000016628 00000 n
+0000016958 00000 n
+0000017032 00000 n
+0000017093 00000 n
+0000017165 00000 n
+0000017338 00000 n
+0000017412 00000 n
+0000017522 00000 n
+0000017571 00000 n
+0000017896 00000 n
+0000017970 00000 n
+0000018031 00000 n
+0000018103 00000 n
+0000018288 00000 n
+0000018362 00000 n
+0000018472 00000 n
+0000018521 00000 n
+0000018861 00000 n
+0000018936 00000 n
+0000018997 00000 n
+0000019069 00000 n
+0000019242 00000 n
+0000019317 00000 n
+0000019427 00000 n
+0000019476 00000 n
+0000019806 00000 n
+0000019881 00000 n
+0000019942 00000 n
+0000020014 00000 n
+0000020187 00000 n
+0000020262 00000 n
+0000020372 00000 n
+0000020422 00000 n
+0000020752 00000 n
+0000020802 00000 n
+0000020950 00000 n
trailer <<
/Root 1 0 R
/Size 153
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-21421
+20987
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-59.pdf b/qpdf/qtest/qpdf/fx-overlay-59.pdf
index f9b17a71..611c0b60 100644
--- a/qpdf/qtest/qpdf/fx-overlay-59.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-59.pdf
@@ -566,14 +566,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
-66
+30
endobj
%% Original object ID: 21 0
@@ -681,14 +681,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 108.00000 243.00000 cm
+0.5 0 0 0.5 108 243 cm
/Fx1 Do
Q
endstream
endobj
34 0 obj
-70
+38
endobj
%% Original object ID: 60 0
@@ -701,12 +701,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -799,14 +799,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 20.00000 20.00000 cm
+1 0 0 1 20 20 cm
/Fx1 Do
Q
endstream
endobj
44 0 obj
-68
+32
endobj
%% Original object ID: 63 0
@@ -819,12 +819,12 @@ endobj
782
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 592.000000
- 772.000000
+ -1
+ 0
+ 0
+ -1
+ 592
+ 772
]
/Resources <<
/Font <<
@@ -904,14 +904,14 @@ stream
Q
q
-0.81383 0.00000 0.00000 0.81383 16.27660 146.96809 cm
+0.81383 0 0 0.81383 16.2766 146.96809 cm
/Fx1 Do
Q
endstream
endobj
52 0 obj
-69
+56
endobj
%% Original object ID: 66 0
@@ -924,12 +924,12 @@ endobj
772
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 752.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 752
+ 0
]
/Resources <<
/Font <<
@@ -1010,14 +1010,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
60 0 obj
-71
+53
endobj
%% Original object ID: 69 0
@@ -1106,14 +1106,14 @@ stream
Q
q
-0.00000 0.66667 -0.66667 0.00000 510.00000 132.00000 cm
+0 0.66667 -0.66667 0 510 132 cm
/Fx1 Do
Q
endstream
endobj
68 0 obj
-71
+47
endobj
%% Original object ID: 72 0
@@ -1126,12 +1126,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1210,14 +1210,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
76 0 obj
-71
+53
endobj
%% Original object ID: 75 0
@@ -1230,12 +1230,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1314,14 +1314,14 @@ stream
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
84 0 obj
-69
+33
endobj
%% Original object ID: 78 0
@@ -1334,12 +1334,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1418,14 +1418,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
92 0 obj
-72
+36
endobj
%% Original object ID: 81 0
@@ -1514,14 +1514,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
100 0 obj
-72
+54
endobj
%% Original object ID: 84 0
@@ -1534,12 +1534,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1618,14 +1618,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
108 0 obj
-72
+36
endobj
%% Original object ID: 87 0
@@ -1638,12 +1638,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1722,14 +1722,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
116 0 obj
-72
+54
endobj
%% Original object ID: 90 0
@@ -1742,12 +1742,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1826,14 +1826,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
124 0 obj
-69
+51
endobj
%% Original object ID: 93 0
@@ -1922,14 +1922,14 @@ stream
Q
q
-0.00000 -0.66667 0.66667 0.00000 0.00000 792.00000 cm
+0 -0.66667 0.66667 0 0 792 cm
/Fx1 Do
Q
endstream
endobj
132 0 obj
-69
+45
endobj
%% Original object ID: 96 0
@@ -1942,12 +1942,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.500000
- 1.500000
- 0.000000
- 0.000000
- 918.000000
+ 0
+ -1.5
+ 1.5
+ 0
+ 0
+ 918
]
/Resources <<
/Font <<
@@ -2026,14 +2026,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
140 0 obj
-69
+51
endobj
%% Original object ID: 99 0
@@ -2046,12 +2046,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -2130,14 +2130,14 @@ stream
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx1 Do
Q
endstream
endobj
148 0 obj
-69
+33
endobj
%% Original object ID: 102 0
@@ -2150,12 +2150,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -2230,140 +2230,140 @@ xref
0000005714 00000 n
0000005879 00000 n
0000005951 00000 n
-0000006074 00000 n
-0000006122 00000 n
-0000006269 00000 n
-0000006333 00000 n
-0000006655 00000 n
-0000006727 00000 n
-0000006786 00000 n
-0000006856 00000 n
-0000007030 00000 n
-0000007102 00000 n
-0000007229 00000 n
-0000007277 00000 n
-0000007700 00000 n
-0000007772 00000 n
-0000007831 00000 n
-0000007901 00000 n
-0000008003 00000 n
-0000008074 00000 n
-0000008194 00000 n
-0000008265 00000 n
-0000008390 00000 n
-0000008438 00000 n
-0000008903 00000 n
-0000008975 00000 n
-0000009034 00000 n
-0000009104 00000 n
-0000009269 00000 n
-0000009341 00000 n
-0000009467 00000 n
-0000009515 00000 n
-0000009997 00000 n
-0000010069 00000 n
-0000010128 00000 n
-0000010198 00000 n
-0000010367 00000 n
-0000010439 00000 n
-0000010567 00000 n
-0000010615 00000 n
-0000010937 00000 n
-0000011009 00000 n
-0000011068 00000 n
-0000011138 00000 n
-0000011318 00000 n
-0000011390 00000 n
-0000011518 00000 n
-0000011566 00000 n
-0000011989 00000 n
-0000012061 00000 n
-0000012120 00000 n
-0000012190 00000 n
-0000012359 00000 n
-0000012431 00000 n
-0000012559 00000 n
-0000012607 00000 n
-0000013034 00000 n
-0000013106 00000 n
-0000013165 00000 n
-0000013235 00000 n
-0000013404 00000 n
-0000013476 00000 n
-0000013602 00000 n
-0000013650 00000 n
-0000014074 00000 n
-0000014146 00000 n
-0000014205 00000 n
-0000014275 00000 n
-0000014445 00000 n
-0000014517 00000 n
-0000014646 00000 n
-0000014694 00000 n
-0000015016 00000 n
-0000015089 00000 n
-0000015148 00000 n
-0000015219 00000 n
-0000015402 00000 n
-0000015475 00000 n
-0000015605 00000 n
+0000006038 00000 n
+0000006086 00000 n
+0000006233 00000 n
+0000006297 00000 n
+0000006619 00000 n
+0000006691 00000 n
+0000006750 00000 n
+0000006820 00000 n
+0000006994 00000 n
+0000007066 00000 n
+0000007161 00000 n
+0000007209 00000 n
+0000007590 00000 n
+0000007662 00000 n
+0000007721 00000 n
+0000007791 00000 n
+0000007893 00000 n
+0000007964 00000 n
+0000008084 00000 n
+0000008155 00000 n
+0000008244 00000 n
+0000008292 00000 n
+0000008715 00000 n
+0000008787 00000 n
+0000008846 00000 n
+0000008916 00000 n
+0000009081 00000 n
+0000009153 00000 n
+0000009266 00000 n
+0000009314 00000 n
+0000009754 00000 n
+0000009826 00000 n
+0000009885 00000 n
+0000009955 00000 n
+0000010124 00000 n
+0000010196 00000 n
+0000010306 00000 n
+0000010354 00000 n
+0000010676 00000 n
+0000010748 00000 n
+0000010807 00000 n
+0000010877 00000 n
+0000011057 00000 n
+0000011129 00000 n
+0000011233 00000 n
+0000011281 00000 n
+0000011662 00000 n
+0000011734 00000 n
+0000011793 00000 n
+0000011863 00000 n
+0000012032 00000 n
+0000012104 00000 n
+0000012214 00000 n
+0000012262 00000 n
+0000012647 00000 n
+0000012719 00000 n
+0000012778 00000 n
+0000012848 00000 n
+0000013017 00000 n
+0000013089 00000 n
+0000013179 00000 n
+0000013227 00000 n
+0000013609 00000 n
+0000013681 00000 n
+0000013740 00000 n
+0000013810 00000 n
+0000013980 00000 n
+0000014052 00000 n
+0000014145 00000 n
+0000014193 00000 n
+0000014515 00000 n
+0000014588 00000 n
+0000014647 00000 n
+0000014718 00000 n
+0000014901 00000 n
+0000014974 00000 n
+0000015086 00000 n
+0000015135 00000 n
+0000015519 00000 n
+0000015593 00000 n
0000015654 00000 n
-0000016080 00000 n
-0000016154 00000 n
-0000016215 00000 n
-0000016287 00000 n
-0000016460 00000 n
-0000016534 00000 n
-0000016665 00000 n
-0000016714 00000 n
-0000017144 00000 n
-0000017218 00000 n
-0000017279 00000 n
-0000017351 00000 n
-0000017524 00000 n
-0000017598 00000 n
-0000017729 00000 n
-0000017778 00000 n
-0000018205 00000 n
-0000018279 00000 n
-0000018340 00000 n
-0000018412 00000 n
-0000018585 00000 n
-0000018659 00000 n
-0000018787 00000 n
+0000015726 00000 n
+0000015899 00000 n
+0000015973 00000 n
+0000016068 00000 n
+0000016117 00000 n
+0000016505 00000 n
+0000016579 00000 n
+0000016640 00000 n
+0000016712 00000 n
+0000016885 00000 n
+0000016959 00000 n
+0000017072 00000 n
+0000017121 00000 n
+0000017506 00000 n
+0000017580 00000 n
+0000017641 00000 n
+0000017713 00000 n
+0000017886 00000 n
+0000017960 00000 n
+0000018070 00000 n
+0000018119 00000 n
+0000018444 00000 n
+0000018518 00000 n
+0000018579 00000 n
+0000018651 00000 n
0000018836 00000 n
-0000019161 00000 n
-0000019235 00000 n
-0000019296 00000 n
-0000019368 00000 n
-0000019553 00000 n
-0000019627 00000 n
-0000019755 00000 n
-0000019804 00000 n
-0000020241 00000 n
-0000020316 00000 n
-0000020377 00000 n
-0000020449 00000 n
-0000020622 00000 n
-0000020697 00000 n
-0000020825 00000 n
-0000020874 00000 n
-0000021304 00000 n
-0000021379 00000 n
-0000021440 00000 n
-0000021512 00000 n
-0000021685 00000 n
-0000021760 00000 n
-0000021888 00000 n
-0000021938 00000 n
-0000022365 00000 n
-0000022415 00000 n
-0000022563 00000 n
+0000018910 00000 n
+0000019014 00000 n
+0000019063 00000 n
+0000019462 00000 n
+0000019537 00000 n
+0000019598 00000 n
+0000019670 00000 n
+0000019843 00000 n
+0000019918 00000 n
+0000020028 00000 n
+0000020077 00000 n
+0000020465 00000 n
+0000020540 00000 n
+0000020601 00000 n
+0000020673 00000 n
+0000020846 00000 n
+0000020921 00000 n
+0000021013 00000 n
+0000021063 00000 n
+0000021448 00000 n
+0000021498 00000 n
+0000021646 00000 n
trailer <<
/Root 1 0 R
/Size 153
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-22600
+21683
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-64.pdf b/qpdf/qtest/qpdf/fx-overlay-64.pdf
index eb27ad6d..b345c49d 100644
--- a/qpdf/qtest/qpdf/fx-overlay-64.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-64.pdf
@@ -129,14 +129,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 153.00000 198.00000 cm
+1 0 0 1 153 198 cm
/Fx1 Do
Q
endstream
endobj
10 0 obj
-70
+34
endobj
%% Original object ID: 7 0
@@ -244,14 +244,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 -153.00000 -198.00000 cm
+1 0 0 1 -153 -198 cm
/Fx1 Do
Q
endstream
endobj
20 0 obj
-72
+36
endobj
%% Original object ID: 11 0
@@ -360,30 +360,30 @@ xref
0000000998 00000 n
0000001154 00000 n
0000001225 00000 n
-0000001351 00000 n
-0000001398 00000 n
-0000001544 00000 n
-0000001608 00000 n
-0000001924 00000 n
-0000001996 00000 n
-0000002055 00000 n
-0000002124 00000 n
-0000002284 00000 n
-0000002356 00000 n
-0000002485 00000 n
-0000002533 00000 n
-0000002680 00000 n
-0000002744 00000 n
-0000003058 00000 n
-0000003107 00000 n
-0000003254 00000 n
-0000003318 00000 n
-0000003465 00000 n
+0000001315 00000 n
+0000001362 00000 n
+0000001508 00000 n
+0000001572 00000 n
+0000001888 00000 n
+0000001960 00000 n
+0000002019 00000 n
+0000002088 00000 n
+0000002248 00000 n
+0000002320 00000 n
+0000002413 00000 n
+0000002461 00000 n
+0000002608 00000 n
+0000002672 00000 n
+0000002986 00000 n
+0000003035 00000 n
+0000003182 00000 n
+0000003246 00000 n
+0000003393 00000 n
trailer <<
/Root 1 0 R
/Size 29
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-3501
+3429
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-65.pdf b/qpdf/qtest/qpdf/fx-overlay-65.pdf
index 9a01f5d8..77d87d8c 100644
--- a/qpdf/qtest/qpdf/fx-overlay-65.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-65.pdf
@@ -129,14 +129,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 153.00000 198.00000 cm
+1 0 0 1 153 198 cm
/Fx1 Do
Q
endstream
endobj
10 0 obj
-70
+34
endobj
%% Original object ID: 7 0
@@ -244,14 +244,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 0.00000 0.00000 cm
+0.5 0 0 0.5 0 0 cm
/Fx1 Do
Q
endstream
endobj
20 0 obj
-66
+34
endobj
%% Original object ID: 11 0
@@ -360,30 +360,30 @@ xref
0000000998 00000 n
0000001154 00000 n
0000001225 00000 n
-0000001351 00000 n
-0000001398 00000 n
-0000001544 00000 n
-0000001608 00000 n
-0000001924 00000 n
-0000001996 00000 n
-0000002055 00000 n
-0000002124 00000 n
-0000002284 00000 n
-0000002356 00000 n
-0000002479 00000 n
-0000002527 00000 n
-0000002674 00000 n
-0000002738 00000 n
-0000003052 00000 n
-0000003101 00000 n
-0000003248 00000 n
-0000003312 00000 n
-0000003459 00000 n
+0000001315 00000 n
+0000001362 00000 n
+0000001508 00000 n
+0000001572 00000 n
+0000001888 00000 n
+0000001960 00000 n
+0000002019 00000 n
+0000002088 00000 n
+0000002248 00000 n
+0000002320 00000 n
+0000002411 00000 n
+0000002459 00000 n
+0000002606 00000 n
+0000002670 00000 n
+0000002984 00000 n
+0000003033 00000 n
+0000003180 00000 n
+0000003244 00000 n
+0000003391 00000 n
trailer <<
/Root 1 0 R
/Size 29
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-3495
+3427
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-66.pdf b/qpdf/qtest/qpdf/fx-overlay-66.pdf
index 2b887848..d46fc7b3 100644
--- a/qpdf/qtest/qpdf/fx-overlay-66.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-66.pdf
@@ -129,14 +129,14 @@ stream
Q
q
-2.00000 0.00000 0.00000 2.00000 0.00000 0.00000 cm
+2 0 0 2 0 0 cm
/Fx1 Do
Q
endstream
endobj
10 0 obj
-66
+30
endobj
%% Original object ID: 7 0
@@ -244,14 +244,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 -153.00000 -198.00000 cm
+1 0 0 1 -153 -198 cm
/Fx1 Do
Q
endstream
endobj
20 0 obj
-72
+36
endobj
%% Original object ID: 11 0
@@ -360,30 +360,30 @@ xref
0000000998 00000 n
0000001154 00000 n
0000001225 00000 n
-0000001347 00000 n
-0000001394 00000 n
-0000001540 00000 n
-0000001604 00000 n
-0000001920 00000 n
-0000001992 00000 n
-0000002051 00000 n
-0000002120 00000 n
-0000002280 00000 n
-0000002352 00000 n
-0000002481 00000 n
-0000002529 00000 n
-0000002676 00000 n
-0000002740 00000 n
-0000003054 00000 n
-0000003103 00000 n
-0000003250 00000 n
-0000003314 00000 n
-0000003461 00000 n
+0000001311 00000 n
+0000001358 00000 n
+0000001504 00000 n
+0000001568 00000 n
+0000001884 00000 n
+0000001956 00000 n
+0000002015 00000 n
+0000002084 00000 n
+0000002244 00000 n
+0000002316 00000 n
+0000002409 00000 n
+0000002457 00000 n
+0000002604 00000 n
+0000002668 00000 n
+0000002982 00000 n
+0000003031 00000 n
+0000003178 00000 n
+0000003242 00000 n
+0000003389 00000 n
trailer <<
/Root 1 0 R
/Size 29
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-3497
+3425
%%EOF
diff --git a/qpdf/qtest/qpdf/fx-overlay-67.pdf b/qpdf/qtest/qpdf/fx-overlay-67.pdf
index 8c09168f..cdaf82d6 100644
--- a/qpdf/qtest/qpdf/fx-overlay-67.pdf
+++ b/qpdf/qtest/qpdf/fx-overlay-67.pdf
@@ -129,14 +129,14 @@ stream
Q
q
-2.00000 0.00000 0.00000 2.00000 0.00000 0.00000 cm
+2 0 0 2 0 0 cm
/Fx1 Do
Q
endstream
endobj
10 0 obj
-66
+30
endobj
%% Original object ID: 7 0
@@ -244,14 +244,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 0.00000 0.00000 cm
+0.5 0 0 0.5 0 0 cm
/Fx1 Do
Q
endstream
endobj
20 0 obj
-66
+34
endobj
%% Original object ID: 11 0
@@ -360,30 +360,30 @@ xref
0000000998 00000 n
0000001154 00000 n
0000001225 00000 n
-0000001347 00000 n
-0000001394 00000 n
-0000001540 00000 n
-0000001604 00000 n
-0000001920 00000 n
-0000001992 00000 n
-0000002051 00000 n
-0000002120 00000 n
-0000002280 00000 n
-0000002352 00000 n
-0000002475 00000 n
-0000002523 00000 n
-0000002670 00000 n
-0000002734 00000 n
-0000003048 00000 n
-0000003097 00000 n
-0000003244 00000 n
-0000003308 00000 n
-0000003455 00000 n
+0000001311 00000 n
+0000001358 00000 n
+0000001504 00000 n
+0000001568 00000 n
+0000001884 00000 n
+0000001956 00000 n
+0000002015 00000 n
+0000002084 00000 n
+0000002244 00000 n
+0000002316 00000 n
+0000002407 00000 n
+0000002455 00000 n
+0000002602 00000 n
+0000002666 00000 n
+0000002980 00000 n
+0000003029 00000 n
+0000003176 00000 n
+0000003240 00000 n
+0000003387 00000 n
trailer <<
/Root 1 0 R
/Size 29
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-3491
+3423
%%EOF
diff --git a/qpdf/qtest/qpdf/manual-appearances-out.pdf b/qpdf/qtest/qpdf/manual-appearances-out.pdf
index 55d6f575..2d972d66 100644
--- a/qpdf/qtest/qpdf/manual-appearances-out.pdf
+++ b/qpdf/qtest/qpdf/manual-appearances-out.pdf
@@ -152,22 +152,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
11 0 obj
-207
+159
endobj
12 0 obj
@@ -669,22 +669,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-0.00000 1.00003 -0.99998 0.00000 392.14700 528.24900 cm
+0 1.00003 -0.99998 0 392.147 528.249 cm
/Fxo3 Do
Q
endstream
endobj
34 0 obj
-208
+160
endobj
35 0 obj
@@ -858,22 +858,22 @@ stream
Q
q
-0.92124 0.00000 0.00000 0.73126 153.31752 651.15100 cm
+0.92124 0 0 0.73126 153.31752 651.151 cm
/Fxo1 Do
Q
q
-0.88367 0.00000 0.00000 0.47909 129.84900 542.75100 cm
+0.88367 0 0 0.47909 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
47 0 obj
-207
+161
endobj
48 0 obj
@@ -1063,22 +1063,22 @@ stream
Q
q
-0.92124 0.00000 0.00000 0.73126 153.31752 651.15100 cm
+0.92124 0 0 0.73126 153.31752 651.151 cm
/Fxo1 Do
Q
q
-0.88367 0.00000 0.00000 0.47909 129.84900 542.75100 cm
+0.88367 0 0 0.47909 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
60 0 obj
-207
+161
endobj
61 0 obj
@@ -1268,22 +1268,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
--1.00003 0.00000 0.00000 -0.99998 294.14900 626.24700 cm
+-1.00003 0 0 -0.99998 294.149 626.247 cm
/Fxo3 Do
Q
endstream
endobj
73 0 obj
-209
+161
endobj
74 0 obj
@@ -1457,22 +1457,22 @@ stream
Q
q
-0.00000 0.92124 -0.73126 0.00000 180.79700 725.56752 cm
+0 0.92124 -0.73126 0 180.797 725.56752 cm
/Fxo1 Do
Q
q
-0.00000 0.44193 -0.23955 0.00000 254.71087 551.55555 cm
+0 0.44193 -0.23955 0 254.71087 551.55555 cm
/Fxo2 Do
Q
q
-0.00000 1.00003 -0.99998 0.00000 392.14700 528.24900 cm
+0 1.00003 -0.99998 0 392.147 528.249 cm
/Fxo3 Do
Q
endstream
endobj
86 0 obj
-210
+168
endobj
87 0 obj
@@ -1662,18 +1662,18 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
endstream
endobj
99 0 obj
-139
+107
endobj
100 0 obj
@@ -1812,22 +1812,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-0.00000 -1.00003 0.99998 0.00000 196.15100 528.24900 cm
+0 -1.00003 0.99998 0 196.151 528.249 cm
/Fxo3 Do
Q
endstream
endobj
110 0 obj
-208
+160
endobj
111 0 obj
@@ -2001,22 +2001,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
123 0 obj
-207
+159
endobj
124 0 obj
@@ -2202,131 +2202,131 @@ xref
0000001241 00000 n
0000001558 00000 n
0000001601 00000 n
-0000001865 00000 n
-0000001886 00000 n
-0000001909 00000 n
-0000002191 00000 n
-0000002211 00000 n
-0000002544 00000 n
-0000002565 00000 n
-0000002841 00000 n
-0000002871 00000 n
-0000003294 00000 n
-0000003704 00000 n
-0000004127 00000 n
-0000004551 00000 n
-0000004974 00000 n
-0000005368 00000 n
-0000005799 00000 n
-0000006206 00000 n
-0000006346 00000 n
-0000006466 00000 n
-0000006525 00000 n
-0000006567 00000 n
-0000006886 00000 n
-0000006930 00000 n
-0000007195 00000 n
-0000007216 00000 n
-0000007239 00000 n
-0000007521 00000 n
-0000007541 00000 n
-0000007874 00000 n
-0000007895 00000 n
-0000008171 00000 n
-0000008214 00000 n
-0000008273 00000 n
-0000008315 00000 n
-0000008634 00000 n
-0000008678 00000 n
-0000008942 00000 n
-0000008963 00000 n
-0000008986 00000 n
-0000009329 00000 n
-0000009349 00000 n
-0000009740 00000 n
-0000009761 00000 n
-0000010037 00000 n
-0000010080 00000 n
-0000010139 00000 n
-0000010181 00000 n
-0000010500 00000 n
-0000010544 00000 n
-0000010808 00000 n
-0000010829 00000 n
-0000010852 00000 n
-0000011195 00000 n
-0000011215 00000 n
-0000011606 00000 n
-0000011627 00000 n
-0000011903 00000 n
-0000011946 00000 n
-0000012005 00000 n
-0000012047 00000 n
-0000012366 00000 n
-0000012410 00000 n
-0000012676 00000 n
-0000012697 00000 n
-0000012720 00000 n
-0000013002 00000 n
-0000013022 00000 n
-0000013355 00000 n
-0000013376 00000 n
-0000013652 00000 n
-0000013695 00000 n
-0000013754 00000 n
-0000013796 00000 n
-0000014115 00000 n
-0000014159 00000 n
-0000014426 00000 n
-0000014447 00000 n
-0000014470 00000 n
-0000014813 00000 n
-0000014833 00000 n
-0000015229 00000 n
-0000015250 00000 n
-0000015526 00000 n
-0000015569 00000 n
-0000015628 00000 n
-0000015670 00000 n
-0000015989 00000 n
-0000016033 00000 n
-0000016229 00000 n
-0000016250 00000 n
-0000016274 00000 n
-0000016558 00000 n
-0000016579 00000 n
-0000016914 00000 n
-0000016959 00000 n
-0000017020 00000 n
-0000017063 00000 n
+0000001817 00000 n
+0000001838 00000 n
+0000001861 00000 n
+0000002143 00000 n
+0000002163 00000 n
+0000002496 00000 n
+0000002517 00000 n
+0000002793 00000 n
+0000002823 00000 n
+0000003246 00000 n
+0000003656 00000 n
+0000004079 00000 n
+0000004503 00000 n
+0000004926 00000 n
+0000005320 00000 n
+0000005751 00000 n
+0000006158 00000 n
+0000006298 00000 n
+0000006418 00000 n
+0000006477 00000 n
+0000006519 00000 n
+0000006838 00000 n
+0000006882 00000 n
+0000007099 00000 n
+0000007120 00000 n
+0000007143 00000 n
+0000007425 00000 n
+0000007445 00000 n
+0000007778 00000 n
+0000007799 00000 n
+0000008075 00000 n
+0000008118 00000 n
+0000008177 00000 n
+0000008219 00000 n
+0000008538 00000 n
+0000008582 00000 n
+0000008800 00000 n
+0000008821 00000 n
+0000008844 00000 n
+0000009187 00000 n
+0000009207 00000 n
+0000009598 00000 n
+0000009619 00000 n
+0000009895 00000 n
+0000009938 00000 n
+0000009997 00000 n
+0000010039 00000 n
+0000010358 00000 n
+0000010402 00000 n
+0000010620 00000 n
+0000010641 00000 n
+0000010664 00000 n
+0000011007 00000 n
+0000011027 00000 n
+0000011418 00000 n
+0000011439 00000 n
+0000011715 00000 n
+0000011758 00000 n
+0000011817 00000 n
+0000011859 00000 n
+0000012178 00000 n
+0000012222 00000 n
+0000012440 00000 n
+0000012461 00000 n
+0000012484 00000 n
+0000012766 00000 n
+0000012786 00000 n
+0000013119 00000 n
+0000013140 00000 n
+0000013416 00000 n
+0000013459 00000 n
+0000013518 00000 n
+0000013560 00000 n
+0000013879 00000 n
+0000013923 00000 n
+0000014148 00000 n
+0000014169 00000 n
+0000014192 00000 n
+0000014535 00000 n
+0000014555 00000 n
+0000014951 00000 n
+0000014972 00000 n
+0000015248 00000 n
+0000015291 00000 n
+0000015350 00000 n
+0000015392 00000 n
+0000015711 00000 n
+0000015755 00000 n
+0000015919 00000 n
+0000015940 00000 n
+0000015964 00000 n
+0000016248 00000 n
+0000016269 00000 n
+0000016604 00000 n
+0000016649 00000 n
+0000016710 00000 n
+0000016753 00000 n
+0000017074 00000 n
+0000017119 00000 n
+0000017338 00000 n
+0000017360 00000 n
0000017384 00000 n
-0000017429 00000 n
-0000017696 00000 n
-0000017718 00000 n
-0000017742 00000 n
-0000018026 00000 n
-0000018047 00000 n
-0000018382 00000 n
-0000018404 00000 n
-0000018682 00000 n
-0000018726 00000 n
-0000018787 00000 n
-0000018830 00000 n
-0000019151 00000 n
-0000019196 00000 n
-0000019462 00000 n
-0000019484 00000 n
-0000019508 00000 n
-0000019792 00000 n
-0000019813 00000 n
-0000020148 00000 n
-0000020170 00000 n
-0000020448 00000 n
-0000020469 00000 n
-0000020565 00000 n
-0000020661 00000 n
-0000020757 00000 n
-0000020853 00000 n
+0000017668 00000 n
+0000017689 00000 n
+0000018024 00000 n
+0000018046 00000 n
+0000018324 00000 n
+0000018368 00000 n
+0000018429 00000 n
+0000018472 00000 n
+0000018793 00000 n
+0000018838 00000 n
+0000019056 00000 n
+0000019078 00000 n
+0000019102 00000 n
+0000019386 00000 n
+0000019407 00000 n
+0000019742 00000 n
+0000019764 00000 n
+0000020042 00000 n
+0000020063 00000 n
+0000020159 00000 n
+0000020255 00000 n
+0000020351 00000 n
+0000020447 00000 n
trailer <<
/DocChecksum /DA785F789D02970D387C264D0A6C8CB0
/Info 2 0 R
@@ -2335,5 +2335,5 @@ trailer <<
/ID [<976442cb303b8d5e88a36a127de2a19f><31415926535897932384626433832795>]
>>
startxref
-20910
+20504
%%EOF
diff --git a/qpdf/qtest/qpdf/manual-appearances-print-out.pdf b/qpdf/qtest/qpdf/manual-appearances-print-out.pdf
index 87545af4..ff9e1a3c 100644
--- a/qpdf/qtest/qpdf/manual-appearances-print-out.pdf
+++ b/qpdf/qtest/qpdf/manual-appearances-print-out.pdf
@@ -152,22 +152,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
11 0 obj
-207
+159
endobj
12 0 obj
@@ -668,22 +668,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-0.00000 1.00003 -0.99998 0.00000 392.14700 528.24900 cm
+0 1.00003 -0.99998 0 392.147 528.249 cm
/Fxo3 Do
Q
endstream
endobj
34 0 obj
-208
+160
endobj
35 0 obj
@@ -857,22 +857,22 @@ stream
Q
q
-0.92124 0.00000 0.00000 0.73126 153.31752 651.15100 cm
+0.92124 0 0 0.73126 153.31752 651.151 cm
/Fxo1 Do
Q
q
-0.88367 0.00000 0.00000 0.47909 129.84900 542.75100 cm
+0.88367 0 0 0.47909 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
47 0 obj
-207
+161
endobj
48 0 obj
@@ -1062,22 +1062,22 @@ stream
Q
q
-0.92124 0.00000 0.00000 0.73126 153.31752 651.15100 cm
+0.92124 0 0 0.73126 153.31752 651.151 cm
/Fxo1 Do
Q
q
-0.88367 0.00000 0.00000 0.47909 129.84900 542.75100 cm
+0.88367 0 0 0.47909 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
60 0 obj
-207
+161
endobj
61 0 obj
@@ -1267,22 +1267,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
--1.00003 0.00000 0.00000 -0.99998 294.14900 626.24700 cm
+-1.00003 0 0 -0.99998 294.149 626.247 cm
/Fxo3 Do
Q
endstream
endobj
73 0 obj
-209
+161
endobj
74 0 obj
@@ -1456,22 +1456,22 @@ stream
Q
q
-0.00000 0.92124 -0.73126 0.00000 180.79700 725.56752 cm
+0 0.92124 -0.73126 0 180.797 725.56752 cm
/Fxo1 Do
Q
q
-0.00000 0.44193 -0.23955 0.00000 254.71087 551.55555 cm
+0 0.44193 -0.23955 0 254.71087 551.55555 cm
/Fxo2 Do
Q
q
-0.00000 1.00003 -0.99998 0.00000 392.14700 528.24900 cm
+0 1.00003 -0.99998 0 392.147 528.249 cm
/Fxo3 Do
Q
endstream
endobj
86 0 obj
-210
+168
endobj
87 0 obj
@@ -1661,14 +1661,14 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
endstream
endobj
99 0 obj
-71
+55
endobj
100 0 obj
@@ -1765,22 +1765,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-0.00000 -1.00003 0.99998 0.00000 196.15100 528.24900 cm
+0 -1.00003 0.99998 0 196.151 528.249 cm
/Fxo3 Do
Q
endstream
endobj
108 0 obj
-208
+160
endobj
109 0 obj
@@ -1954,22 +1954,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
121 0 obj
-207
+159
endobj
122 0 obj
@@ -2155,129 +2155,129 @@ xref
0000001241 00000 n
0000001558 00000 n
0000001601 00000 n
-0000001865 00000 n
-0000001886 00000 n
-0000001909 00000 n
-0000002191 00000 n
-0000002211 00000 n
-0000002544 00000 n
-0000002565 00000 n
-0000002841 00000 n
-0000002871 00000 n
-0000003294 00000 n
-0000003704 00000 n
-0000004127 00000 n
-0000004551 00000 n
-0000004974 00000 n
-0000005348 00000 n
-0000005779 00000 n
-0000006186 00000 n
-0000006326 00000 n
-0000006446 00000 n
-0000006505 00000 n
-0000006547 00000 n
-0000006866 00000 n
-0000006910 00000 n
-0000007175 00000 n
-0000007196 00000 n
-0000007219 00000 n
-0000007501 00000 n
-0000007521 00000 n
-0000007854 00000 n
-0000007875 00000 n
-0000008151 00000 n
-0000008194 00000 n
-0000008253 00000 n
-0000008295 00000 n
-0000008614 00000 n
-0000008658 00000 n
-0000008922 00000 n
-0000008943 00000 n
-0000008966 00000 n
-0000009309 00000 n
-0000009329 00000 n
-0000009720 00000 n
-0000009741 00000 n
-0000010017 00000 n
-0000010060 00000 n
-0000010119 00000 n
-0000010161 00000 n
-0000010480 00000 n
-0000010524 00000 n
-0000010788 00000 n
-0000010809 00000 n
-0000010832 00000 n
-0000011175 00000 n
-0000011195 00000 n
-0000011586 00000 n
-0000011607 00000 n
-0000011883 00000 n
-0000011926 00000 n
-0000011985 00000 n
-0000012027 00000 n
-0000012346 00000 n
-0000012390 00000 n
-0000012656 00000 n
-0000012677 00000 n
-0000012700 00000 n
-0000012982 00000 n
-0000013002 00000 n
-0000013335 00000 n
-0000013356 00000 n
-0000013632 00000 n
-0000013675 00000 n
-0000013734 00000 n
-0000013776 00000 n
-0000014095 00000 n
-0000014139 00000 n
-0000014406 00000 n
-0000014427 00000 n
-0000014450 00000 n
-0000014793 00000 n
-0000014813 00000 n
-0000015209 00000 n
-0000015230 00000 n
-0000015506 00000 n
-0000015549 00000 n
-0000015608 00000 n
-0000015650 00000 n
-0000015969 00000 n
-0000016013 00000 n
-0000016141 00000 n
-0000016161 00000 n
-0000016185 00000 n
-0000016469 00000 n
-0000016513 00000 n
-0000016574 00000 n
-0000016617 00000 n
-0000016938 00000 n
-0000016983 00000 n
-0000017250 00000 n
-0000017272 00000 n
-0000017296 00000 n
-0000017580 00000 n
-0000017601 00000 n
-0000017936 00000 n
-0000017958 00000 n
-0000018236 00000 n
-0000018280 00000 n
-0000018341 00000 n
-0000018384 00000 n
-0000018705 00000 n
-0000018750 00000 n
-0000019016 00000 n
-0000019038 00000 n
-0000019062 00000 n
-0000019346 00000 n
-0000019367 00000 n
-0000019702 00000 n
-0000019724 00000 n
-0000020002 00000 n
-0000020023 00000 n
-0000020119 00000 n
-0000020215 00000 n
-0000020311 00000 n
-0000020407 00000 n
+0000001817 00000 n
+0000001838 00000 n
+0000001861 00000 n
+0000002143 00000 n
+0000002163 00000 n
+0000002496 00000 n
+0000002517 00000 n
+0000002793 00000 n
+0000002823 00000 n
+0000003246 00000 n
+0000003656 00000 n
+0000004079 00000 n
+0000004503 00000 n
+0000004926 00000 n
+0000005300 00000 n
+0000005731 00000 n
+0000006138 00000 n
+0000006278 00000 n
+0000006398 00000 n
+0000006457 00000 n
+0000006499 00000 n
+0000006818 00000 n
+0000006862 00000 n
+0000007079 00000 n
+0000007100 00000 n
+0000007123 00000 n
+0000007405 00000 n
+0000007425 00000 n
+0000007758 00000 n
+0000007779 00000 n
+0000008055 00000 n
+0000008098 00000 n
+0000008157 00000 n
+0000008199 00000 n
+0000008518 00000 n
+0000008562 00000 n
+0000008780 00000 n
+0000008801 00000 n
+0000008824 00000 n
+0000009167 00000 n
+0000009187 00000 n
+0000009578 00000 n
+0000009599 00000 n
+0000009875 00000 n
+0000009918 00000 n
+0000009977 00000 n
+0000010019 00000 n
+0000010338 00000 n
+0000010382 00000 n
+0000010600 00000 n
+0000010621 00000 n
+0000010644 00000 n
+0000010987 00000 n
+0000011007 00000 n
+0000011398 00000 n
+0000011419 00000 n
+0000011695 00000 n
+0000011738 00000 n
+0000011797 00000 n
+0000011839 00000 n
+0000012158 00000 n
+0000012202 00000 n
+0000012420 00000 n
+0000012441 00000 n
+0000012464 00000 n
+0000012746 00000 n
+0000012766 00000 n
+0000013099 00000 n
+0000013120 00000 n
+0000013396 00000 n
+0000013439 00000 n
+0000013498 00000 n
+0000013540 00000 n
+0000013859 00000 n
+0000013903 00000 n
+0000014128 00000 n
+0000014149 00000 n
+0000014172 00000 n
+0000014515 00000 n
+0000014535 00000 n
+0000014931 00000 n
+0000014952 00000 n
+0000015228 00000 n
+0000015271 00000 n
+0000015330 00000 n
+0000015372 00000 n
+0000015691 00000 n
+0000015735 00000 n
+0000015847 00000 n
+0000015867 00000 n
+0000015891 00000 n
+0000016175 00000 n
+0000016219 00000 n
+0000016280 00000 n
+0000016323 00000 n
+0000016644 00000 n
+0000016689 00000 n
+0000016908 00000 n
+0000016930 00000 n
+0000016954 00000 n
+0000017238 00000 n
+0000017259 00000 n
+0000017594 00000 n
+0000017616 00000 n
+0000017894 00000 n
+0000017938 00000 n
+0000017999 00000 n
+0000018042 00000 n
+0000018363 00000 n
+0000018408 00000 n
+0000018626 00000 n
+0000018648 00000 n
+0000018672 00000 n
+0000018956 00000 n
+0000018977 00000 n
+0000019312 00000 n
+0000019334 00000 n
+0000019612 00000 n
+0000019633 00000 n
+0000019729 00000 n
+0000019825 00000 n
+0000019921 00000 n
+0000020017 00000 n
trailer <<
/DocChecksum /DA785F789D02970D387C264D0A6C8CB0
/Info 2 0 R
@@ -2286,5 +2286,5 @@ trailer <<
/ID [<976442cb303b8d5e88a36a127de2a19f><31415926535897932384626433832795>]
>>
startxref
-20464
+20074
%%EOF
diff --git a/qpdf/qtest/qpdf/manual-appearances-screen-out.pdf b/qpdf/qtest/qpdf/manual-appearances-screen-out.pdf
index dea94f71..db387693 100644
--- a/qpdf/qtest/qpdf/manual-appearances-screen-out.pdf
+++ b/qpdf/qtest/qpdf/manual-appearances-screen-out.pdf
@@ -152,22 +152,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
11 0 obj
-207
+159
endobj
12 0 obj
@@ -668,22 +668,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-0.00000 1.00003 -0.99998 0.00000 392.14700 528.24900 cm
+0 1.00003 -0.99998 0 392.147 528.249 cm
/Fxo3 Do
Q
endstream
endobj
34 0 obj
-208
+160
endobj
35 0 obj
@@ -857,22 +857,22 @@ stream
Q
q
-0.92124 0.00000 0.00000 0.73126 153.31752 651.15100 cm
+0.92124 0 0 0.73126 153.31752 651.151 cm
/Fxo1 Do
Q
q
-0.88367 0.00000 0.00000 0.47909 129.84900 542.75100 cm
+0.88367 0 0 0.47909 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
47 0 obj
-207
+161
endobj
48 0 obj
@@ -1062,22 +1062,22 @@ stream
Q
q
-0.92124 0.00000 0.00000 0.73126 153.31752 651.15100 cm
+0.92124 0 0 0.73126 153.31752 651.151 cm
/Fxo1 Do
Q
q
-0.88367 0.00000 0.00000 0.47909 129.84900 542.75100 cm
+0.88367 0 0 0.47909 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
60 0 obj
-207
+161
endobj
61 0 obj
@@ -1267,22 +1267,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
--1.00003 0.00000 0.00000 -0.99998 294.14900 626.24700 cm
+-1.00003 0 0 -0.99998 294.149 626.247 cm
/Fxo3 Do
Q
endstream
endobj
73 0 obj
-209
+161
endobj
74 0 obj
@@ -1456,22 +1456,22 @@ stream
Q
q
-0.00000 0.92124 -0.73126 0.00000 180.79700 725.56752 cm
+0 0.92124 -0.73126 0 180.797 725.56752 cm
/Fxo1 Do
Q
q
-0.00000 0.44193 -0.23955 0.00000 254.71087 551.55555 cm
+0 0.44193 -0.23955 0 254.71087 551.55555 cm
/Fxo2 Do
Q
q
-0.00000 1.00003 -0.99998 0.00000 392.14700 528.24900 cm
+0 1.00003 -0.99998 0 392.147 528.249 cm
/Fxo3 Do
Q
endstream
endobj
86 0 obj
-210
+168
endobj
87 0 obj
@@ -1661,14 +1661,14 @@ stream
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo1 Do
Q
endstream
endobj
99 0 obj
-71
+55
endobj
100 0 obj
@@ -1772,22 +1772,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-0.00000 -1.00003 0.99998 0.00000 196.15100 528.24900 cm
+0 -1.00003 0.99998 0 196.151 528.249 cm
/Fxo3 Do
Q
endstream
endobj
108 0 obj
-208
+160
endobj
109 0 obj
@@ -1961,22 +1961,22 @@ stream
Q
q
-1.00003 0.00000 0.00000 0.99996 129.84900 651.15100 cm
+1.00003 0 0 0.99996 129.849 651.151 cm
/Fxo1 Do
Q
q
-1.00002 0.00000 0.00000 0.99996 129.84900 542.75100 cm
+1.00002 0 0 0.99996 129.849 542.751 cm
/Fxo2 Do
Q
q
-1.00003 0.00000 0.00000 0.99998 294.14900 430.25100 cm
+1.00003 0 0 0.99998 294.149 430.251 cm
/Fxo3 Do
Q
endstream
endobj
121 0 obj
-207
+159
endobj
122 0 obj
@@ -2162,129 +2162,129 @@ xref
0000001241 00000 n
0000001558 00000 n
0000001601 00000 n
-0000001865 00000 n
-0000001886 00000 n
-0000001909 00000 n
-0000002191 00000 n
-0000002211 00000 n
-0000002544 00000 n
-0000002565 00000 n
-0000002841 00000 n
-0000002871 00000 n
-0000003294 00000 n
-0000003704 00000 n
-0000004127 00000 n
-0000004551 00000 n
-0000004974 00000 n
-0000005348 00000 n
-0000005779 00000 n
-0000006186 00000 n
-0000006326 00000 n
-0000006446 00000 n
-0000006505 00000 n
-0000006547 00000 n
-0000006866 00000 n
-0000006910 00000 n
-0000007175 00000 n
-0000007196 00000 n
-0000007219 00000 n
-0000007501 00000 n
-0000007521 00000 n
-0000007854 00000 n
-0000007875 00000 n
-0000008151 00000 n
-0000008194 00000 n
-0000008253 00000 n
-0000008295 00000 n
-0000008614 00000 n
-0000008658 00000 n
-0000008922 00000 n
-0000008943 00000 n
-0000008966 00000 n
-0000009309 00000 n
-0000009329 00000 n
-0000009720 00000 n
-0000009741 00000 n
-0000010017 00000 n
-0000010060 00000 n
-0000010119 00000 n
-0000010161 00000 n
-0000010480 00000 n
-0000010524 00000 n
-0000010788 00000 n
-0000010809 00000 n
-0000010832 00000 n
-0000011175 00000 n
-0000011195 00000 n
-0000011586 00000 n
-0000011607 00000 n
-0000011883 00000 n
-0000011926 00000 n
-0000011985 00000 n
-0000012027 00000 n
-0000012346 00000 n
-0000012390 00000 n
-0000012656 00000 n
-0000012677 00000 n
-0000012700 00000 n
-0000012982 00000 n
-0000013002 00000 n
-0000013335 00000 n
-0000013356 00000 n
-0000013632 00000 n
-0000013675 00000 n
-0000013734 00000 n
-0000013776 00000 n
-0000014095 00000 n
-0000014139 00000 n
-0000014406 00000 n
-0000014427 00000 n
-0000014450 00000 n
-0000014793 00000 n
-0000014813 00000 n
-0000015209 00000 n
-0000015230 00000 n
-0000015506 00000 n
-0000015549 00000 n
-0000015608 00000 n
-0000015650 00000 n
-0000015969 00000 n
-0000016013 00000 n
-0000016141 00000 n
-0000016161 00000 n
-0000016185 00000 n
-0000016520 00000 n
-0000016565 00000 n
-0000016626 00000 n
-0000016669 00000 n
-0000016990 00000 n
-0000017035 00000 n
-0000017302 00000 n
-0000017324 00000 n
-0000017348 00000 n
-0000017632 00000 n
-0000017653 00000 n
-0000017988 00000 n
-0000018010 00000 n
-0000018288 00000 n
-0000018332 00000 n
-0000018393 00000 n
-0000018436 00000 n
-0000018757 00000 n
-0000018802 00000 n
-0000019068 00000 n
-0000019090 00000 n
-0000019114 00000 n
-0000019398 00000 n
-0000019419 00000 n
-0000019754 00000 n
-0000019776 00000 n
-0000020054 00000 n
-0000020075 00000 n
-0000020171 00000 n
-0000020267 00000 n
-0000020363 00000 n
-0000020459 00000 n
+0000001817 00000 n
+0000001838 00000 n
+0000001861 00000 n
+0000002143 00000 n
+0000002163 00000 n
+0000002496 00000 n
+0000002517 00000 n
+0000002793 00000 n
+0000002823 00000 n
+0000003246 00000 n
+0000003656 00000 n
+0000004079 00000 n
+0000004503 00000 n
+0000004926 00000 n
+0000005300 00000 n
+0000005731 00000 n
+0000006138 00000 n
+0000006278 00000 n
+0000006398 00000 n
+0000006457 00000 n
+0000006499 00000 n
+0000006818 00000 n
+0000006862 00000 n
+0000007079 00000 n
+0000007100 00000 n
+0000007123 00000 n
+0000007405 00000 n
+0000007425 00000 n
+0000007758 00000 n
+0000007779 00000 n
+0000008055 00000 n
+0000008098 00000 n
+0000008157 00000 n
+0000008199 00000 n
+0000008518 00000 n
+0000008562 00000 n
+0000008780 00000 n
+0000008801 00000 n
+0000008824 00000 n
+0000009167 00000 n
+0000009187 00000 n
+0000009578 00000 n
+0000009599 00000 n
+0000009875 00000 n
+0000009918 00000 n
+0000009977 00000 n
+0000010019 00000 n
+0000010338 00000 n
+0000010382 00000 n
+0000010600 00000 n
+0000010621 00000 n
+0000010644 00000 n
+0000010987 00000 n
+0000011007 00000 n
+0000011398 00000 n
+0000011419 00000 n
+0000011695 00000 n
+0000011738 00000 n
+0000011797 00000 n
+0000011839 00000 n
+0000012158 00000 n
+0000012202 00000 n
+0000012420 00000 n
+0000012441 00000 n
+0000012464 00000 n
+0000012746 00000 n
+0000012766 00000 n
+0000013099 00000 n
+0000013120 00000 n
+0000013396 00000 n
+0000013439 00000 n
+0000013498 00000 n
+0000013540 00000 n
+0000013859 00000 n
+0000013903 00000 n
+0000014128 00000 n
+0000014149 00000 n
+0000014172 00000 n
+0000014515 00000 n
+0000014535 00000 n
+0000014931 00000 n
+0000014952 00000 n
+0000015228 00000 n
+0000015271 00000 n
+0000015330 00000 n
+0000015372 00000 n
+0000015691 00000 n
+0000015735 00000 n
+0000015847 00000 n
+0000015867 00000 n
+0000015891 00000 n
+0000016226 00000 n
+0000016271 00000 n
+0000016332 00000 n
+0000016375 00000 n
+0000016696 00000 n
+0000016741 00000 n
+0000016960 00000 n
+0000016982 00000 n
+0000017006 00000 n
+0000017290 00000 n
+0000017311 00000 n
+0000017646 00000 n
+0000017668 00000 n
+0000017946 00000 n
+0000017990 00000 n
+0000018051 00000 n
+0000018094 00000 n
+0000018415 00000 n
+0000018460 00000 n
+0000018678 00000 n
+0000018700 00000 n
+0000018724 00000 n
+0000019008 00000 n
+0000019029 00000 n
+0000019364 00000 n
+0000019386 00000 n
+0000019664 00000 n
+0000019685 00000 n
+0000019781 00000 n
+0000019877 00000 n
+0000019973 00000 n
+0000020069 00000 n
trailer <<
/DocChecksum /DA785F789D02970D387C264D0A6C8CB0
/Info 2 0 R
@@ -2293,5 +2293,5 @@ trailer <<
/ID [<976442cb303b8d5e88a36a127de2a19f><31415926535897932384626433832795>]
>>
startxref
-20516
+20126
%%EOF
diff --git a/qpdf/qtest/qpdf/need-appearances-more-out.pdf b/qpdf/qtest/qpdf/need-appearances-more-out.pdf
index 6467baae..e4868cfa 100644
--- a/qpdf/qtest/qpdf/need-appearances-more-out.pdf
+++ b/qpdf/qtest/qpdf/need-appearances-more-out.pdf
@@ -1206,14 +1206,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 435.00000 703.00000 cm
+1 0 0 1 435 703 cm
/Fxo1 Do
Q
endstream
endobj
52 0 obj
-71
+35
endobj
53 0 obj
@@ -3571,154 +3571,154 @@ xref
0000010071 00000 n
0000014897 00000 n
0000014942 00000 n
-0000015070 00000 n
-0000015090 00000 n
-0000016313 00000 n
-0000016334 00000 n
-0000017121 00000 n
-0000017522 00000 n
-0000017973 00000 n
-0000019890 00000 n
-0000020260 00000 n
-0000022174 00000 n
-0000022550 00000 n
-0000022571 00000 n
-0000022739 00000 n
-0000022759 00000 n
-0000023135 00000 n
-0000023156 00000 n
-0000023324 00000 n
-0000023344 00000 n
-0000023720 00000 n
-0000023741 00000 n
-0000023909 00000 n
-0000023929 00000 n
-0000024305 00000 n
-0000024326 00000 n
-0000024494 00000 n
-0000024514 00000 n
-0000024890 00000 n
-0000024911 00000 n
-0000025079 00000 n
-0000025099 00000 n
-0000025475 00000 n
-0000025496 00000 n
-0000025664 00000 n
-0000025684 00000 n
-0000025797 00000 n
-0000025893 00000 n
-0000026006 00000 n
-0000026102 00000 n
-0000026215 00000 n
-0000026311 00000 n
-0000026407 00000 n
-0000026503 00000 n
-0000026599 00000 n
-0000026695 00000 n
-0000026791 00000 n
-0000026904 00000 n
-0000027000 00000 n
-0000027096 00000 n
-0000027192 00000 n
-0000027289 00000 n
-0000027386 00000 n
-0000027483 00000 n
-0000027580 00000 n
-0000027677 00000 n
-0000027774 00000 n
-0000027871 00000 n
-0000027985 00000 n
-0000028082 00000 n
-0000028179 00000 n
-0000028276 00000 n
-0000028373 00000 n
-0000028470 00000 n
-0000028567 00000 n
-0000028664 00000 n
-0000028761 00000 n
-0000028858 00000 n
-0000028955 00000 n
-0000029069 00000 n
-0000029166 00000 n
-0000029263 00000 n
-0000029360 00000 n
-0000029480 00000 n
-0000029577 00000 n
-0000029674 00000 n
-0000029771 00000 n
-0000029868 00000 n
-0000029965 00000 n
-0000030085 00000 n
-0000030183 00000 n
-0000030281 00000 n
-0000030379 00000 n
-0000030477 00000 n
-0000030575 00000 n
-0000030673 00000 n
-0000030771 00000 n
-0000030869 00000 n
-0000030967 00000 n
-0000031065 00000 n
-0000031163 00000 n
-0000031261 00000 n
-0000031359 00000 n
-0000031457 00000 n
-0000031555 00000 n
-0000031800 00000 n
-0000032561 00000 n
-0000032583 00000 n
-0000032799 00000 n
-0000033043 00000 n
-0000033684 00000 n
-0000033706 00000 n
-0000033921 00000 n
-0000033978 00000 n
-0000034035 00000 n
-0000034092 00000 n
-0000034149 00000 n
-0000034206 00000 n
-0000034263 00000 n
-0000034320 00000 n
-0000034377 00000 n
-0000034434 00000 n
-0000034491 00000 n
-0000034548 00000 n
-0000034605 00000 n
-0000034662 00000 n
-0000034719 00000 n
-0000034776 00000 n
-0000034833 00000 n
-0000034890 00000 n
-0000034947 00000 n
-0000035004 00000 n
-0000035061 00000 n
-0000035118 00000 n
-0000035175 00000 n
-0000035232 00000 n
-0000035289 00000 n
-0000035346 00000 n
-0000035403 00000 n
-0000035460 00000 n
-0000035517 00000 n
-0000035574 00000 n
-0000035631 00000 n
-0000035688 00000 n
-0000035745 00000 n
-0000035802 00000 n
-0000035859 00000 n
-0000035916 00000 n
-0000035973 00000 n
-0000036030 00000 n
-0000036087 00000 n
-0000036144 00000 n
-0000036201 00000 n
-0000036258 00000 n
-0000036315 00000 n
-0000036372 00000 n
-0000036429 00000 n
-0000052711 00000 n
-0000052735 00000 n
-0000063921 00000 n
+0000015034 00000 n
+0000015054 00000 n
+0000016277 00000 n
+0000016298 00000 n
+0000017085 00000 n
+0000017486 00000 n
+0000017937 00000 n
+0000019854 00000 n
+0000020224 00000 n
+0000022138 00000 n
+0000022514 00000 n
+0000022535 00000 n
+0000022703 00000 n
+0000022723 00000 n
+0000023099 00000 n
+0000023120 00000 n
+0000023288 00000 n
+0000023308 00000 n
+0000023684 00000 n
+0000023705 00000 n
+0000023873 00000 n
+0000023893 00000 n
+0000024269 00000 n
+0000024290 00000 n
+0000024458 00000 n
+0000024478 00000 n
+0000024854 00000 n
+0000024875 00000 n
+0000025043 00000 n
+0000025063 00000 n
+0000025439 00000 n
+0000025460 00000 n
+0000025628 00000 n
+0000025648 00000 n
+0000025761 00000 n
+0000025857 00000 n
+0000025970 00000 n
+0000026066 00000 n
+0000026179 00000 n
+0000026275 00000 n
+0000026371 00000 n
+0000026467 00000 n
+0000026563 00000 n
+0000026659 00000 n
+0000026755 00000 n
+0000026868 00000 n
+0000026964 00000 n
+0000027060 00000 n
+0000027156 00000 n
+0000027253 00000 n
+0000027350 00000 n
+0000027447 00000 n
+0000027544 00000 n
+0000027641 00000 n
+0000027738 00000 n
+0000027835 00000 n
+0000027949 00000 n
+0000028046 00000 n
+0000028143 00000 n
+0000028240 00000 n
+0000028337 00000 n
+0000028434 00000 n
+0000028531 00000 n
+0000028628 00000 n
+0000028725 00000 n
+0000028822 00000 n
+0000028919 00000 n
+0000029033 00000 n
+0000029130 00000 n
+0000029227 00000 n
+0000029324 00000 n
+0000029444 00000 n
+0000029541 00000 n
+0000029638 00000 n
+0000029735 00000 n
+0000029832 00000 n
+0000029929 00000 n
+0000030049 00000 n
+0000030147 00000 n
+0000030245 00000 n
+0000030343 00000 n
+0000030441 00000 n
+0000030539 00000 n
+0000030637 00000 n
+0000030735 00000 n
+0000030833 00000 n
+0000030931 00000 n
+0000031029 00000 n
+0000031127 00000 n
+0000031225 00000 n
+0000031323 00000 n
+0000031421 00000 n
+0000031519 00000 n
+0000031764 00000 n
+0000032525 00000 n
+0000032547 00000 n
+0000032763 00000 n
+0000033007 00000 n
+0000033648 00000 n
+0000033670 00000 n
+0000033885 00000 n
+0000033942 00000 n
+0000033999 00000 n
+0000034056 00000 n
+0000034113 00000 n
+0000034170 00000 n
+0000034227 00000 n
+0000034284 00000 n
+0000034341 00000 n
+0000034398 00000 n
+0000034455 00000 n
+0000034512 00000 n
+0000034569 00000 n
+0000034626 00000 n
+0000034683 00000 n
+0000034740 00000 n
+0000034797 00000 n
+0000034854 00000 n
+0000034911 00000 n
+0000034968 00000 n
+0000035025 00000 n
+0000035082 00000 n
+0000035139 00000 n
+0000035196 00000 n
+0000035253 00000 n
+0000035310 00000 n
+0000035367 00000 n
+0000035424 00000 n
+0000035481 00000 n
+0000035538 00000 n
+0000035595 00000 n
+0000035652 00000 n
+0000035709 00000 n
+0000035766 00000 n
+0000035823 00000 n
+0000035880 00000 n
+0000035937 00000 n
+0000035994 00000 n
+0000036051 00000 n
+0000036108 00000 n
+0000036165 00000 n
+0000036222 00000 n
+0000036279 00000 n
+0000036336 00000 n
+0000036393 00000 n
+0000052675 00000 n
+0000052699 00000 n
+0000063885 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3727,5 +3727,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-63945
+63909
%%EOF
diff --git a/qpdf/qtest/qpdf/need-appearances-out.pdf b/qpdf/qtest/qpdf/need-appearances-out.pdf
index 09e38072..90c5d7d0 100644
--- a/qpdf/qtest/qpdf/need-appearances-out.pdf
+++ b/qpdf/qtest/qpdf/need-appearances-out.pdf
@@ -1252,14 +1252,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 435.00000 703.00000 cm
+1 0 0 1 435 703 cm
/Fxo1 Do
Q
endstream
endobj
55 0 obj
-71
+35
endobj
56 0 obj
@@ -3620,154 +3620,154 @@ xref
0000010493 00000 n
0000015319 00000 n
0000015364 00000 n
-0000015492 00000 n
-0000015512 00000 n
-0000016735 00000 n
-0000016756 00000 n
-0000017546 00000 n
-0000017947 00000 n
-0000018398 00000 n
-0000020315 00000 n
-0000020685 00000 n
-0000022599 00000 n
-0000022975 00000 n
-0000022996 00000 n
-0000023164 00000 n
-0000023184 00000 n
-0000023560 00000 n
-0000023581 00000 n
-0000023749 00000 n
-0000023769 00000 n
-0000024145 00000 n
-0000024166 00000 n
-0000024334 00000 n
-0000024354 00000 n
-0000024730 00000 n
-0000024751 00000 n
-0000024919 00000 n
-0000024939 00000 n
-0000025315 00000 n
-0000025336 00000 n
-0000025504 00000 n
-0000025524 00000 n
-0000025900 00000 n
-0000025921 00000 n
-0000026089 00000 n
-0000026109 00000 n
-0000026222 00000 n
-0000026318 00000 n
-0000026431 00000 n
-0000026527 00000 n
-0000026640 00000 n
-0000026736 00000 n
-0000026832 00000 n
-0000026928 00000 n
-0000027024 00000 n
-0000027120 00000 n
-0000027216 00000 n
-0000027329 00000 n
-0000027426 00000 n
-0000027523 00000 n
-0000027620 00000 n
-0000027717 00000 n
-0000027814 00000 n
-0000027911 00000 n
-0000028008 00000 n
-0000028105 00000 n
-0000028202 00000 n
-0000028299 00000 n
-0000028413 00000 n
-0000028510 00000 n
-0000028607 00000 n
-0000028704 00000 n
-0000028801 00000 n
-0000028898 00000 n
-0000028995 00000 n
-0000029092 00000 n
-0000029189 00000 n
-0000029286 00000 n
-0000029383 00000 n
-0000029497 00000 n
-0000029594 00000 n
-0000029691 00000 n
-0000029788 00000 n
-0000029908 00000 n
-0000030005 00000 n
-0000030102 00000 n
-0000030199 00000 n
-0000030296 00000 n
-0000030393 00000 n
-0000030513 00000 n
-0000030611 00000 n
-0000030709 00000 n
-0000030807 00000 n
-0000030905 00000 n
-0000031003 00000 n
-0000031101 00000 n
-0000031199 00000 n
-0000031297 00000 n
-0000031395 00000 n
-0000031493 00000 n
-0000031591 00000 n
-0000031689 00000 n
-0000031787 00000 n
-0000031885 00000 n
-0000031983 00000 n
-0000032228 00000 n
-0000032989 00000 n
-0000033011 00000 n
-0000033227 00000 n
-0000033471 00000 n
-0000034112 00000 n
-0000034134 00000 n
-0000034349 00000 n
-0000034406 00000 n
-0000034463 00000 n
-0000034520 00000 n
-0000034577 00000 n
-0000034634 00000 n
-0000034691 00000 n
-0000034748 00000 n
-0000034805 00000 n
-0000034862 00000 n
-0000034919 00000 n
-0000034976 00000 n
-0000035033 00000 n
-0000035090 00000 n
-0000035147 00000 n
-0000035204 00000 n
-0000035261 00000 n
-0000035318 00000 n
-0000035375 00000 n
-0000035432 00000 n
-0000035489 00000 n
-0000035546 00000 n
-0000035603 00000 n
-0000035660 00000 n
-0000035717 00000 n
-0000035774 00000 n
-0000035831 00000 n
-0000035888 00000 n
-0000035945 00000 n
-0000036002 00000 n
-0000036059 00000 n
-0000036116 00000 n
-0000036173 00000 n
-0000036230 00000 n
-0000036287 00000 n
-0000036344 00000 n
-0000036401 00000 n
-0000036458 00000 n
-0000036515 00000 n
-0000036572 00000 n
-0000036629 00000 n
-0000036686 00000 n
-0000036743 00000 n
-0000036800 00000 n
-0000036857 00000 n
-0000053139 00000 n
-0000053163 00000 n
-0000064349 00000 n
+0000015456 00000 n
+0000015476 00000 n
+0000016699 00000 n
+0000016720 00000 n
+0000017510 00000 n
+0000017911 00000 n
+0000018362 00000 n
+0000020279 00000 n
+0000020649 00000 n
+0000022563 00000 n
+0000022939 00000 n
+0000022960 00000 n
+0000023128 00000 n
+0000023148 00000 n
+0000023524 00000 n
+0000023545 00000 n
+0000023713 00000 n
+0000023733 00000 n
+0000024109 00000 n
+0000024130 00000 n
+0000024298 00000 n
+0000024318 00000 n
+0000024694 00000 n
+0000024715 00000 n
+0000024883 00000 n
+0000024903 00000 n
+0000025279 00000 n
+0000025300 00000 n
+0000025468 00000 n
+0000025488 00000 n
+0000025864 00000 n
+0000025885 00000 n
+0000026053 00000 n
+0000026073 00000 n
+0000026186 00000 n
+0000026282 00000 n
+0000026395 00000 n
+0000026491 00000 n
+0000026604 00000 n
+0000026700 00000 n
+0000026796 00000 n
+0000026892 00000 n
+0000026988 00000 n
+0000027084 00000 n
+0000027180 00000 n
+0000027293 00000 n
+0000027390 00000 n
+0000027487 00000 n
+0000027584 00000 n
+0000027681 00000 n
+0000027778 00000 n
+0000027875 00000 n
+0000027972 00000 n
+0000028069 00000 n
+0000028166 00000 n
+0000028263 00000 n
+0000028377 00000 n
+0000028474 00000 n
+0000028571 00000 n
+0000028668 00000 n
+0000028765 00000 n
+0000028862 00000 n
+0000028959 00000 n
+0000029056 00000 n
+0000029153 00000 n
+0000029250 00000 n
+0000029347 00000 n
+0000029461 00000 n
+0000029558 00000 n
+0000029655 00000 n
+0000029752 00000 n
+0000029872 00000 n
+0000029969 00000 n
+0000030066 00000 n
+0000030163 00000 n
+0000030260 00000 n
+0000030357 00000 n
+0000030477 00000 n
+0000030575 00000 n
+0000030673 00000 n
+0000030771 00000 n
+0000030869 00000 n
+0000030967 00000 n
+0000031065 00000 n
+0000031163 00000 n
+0000031261 00000 n
+0000031359 00000 n
+0000031457 00000 n
+0000031555 00000 n
+0000031653 00000 n
+0000031751 00000 n
+0000031849 00000 n
+0000031947 00000 n
+0000032192 00000 n
+0000032953 00000 n
+0000032975 00000 n
+0000033191 00000 n
+0000033435 00000 n
+0000034076 00000 n
+0000034098 00000 n
+0000034313 00000 n
+0000034370 00000 n
+0000034427 00000 n
+0000034484 00000 n
+0000034541 00000 n
+0000034598 00000 n
+0000034655 00000 n
+0000034712 00000 n
+0000034769 00000 n
+0000034826 00000 n
+0000034883 00000 n
+0000034940 00000 n
+0000034997 00000 n
+0000035054 00000 n
+0000035111 00000 n
+0000035168 00000 n
+0000035225 00000 n
+0000035282 00000 n
+0000035339 00000 n
+0000035396 00000 n
+0000035453 00000 n
+0000035510 00000 n
+0000035567 00000 n
+0000035624 00000 n
+0000035681 00000 n
+0000035738 00000 n
+0000035795 00000 n
+0000035852 00000 n
+0000035909 00000 n
+0000035966 00000 n
+0000036023 00000 n
+0000036080 00000 n
+0000036137 00000 n
+0000036194 00000 n
+0000036251 00000 n
+0000036308 00000 n
+0000036365 00000 n
+0000036422 00000 n
+0000036479 00000 n
+0000036536 00000 n
+0000036593 00000 n
+0000036650 00000 n
+0000036707 00000 n
+0000036764 00000 n
+0000036821 00000 n
+0000053103 00000 n
+0000053127 00000 n
+0000064313 00000 n
trailer <<
/DocChecksum /CC322E136FE95DECF8BC297B1A9B2C2E
/Info 2 0 R
@@ -3776,5 +3776,5 @@ trailer <<
/ID [<f8abc47bb1df544a0df9c15a75ef0046><31415926535897932384626433832795>]
>>
startxref
-64373
+64337
%%EOF
diff --git a/qpdf/qtest/qpdf/sample-form-out.pdf b/qpdf/qtest/qpdf/sample-form-out.pdf
index 01db7bef..ee3f2754 100644
--- a/qpdf/qtest/qpdf/sample-form-out.pdf
+++ b/qpdf/qtest/qpdf/sample-form-out.pdf
@@ -2651,62 +2651,62 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 453.70000 cm
+1 0 0 1 165.7 453.7 cm
/Fxo1 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 421.20000 cm
+1 0 0 1 165.7 421.2 cm
/Fxo2 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 388.30000 cm
+1 0 0 1 165.7 388.3 cm
/Fxo3 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 378.40000 388.40000 cm
+1 0 0 1 378.4 388.4 cm
/Fxo4 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 368.40000 cm
+1 0 0 1 165.7 368.4 cm
/Fxo5 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 348.50000 cm
+1 0 0 1 165.7 348.5 cm
/Fxo6 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 297.10000 348.50000 cm
+1 0 0 1 297.1 348.5 cm
/Fxo7 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 315.90000 cm
+1 0 0 1 165.7 315.9 cm
/Fxo8 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 283.40000 cm
+1 0 0 1 165.7 283.4 cm
/Fxo9 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 250.80000 cm
+1 0 0 1 165.7 250.8 cm
/Fxo10 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 164.10000 221.40000 cm
+1 0 0 1 164.1 221.4 cm
/Fxo11 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 154.80000 177.60000 cm
+1 0 0 1 154.8 177.6 cm
/Fxo12 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 165.70000 143.40000 cm
+1 0 0 1 165.7 143.4 cm
/Fxo13 Do
Q
endstream
endobj
83 0 obj
-891
+475
endobj
84 0 obj
@@ -2752,10 +2752,13 @@ endobj
>>
stream
-
+
+*
+>
endstream
endobj
startxref
-68768
+68352
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-1.pdf b/qpdf/qtest/qpdf/uo-1.pdf
index 69cd34a1..a79b77e0 100644
--- a/qpdf/qtest/qpdf/uo-1.pdf
+++ b/qpdf/qtest/qpdf/uo-1.pdf
@@ -548,14 +548,14 @@ endobj
>>
stream
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
22 0 obj
-63
+27
endobj
%% Contents for page 1
@@ -590,14 +590,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx2 Do
Q
endstream
endobj
26 0 obj
-66
+30
endobj
27 0 obj
@@ -710,14 +710,14 @@ endobj
>>
stream
q
-0.50000 0.00000 0.00000 0.50000 153.00000 198.00000 cm
+0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
endstream
endobj
36 0 obj
-67
+35
endobj
%% Contents for page 2
@@ -752,14 +752,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 108.00000 243.00000 cm
+0.5 0 0 0.5 108 243 cm
/Fx2 Do
Q
endstream
endobj
40 0 obj
-70
+38
endobj
41 0 obj
@@ -807,12 +807,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -863,14 +863,14 @@ endobj
>>
stream
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
48 0 obj
-65
+47
endobj
%% Contents for page 3
@@ -918,14 +918,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 20.00000 20.00000 cm
+1 0 0 1 20 20 cm
/Fx2 Do
Q
endstream
endobj
54 0 obj
-68
+32
endobj
55 0 obj
@@ -937,12 +937,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -981,12 +981,12 @@ endobj
782
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 592.000000
- 772.000000
+ -1
+ 0
+ 0
+ -1
+ 592
+ 772
]
/Resources <<
/Font <<
@@ -1038,14 +1038,14 @@ endobj
>>
stream
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
62 0 obj
-65
+47
endobj
%% Contents for page 4
@@ -1080,14 +1080,14 @@ stream
Q
q
-0.81383 0.00000 0.00000 0.81383 16.27660 146.96809 cm
+0.81383 0 0 0.81383 16.2766 146.96809 cm
/Fx2 Do
Q
endstream
endobj
66 0 obj
-69
+56
endobj
67 0 obj
@@ -1099,12 +1099,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1143,12 +1143,12 @@ endobj
772
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 752.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 752
+ 0
]
/Resources <<
/Font <<
@@ -1201,14 +1201,14 @@ endobj
>>
stream
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
74 0 obj
-68
+50
endobj
%% Contents for page 5
@@ -1243,14 +1243,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx2 Do
Q
endstream
endobj
78 0 obj
-71
+53
endobj
79 0 obj
@@ -1262,12 +1262,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1354,14 +1354,14 @@ endobj
>>
stream
q
-0.00000 0.66667 -0.66667 0.00000 570.00000 192.00000 cm
+0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
endstream
endobj
86 0 obj
-68
+44
endobj
%% Contents for page 6
@@ -1396,14 +1396,14 @@ stream
Q
q
-0.00000 0.66667 -0.66667 0.00000 510.00000 132.00000 cm
+0 0.66667 -0.66667 0 510 132 cm
/Fx2 Do
Q
endstream
endobj
90 0 obj
-71
+47
endobj
91 0 obj
@@ -1415,12 +1415,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1459,12 +1459,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1515,14 +1515,14 @@ endobj
>>
stream
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
98 0 obj
-66
+30
endobj
%% Contents for page 7
@@ -1557,14 +1557,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx2 Do
Q
endstream
endobj
102 0 obj
-71
+53
endobj
103 0 obj
@@ -1576,12 +1576,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1620,12 +1620,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1676,14 +1676,14 @@ endobj
>>
stream
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
110 0 obj
-66
+30
endobj
%% Contents for page 8
@@ -1718,14 +1718,14 @@ stream
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx2 Do
Q
endstream
endobj
114 0 obj
-69
+33
endobj
115 0 obj
@@ -1737,12 +1737,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1781,12 +1781,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1837,14 +1837,14 @@ endobj
>>
stream
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
122 0 obj
-69
+51
endobj
%% Contents for page 9
@@ -1879,14 +1879,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx2 Do
Q
endstream
endobj
126 0 obj
-72
+36
endobj
127 0 obj
@@ -1946,14 +1946,14 @@ endobj
>>
stream
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
132 0 obj
-69
+51
endobj
%% Contents for page 10
@@ -1988,14 +1988,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
136 0 obj
-72
+54
endobj
137 0 obj
@@ -2007,12 +2007,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -2063,14 +2063,14 @@ endobj
>>
stream
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
142 0 obj
-69
+51
endobj
%% Contents for page 11
@@ -2105,14 +2105,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx2 Do
Q
endstream
endobj
146 0 obj
-72
+36
endobj
147 0 obj
@@ -2124,12 +2124,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -2180,14 +2180,14 @@ endobj
>>
stream
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
152 0 obj
-69
+51
endobj
%% Contents for page 12
@@ -2222,14 +2222,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
156 0 obj
-72
+54
endobj
157 0 obj
@@ -2241,12 +2241,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -2297,14 +2297,14 @@ endobj
>>
stream
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx1 Do
Q
endstream
endobj
162 0 obj
-66
+30
endobj
%% Contents for page 13
@@ -2339,14 +2339,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx2 Do
Q
endstream
endobj
166 0 obj
-69
+51
endobj
167 0 obj
@@ -2406,14 +2406,14 @@ endobj
>>
stream
q
-0.00000 -0.80000 0.80000 0.00000 61.20000 712.80000 cm
+0 -0.8 0.8 0 61.2 712.8 cm
/Fx1 Do
Q
endstream
endobj
172 0 obj
-67
+39
endobj
%% Contents for page 14
@@ -2448,14 +2448,14 @@ stream
Q
q
-0.00000 -0.66667 0.66667 0.00000 0.00000 792.00000 cm
+0 -0.66667 0.66667 0 0 792 cm
/Fx2 Do
Q
endstream
endobj
176 0 obj
-69
+45
endobj
177 0 obj
@@ -2467,12 +2467,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.500000
- 1.500000
- 0.000000
- 0.000000
- 918.000000
+ 0
+ -1.5
+ 1.5
+ 0
+ 0
+ 918
]
/Resources <<
/Font <<
@@ -2548,14 +2548,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
184 0 obj
-69
+51
endobj
185 0 obj
@@ -2567,12 +2567,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -2648,14 +2648,14 @@ stream
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx1 Do
Q
endstream
endobj
192 0 obj
-69
+33
endobj
193 0 obj
@@ -2667,12 +2667,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -2760,188 +2760,188 @@ xref
0000005496 00000 n
0000005555 00000 n
0000005597 00000 n
-0000005717 00000 n
-0000005760 00000 n
-0000005925 00000 n
-0000005969 00000 n
-0000006092 00000 n
-0000006112 00000 n
-0000006231 00000 n
-0000006267 00000 n
-0000006590 00000 n
-0000006611 00000 n
-0000006933 00000 n
-0000006977 00000 n
-0000007036 00000 n
-0000007078 00000 n
-0000007202 00000 n
-0000007245 00000 n
-0000007419 00000 n
-0000007463 00000 n
-0000007590 00000 n
-0000007610 00000 n
-0000007933 00000 n
-0000007954 00000 n
-0000008377 00000 n
-0000008421 00000 n
-0000008480 00000 n
-0000008522 00000 n
-0000008644 00000 n
-0000008687 00000 n
-0000008789 00000 n
-0000008832 00000 n
-0000008952 00000 n
-0000008995 00000 n
-0000009120 00000 n
-0000009140 00000 n
-0000009564 00000 n
-0000009585 00000 n
-0000010050 00000 n
-0000010094 00000 n
-0000010153 00000 n
-0000010195 00000 n
-0000010317 00000 n
-0000010360 00000 n
-0000010525 00000 n
-0000010569 00000 n
-0000010695 00000 n
-0000010715 00000 n
-0000011139 00000 n
-0000011160 00000 n
-0000011642 00000 n
-0000011686 00000 n
-0000011745 00000 n
-0000011787 00000 n
-0000011912 00000 n
-0000011955 00000 n
-0000012124 00000 n
-0000012168 00000 n
-0000012296 00000 n
-0000012316 00000 n
-0000012744 00000 n
-0000012765 00000 n
-0000013087 00000 n
-0000013131 00000 n
-0000013190 00000 n
-0000013232 00000 n
-0000013357 00000 n
-0000013400 00000 n
-0000013580 00000 n
-0000013624 00000 n
-0000013752 00000 n
-0000013772 00000 n
-0000014200 00000 n
-0000014221 00000 n
-0000014644 00000 n
-0000014688 00000 n
-0000014747 00000 n
-0000014789 00000 n
-0000014912 00000 n
-0000014955 00000 n
-0000015125 00000 n
-0000015170 00000 n
-0000015300 00000 n
-0000015321 00000 n
-0000015748 00000 n
-0000015770 00000 n
-0000016199 00000 n
-0000016244 00000 n
-0000016305 00000 n
-0000016348 00000 n
-0000016473 00000 n
-0000016517 00000 n
-0000016688 00000 n
-0000016733 00000 n
-0000016861 00000 n
-0000016882 00000 n
-0000017309 00000 n
-0000017331 00000 n
-0000017757 00000 n
-0000017802 00000 n
-0000017863 00000 n
-0000017906 00000 n
-0000018034 00000 n
-0000018078 00000 n
-0000018250 00000 n
-0000018295 00000 n
-0000018426 00000 n
-0000018447 00000 n
-0000018771 00000 n
-0000018817 00000 n
-0000018878 00000 n
-0000018922 00000 n
-0000019050 00000 n
-0000019095 00000 n
-0000019280 00000 n
-0000019326 00000 n
+0000005681 00000 n
+0000005724 00000 n
+0000005889 00000 n
+0000005933 00000 n
+0000006020 00000 n
+0000006040 00000 n
+0000006159 00000 n
+0000006195 00000 n
+0000006518 00000 n
+0000006539 00000 n
+0000006861 00000 n
+0000006905 00000 n
+0000006964 00000 n
+0000007006 00000 n
+0000007098 00000 n
+0000007141 00000 n
+0000007315 00000 n
+0000007359 00000 n
+0000007454 00000 n
+0000007474 00000 n
+0000007797 00000 n
+0000007818 00000 n
+0000008199 00000 n
+0000008243 00000 n
+0000008302 00000 n
+0000008344 00000 n
+0000008448 00000 n
+0000008491 00000 n
+0000008593 00000 n
+0000008636 00000 n
+0000008756 00000 n
+0000008799 00000 n
+0000008888 00000 n
+0000008908 00000 n
+0000009290 00000 n
+0000009311 00000 n
+0000009734 00000 n
+0000009778 00000 n
+0000009837 00000 n
+0000009879 00000 n
+0000009983 00000 n
+0000010026 00000 n
+0000010191 00000 n
+0000010235 00000 n
+0000010348 00000 n
+0000010368 00000 n
+0000010750 00000 n
+0000010771 00000 n
+0000011211 00000 n
+0000011255 00000 n
+0000011314 00000 n
+0000011356 00000 n
+0000011463 00000 n
+0000011506 00000 n
+0000011675 00000 n
+0000011719 00000 n
+0000011829 00000 n
+0000011849 00000 n
+0000012235 00000 n
+0000012256 00000 n
+0000012578 00000 n
+0000012622 00000 n
+0000012681 00000 n
+0000012723 00000 n
+0000012824 00000 n
+0000012867 00000 n
+0000013047 00000 n
+0000013091 00000 n
+0000013195 00000 n
+0000013215 00000 n
+0000013601 00000 n
+0000013622 00000 n
+0000014003 00000 n
+0000014047 00000 n
+0000014106 00000 n
+0000014148 00000 n
+0000014235 00000 n
+0000014278 00000 n
+0000014448 00000 n
+0000014493 00000 n
+0000014605 00000 n
+0000014626 00000 n
+0000015011 00000 n
+0000015033 00000 n
+0000015420 00000 n
+0000015465 00000 n
+0000015526 00000 n
+0000015569 00000 n
+0000015658 00000 n
+0000015702 00000 n
+0000015873 00000 n
+0000015918 00000 n
+0000016010 00000 n
+0000016031 00000 n
+0000016416 00000 n
+0000016438 00000 n
+0000016822 00000 n
+0000016867 00000 n
+0000016928 00000 n
+0000016971 00000 n
+0000017081 00000 n
+0000017125 00000 n
+0000017297 00000 n
+0000017342 00000 n
+0000017437 00000 n
+0000017458 00000 n
+0000017782 00000 n
+0000017828 00000 n
+0000017889 00000 n
+0000017933 00000 n
+0000018043 00000 n
+0000018088 00000 n
+0000018273 00000 n
+0000018319 00000 n
+0000018432 00000 n
+0000018453 00000 n
+0000018837 00000 n
+0000018883 00000 n
+0000018944 00000 n
+0000018988 00000 n
+0000019098 00000 n
+0000019143 00000 n
+0000019316 00000 n
+0000019362 00000 n
0000019457 00000 n
0000019478 00000 n
-0000019904 00000 n
-0000019950 00000 n
-0000020011 00000 n
-0000020055 00000 n
-0000020183 00000 n
-0000020228 00000 n
-0000020401 00000 n
-0000020447 00000 n
-0000020578 00000 n
-0000020599 00000 n
-0000021029 00000 n
-0000021075 00000 n
-0000021136 00000 n
-0000021180 00000 n
-0000021308 00000 n
-0000021353 00000 n
-0000021526 00000 n
-0000021572 00000 n
-0000021703 00000 n
-0000021724 00000 n
-0000022151 00000 n
-0000022197 00000 n
-0000022258 00000 n
-0000022302 00000 n
-0000022427 00000 n
-0000022472 00000 n
-0000022645 00000 n
-0000022691 00000 n
-0000022819 00000 n
-0000022840 00000 n
-0000023165 00000 n
-0000023211 00000 n
-0000023272 00000 n
-0000023316 00000 n
-0000023442 00000 n
-0000023487 00000 n
-0000023672 00000 n
-0000023718 00000 n
-0000023846 00000 n
-0000023867 00000 n
-0000024304 00000 n
-0000024350 00000 n
-0000024411 00000 n
-0000024455 00000 n
-0000024628 00000 n
-0000024674 00000 n
-0000024802 00000 n
-0000024823 00000 n
-0000025253 00000 n
-0000025299 00000 n
-0000025360 00000 n
-0000025404 00000 n
-0000025577 00000 n
-0000025623 00000 n
-0000025751 00000 n
-0000025772 00000 n
-0000026199 00000 n
-0000026221 00000 n
-0000026341 00000 n
-0000026378 00000 n
-0000026498 00000 n
+0000019866 00000 n
+0000019912 00000 n
+0000019973 00000 n
+0000020017 00000 n
+0000020127 00000 n
+0000020172 00000 n
+0000020345 00000 n
+0000020391 00000 n
+0000020504 00000 n
+0000020525 00000 n
+0000020910 00000 n
+0000020956 00000 n
+0000021017 00000 n
+0000021061 00000 n
+0000021150 00000 n
+0000021195 00000 n
+0000021368 00000 n
+0000021414 00000 n
+0000021524 00000 n
+0000021545 00000 n
+0000021870 00000 n
+0000021916 00000 n
+0000021977 00000 n
+0000022021 00000 n
+0000022119 00000 n
+0000022164 00000 n
+0000022349 00000 n
+0000022395 00000 n
+0000022499 00000 n
+0000022520 00000 n
+0000022919 00000 n
+0000022965 00000 n
+0000023026 00000 n
+0000023070 00000 n
+0000023243 00000 n
+0000023289 00000 n
+0000023399 00000 n
+0000023420 00000 n
+0000023808 00000 n
+0000023854 00000 n
+0000023915 00000 n
+0000023959 00000 n
+0000024132 00000 n
+0000024178 00000 n
+0000024270 00000 n
+0000024291 00000 n
+0000024676 00000 n
+0000024698 00000 n
+0000024818 00000 n
+0000024855 00000 n
+0000024975 00000 n
trailer <<
/Root 1 0 R
/Size 199
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-26535
+25012
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-2.pdf b/qpdf/qtest/qpdf/uo-2.pdf
index 2003f89b..e001f518 100644
--- a/qpdf/qtest/qpdf/uo-2.pdf
+++ b/qpdf/qtest/qpdf/uo-2.pdf
@@ -552,14 +552,14 @@ endobj
>>
stream
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
22 0 obj
-65
+47
endobj
%% Contents for page 1
@@ -594,14 +594,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx2 Do
Q
endstream
endobj
26 0 obj
-68
+50
endobj
27 0 obj
@@ -630,12 +630,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -674,12 +674,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -730,14 +730,14 @@ endobj
>>
stream
q
-0.50000 0.00000 0.00000 0.50000 153.00000 198.00000 cm
+0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
endstream
endobj
36 0 obj
-67
+35
endobj
%% Contents for page 2
@@ -772,14 +772,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 108.00000 243.00000 cm
+0.5 0 0 0.5 108 243 cm
/Fx2 Do
Q
endstream
endobj
40 0 obj
-70
+38
endobj
41 0 obj
@@ -791,12 +791,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -835,12 +835,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -891,14 +891,14 @@ endobj
>>
stream
q
-0.51515 0.00000 0.00000 0.51515 0.00000 159.54545 cm
+0.51515 0 0 0.51515 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
48 0 obj
-65
+47
endobj
%% Contents for page 3
@@ -946,14 +946,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx2 Do
Q
endstream
endobj
54 0 obj
-68
+50
endobj
55 0 obj
@@ -965,12 +965,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.500000
- 1.500000
- 0.000000
- 0.000000
- 918.000000
+ 0
+ -1.5
+ 1.5
+ 0
+ 0
+ 918
]
/Resources <<
/Font <<
@@ -1021,14 +1021,14 @@ endobj
>>
stream
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
60 0 obj
-63
+27
endobj
%% Contents for page 4
@@ -1063,14 +1063,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx2 Do
Q
endstream
endobj
64 0 obj
-68
+50
endobj
65 0 obj
@@ -1130,14 +1130,14 @@ endobj
>>
stream
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
70 0 obj
-66
+30
endobj
%% Contents for page 5
@@ -1172,14 +1172,14 @@ stream
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx2 Do
Q
endstream
endobj
74 0 obj
-69
+33
endobj
75 0 obj
@@ -1191,12 +1191,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1247,14 +1247,14 @@ endobj
>>
stream
q
-0.00000 0.66667 -0.66667 0.00000 570.00000 192.00000 cm
+0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
endstream
endobj
80 0 obj
-68
+44
endobj
%% Contents for page 6
@@ -1289,14 +1289,14 @@ stream
Q
q
-0.00000 0.66667 -0.66667 0.00000 510.00000 132.00000 cm
+0 0.66667 -0.66667 0 510 132 cm
/Fx2 Do
Q
endstream
endobj
84 0 obj
-71
+47
endobj
85 0 obj
@@ -1308,12 +1308,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1364,14 +1364,14 @@ endobj
>>
stream
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
90 0 obj
-66
+30
endobj
%% Contents for page 7
@@ -1406,14 +1406,14 @@ stream
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx2 Do
Q
endstream
endobj
94 0 obj
-69
+33
endobj
95 0 obj
@@ -1425,12 +1425,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1481,14 +1481,14 @@ endobj
>>
stream
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
100 0 obj
-68
+50
endobj
%% Contents for page 8
@@ -1523,14 +1523,14 @@ stream
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx2 Do
Q
endstream
endobj
104 0 obj
-69
+33
endobj
105 0 obj
@@ -1590,14 +1590,14 @@ endobj
>>
stream
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
110 0 obj
-69
+51
endobj
%% Contents for page 9
@@ -1632,14 +1632,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
114 0 obj
-72
+54
endobj
115 0 obj
@@ -1651,12 +1651,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1707,14 +1707,14 @@ endobj
>>
stream
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
120 0 obj
-69
+33
endobj
%% Contents for page 10
@@ -1749,14 +1749,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
124 0 obj
-72
+54
endobj
125 0 obj
@@ -1768,12 +1768,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1824,14 +1824,14 @@ endobj
>>
stream
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
endstream
endobj
130 0 obj
-69
+51
endobj
%% Contents for page 11
@@ -1866,14 +1866,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
134 0 obj
-72
+54
endobj
135 0 obj
@@ -1885,12 +1885,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1941,14 +1941,14 @@ endobj
>>
stream
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
140 0 obj
-69
+33
endobj
%% Contents for page 12
@@ -1983,14 +1983,14 @@ stream
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
144 0 obj
-72
+54
endobj
145 0 obj
@@ -2050,14 +2050,14 @@ endobj
>>
stream
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 752.00000 cm
+0 -1 1 0 0 752 cm
/Fx1 Do
Q
endstream
endobj
150 0 obj
-66
+30
endobj
%% Contents for page 13
@@ -2092,14 +2092,14 @@ stream
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx2 Do
Q
endstream
endobj
154 0 obj
-69
+33
endobj
155 0 obj
@@ -2111,12 +2111,12 @@ endobj
772
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 752.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 752
+ 0
]
/Resources <<
/Font <<
@@ -2169,14 +2169,14 @@ endobj
>>
stream
q
-0.00000 -0.79275 0.79275 0.00000 7.92746 622.72539 cm
+0 -0.79275 0.79275 0 7.92746 622.72539 cm
/Fx1 Do
Q
endstream
endobj
160 0 obj
-66
+54
endobj
%% Contents for page 14
@@ -2211,14 +2211,14 @@ stream
Q
q
-0.00000 -0.80000 0.80000 0.00000 61.20000 712.80000 cm
+0 -0.8 0.8 0 61.2 712.8 cm
/Fx2 Do
Q
endstream
endobj
164 0 obj
-70
+42
endobj
165 0 obj
@@ -2230,12 +2230,12 @@ endobj
782
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 592.000000
- 772.000000
+ -1
+ 0
+ 0
+ -1
+ 592
+ 772
]
/Resources <<
/Font <<
@@ -2287,14 +2287,14 @@ endobj
>>
stream
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx1 Do
Q
endstream
endobj
170 0 obj
-66
+30
endobj
%% Contents for page 15
@@ -2329,14 +2329,14 @@ stream
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx2 Do
Q
endstream
endobj
174 0 obj
-69
+33
endobj
175 0 obj
@@ -2348,12 +2348,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -2404,14 +2404,14 @@ endobj
>>
stream
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
180 0 obj
-66
+48
endobj
%% Contents for page 16
@@ -2446,14 +2446,14 @@ stream
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx2 Do
Q
endstream
endobj
184 0 obj
-69
+33
endobj
185 0 obj
@@ -2550,180 +2550,180 @@ xref
0000005544 00000 n
0000005603 00000 n
0000005645 00000 n
-0000005767 00000 n
-0000005810 00000 n
-0000005975 00000 n
-0000006019 00000 n
-0000006144 00000 n
-0000006164 00000 n
+0000005749 00000 n
+0000005792 00000 n
+0000005957 00000 n
+0000006001 00000 n
+0000006108 00000 n
+0000006128 00000 n
+0000006247 00000 n
0000006283 00000 n
-0000006319 00000 n
-0000006744 00000 n
-0000006765 00000 n
-0000007190 00000 n
-0000007234 00000 n
-0000007293 00000 n
-0000007335 00000 n
-0000007459 00000 n
-0000007502 00000 n
-0000007676 00000 n
-0000007720 00000 n
-0000007847 00000 n
-0000007867 00000 n
-0000008295 00000 n
-0000008316 00000 n
-0000008741 00000 n
-0000008785 00000 n
-0000008844 00000 n
-0000008886 00000 n
-0000009008 00000 n
-0000009051 00000 n
-0000009153 00000 n
-0000009196 00000 n
-0000009316 00000 n
-0000009359 00000 n
-0000009484 00000 n
-0000009504 00000 n
-0000009939 00000 n
-0000009983 00000 n
-0000010042 00000 n
-0000010084 00000 n
-0000010204 00000 n
-0000010247 00000 n
-0000010412 00000 n
-0000010456 00000 n
-0000010581 00000 n
-0000010601 00000 n
-0000010924 00000 n
-0000010968 00000 n
-0000011027 00000 n
-0000011069 00000 n
-0000011192 00000 n
-0000011235 00000 n
-0000011404 00000 n
-0000011448 00000 n
-0000011574 00000 n
-0000011594 00000 n
-0000012019 00000 n
-0000012063 00000 n
-0000012122 00000 n
-0000012164 00000 n
-0000012289 00000 n
-0000012332 00000 n
-0000012512 00000 n
-0000012556 00000 n
-0000012684 00000 n
-0000012704 00000 n
-0000013132 00000 n
-0000013176 00000 n
-0000013235 00000 n
-0000013277 00000 n
-0000013400 00000 n
-0000013443 00000 n
-0000013612 00000 n
-0000013656 00000 n
-0000013782 00000 n
-0000013802 00000 n
-0000014226 00000 n
-0000014270 00000 n
-0000014329 00000 n
-0000014371 00000 n
-0000014497 00000 n
-0000014541 00000 n
-0000014712 00000 n
-0000014757 00000 n
-0000014885 00000 n
-0000014906 00000 n
-0000015230 00000 n
-0000015275 00000 n
-0000015336 00000 n
-0000015379 00000 n
-0000015507 00000 n
-0000015551 00000 n
-0000015723 00000 n
-0000015768 00000 n
-0000015899 00000 n
-0000015920 00000 n
-0000016346 00000 n
-0000016392 00000 n
-0000016453 00000 n
-0000016497 00000 n
-0000016625 00000 n
-0000016670 00000 n
-0000016855 00000 n
-0000016901 00000 n
-0000017032 00000 n
-0000017053 00000 n
-0000017482 00000 n
-0000017528 00000 n
-0000017589 00000 n
-0000017633 00000 n
-0000017761 00000 n
-0000017806 00000 n
-0000017979 00000 n
-0000018025 00000 n
-0000018156 00000 n
-0000018177 00000 n
-0000018602 00000 n
-0000018648 00000 n
-0000018709 00000 n
-0000018753 00000 n
-0000018881 00000 n
-0000018926 00000 n
-0000019099 00000 n
-0000019145 00000 n
-0000019276 00000 n
-0000019297 00000 n
-0000019621 00000 n
-0000019667 00000 n
-0000019728 00000 n
-0000019772 00000 n
-0000019897 00000 n
-0000019942 00000 n
-0000020115 00000 n
-0000020161 00000 n
-0000020289 00000 n
-0000020310 00000 n
-0000020794 00000 n
-0000020840 00000 n
-0000020901 00000 n
-0000020945 00000 n
-0000021070 00000 n
-0000021115 00000 n
-0000021300 00000 n
-0000021346 00000 n
-0000021475 00000 n
-0000021496 00000 n
-0000021963 00000 n
-0000022009 00000 n
-0000022070 00000 n
-0000022114 00000 n
-0000022239 00000 n
-0000022284 00000 n
-0000022457 00000 n
-0000022503 00000 n
-0000022631 00000 n
+0000006666 00000 n
+0000006687 00000 n
+0000007070 00000 n
+0000007114 00000 n
+0000007173 00000 n
+0000007215 00000 n
+0000007307 00000 n
+0000007350 00000 n
+0000007524 00000 n
+0000007568 00000 n
+0000007663 00000 n
+0000007683 00000 n
+0000008069 00000 n
+0000008090 00000 n
+0000008473 00000 n
+0000008517 00000 n
+0000008576 00000 n
+0000008618 00000 n
+0000008722 00000 n
+0000008765 00000 n
+0000008867 00000 n
+0000008910 00000 n
+0000009030 00000 n
+0000009073 00000 n
+0000009180 00000 n
+0000009200 00000 n
+0000009597 00000 n
+0000009641 00000 n
+0000009700 00000 n
+0000009742 00000 n
+0000009826 00000 n
+0000009869 00000 n
+0000010034 00000 n
+0000010078 00000 n
+0000010185 00000 n
+0000010205 00000 n
+0000010528 00000 n
+0000010572 00000 n
+0000010631 00000 n
+0000010673 00000 n
+0000010760 00000 n
+0000010803 00000 n
+0000010972 00000 n
+0000011016 00000 n
+0000011106 00000 n
+0000011126 00000 n
+0000011509 00000 n
+0000011553 00000 n
+0000011612 00000 n
+0000011654 00000 n
+0000011755 00000 n
+0000011798 00000 n
+0000011978 00000 n
+0000012022 00000 n
+0000012126 00000 n
+0000012146 00000 n
+0000012532 00000 n
+0000012576 00000 n
+0000012635 00000 n
+0000012677 00000 n
+0000012764 00000 n
+0000012807 00000 n
+0000012976 00000 n
+0000013020 00000 n
+0000013110 00000 n
+0000013130 00000 n
+0000013512 00000 n
+0000013556 00000 n
+0000013615 00000 n
+0000013657 00000 n
+0000013765 00000 n
+0000013809 00000 n
+0000013980 00000 n
+0000014025 00000 n
+0000014117 00000 n
+0000014138 00000 n
+0000014462 00000 n
+0000014507 00000 n
+0000014568 00000 n
+0000014611 00000 n
+0000014721 00000 n
+0000014765 00000 n
+0000014937 00000 n
+0000014982 00000 n
+0000015095 00000 n
+0000015116 00000 n
+0000015500 00000 n
+0000015546 00000 n
+0000015607 00000 n
+0000015651 00000 n
+0000015743 00000 n
+0000015788 00000 n
+0000015973 00000 n
+0000016019 00000 n
+0000016132 00000 n
+0000016153 00000 n
+0000016540 00000 n
+0000016586 00000 n
+0000016647 00000 n
+0000016691 00000 n
+0000016801 00000 n
+0000016846 00000 n
+0000017019 00000 n
+0000017065 00000 n
+0000017178 00000 n
+0000017199 00000 n
+0000017582 00000 n
+0000017628 00000 n
+0000017689 00000 n
+0000017733 00000 n
+0000017825 00000 n
+0000017870 00000 n
+0000018043 00000 n
+0000018089 00000 n
+0000018202 00000 n
+0000018223 00000 n
+0000018547 00000 n
+0000018593 00000 n
+0000018654 00000 n
+0000018698 00000 n
+0000018787 00000 n
+0000018832 00000 n
+0000019005 00000 n
+0000019051 00000 n
+0000019143 00000 n
+0000019164 00000 n
+0000019606 00000 n
+0000019652 00000 n
+0000019713 00000 n
+0000019757 00000 n
+0000019870 00000 n
+0000019915 00000 n
+0000020100 00000 n
+0000020146 00000 n
+0000020247 00000 n
+0000020268 00000 n
+0000020693 00000 n
+0000020739 00000 n
+0000020800 00000 n
+0000020844 00000 n
+0000020933 00000 n
+0000020978 00000 n
+0000021151 00000 n
+0000021197 00000 n
+0000021289 00000 n
+0000021310 00000 n
+0000021693 00000 n
+0000021739 00000 n
+0000021800 00000 n
+0000021844 00000 n
+0000021951 00000 n
+0000021996 00000 n
+0000022169 00000 n
+0000022215 00000 n
+0000022307 00000 n
+0000022328 00000 n
0000022652 00000 n
-0000023077 00000 n
-0000023123 00000 n
-0000023184 00000 n
-0000023228 00000 n
-0000023353 00000 n
-0000023398 00000 n
-0000023571 00000 n
-0000023617 00000 n
-0000023745 00000 n
-0000023766 00000 n
-0000024090 00000 n
-0000024112 00000 n
-0000024232 00000 n
-0000024269 00000 n
-0000024389 00000 n
+0000022674 00000 n
+0000022794 00000 n
+0000022831 00000 n
+0000022951 00000 n
trailer <<
/Root 1 0 R
/Size 191
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-24426
+22988
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-3.pdf b/qpdf/qtest/qpdf/uo-3.pdf
index 109e18d3..fed1eb4a 100644
--- a/qpdf/qtest/qpdf/uo-3.pdf
+++ b/qpdf/qtest/qpdf/uo-3.pdf
@@ -458,7 +458,7 @@ endobj
stream
q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
1 0 0 RG
@@ -474,14 +474,14 @@ ET
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx2 Do
Q
endstream
endobj
20 0 obj
-243
+207
endobj
21 0 obj
@@ -510,12 +510,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -554,12 +554,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -597,7 +597,7 @@ endobj
stream
q
q
-0.50000 0.00000 0.00000 0.50000 153.00000 198.00000 cm
+0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
1 0 0 RG
@@ -613,14 +613,14 @@ ET
Q
q
-0.50000 0.00000 0.00000 0.50000 108.00000 243.00000 cm
+0.5 0 0 0.5 108 243 cm
/Fx2 Do
Q
endstream
endobj
28 0 obj
-256
+192
endobj
29 0 obj
@@ -632,12 +632,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -676,12 +676,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -719,7 +719,7 @@ endobj
stream
q
q
-0.51515 0.00000 0.00000 0.51515 0.00000 159.54545 cm
+0.51515 0 0 0.51515 0 159.54545 cm
/Fx1 Do
Q
1 0 0 RG
@@ -735,14 +735,14 @@ ET
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx2 Do
Q
endstream
endobj
34 0 obj
-243
+207
endobj
35 0 obj
@@ -754,12 +754,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.500000
- 1.500000
- 0.000000
- 0.000000
- 918.000000
+ 0
+ -1.5
+ 1.5
+ 0
+ 0
+ 918
]
/Resources <<
/Font <<
@@ -797,7 +797,7 @@ endobj
stream
q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
1 0 0 RG
@@ -813,14 +813,14 @@ ET
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx2 Do
Q
endstream
endobj
38 0 obj
-241
+187
endobj
39 0 obj
@@ -867,7 +867,7 @@ endobj
stream
q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
1 0 0 RG
@@ -883,14 +883,14 @@ ET
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx2 Do
Q
endstream
endobj
42 0 obj
-249
+177
endobj
43 0 obj
@@ -902,12 +902,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -945,7 +945,7 @@ endobj
stream
q
q
-0.00000 0.66667 -0.66667 0.00000 570.00000 192.00000 cm
+0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
1 0 0 RG
@@ -961,14 +961,14 @@ ET
Q
q
-0.00000 0.66667 -0.66667 0.00000 510.00000 132.00000 cm
+0 0.66667 -0.66667 0 510 132 cm
/Fx2 Do
Q
endstream
endobj
46 0 obj
-264
+216
endobj
47 0 obj
@@ -980,12 +980,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1023,7 +1023,7 @@ endobj
stream
q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1039,14 +1039,14 @@ ET
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx2 Do
Q
endstream
endobj
50 0 obj
-249
+177
endobj
51 0 obj
@@ -1058,12 +1058,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1101,7 +1101,7 @@ endobj
stream
q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1117,14 +1117,14 @@ ET
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx2 Do
Q
endstream
endobj
54 0 obj
-251
+197
endobj
55 0 obj
@@ -1171,7 +1171,7 @@ endobj
stream
q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1187,14 +1187,14 @@ ET
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
58 0 obj
-256
+220
endobj
59 0 obj
@@ -1206,12 +1206,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1249,7 +1249,7 @@ endobj
stream
q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1265,14 +1265,14 @@ ET
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
62 0 obj
-269
+215
endobj
63 0 obj
@@ -1284,12 +1284,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1327,7 +1327,7 @@ endobj
stream
q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1343,14 +1343,14 @@ ET
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
66 0 obj
-257
+221
endobj
67 0 obj
@@ -1362,12 +1362,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1405,7 +1405,7 @@ endobj
stream
q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1421,14 +1421,14 @@ ET
Q
q
--0.77273 0.00000 0.00000 -0.77273 612.00000 632.45455 cm
+-0.77273 0 0 -0.77273 612 632.45455 cm
/Fx2 Do
Q
endstream
endobj
70 0 obj
-257
+203
endobj
71 0 obj
@@ -1475,7 +1475,7 @@ endobj
stream
q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 752.00000 cm
+0 -1 1 0 0 752 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1491,14 +1491,14 @@ ET
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx2 Do
Q
endstream
endobj
74 0 obj
-251
+179
endobj
75 0 obj
@@ -1510,12 +1510,12 @@ endobj
772
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 752.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 752
+ 0
]
/Resources <<
/Font <<
@@ -1555,7 +1555,7 @@ endobj
stream
q
q
-0.00000 -0.79275 0.79275 0.00000 7.92746 622.72539 cm
+0 -0.79275 0.79275 0 7.92746 622.72539 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1571,14 +1571,14 @@ ET
Q
q
-0.00000 -0.80000 0.80000 0.00000 61.20000 712.80000 cm
+0 -0.8 0.8 0 61.2 712.8 cm
/Fx2 Do
Q
endstream
endobj
78 0 obj
-264
+224
endobj
79 0 obj
@@ -1590,12 +1590,12 @@ endobj
782
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 592.000000
- 772.000000
+ -1
+ 0
+ 0
+ -1
+ 592
+ 772
]
/Resources <<
/Font <<
@@ -1634,7 +1634,7 @@ endobj
stream
q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1650,14 +1650,14 @@ ET
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx2 Do
Q
endstream
endobj
82 0 obj
-251
+179
endobj
83 0 obj
@@ -1669,12 +1669,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -1712,7 +1712,7 @@ endobj
stream
q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
1 0 0 RG
@@ -1728,14 +1728,14 @@ ET
Q
q
-0.00000 -1.00000 1.00000 0.00000 0.00000 792.00000 cm
+0 -1 1 0 0 792 cm
/Fx2 Do
Q
endstream
endobj
86 0 obj
-251
+197
endobj
87 0 obj
@@ -1830,84 +1830,84 @@ xref
0000004230 00000 n
0000004510 00000 n
0000004802 00000 n
-0000005102 00000 n
-0000005123 00000 n
+0000005066 00000 n
+0000005087 00000 n
+0000005206 00000 n
0000005242 00000 n
-0000005278 00000 n
-0000005701 00000 n
-0000005722 00000 n
-0000006145 00000 n
-0000006189 00000 n
-0000006502 00000 n
-0000006523 00000 n
-0000006949 00000 n
-0000006970 00000 n
-0000007393 00000 n
-0000007437 00000 n
-0000007737 00000 n
-0000007758 00000 n
-0000008191 00000 n
-0000008235 00000 n
-0000008533 00000 n
-0000008554 00000 n
-0000008875 00000 n
-0000008919 00000 n
-0000009225 00000 n
-0000009246 00000 n
-0000009669 00000 n
-0000009713 00000 n
-0000010034 00000 n
-0000010055 00000 n
-0000010481 00000 n
-0000010525 00000 n
-0000010831 00000 n
-0000010852 00000 n
-0000011274 00000 n
-0000011318 00000 n
-0000011626 00000 n
-0000011647 00000 n
-0000011967 00000 n
-0000012011 00000 n
-0000012324 00000 n
-0000012345 00000 n
-0000012767 00000 n
-0000012812 00000 n
-0000013138 00000 n
-0000013159 00000 n
-0000013584 00000 n
-0000013629 00000 n
-0000013943 00000 n
-0000013964 00000 n
-0000014385 00000 n
-0000014430 00000 n
-0000014744 00000 n
-0000014765 00000 n
-0000015085 00000 n
-0000015130 00000 n
-0000015438 00000 n
-0000015459 00000 n
-0000015939 00000 n
-0000015984 00000 n
-0000016305 00000 n
-0000016326 00000 n
-0000016789 00000 n
-0000016834 00000 n
-0000017142 00000 n
-0000017163 00000 n
-0000017584 00000 n
-0000017629 00000 n
-0000017937 00000 n
-0000017958 00000 n
-0000018278 00000 n
-0000018299 00000 n
-0000018418 00000 n
-0000018454 00000 n
-0000018573 00000 n
+0000005623 00000 n
+0000005644 00000 n
+0000006025 00000 n
+0000006069 00000 n
+0000006318 00000 n
+0000006339 00000 n
+0000006723 00000 n
+0000006744 00000 n
+0000007125 00000 n
+0000007169 00000 n
+0000007433 00000 n
+0000007454 00000 n
+0000007849 00000 n
+0000007893 00000 n
+0000008137 00000 n
+0000008158 00000 n
+0000008479 00000 n
+0000008523 00000 n
+0000008757 00000 n
+0000008778 00000 n
+0000009159 00000 n
+0000009203 00000 n
+0000009476 00000 n
+0000009497 00000 n
+0000009881 00000 n
+0000009925 00000 n
+0000010159 00000 n
+0000010180 00000 n
+0000010560 00000 n
+0000010604 00000 n
+0000010858 00000 n
+0000010879 00000 n
+0000011199 00000 n
+0000011243 00000 n
+0000011520 00000 n
+0000011541 00000 n
+0000011921 00000 n
+0000011966 00000 n
+0000012238 00000 n
+0000012259 00000 n
+0000012642 00000 n
+0000012687 00000 n
+0000012965 00000 n
+0000012986 00000 n
+0000013365 00000 n
+0000013410 00000 n
+0000013670 00000 n
+0000013691 00000 n
+0000014011 00000 n
+0000014056 00000 n
+0000014292 00000 n
+0000014313 00000 n
+0000014751 00000 n
+0000014796 00000 n
+0000015077 00000 n
+0000015098 00000 n
+0000015519 00000 n
+0000015564 00000 n
+0000015800 00000 n
+0000015821 00000 n
+0000016200 00000 n
+0000016245 00000 n
+0000016499 00000 n
+0000016520 00000 n
+0000016840 00000 n
+0000016861 00000 n
+0000016980 00000 n
+0000017016 00000 n
+0000017135 00000 n
trailer <<
/Root 1 0 R
/Size 93
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-18609
+17171
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-4.pdf b/qpdf/qtest/qpdf/uo-4.pdf
index cf362b61..7c2f0d96 100644
--- a/qpdf/qtest/qpdf/uo-4.pdf
+++ b/qpdf/qtest/qpdf/uo-4.pdf
@@ -489,14 +489,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
-66
+30
endobj
25 0 obj
@@ -598,14 +598,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 153.00000 198.00000 cm
+0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
endstream
endobj
34 0 obj
-70
+38
endobj
35 0 obj
@@ -703,14 +703,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
44 0 obj
-68
+50
endobj
45 0 obj
@@ -722,12 +722,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -803,14 +803,14 @@ stream
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx1 Do
Q
endstream
endobj
52 0 obj
-68
+50
endobj
53 0 obj
@@ -822,12 +822,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -903,14 +903,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
60 0 obj
-71
+53
endobj
61 0 obj
@@ -922,12 +922,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1003,14 +1003,14 @@ stream
Q
q
-0.00000 0.66667 -0.66667 0.00000 570.00000 192.00000 cm
+0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
endstream
endobj
68 0 obj
-71
+47
endobj
69 0 obj
@@ -1022,12 +1022,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1103,14 +1103,14 @@ stream
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
76 0 obj
-69
+33
endobj
77 0 obj
@@ -1122,12 +1122,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1203,14 +1203,14 @@ stream
Q
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
84 0 obj
-69
+33
endobj
85 0 obj
@@ -1222,12 +1222,12 @@ endobj
792
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 792.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
]
/Resources <<
/Font <<
@@ -1484,92 +1484,92 @@ xref
0000004555 00000 n
0000004720 00000 n
0000004764 00000 n
-0000004887 00000 n
-0000004907 00000 n
+0000004851 00000 n
+0000004871 00000 n
+0000004990 00000 n
0000005026 00000 n
-0000005062 00000 n
-0000005385 00000 n
-0000005429 00000 n
-0000005488 00000 n
-0000005530 00000 n
-0000005704 00000 n
-0000005748 00000 n
-0000005875 00000 n
-0000005895 00000 n
-0000006218 00000 n
-0000006262 00000 n
-0000006321 00000 n
-0000006363 00000 n
-0000006465 00000 n
-0000006508 00000 n
-0000006628 00000 n
-0000006671 00000 n
-0000006796 00000 n
-0000006816 00000 n
-0000007240 00000 n
-0000007284 00000 n
-0000007343 00000 n
-0000007385 00000 n
-0000007550 00000 n
-0000007594 00000 n
-0000007719 00000 n
-0000007739 00000 n
-0000008163 00000 n
-0000008207 00000 n
-0000008266 00000 n
-0000008308 00000 n
-0000008477 00000 n
-0000008521 00000 n
-0000008649 00000 n
-0000008669 00000 n
-0000009097 00000 n
-0000009141 00000 n
-0000009200 00000 n
-0000009242 00000 n
-0000009422 00000 n
-0000009466 00000 n
-0000009594 00000 n
-0000009614 00000 n
+0000005349 00000 n
+0000005393 00000 n
+0000005452 00000 n
+0000005494 00000 n
+0000005668 00000 n
+0000005712 00000 n
+0000005807 00000 n
+0000005827 00000 n
+0000006150 00000 n
+0000006194 00000 n
+0000006253 00000 n
+0000006295 00000 n
+0000006397 00000 n
+0000006440 00000 n
+0000006560 00000 n
+0000006603 00000 n
+0000006710 00000 n
+0000006730 00000 n
+0000007112 00000 n
+0000007156 00000 n
+0000007215 00000 n
+0000007257 00000 n
+0000007422 00000 n
+0000007466 00000 n
+0000007573 00000 n
+0000007593 00000 n
+0000007975 00000 n
+0000008019 00000 n
+0000008078 00000 n
+0000008120 00000 n
+0000008289 00000 n
+0000008333 00000 n
+0000008443 00000 n
+0000008463 00000 n
+0000008849 00000 n
+0000008893 00000 n
+0000008952 00000 n
+0000008994 00000 n
+0000009174 00000 n
+0000009218 00000 n
+0000009322 00000 n
+0000009342 00000 n
+0000009728 00000 n
+0000009772 00000 n
+0000009831 00000 n
+0000009873 00000 n
0000010042 00000 n
0000010086 00000 n
-0000010145 00000 n
-0000010187 00000 n
-0000010356 00000 n
-0000010400 00000 n
-0000010526 00000 n
-0000010546 00000 n
-0000010971 00000 n
-0000011015 00000 n
-0000011074 00000 n
-0000011116 00000 n
-0000011285 00000 n
-0000011329 00000 n
-0000011455 00000 n
-0000011475 00000 n
-0000011900 00000 n
-0000011944 00000 n
-0000012114 00000 n
-0000012159 00000 n
-0000012342 00000 n
-0000012387 00000 n
-0000012558 00000 n
-0000012603 00000 n
-0000012774 00000 n
-0000012819 00000 n
-0000012990 00000 n
-0000013035 00000 n
-0000013218 00000 n
-0000013263 00000 n
-0000013435 00000 n
-0000013481 00000 n
-0000013654 00000 n
-0000013676 00000 n
-0000013796 00000 n
+0000010176 00000 n
+0000010196 00000 n
+0000010579 00000 n
+0000010623 00000 n
+0000010682 00000 n
+0000010724 00000 n
+0000010893 00000 n
+0000010937 00000 n
+0000011027 00000 n
+0000011047 00000 n
+0000011430 00000 n
+0000011474 00000 n
+0000011644 00000 n
+0000011689 00000 n
+0000011872 00000 n
+0000011917 00000 n
+0000012088 00000 n
+0000012133 00000 n
+0000012304 00000 n
+0000012349 00000 n
+0000012520 00000 n
+0000012565 00000 n
+0000012748 00000 n
+0000012793 00000 n
+0000012965 00000 n
+0000013011 00000 n
+0000013184 00000 n
+0000013206 00000 n
+0000013326 00000 n
trailer <<
/Root 1 0 R
/Size 105
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-13833
+13363
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-5.pdf b/qpdf/qtest/qpdf/uo-5.pdf
index 13f3de40..e463e470 100644
--- a/qpdf/qtest/qpdf/uo-5.pdf
+++ b/qpdf/qtest/qpdf/uo-5.pdf
@@ -487,14 +487,14 @@ endobj
>>
stream
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
26 0 obj
-63
+27
endobj
%% Contents for page 3
@@ -576,14 +576,14 @@ endobj
>>
stream
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
34 0 obj
-63
+27
endobj
%% Contents for page 4
@@ -652,14 +652,14 @@ endobj
>>
stream
q
-0.00000 1.00000 -1.00000 0.00000 612.00000 0.00000 cm
+0 1 -1 0 612 0 cm
/Fx1 Do
Q
endstream
endobj
40 0 obj
-66
+30
endobj
%% Contents for page 5
@@ -694,12 +694,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -736,14 +736,14 @@ endobj
>>
stream
q
-0.00000 0.66667 -0.66667 0.00000 510.00000 132.00000 cm
+0 0.66667 -0.66667 0 510 132 cm
/Fx1 Do
Q
endstream
endobj
46 0 obj
-68
+44
endobj
%% Contents for page 6
@@ -778,12 +778,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -820,14 +820,14 @@ endobj
>>
stream
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
52 0 obj
-68
+50
endobj
%% Contents for page 7
@@ -862,12 +862,12 @@ endobj
792
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 612.000000
- 792.000000
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
]
/Resources <<
/Font <<
@@ -1149,62 +1149,62 @@ xref
0000004543 00000 n
0000004717 00000 n
0000004761 00000 n
-0000004881 00000 n
-0000004924 00000 n
-0000005026 00000 n
-0000005069 00000 n
-0000005189 00000 n
-0000005209 00000 n
-0000005530 00000 n
-0000005574 00000 n
-0000005694 00000 n
-0000005737 00000 n
-0000005902 00000 n
-0000005923 00000 n
-0000006244 00000 n
-0000006288 00000 n
-0000006411 00000 n
-0000006454 00000 n
-0000006623 00000 n
-0000006644 00000 n
-0000007066 00000 n
-0000007110 00000 n
-0000007235 00000 n
-0000007278 00000 n
-0000007458 00000 n
-0000007479 00000 n
-0000007901 00000 n
-0000007945 00000 n
-0000008070 00000 n
-0000008113 00000 n
-0000008282 00000 n
-0000008303 00000 n
-0000008729 00000 n
-0000008773 00000 n
-0000008942 00000 n
-0000008986 00000 n
-0000009156 00000 n
-0000009201 00000 n
-0000009384 00000 n
-0000009429 00000 n
-0000009600 00000 n
-0000009645 00000 n
-0000009816 00000 n
-0000009861 00000 n
-0000010032 00000 n
-0000010077 00000 n
-0000010260 00000 n
-0000010305 00000 n
-0000010476 00000 n
-0000010521 00000 n
-0000010692 00000 n
-0000010713 00000 n
-0000010832 00000 n
+0000004845 00000 n
+0000004888 00000 n
+0000004990 00000 n
+0000005033 00000 n
+0000005153 00000 n
+0000005173 00000 n
+0000005494 00000 n
+0000005538 00000 n
+0000005622 00000 n
+0000005665 00000 n
+0000005830 00000 n
+0000005851 00000 n
+0000006172 00000 n
+0000006216 00000 n
+0000006303 00000 n
+0000006346 00000 n
+0000006515 00000 n
+0000006536 00000 n
+0000006916 00000 n
+0000006960 00000 n
+0000007061 00000 n
+0000007104 00000 n
+0000007284 00000 n
+0000007305 00000 n
+0000007685 00000 n
+0000007729 00000 n
+0000007836 00000 n
+0000007879 00000 n
+0000008048 00000 n
+0000008069 00000 n
+0000008453 00000 n
+0000008497 00000 n
+0000008666 00000 n
+0000008710 00000 n
+0000008880 00000 n
+0000008925 00000 n
+0000009108 00000 n
+0000009153 00000 n
+0000009324 00000 n
+0000009369 00000 n
+0000009540 00000 n
+0000009585 00000 n
+0000009756 00000 n
+0000009801 00000 n
+0000009984 00000 n
+0000010029 00000 n
+0000010200 00000 n
+0000010245 00000 n
+0000010416 00000 n
+0000010437 00000 n
+0000010556 00000 n
trailer <<
/Root 1 0 R
/Size 77
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-10868
+10592
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-6.pdf b/qpdf/qtest/qpdf/uo-6.pdf
index bb062dc9..1e2ecc9e 100644
--- a/qpdf/qtest/qpdf/uo-6.pdf
+++ b/qpdf/qtest/qpdf/uo-6.pdf
@@ -96,26 +96,26 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
q
-0.77273 0.00000 0.00000 0.77273 0.00000 159.54545 cm
+0.77273 0 0 0.77273 0 159.54545 cm
/Fx2 Do
Q
q
-1.00000 0.00000 0.00000 1.00000 20.00000 20.00000 cm
+1 0 0 1 20 20 cm
/Fx3 Do
Q
q
-0.81383 0.00000 0.00000 0.81383 16.27660 146.96809 cm
+0.81383 0 0 0.81383 16.2766 146.96809 cm
/Fx4 Do
Q
endstream
endobj
9 0 obj
-262
+159
endobj
10 0 obj
@@ -180,12 +180,12 @@ endobj
792
]
/Matrix [
- 0.000000
- -1.000000
- 1.000000
- 0.000000
- 0.000000
- 612.000000
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
]
/Resources <<
/Font <<
@@ -224,12 +224,12 @@ endobj
782
]
/Matrix [
- -1.000000
- 0.000000
- 0.000000
- -1.000000
- 592.000000
- 772.000000
+ -1
+ 0
+ 0
+ -1
+ 592
+ 772
]
/Resources <<
/Font <<
@@ -269,12 +269,12 @@ endobj
772
]
/Matrix [
- 0.000000
- 1.000000
- -1.000000
- 0.000000
- 752.000000
- 0.000000
+ 0
+ 1
+ -1
+ 0
+ 752
+ 0
]
/Resources <<
/Font <<
@@ -334,24 +334,24 @@ xref
0000000601 00000 n
0000000764 00000 n
0000000807 00000 n
-0000001124 00000 n
-0000001144 00000 n
-0000001263 00000 n
-0000001299 00000 n
-0000001619 00000 n
-0000001640 00000 n
-0000002061 00000 n
-0000002082 00000 n
-0000002545 00000 n
-0000002566 00000 n
-0000003046 00000 n
-0000003067 00000 n
-0000003186 00000 n
+0000001021 00000 n
+0000001041 00000 n
+0000001160 00000 n
+0000001196 00000 n
+0000001516 00000 n
+0000001537 00000 n
+0000001916 00000 n
+0000001937 00000 n
+0000002358 00000 n
+0000002379 00000 n
+0000002817 00000 n
+0000002838 00000 n
+0000002957 00000 n
trailer <<
/Root 1 0 R
/Size 22
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-3222
+2993
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-7.pdf b/qpdf/qtest/qpdf/uo-7.pdf
index ca55d46b..4cabeaf7 100644
--- a/qpdf/qtest/qpdf/uo-7.pdf
+++ b/qpdf/qtest/qpdf/uo-7.pdf
@@ -545,14 +545,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
-66
+30
endobj
25 0 obj
@@ -648,14 +648,14 @@ stream
Q
q
-0.50000 0.00000 0.00000 0.50000 153.00000 198.00000 cm
+0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
endstream
endobj
34 0 obj
-70
+38
endobj
35 0 obj
@@ -747,14 +747,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
44 0 obj
-66
+30
endobj
45 0 obj
@@ -833,14 +833,14 @@ stream
Q
q
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 cm
+1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
52 0 obj
-66
+30
endobj
53 0 obj
@@ -919,14 +919,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
60 0 obj
-71
+53
endobj
61 0 obj
@@ -1005,14 +1005,14 @@ stream
Q
q
-0.00000 0.66667 -0.66667 0.00000 570.00000 192.00000 cm
+0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
endstream
endobj
68 0 obj
-71
+47
endobj
69 0 obj
@@ -1091,14 +1091,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
76 0 obj
-71
+53
endobj
77 0 obj
@@ -1177,14 +1177,14 @@ stream
Q
q
-0.00000 0.77273 -0.77273 0.00000 612.00000 159.54545 cm
+0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
84 0 obj
-71
+53
endobj
85 0 obj
@@ -1263,14 +1263,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
92 0 obj
-72
+36
endobj
93 0 obj
@@ -1349,14 +1349,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
100 0 obj
-72
+36
endobj
101 0 obj
@@ -1435,14 +1435,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
108 0 obj
-72
+36
endobj
109 0 obj
@@ -1521,14 +1521,14 @@ stream
Q
q
--1.00000 0.00000 0.00000 -1.00000 612.00000 792.00000 cm
+-1 0 0 -1 612 792 cm
/Fx1 Do
Q
endstream
endobj
116 0 obj
-72
+36
endobj
117 0 obj
@@ -1607,14 +1607,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
124 0 obj
-69
+51
endobj
125 0 obj
@@ -1693,14 +1693,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
132 0 obj
-69
+51
endobj
133 0 obj
@@ -1779,14 +1779,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
140 0 obj
-69
+51
endobj
141 0 obj
@@ -1865,14 +1865,14 @@ stream
Q
q
-0.00000 -0.77273 0.77273 0.00000 0.00000 632.45455 cm
+0 -0.77273 0.77273 0 0 632.45455 cm
/Fx1 Do
Q
endstream
endobj
148 0 obj
-69
+51
endobj
149 0 obj
@@ -1940,139 +1940,139 @@ xref
0000005163 00000 n
0000005328 00000 n
0000005372 00000 n
-0000005495 00000 n
-0000005515 00000 n
+0000005459 00000 n
+0000005479 00000 n
+0000005598 00000 n
0000005634 00000 n
-0000005670 00000 n
-0000005953 00000 n
-0000005996 00000 n
-0000006055 00000 n
-0000006097 00000 n
-0000006271 00000 n
-0000006315 00000 n
-0000006442 00000 n
-0000006462 00000 n
-0000006745 00000 n
-0000006788 00000 n
-0000006847 00000 n
-0000006889 00000 n
-0000006991 00000 n
-0000007034 00000 n
-0000007154 00000 n
-0000007197 00000 n
-0000007320 00000 n
-0000007340 00000 n
-0000007623 00000 n
-0000007666 00000 n
-0000007725 00000 n
-0000007767 00000 n
-0000007932 00000 n
-0000007976 00000 n
-0000008099 00000 n
-0000008119 00000 n
-0000008402 00000 n
-0000008445 00000 n
-0000008504 00000 n
-0000008546 00000 n
-0000008715 00000 n
-0000008759 00000 n
-0000008887 00000 n
-0000008907 00000 n
-0000009190 00000 n
-0000009233 00000 n
-0000009292 00000 n
-0000009334 00000 n
-0000009514 00000 n
-0000009558 00000 n
-0000009686 00000 n
-0000009706 00000 n
-0000009989 00000 n
-0000010032 00000 n
-0000010091 00000 n
-0000010133 00000 n
-0000010302 00000 n
-0000010346 00000 n
-0000010474 00000 n
-0000010494 00000 n
-0000010777 00000 n
-0000010820 00000 n
-0000010879 00000 n
-0000010921 00000 n
-0000011090 00000 n
-0000011134 00000 n
-0000011262 00000 n
-0000011282 00000 n
-0000011565 00000 n
-0000011608 00000 n
-0000011667 00000 n
-0000011709 00000 n
-0000011879 00000 n
-0000011923 00000 n
-0000012052 00000 n
-0000012072 00000 n
-0000012355 00000 n
-0000012399 00000 n
-0000012458 00000 n
-0000012501 00000 n
-0000012684 00000 n
-0000012729 00000 n
-0000012859 00000 n
-0000012880 00000 n
-0000013165 00000 n
-0000013210 00000 n
-0000013271 00000 n
-0000013315 00000 n
-0000013488 00000 n
-0000013534 00000 n
-0000013665 00000 n
-0000013686 00000 n
-0000013972 00000 n
-0000014017 00000 n
-0000014078 00000 n
-0000014122 00000 n
-0000014295 00000 n
-0000014341 00000 n
-0000014472 00000 n
-0000014493 00000 n
-0000014779 00000 n
-0000014824 00000 n
-0000014885 00000 n
-0000014929 00000 n
-0000015102 00000 n
-0000015148 00000 n
-0000015276 00000 n
-0000015297 00000 n
-0000015583 00000 n
-0000015628 00000 n
-0000015689 00000 n
-0000015733 00000 n
-0000015918 00000 n
-0000015964 00000 n
-0000016092 00000 n
-0000016113 00000 n
-0000016399 00000 n
-0000016444 00000 n
-0000016505 00000 n
-0000016549 00000 n
-0000016722 00000 n
-0000016768 00000 n
-0000016896 00000 n
-0000016917 00000 n
-0000017203 00000 n
-0000017248 00000 n
-0000017309 00000 n
-0000017353 00000 n
-0000017526 00000 n
-0000017572 00000 n
-0000017700 00000 n
-0000017721 00000 n
-0000018007 00000 n
-0000018028 00000 n
+0000005917 00000 n
+0000005960 00000 n
+0000006019 00000 n
+0000006061 00000 n
+0000006235 00000 n
+0000006279 00000 n
+0000006374 00000 n
+0000006394 00000 n
+0000006677 00000 n
+0000006720 00000 n
+0000006779 00000 n
+0000006821 00000 n
+0000006923 00000 n
+0000006966 00000 n
+0000007086 00000 n
+0000007129 00000 n
+0000007216 00000 n
+0000007236 00000 n
+0000007519 00000 n
+0000007562 00000 n
+0000007621 00000 n
+0000007663 00000 n
+0000007828 00000 n
+0000007872 00000 n
+0000007959 00000 n
+0000007979 00000 n
+0000008262 00000 n
+0000008305 00000 n
+0000008364 00000 n
+0000008406 00000 n
+0000008575 00000 n
+0000008619 00000 n
+0000008729 00000 n
+0000008749 00000 n
+0000009032 00000 n
+0000009075 00000 n
+0000009134 00000 n
+0000009176 00000 n
+0000009356 00000 n
+0000009400 00000 n
+0000009504 00000 n
+0000009524 00000 n
+0000009807 00000 n
+0000009850 00000 n
+0000009909 00000 n
+0000009951 00000 n
+0000010120 00000 n
+0000010164 00000 n
+0000010274 00000 n
+0000010294 00000 n
+0000010577 00000 n
+0000010620 00000 n
+0000010679 00000 n
+0000010721 00000 n
+0000010890 00000 n
+0000010934 00000 n
+0000011044 00000 n
+0000011064 00000 n
+0000011347 00000 n
+0000011390 00000 n
+0000011449 00000 n
+0000011491 00000 n
+0000011661 00000 n
+0000011705 00000 n
+0000011798 00000 n
+0000011818 00000 n
+0000012101 00000 n
+0000012145 00000 n
+0000012204 00000 n
+0000012247 00000 n
+0000012430 00000 n
+0000012475 00000 n
+0000012569 00000 n
+0000012590 00000 n
+0000012875 00000 n
+0000012920 00000 n
+0000012981 00000 n
+0000013025 00000 n
+0000013198 00000 n
+0000013244 00000 n
+0000013339 00000 n
+0000013360 00000 n
+0000013646 00000 n
+0000013691 00000 n
+0000013752 00000 n
+0000013796 00000 n
+0000013969 00000 n
+0000014015 00000 n
+0000014110 00000 n
+0000014131 00000 n
+0000014417 00000 n
+0000014462 00000 n
+0000014523 00000 n
+0000014567 00000 n
+0000014740 00000 n
+0000014786 00000 n
+0000014896 00000 n
+0000014917 00000 n
+0000015203 00000 n
+0000015248 00000 n
+0000015309 00000 n
+0000015353 00000 n
+0000015538 00000 n
+0000015584 00000 n
+0000015694 00000 n
+0000015715 00000 n
+0000016001 00000 n
+0000016046 00000 n
+0000016107 00000 n
+0000016151 00000 n
+0000016324 00000 n
+0000016370 00000 n
+0000016480 00000 n
+0000016501 00000 n
+0000016787 00000 n
+0000016832 00000 n
+0000016893 00000 n
+0000016937 00000 n
+0000017110 00000 n
+0000017156 00000 n
+0000017266 00000 n
+0000017287 00000 n
+0000017573 00000 n
+0000017594 00000 n
trailer <<
/Root 1 0 R
/Size 152
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-18138
+17704
%%EOF
diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc
index 6f704987..28e07c5d 100644
--- a/qpdf/test_driver.cc
+++ b/qpdf/test_driver.cc
@@ -560,7 +560,7 @@ void runtest(int n, char const* filename1, char const* arg2)
for (int i = 0; i < nitems; ++i)
{
std::cout << QUtil::double_to_string(
- qnumbers.getArrayItem(i).getNumericValue(), 3)
+ qnumbers.getArrayItem(i).getNumericValue(), 3, false)
<< std::endl;
}
}