aboutsummaryrefslogtreecommitdiffstats
path: root/qpdf
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2024-01-10 22:26:43 +0100
committerJay Berkenbilt <ejb@ql.org>2024-01-11 12:13:57 +0100
commitd339f8ad1ae9bf58a3112a3bfa024553ef6d66a7 (patch)
tree3d0495c29ebbebe3e63648557e752a84b31ef133 /qpdf
parent90a97bf4efcb38748fde1addd3d49d682f0ae728 (diff)
downloadqpdf-d339f8ad1ae9bf58a3112a3bfa024553ef6d66a7.tar.zst
Add non-trivial multiple overlay/underlay tests
Diffstat (limited to 'qpdf')
-rw-r--r--qpdf/qtest/copy-annotations.test3
-rw-r--r--qpdf/qtest/form-xobject.test5
-rw-r--r--qpdf/qtest/qpdf/job-json-underlay-overlay.json25
-rw-r--r--qpdf/qtest/qpdf/job-json-underlay-overlay.pdfbin15843 -> 16314 bytes
-rw-r--r--qpdf/qtest/qpdf/overlay-copy-annotations-p1.pdf317
-rw-r--r--qpdf/qtest/qpdf/overlay-copy-annotations-p2.pdf317
-rw-r--r--qpdf/qtest/qpdf/overlay-copy-annotations-p5.pdf317
-rw-r--r--qpdf/qtest/qpdf/overlay-copy-annotations-p6.pdf315
-rw-r--r--qpdf/qtest/qpdf/uo-8.out27
-rw-r--r--qpdf/qtest/qpdf/uo-8.pdf1240
10 files changed, 2038 insertions, 528 deletions
diff --git a/qpdf/qtest/copy-annotations.test b/qpdf/qtest/copy-annotations.test
index 582d3709..8a6aa2d6 100644
--- a/qpdf/qtest/copy-annotations.test
+++ b/qpdf/qtest/copy-annotations.test
@@ -33,7 +33,8 @@ foreach my $page (1, 2, 5, 6)
{$td->COMMAND =>
"qpdf --qdf --static-id --no-original-object-ids" .
" --pages . $page --" .
- " fxo-red.pdf --overlay form-fields-and-annotations.pdf" .
+ " fxo-red.pdf --overlay minimal.pdf --repeat=1 --" .
+ " --overlay form-fields-and-annotations.pdf" .
" --repeat=1 -- a.pdf"},
{$td->STRING => "", $td->EXIT_STATUS => 0},
$td->NORMALIZE_NEWLINES);
diff --git a/qpdf/qtest/form-xobject.test b/qpdf/qtest/form-xobject.test
index fc98e264..8ae5da96 100644
--- a/qpdf/qtest/form-xobject.test
+++ b/qpdf/qtest/form-xobject.test
@@ -61,6 +61,11 @@ my @uo_cases = (
'--overlay fxo-blue.pdf --to=1,1,1,1 --from=1-4 --' .
' --pages . 1 --', #6
'--overlay 20-pages.pdf --password=user --', #7
+ '--overlay fxo-blue.pdf --to=1-4 --from=1-4 --' .
+ ' --overlay fxo-green.pdf --to=1-4 --from=4-1 --' .
+ ' --underlay fxo-blue.pdf --to=4-1 --from=5-8 --' .
+ ' --underlay fxo-green.pdf --to=4-1 --from=8-5 --' .
+ ' --pages . 1-4 --', #8
);
$n_tests += 2 * scalar(@uo_cases);
for (my $i = 1; $i <= scalar(@uo_cases); ++$i)
diff --git a/qpdf/qtest/qpdf/job-json-underlay-overlay.json b/qpdf/qtest/qpdf/job-json-underlay-overlay.json
index 55ee4652..15fb4701 100644
--- a/qpdf/qtest/qpdf/job-json-underlay-overlay.json
+++ b/qpdf/qtest/qpdf/job-json-underlay-overlay.json
@@ -4,12 +4,21 @@
"outputFile": "a.pdf",
"staticId": "",
"decrypt": "",
- "underlay": {
- "file": "fxo-green.pdf"
- },
- "overlay": {
- "file": "fxo-red.pdf",
- "from": "1,2",
- "repeat": "3"
- }
+ "underlay": [
+ {
+ "file": "fxo-green.pdf"
+ },
+ {
+ "file": "minimal.pdf",
+ "repeat": "1",
+ "to": "5-7"
+ }
+ ],
+ "overlay": [
+ {
+ "file": "fxo-red.pdf",
+ "from": "1,2",
+ "repeat": "3"
+ }
+ ]
}
diff --git a/qpdf/qtest/qpdf/job-json-underlay-overlay.pdf b/qpdf/qtest/qpdf/job-json-underlay-overlay.pdf
index 3b78acb8..83474382 100644
--- a/qpdf/qtest/qpdf/job-json-underlay-overlay.pdf
+++ b/qpdf/qtest/qpdf/job-json-underlay-overlay.pdf
Binary files differ
diff --git a/qpdf/qtest/qpdf/overlay-copy-annotations-p1.pdf b/qpdf/qtest/qpdf/overlay-copy-annotations-p1.pdf
index ca13a022..c5798f12 100644
--- a/qpdf/qtest/qpdf/overlay-copy-annotations-p1.pdf
+++ b/qpdf/qtest/qpdf/overlay-copy-annotations-p1.pdf
@@ -128,6 +128,7 @@ endobj
/XObject <<
/Fx0 25 0 R
/Fx1 27 0 R
+ /Fx2 29 0 R
>>
>>
/Type /Page
@@ -151,7 +152,7 @@ endobj
118.8
11.322
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@@ -188,7 +189,7 @@ endobj
0
0
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@@ -213,8 +214,8 @@ endobj
<<
/AP <<
/N <<
- /1 30 0 R
- /Off 32 0 R
+ /1 32 0 R
+ /Off 34 0 R
>>
>>
/AS /1
@@ -241,8 +242,8 @@ endobj
<<
/AP <<
/N <<
- /2 34 0 R
- /Off 36 0 R
+ /2 36 0 R
+ /Off 38 0 R
>>
>>
/AS /2
@@ -269,8 +270,8 @@ endobj
<<
/AP <<
/N <<
- /3 38 0 R
- /Off 40 0 R
+ /3 40 0 R
+ /Off 42 0 R
>>
>>
/AS /3
@@ -324,10 +325,10 @@ endobj
18 0 obj
<<
/AP <<
- /N 42 0 R
+ /N 44 0 R
>>
/Contents (attachment1.txt)
- /FS 44 0 R
+ /FS 46 0 R
/NM (attachment1.txt)
/Rect [
72
@@ -343,7 +344,7 @@ endobj
19 0 obj
<<
/AP <<
- /N 45 0 R
+ /N 47 0 R
>>
/DA ()
/Rect [
@@ -360,7 +361,7 @@ endobj
20 0 obj
<<
/AP <<
- /N 47 0 R
+ /N 49 0 R
>>
/DA ()
/Rect [
@@ -377,7 +378,7 @@ endobj
21 0 obj
<<
/AP <<
- /N 49 0 R
+ /N 51 0 R
>>
/DA ()
/Rect [
@@ -394,7 +395,7 @@ endobj
22 0 obj
<<
/AP <<
- /N 51 0 R
+ /N 53 0 R
>>
/DA ()
/Rect [
@@ -422,11 +423,15 @@ q
1 0 0 1 0 0 cm
/Fx1 Do
Q
+q
+1 0 0 1 0 0 cm
+/Fx2 Do
+Q
endstream
endobj
24 0 obj
-54
+81
endobj
25 0 obj
@@ -439,9 +444,9 @@ endobj
]
/Resources <<
/Font <<
- /F1 53 0 R
+ /F1 55 0 R
>>
- /ProcSet 54 0 R
+ /ProcSet 56 0 R
>>
/Subtype /Form
/Type /XObject
@@ -475,14 +480,45 @@ endobj
]
/Resources <<
/Font <<
- /F1 9 0 R
+ /F1 57 0 R
>>
+ /ProcSet 58 0 R
>>
/Subtype /Form
/Type /XObject
/Length 28 0 R
>>
stream
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Potato) Tj
+ET
+endstream
+endobj
+
+28 0 obj
+44
+endobj
+
+29 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 9 0 R
+ >>
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 30 0 R
+>>
+stream
q
1 1 .7 rg
.5 .5 0 RG
@@ -548,11 +584,11 @@ ET
endstream
endobj
-28 0 obj
+30 0 obj
874
endobj
-29 0 obj
+31 0 obj
<<
/Font <<
/F1 9 0 R
@@ -560,7 +596,7 @@ endobj
>>
endobj
-30 0 obj
+32 0 obj
<<
/BBox [
0
@@ -568,10 +604,10 @@ endobj
12.05
12.05
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 31 0 R
+ /Length 33 0 R
>>
stream
/Tx BMC
@@ -590,11 +626,11 @@ EMC
endstream
endobj
-31 0 obj
+33 0 obj
202
endobj
-32 0 obj
+34 0 obj
<<
/BBox [
0
@@ -602,10 +638,10 @@ endobj
12.05
12.05
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 33 0 R
+ /Length 35 0 R
>>
stream
/Tx BMC
@@ -613,11 +649,11 @@ EMC
endstream
endobj
-33 0 obj
+35 0 obj
12
endobj
-34 0 obj
+36 0 obj
<<
/BBox [
0
@@ -625,10 +661,10 @@ endobj
12.05
12.05
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 35 0 R
+ /Length 37 0 R
>>
stream
/Tx BMC
@@ -647,11 +683,11 @@ EMC
endstream
endobj
-35 0 obj
+37 0 obj
202
endobj
-36 0 obj
+38 0 obj
<<
/BBox [
0
@@ -659,10 +695,10 @@ endobj
12.05
12.05
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 37 0 R
+ /Length 39 0 R
>>
stream
/Tx BMC
@@ -670,11 +706,11 @@ EMC
endstream
endobj
-37 0 obj
+39 0 obj
12
endobj
-38 0 obj
+40 0 obj
<<
/BBox [
0
@@ -682,10 +718,10 @@ endobj
12.05
12.05
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 39 0 R
+ /Length 41 0 R
>>
stream
/Tx BMC
@@ -704,11 +740,11 @@ EMC
endstream
endobj
-39 0 obj
+41 0 obj
202
endobj
-40 0 obj
+42 0 obj
<<
/BBox [
0
@@ -716,10 +752,10 @@ endobj
12.05
12.05
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 41 0 R
+ /Length 43 0 R
>>
stream
/Tx BMC
@@ -727,11 +763,11 @@ EMC
endstream
endobj
-41 0 obj
+43 0 obj
12
endobj
-42 0 obj
+44 0 obj
<<
/BBox [
0
@@ -743,7 +779,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
- /Length 43 0 R
+ /Length 45 0 R
>>
stream
0 10 m
@@ -756,15 +792,15 @@ S
endstream
endobj
-43 0 obj
+45 0 obj
52
endobj
-44 0 obj
+46 0 obj
<<
/EF <<
- /F 56 0 R
- /UF 56 0 R
+ /F 60 0 R
+ /UF 60 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@@ -772,7 +808,7 @@ endobj
>>
endobj
-45 0 obj
+47 0 obj
<<
/BBox [
0
@@ -780,10 +816,10 @@ endobj
20
10
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 46 0 R
+ /Length 48 0 R
>>
stream
1 0 0 RG
@@ -793,11 +829,11 @@ S
endstream
endobj
-46 0 obj
+48 0 obj
36
endobj
-47 0 obj
+49 0 obj
<<
/BBox [
0
@@ -813,10 +849,10 @@ endobj
0
0
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 48 0 R
+ /Length 50 0 R
>>
stream
0 1 0 RG
@@ -826,11 +862,11 @@ S
endstream
endobj
-48 0 obj
+50 0 obj
36
endobj
-49 0 obj
+51 0 obj
<<
/BBox [
0
@@ -846,10 +882,10 @@ endobj
0
0
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 50 0 R
+ /Length 52 0 R
>>
stream
0 0 1 RG
@@ -859,11 +895,11 @@ S
endstream
endobj
-50 0 obj
+52 0 obj
36
endobj
-51 0 obj
+53 0 obj
<<
/BBox [
0
@@ -879,10 +915,10 @@ endobj
0
0
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 52 0 R
+ /Length 54 0 R
>>
stream
0.5 0 1 RG
@@ -892,11 +928,11 @@ S
endstream
endobj
-52 0 obj
+54 0 obj
38
endobj
-53 0 obj
+55 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
@@ -906,16 +942,33 @@ endobj
>>
endobj
-54 0 obj
+56 0 obj
[
/PDF
/Text
]
endobj
-55 0 obj
+57 0 obj
<<
- /Font 58 0 R
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+58 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+59 0 obj
+<<
+ /Font 62 0 R
/ProcSet [
/PDF
/Text
@@ -923,7 +976,7 @@ endobj
>>
endobj
-56 0 obj
+60 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@@ -931,24 +984,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
- /Length 57 0 R
+ /Length 61 0 R
>>
stream
content of attachment
endstream
endobj
-57 0 obj
+61 0 obj
22
endobj
-58 0 obj
+62 0 obj
<<
- /ZaDi 59 0 R
+ /ZaDi 63 0 R
>>
endobj
-59 0 obj
+63 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@@ -957,7 +1010,7 @@ endobj
endobj
xref
-0 60
+0 64
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@@ -967,62 +1020,66 @@ xref
0000000545 00000 n
0000000794 00000 n
0000000923 00000 n
-0000001255 00000 n
-0000001359 00000 n
-0000001575 00000 n
-0000001595 00000 n
-0000001866 00000 n
-0000001886 00000 n
-0000002197 00000 n
-0000002508 00000 n
-0000002819 00000 n
-0000003063 00000 n
-0000003267 00000 n
-0000003407 00000 n
-0000003549 00000 n
-0000003691 00000 n
-0000003856 00000 n
-0000003967 00000 n
-0000003987 00000 n
-0000004306 00000 n
-0000004327 00000 n
-0000005391 00000 n
-0000005412 00000 n
-0000005465 00000 n
-0000005824 00000 n
-0000005845 00000 n
-0000006014 00000 n
-0000006034 00000 n
-0000006393 00000 n
-0000006414 00000 n
-0000006583 00000 n
-0000006603 00000 n
-0000006962 00000 n
-0000006983 00000 n
-0000007152 00000 n
-0000007172 00000 n
-0000007376 00000 n
-0000007396 00000 n
-0000007527 00000 n
-0000007714 00000 n
-0000007734 00000 n
-0000007974 00000 n
-0000007994 00000 n
-0000008235 00000 n
-0000008255 00000 n
-0000008497 00000 n
-0000008517 00000 n
-0000008636 00000 n
-0000008672 00000 n
-0000008746 00000 n
-0000008954 00000 n
-0000008974 00000 n
-0000009012 00000 n
+0000001273 00000 n
+0000001377 00000 n
+0000001593 00000 n
+0000001613 00000 n
+0000001884 00000 n
+0000001904 00000 n
+0000002215 00000 n
+0000002526 00000 n
+0000002837 00000 n
+0000003081 00000 n
+0000003285 00000 n
+0000003425 00000 n
+0000003567 00000 n
+0000003709 00000 n
+0000003874 00000 n
+0000004012 00000 n
+0000004032 00000 n
+0000004351 00000 n
+0000004372 00000 n
+0000004627 00000 n
+0000004647 00000 n
+0000005711 00000 n
+0000005732 00000 n
+0000005785 00000 n
+0000006144 00000 n
+0000006165 00000 n
+0000006334 00000 n
+0000006354 00000 n
+0000006713 00000 n
+0000006734 00000 n
+0000006903 00000 n
+0000006923 00000 n
+0000007282 00000 n
+0000007303 00000 n
+0000007472 00000 n
+0000007492 00000 n
+0000007696 00000 n
+0000007716 00000 n
+0000007847 00000 n
+0000008034 00000 n
+0000008054 00000 n
+0000008294 00000 n
+0000008314 00000 n
+0000008555 00000 n
+0000008575 00000 n
+0000008817 00000 n
+0000008837 00000 n
+0000008956 00000 n
+0000008992 00000 n
+0000009111 00000 n
+0000009147 00000 n
+0000009221 00000 n
+0000009429 00000 n
+0000009449 00000 n
+0000009487 00000 n
trailer <<
/Root 1 0 R
- /Size 60
+ /Size 64
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-9093
+9568
%%EOF
diff --git a/qpdf/qtest/qpdf/overlay-copy-annotations-p2.pdf b/qpdf/qtest/qpdf/overlay-copy-annotations-p2.pdf
index 203e92e7..6bbdd780 100644
--- a/qpdf/qtest/qpdf/overlay-copy-annotations-p2.pdf
+++ b/qpdf/qtest/qpdf/overlay-copy-annotations-p2.pdf
@@ -128,6 +128,7 @@ endobj
/XObject <<
/Fx0 25 0 R
/Fx1 27 0 R
+ /Fx2 29 0 R
>>
>>
/Type /Page
@@ -160,7 +161,7 @@ endobj
153
198
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@@ -197,7 +198,7 @@ endobj
-198
153
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@@ -222,8 +223,8 @@ endobj
<<
/AP <<
/N <<
- /1 30 0 R
- /Off 32 0 R
+ /1 32 0 R
+ /Off 34 0 R
>>
>>
/AS /1
@@ -250,8 +251,8 @@ endobj
<<
/AP <<
/N <<
- /2 34 0 R
- /Off 36 0 R
+ /2 36 0 R
+ /Off 38 0 R
>>
>>
/AS /2
@@ -278,8 +279,8 @@ endobj
<<
/AP <<
/N <<
- /3 38 0 R
- /Off 40 0 R
+ /3 40 0 R
+ /Off 42 0 R
>>
>>
/AS /3
@@ -333,10 +334,10 @@ endobj
18 0 obj
<<
/AP <<
- /N 42 0 R
+ /N 44 0 R
>>
/Contents (attachment1.txt)
- /FS 44 0 R
+ /FS 46 0 R
/NM (attachment1.txt)
/Rect [
189
@@ -352,7 +353,7 @@ endobj
19 0 obj
<<
/AP <<
- /N 45 0 R
+ /N 47 0 R
>>
/DA ()
/Rect [
@@ -369,7 +370,7 @@ endobj
20 0 obj
<<
/AP <<
- /N 47 0 R
+ /N 49 0 R
>>
/DA ()
/Rect [
@@ -386,7 +387,7 @@ endobj
21 0 obj
<<
/AP <<
- /N 49 0 R
+ /N 51 0 R
>>
/DA ()
/Rect [
@@ -403,7 +404,7 @@ endobj
22 0 obj
<<
/AP <<
- /N 51 0 R
+ /N 53 0 R
>>
/DA ()
/Rect [
@@ -431,11 +432,15 @@ q
0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
+q
+0.5 0 0 0.5 153 198 cm
+/Fx2 Do
+Q
endstream
endobj
24 0 obj
-66
+101
endobj
25 0 obj
@@ -456,9 +461,9 @@ endobj
]
/Resources <<
/Font <<
- /F1 53 0 R
+ /F1 55 0 R
>>
- /ProcSet 54 0 R
+ /ProcSet 56 0 R
>>
/Subtype /Form
/Type /XObject
@@ -492,14 +497,45 @@ endobj
]
/Resources <<
/Font <<
- /F1 9 0 R
+ /F1 57 0 R
>>
+ /ProcSet 58 0 R
>>
/Subtype /Form
/Type /XObject
/Length 28 0 R
>>
stream
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Potato) Tj
+ET
+endstream
+endobj
+
+28 0 obj
+44
+endobj
+
+29 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 9 0 R
+ >>
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 30 0 R
+>>
+stream
q
1 1 .7 rg
.5 .5 0 RG
@@ -565,11 +601,11 @@ ET
endstream
endobj
-28 0 obj
+30 0 obj
874
endobj
-29 0 obj
+31 0 obj
<<
/Font <<
/F1 9 0 R
@@ -577,7 +613,7 @@ endobj
>>
endobj
-30 0 obj
+32 0 obj
<<
/BBox [
0
@@ -593,10 +629,10 @@ endobj
153
198
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 31 0 R
+ /Length 33 0 R
>>
stream
/Tx BMC
@@ -615,11 +651,11 @@ EMC
endstream
endobj
-31 0 obj
+33 0 obj
202
endobj
-32 0 obj
+34 0 obj
<<
/BBox [
0
@@ -635,10 +671,10 @@ endobj
153
198
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 33 0 R
+ /Length 35 0 R
>>
stream
/Tx BMC
@@ -646,11 +682,11 @@ EMC
endstream
endobj
-33 0 obj
+35 0 obj
12
endobj
-34 0 obj
+36 0 obj
<<
/BBox [
0
@@ -666,10 +702,10 @@ endobj
153
198
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 35 0 R
+ /Length 37 0 R
>>
stream
/Tx BMC
@@ -688,11 +724,11 @@ EMC
endstream
endobj
-35 0 obj
+37 0 obj
202
endobj
-36 0 obj
+38 0 obj
<<
/BBox [
0
@@ -708,10 +744,10 @@ endobj
153
198
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 37 0 R
+ /Length 39 0 R
>>
stream
/Tx BMC
@@ -719,11 +755,11 @@ EMC
endstream
endobj
-37 0 obj
+39 0 obj
12
endobj
-38 0 obj
+40 0 obj
<<
/BBox [
0
@@ -739,10 +775,10 @@ endobj
153
198
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 39 0 R
+ /Length 41 0 R
>>
stream
/Tx BMC
@@ -761,11 +797,11 @@ EMC
endstream
endobj
-39 0 obj
+41 0 obj
202
endobj
-40 0 obj
+42 0 obj
<<
/BBox [
0
@@ -781,10 +817,10 @@ endobj
153
198
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 41 0 R
+ /Length 43 0 R
>>
stream
/Tx BMC
@@ -792,11 +828,11 @@ EMC
endstream
endobj
-41 0 obj
+43 0 obj
12
endobj
-42 0 obj
+44 0 obj
<<
/BBox [
0
@@ -816,7 +852,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
- /Length 43 0 R
+ /Length 45 0 R
>>
stream
0 10 m
@@ -829,15 +865,15 @@ S
endstream
endobj
-43 0 obj
+45 0 obj
52
endobj
-44 0 obj
+46 0 obj
<<
/EF <<
- /F 56 0 R
- /UF 56 0 R
+ /F 60 0 R
+ /UF 60 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@@ -845,7 +881,7 @@ endobj
>>
endobj
-45 0 obj
+47 0 obj
<<
/BBox [
0
@@ -861,10 +897,10 @@ endobj
153
198
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 46 0 R
+ /Length 48 0 R
>>
stream
1 0 0 RG
@@ -874,11 +910,11 @@ S
endstream
endobj
-46 0 obj
+48 0 obj
36
endobj
-47 0 obj
+49 0 obj
<<
/BBox [
0
@@ -894,10 +930,10 @@ endobj
-198
153
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 48 0 R
+ /Length 50 0 R
>>
stream
0 1 0 RG
@@ -907,11 +943,11 @@ S
endstream
endobj
-48 0 obj
+50 0 obj
36
endobj
-49 0 obj
+51 0 obj
<<
/BBox [
0
@@ -927,10 +963,10 @@ endobj
-153
-198
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 50 0 R
+ /Length 52 0 R
>>
stream
0 0 1 RG
@@ -940,11 +976,11 @@ S
endstream
endobj
-50 0 obj
+52 0 obj
36
endobj
-51 0 obj
+53 0 obj
<<
/BBox [
0
@@ -960,10 +996,10 @@ endobj
198
-153
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 52 0 R
+ /Length 54 0 R
>>
stream
0.5 0 1 RG
@@ -973,11 +1009,11 @@ S
endstream
endobj
-52 0 obj
+54 0 obj
38
endobj
-53 0 obj
+55 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
@@ -987,16 +1023,33 @@ endobj
>>
endobj
-54 0 obj
+56 0 obj
[
/PDF
/Text
]
endobj
-55 0 obj
+57 0 obj
<<
- /Font 58 0 R
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+58 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+59 0 obj
+<<
+ /Font 62 0 R
/ProcSet [
/PDF
/Text
@@ -1004,7 +1057,7 @@ endobj
>>
endobj
-56 0 obj
+60 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@@ -1012,24 +1065,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
- /Length 57 0 R
+ /Length 61 0 R
>>
stream
content of attachment
endstream
endobj
-57 0 obj
+61 0 obj
22
endobj
-58 0 obj
+62 0 obj
<<
- /ZaDi 59 0 R
+ /ZaDi 63 0 R
>>
endobj
-59 0 obj
+63 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@@ -1038,7 +1091,7 @@ endobj
endobj
xref
-0 60
+0 64
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@@ -1048,62 +1101,66 @@ xref
0000000546 00000 n
0000000795 00000 n
0000000924 00000 n
-0000001270 00000 n
-0000001374 00000 n
-0000001650 00000 n
-0000001670 00000 n
-0000001950 00000 n
-0000001970 00000 n
-0000002285 00000 n
-0000002600 00000 n
-0000002915 00000 n
-0000003160 00000 n
-0000003366 00000 n
-0000003508 00000 n
-0000003650 00000 n
-0000003792 00000 n
-0000003957 00000 n
-0000004080 00000 n
-0000004100 00000 n
-0000004480 00000 n
-0000004501 00000 n
-0000005565 00000 n
-0000005586 00000 n
-0000005639 00000 n
-0000006058 00000 n
-0000006079 00000 n
-0000006308 00000 n
-0000006328 00000 n
-0000006747 00000 n
-0000006768 00000 n
-0000006997 00000 n
-0000007017 00000 n
-0000007436 00000 n
-0000007457 00000 n
-0000007686 00000 n
-0000007706 00000 n
-0000007970 00000 n
-0000007990 00000 n
-0000008121 00000 n
-0000008368 00000 n
-0000008388 00000 n
-0000008637 00000 n
-0000008657 00000 n
-0000008908 00000 n
-0000008928 00000 n
-0000009179 00000 n
-0000009199 00000 n
-0000009318 00000 n
-0000009354 00000 n
-0000009428 00000 n
-0000009636 00000 n
-0000009656 00000 n
-0000009694 00000 n
+0000001288 00000 n
+0000001392 00000 n
+0000001668 00000 n
+0000001688 00000 n
+0000001968 00000 n
+0000001988 00000 n
+0000002303 00000 n
+0000002618 00000 n
+0000002933 00000 n
+0000003178 00000 n
+0000003384 00000 n
+0000003526 00000 n
+0000003668 00000 n
+0000003810 00000 n
+0000003975 00000 n
+0000004133 00000 n
+0000004154 00000 n
+0000004534 00000 n
+0000004555 00000 n
+0000004810 00000 n
+0000004830 00000 n
+0000005894 00000 n
+0000005915 00000 n
+0000005968 00000 n
+0000006387 00000 n
+0000006408 00000 n
+0000006637 00000 n
+0000006657 00000 n
+0000007076 00000 n
+0000007097 00000 n
+0000007326 00000 n
+0000007346 00000 n
+0000007765 00000 n
+0000007786 00000 n
+0000008015 00000 n
+0000008035 00000 n
+0000008299 00000 n
+0000008319 00000 n
+0000008450 00000 n
+0000008697 00000 n
+0000008717 00000 n
+0000008966 00000 n
+0000008986 00000 n
+0000009237 00000 n
+0000009257 00000 n
+0000009508 00000 n
+0000009528 00000 n
+0000009647 00000 n
+0000009683 00000 n
+0000009802 00000 n
+0000009838 00000 n
+0000009912 00000 n
+0000010120 00000 n
+0000010140 00000 n
+0000010178 00000 n
trailer <<
/Root 1 0 R
- /Size 60
+ /Size 64
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-9775
+10259
%%EOF
diff --git a/qpdf/qtest/qpdf/overlay-copy-annotations-p5.pdf b/qpdf/qtest/qpdf/overlay-copy-annotations-p5.pdf
index 6337dd05..bd0619a2 100644
--- a/qpdf/qtest/qpdf/overlay-copy-annotations-p5.pdf
+++ b/qpdf/qtest/qpdf/overlay-copy-annotations-p5.pdf
@@ -128,6 +128,7 @@ endobj
/XObject <<
/Fx0 25 0 R
/Fx1 27 0 R
+ /Fx2 29 0 R
>>
>>
/Rotate 90
@@ -160,7 +161,7 @@ endobj
612
159.545455
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@@ -197,7 +198,7 @@ endobj
-159.545455
612
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@@ -222,8 +223,8 @@ endobj
<<
/AP <<
/N <<
- /1 30 0 R
- /Off 32 0 R
+ /1 32 0 R
+ /Off 34 0 R
>>
>>
/AS /1
@@ -250,8 +251,8 @@ endobj
<<
/AP <<
/N <<
- /2 34 0 R
- /Off 36 0 R
+ /2 36 0 R
+ /Off 38 0 R
>>
>>
/AS /2
@@ -278,8 +279,8 @@ endobj
<<
/AP <<
/N <<
- /3 38 0 R
- /Off 40 0 R
+ /3 40 0 R
+ /Off 42 0 R
>>
>>
/AS /3
@@ -333,10 +334,10 @@ endobj
18 0 obj
<<
/AP <<
- /N 42 0 R
+ /N 44 0 R
>>
/Contents (attachment1.txt)
- /FS 44 0 R
+ /FS 46 0 R
/NM (attachment1.txt)
/Rect [
287.454545
@@ -352,7 +353,7 @@ endobj
19 0 obj
<<
/AP <<
- /N 45 0 R
+ /N 47 0 R
>>
/DA ()
/Rect [
@@ -369,7 +370,7 @@ endobj
20 0 obj
<<
/AP <<
- /N 47 0 R
+ /N 49 0 R
>>
/DA ()
/Rect [
@@ -386,7 +387,7 @@ endobj
21 0 obj
<<
/AP <<
- /N 49 0 R
+ /N 51 0 R
>>
/DA ()
/Rect [
@@ -403,7 +404,7 @@ endobj
22 0 obj
<<
/AP <<
- /N 51 0 R
+ /N 53 0 R
>>
/DA ()
/Rect [
@@ -431,11 +432,15 @@ q
0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
+q
+0 0.77273 -0.77273 0 612 159.54545 cm
+/Fx2 Do
+Q
endstream
endobj
24 0 obj
-80
+130
endobj
25 0 obj
@@ -456,9 +461,9 @@ endobj
]
/Resources <<
/Font <<
- /F1 53 0 R
+ /F1 55 0 R
>>
- /ProcSet 54 0 R
+ /ProcSet 56 0 R
>>
/Subtype /Form
/Type /XObject
@@ -492,14 +497,45 @@ endobj
]
/Resources <<
/Font <<
- /F1 9 0 R
+ /F1 57 0 R
>>
+ /ProcSet 58 0 R
>>
/Subtype /Form
/Type /XObject
/Length 28 0 R
>>
stream
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Potato) Tj
+ET
+endstream
+endobj
+
+28 0 obj
+44
+endobj
+
+29 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 9 0 R
+ >>
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 30 0 R
+>>
+stream
q
1 1 .7 rg
.5 .5 0 RG
@@ -565,11 +601,11 @@ ET
endstream
endobj
-28 0 obj
+30 0 obj
874
endobj
-29 0 obj
+31 0 obj
<<
/Font <<
/F1 9 0 R
@@ -577,7 +613,7 @@ endobj
>>
endobj
-30 0 obj
+32 0 obj
<<
/BBox [
0
@@ -593,10 +629,10 @@ endobj
612
159.545455
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 31 0 R
+ /Length 33 0 R
>>
stream
/Tx BMC
@@ -615,11 +651,11 @@ EMC
endstream
endobj
-31 0 obj
+33 0 obj
202
endobj
-32 0 obj
+34 0 obj
<<
/BBox [
0
@@ -635,10 +671,10 @@ endobj
612
159.545455
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 33 0 R
+ /Length 35 0 R
>>
stream
/Tx BMC
@@ -646,11 +682,11 @@ EMC
endstream
endobj
-33 0 obj
+35 0 obj
12
endobj
-34 0 obj
+36 0 obj
<<
/BBox [
0
@@ -666,10 +702,10 @@ endobj
612
159.545455
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 35 0 R
+ /Length 37 0 R
>>
stream
/Tx BMC
@@ -688,11 +724,11 @@ EMC
endstream
endobj
-35 0 obj
+37 0 obj
202
endobj
-36 0 obj
+38 0 obj
<<
/BBox [
0
@@ -708,10 +744,10 @@ endobj
612
159.545455
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 37 0 R
+ /Length 39 0 R
>>
stream
/Tx BMC
@@ -719,11 +755,11 @@ EMC
endstream
endobj
-37 0 obj
+39 0 obj
12
endobj
-38 0 obj
+40 0 obj
<<
/BBox [
0
@@ -739,10 +775,10 @@ endobj
612
159.545455
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 39 0 R
+ /Length 41 0 R
>>
stream
/Tx BMC
@@ -761,11 +797,11 @@ EMC
endstream
endobj
-39 0 obj
+41 0 obj
202
endobj
-40 0 obj
+42 0 obj
<<
/BBox [
0
@@ -781,10 +817,10 @@ endobj
612
159.545455
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 41 0 R
+ /Length 43 0 R
>>
stream
/Tx BMC
@@ -792,11 +828,11 @@ EMC
endstream
endobj
-41 0 obj
+43 0 obj
12
endobj
-42 0 obj
+44 0 obj
<<
/BBox [
0
@@ -816,7 +852,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
- /Length 43 0 R
+ /Length 45 0 R
>>
stream
0 10 m
@@ -829,15 +865,15 @@ S
endstream
endobj
-43 0 obj
+45 0 obj
52
endobj
-44 0 obj
+46 0 obj
<<
/EF <<
- /F 56 0 R
- /UF 56 0 R
+ /F 60 0 R
+ /UF 60 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@@ -845,7 +881,7 @@ endobj
>>
endobj
-45 0 obj
+47 0 obj
<<
/BBox [
0
@@ -861,10 +897,10 @@ endobj
612
159.545455
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 46 0 R
+ /Length 48 0 R
>>
stream
1 0 0 RG
@@ -874,11 +910,11 @@ S
endstream
endobj
-46 0 obj
+48 0 obj
36
endobj
-47 0 obj
+49 0 obj
<<
/BBox [
0
@@ -894,10 +930,10 @@ endobj
-159.545455
612
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 48 0 R
+ /Length 50 0 R
>>
stream
0 1 0 RG
@@ -907,11 +943,11 @@ S
endstream
endobj
-48 0 obj
+50 0 obj
36
endobj
-49 0 obj
+51 0 obj
<<
/BBox [
0
@@ -927,10 +963,10 @@ endobj
-612
-159.545455
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 50 0 R
+ /Length 52 0 R
>>
stream
0 0 1 RG
@@ -940,11 +976,11 @@ S
endstream
endobj
-50 0 obj
+52 0 obj
36
endobj
-51 0 obj
+53 0 obj
<<
/BBox [
0
@@ -960,10 +996,10 @@ endobj
159.545455
-612
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 52 0 R
+ /Length 54 0 R
>>
stream
0.5 0 1 RG
@@ -973,11 +1009,11 @@ S
endstream
endobj
-52 0 obj
+54 0 obj
38
endobj
-53 0 obj
+55 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
@@ -987,16 +1023,33 @@ endobj
>>
endobj
-54 0 obj
+56 0 obj
[
/PDF
/Text
]
endobj
-55 0 obj
+57 0 obj
<<
- /Font 58 0 R
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+58 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+59 0 obj
+<<
+ /Font 62 0 R
/ProcSet [
/PDF
/Text
@@ -1004,7 +1057,7 @@ endobj
>>
endobj
-56 0 obj
+60 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@@ -1012,24 +1065,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
- /Length 57 0 R
+ /Length 61 0 R
>>
stream
content of attachment
endstream
endobj
-57 0 obj
+61 0 obj
22
endobj
-58 0 obj
+62 0 obj
<<
- /ZaDi 59 0 R
+ /ZaDi 63 0 R
>>
endobj
-59 0 obj
+63 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@@ -1038,7 +1091,7 @@ endobj
endobj
xref
-0 60
+0 64
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@@ -1048,62 +1101,66 @@ xref
0000000564 00000 n
0000000822 00000 n
0000000951 00000 n
-0000001296 00000 n
-0000001400 00000 n
-0000001694 00000 n
-0000001714 00000 n
-0000002013 00000 n
-0000002033 00000 n
-0000002356 00000 n
-0000002679 00000 n
-0000003000 00000 n
-0000003260 00000 n
-0000003494 00000 n
-0000003664 00000 n
-0000003834 00000 n
-0000004004 00000 n
-0000004190 00000 n
-0000004327 00000 n
-0000004347 00000 n
-0000004725 00000 n
-0000004746 00000 n
-0000005810 00000 n
-0000005831 00000 n
-0000005884 00000 n
-0000006321 00000 n
-0000006342 00000 n
-0000006589 00000 n
-0000006609 00000 n
-0000007046 00000 n
-0000007067 00000 n
-0000007314 00000 n
-0000007334 00000 n
-0000007771 00000 n
-0000007792 00000 n
-0000008039 00000 n
-0000008059 00000 n
-0000008341 00000 n
-0000008361 00000 n
-0000008492 00000 n
-0000008757 00000 n
-0000008777 00000 n
-0000009045 00000 n
-0000009065 00000 n
-0000009333 00000 n
-0000009353 00000 n
-0000009620 00000 n
-0000009640 00000 n
-0000009759 00000 n
-0000009795 00000 n
-0000009869 00000 n
-0000010077 00000 n
-0000010097 00000 n
-0000010135 00000 n
+0000001314 00000 n
+0000001418 00000 n
+0000001712 00000 n
+0000001732 00000 n
+0000002031 00000 n
+0000002051 00000 n
+0000002374 00000 n
+0000002697 00000 n
+0000003018 00000 n
+0000003278 00000 n
+0000003512 00000 n
+0000003682 00000 n
+0000003852 00000 n
+0000004022 00000 n
+0000004208 00000 n
+0000004395 00000 n
+0000004416 00000 n
+0000004794 00000 n
+0000004815 00000 n
+0000005070 00000 n
+0000005090 00000 n
+0000006154 00000 n
+0000006175 00000 n
+0000006228 00000 n
+0000006665 00000 n
+0000006686 00000 n
+0000006933 00000 n
+0000006953 00000 n
+0000007390 00000 n
+0000007411 00000 n
+0000007658 00000 n
+0000007678 00000 n
+0000008115 00000 n
+0000008136 00000 n
+0000008383 00000 n
+0000008403 00000 n
+0000008685 00000 n
+0000008705 00000 n
+0000008836 00000 n
+0000009101 00000 n
+0000009121 00000 n
+0000009389 00000 n
+0000009409 00000 n
+0000009677 00000 n
+0000009697 00000 n
+0000009964 00000 n
+0000009984 00000 n
+0000010103 00000 n
+0000010139 00000 n
+0000010258 00000 n
+0000010294 00000 n
+0000010368 00000 n
+0000010576 00000 n
+0000010596 00000 n
+0000010634 00000 n
trailer <<
/Root 1 0 R
- /Size 60
+ /Size 64
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-10216
+10715
%%EOF
diff --git a/qpdf/qtest/qpdf/overlay-copy-annotations-p6.pdf b/qpdf/qtest/qpdf/overlay-copy-annotations-p6.pdf
index e3f66f69..badcd00f 100644
--- a/qpdf/qtest/qpdf/overlay-copy-annotations-p6.pdf
+++ b/qpdf/qtest/qpdf/overlay-copy-annotations-p6.pdf
@@ -128,6 +128,7 @@ endobj
/XObject <<
/Fx0 25 0 R
/Fx1 27 0 R
+ /Fx2 29 0 R
>>
>>
/Rotate 90
@@ -161,7 +162,7 @@ endobj
570
192
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@@ -198,7 +199,7 @@ endobj
-192
570
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@@ -223,8 +224,8 @@ endobj
<<
/AP <<
/N <<
- /1 30 0 R
- /Off 32 0 R
+ /1 32 0 R
+ /Off 34 0 R
>>
>>
/AS /1
@@ -251,8 +252,8 @@ endobj
<<
/AP <<
/N <<
- /2 34 0 R
- /Off 36 0 R
+ /2 36 0 R
+ /Off 38 0 R
>>
>>
/AS /2
@@ -279,8 +280,8 @@ endobj
<<
/AP <<
/N <<
- /3 38 0 R
- /Off 40 0 R
+ /3 40 0 R
+ /Off 42 0 R
>>
>>
/AS /3
@@ -334,10 +335,10 @@ endobj
18 0 obj
<<
/AP <<
- /N 42 0 R
+ /N 44 0 R
>>
/Contents (attachment1.txt)
- /FS 44 0 R
+ /FS 46 0 R
/NM (attachment1.txt)
/Rect [
290
@@ -353,7 +354,7 @@ endobj
19 0 obj
<<
/AP <<
- /N 45 0 R
+ /N 47 0 R
>>
/DA ()
/Rect [
@@ -370,7 +371,7 @@ endobj
20 0 obj
<<
/AP <<
- /N 47 0 R
+ /N 49 0 R
>>
/DA ()
/Rect [
@@ -387,7 +388,7 @@ endobj
21 0 obj
<<
/AP <<
- /N 49 0 R
+ /N 51 0 R
>>
/DA ()
/Rect [
@@ -404,7 +405,7 @@ endobj
22 0 obj
<<
/AP <<
- /N 51 0 R
+ /N 53 0 R
>>
/DA ()
/Rect [
@@ -432,11 +433,15 @@ q
0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
+q
+0 0.66667 -0.66667 0 570 192 cm
+/Fx2 Do
+Q
endstream
endobj
24 0 obj
-86
+130
endobj
25 0 obj
@@ -457,9 +462,9 @@ endobj
]
/Resources <<
/Font <<
- /F1 53 0 R
+ /F1 55 0 R
>>
- /ProcSet 54 0 R
+ /ProcSet 56 0 R
>>
/Subtype /Form
/Type /XObject
@@ -493,14 +498,45 @@ endobj
]
/Resources <<
/Font <<
- /F1 9 0 R
+ /F1 57 0 R
>>
+ /ProcSet 58 0 R
>>
/Subtype /Form
/Type /XObject
/Length 28 0 R
>>
stream
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Potato) Tj
+ET
+endstream
+endobj
+
+28 0 obj
+44
+endobj
+
+29 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 9 0 R
+ >>
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 30 0 R
+>>
+stream
q
1 1 .7 rg
.5 .5 0 RG
@@ -566,11 +602,11 @@ ET
endstream
endobj
-28 0 obj
+30 0 obj
874
endobj
-29 0 obj
+31 0 obj
<<
/Font <<
/F1 9 0 R
@@ -578,7 +614,7 @@ endobj
>>
endobj
-30 0 obj
+32 0 obj
<<
/BBox [
0
@@ -594,10 +630,10 @@ endobj
570
192
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 31 0 R
+ /Length 33 0 R
>>
stream
/Tx BMC
@@ -616,11 +652,11 @@ EMC
endstream
endobj
-31 0 obj
+33 0 obj
202
endobj
-32 0 obj
+34 0 obj
<<
/BBox [
0
@@ -636,10 +672,10 @@ endobj
570
192
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 33 0 R
+ /Length 35 0 R
>>
stream
/Tx BMC
@@ -647,11 +683,11 @@ EMC
endstream
endobj
-33 0 obj
+35 0 obj
12
endobj
-34 0 obj
+36 0 obj
<<
/BBox [
0
@@ -667,10 +703,10 @@ endobj
570
192
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 35 0 R
+ /Length 37 0 R
>>
stream
/Tx BMC
@@ -689,11 +725,11 @@ EMC
endstream
endobj
-35 0 obj
+37 0 obj
202
endobj
-36 0 obj
+38 0 obj
<<
/BBox [
0
@@ -709,10 +745,10 @@ endobj
570
192
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 37 0 R
+ /Length 39 0 R
>>
stream
/Tx BMC
@@ -720,11 +756,11 @@ EMC
endstream
endobj
-37 0 obj
+39 0 obj
12
endobj
-38 0 obj
+40 0 obj
<<
/BBox [
0
@@ -740,10 +776,10 @@ endobj
570
192
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 39 0 R
+ /Length 41 0 R
>>
stream
/Tx BMC
@@ -762,11 +798,11 @@ EMC
endstream
endobj
-39 0 obj
+41 0 obj
202
endobj
-40 0 obj
+42 0 obj
<<
/BBox [
0
@@ -782,10 +818,10 @@ endobj
570
192
]
- /Resources 55 0 R
+ /Resources 59 0 R
/Subtype /Form
/Type /XObject
- /Length 41 0 R
+ /Length 43 0 R
>>
stream
/Tx BMC
@@ -793,11 +829,11 @@ EMC
endstream
endobj
-41 0 obj
+43 0 obj
12
endobj
-42 0 obj
+44 0 obj
<<
/BBox [
0
@@ -817,7 +853,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
- /Length 43 0 R
+ /Length 45 0 R
>>
stream
0 10 m
@@ -830,15 +866,15 @@ S
endstream
endobj
-43 0 obj
+45 0 obj
52
endobj
-44 0 obj
+46 0 obj
<<
/EF <<
- /F 56 0 R
- /UF 56 0 R
+ /F 60 0 R
+ /UF 60 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@@ -846,7 +882,7 @@ endobj
>>
endobj
-45 0 obj
+47 0 obj
<<
/BBox [
0
@@ -862,10 +898,10 @@ endobj
570
192
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 46 0 R
+ /Length 48 0 R
>>
stream
1 0 0 RG
@@ -875,11 +911,11 @@ S
endstream
endobj
-46 0 obj
+48 0 obj
36
endobj
-47 0 obj
+49 0 obj
<<
/BBox [
0
@@ -895,10 +931,10 @@ endobj
-192
570
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 48 0 R
+ /Length 50 0 R
>>
stream
0 1 0 RG
@@ -908,11 +944,11 @@ S
endstream
endobj
-48 0 obj
+50 0 obj
36
endobj
-49 0 obj
+51 0 obj
<<
/BBox [
0
@@ -928,10 +964,10 @@ endobj
-570
-192
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 50 0 R
+ /Length 52 0 R
>>
stream
0 0 1 RG
@@ -941,11 +977,11 @@ S
endstream
endobj
-50 0 obj
+52 0 obj
36
endobj
-51 0 obj
+53 0 obj
<<
/BBox [
0
@@ -961,10 +997,10 @@ endobj
192
-570
]
- /Resources 29 0 R
+ /Resources 31 0 R
/Subtype /Form
/Type /XObject
- /Length 52 0 R
+ /Length 54 0 R
>>
stream
0.5 0 1 RG
@@ -974,11 +1010,11 @@ S
endstream
endobj
-52 0 obj
+54 0 obj
38
endobj
-53 0 obj
+55 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
@@ -988,16 +1024,33 @@ endobj
>>
endobj
-54 0 obj
+56 0 obj
[
/PDF
/Text
]
endobj
-55 0 obj
+57 0 obj
<<
- /Font 58 0 R
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+58 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+59 0 obj
+<<
+ /Font 62 0 R
/ProcSet [
/PDF
/Text
@@ -1005,7 +1058,7 @@ endobj
>>
endobj
-56 0 obj
+60 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@@ -1013,24 +1066,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
- /Length 57 0 R
+ /Length 61 0 R
>>
stream
content of attachment
endstream
endobj
-57 0 obj
+61 0 obj
22
endobj
-58 0 obj
+62 0 obj
<<
- /ZaDi 59 0 R
+ /ZaDi 63 0 R
>>
endobj
-59 0 obj
+63 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@@ -1039,7 +1092,7 @@ endobj
endobj
xref
-0 60
+0 64
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@@ -1049,62 +1102,66 @@ xref
0000000552 00000 n
0000000804 00000 n
0000000933 00000 n
-0000001294 00000 n
-0000001398 00000 n
-0000001685 00000 n
-0000001705 00000 n
-0000001997 00000 n
-0000002017 00000 n
-0000002334 00000 n
-0000002657 00000 n
-0000002974 00000 n
-0000003225 00000 n
-0000003445 00000 n
-0000003601 00000 n
-0000003764 00000 n
-0000003927 00000 n
-0000004113 00000 n
-0000004256 00000 n
-0000004276 00000 n
-0000004669 00000 n
-0000004690 00000 n
-0000005754 00000 n
-0000005775 00000 n
-0000005828 00000 n
-0000006258 00000 n
-0000006279 00000 n
-0000006519 00000 n
-0000006539 00000 n
-0000006969 00000 n
-0000006990 00000 n
-0000007230 00000 n
-0000007250 00000 n
-0000007680 00000 n
-0000007701 00000 n
-0000007941 00000 n
-0000007961 00000 n
-0000008236 00000 n
-0000008256 00000 n
-0000008387 00000 n
-0000008645 00000 n
-0000008665 00000 n
-0000008926 00000 n
-0000008946 00000 n
-0000009207 00000 n
-0000009227 00000 n
-0000009487 00000 n
-0000009507 00000 n
-0000009626 00000 n
-0000009662 00000 n
-0000009736 00000 n
-0000009944 00000 n
+0000001312 00000 n
+0000001416 00000 n
+0000001703 00000 n
+0000001723 00000 n
+0000002015 00000 n
+0000002035 00000 n
+0000002352 00000 n
+0000002675 00000 n
+0000002992 00000 n
+0000003243 00000 n
+0000003463 00000 n
+0000003619 00000 n
+0000003782 00000 n
+0000003945 00000 n
+0000004131 00000 n
+0000004318 00000 n
+0000004339 00000 n
+0000004732 00000 n
+0000004753 00000 n
+0000005008 00000 n
+0000005028 00000 n
+0000006092 00000 n
+0000006113 00000 n
+0000006166 00000 n
+0000006596 00000 n
+0000006617 00000 n
+0000006857 00000 n
+0000006877 00000 n
+0000007307 00000 n
+0000007328 00000 n
+0000007568 00000 n
+0000007588 00000 n
+0000008018 00000 n
+0000008039 00000 n
+0000008279 00000 n
+0000008299 00000 n
+0000008574 00000 n
+0000008594 00000 n
+0000008725 00000 n
+0000008983 00000 n
+0000009003 00000 n
+0000009264 00000 n
+0000009284 00000 n
+0000009545 00000 n
+0000009565 00000 n
+0000009825 00000 n
+0000009845 00000 n
0000009964 00000 n
-0000010002 00000 n
+0000010000 00000 n
+0000010119 00000 n
+0000010155 00000 n
+0000010229 00000 n
+0000010437 00000 n
+0000010457 00000 n
+0000010495 00000 n
trailer <<
/Root 1 0 R
- /Size 60
+ /Size 64
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
-10083
+10576
%%EOF
diff --git a/qpdf/qtest/qpdf/uo-8.out b/qpdf/qtest/qpdf/uo-8.out
new file mode 100644
index 00000000..a2d67f8d
--- /dev/null
+++ b/qpdf/qtest/qpdf/uo-8.out
@@ -0,0 +1,27 @@
+qpdf: selecting --keep-open-files=y
+qpdf: fxo-red.pdf: checking for shared resources
+qpdf: no shared resources found
+qpdf: removing unreferenced pages from primary input
+qpdf: adding pages from fxo-red.pdf
+qpdf: processing underlay/overlay
+ page 1
+ fxo-blue.pdf underlay 8
+ fxo-green.pdf underlay 5
+ fxo-blue.pdf overlay 1
+ fxo-green.pdf overlay 4
+ page 2
+ fxo-blue.pdf underlay 7
+ fxo-green.pdf underlay 6
+ fxo-blue.pdf overlay 2
+ fxo-green.pdf overlay 3
+ page 3
+ fxo-blue.pdf underlay 6
+ fxo-green.pdf underlay 7
+ fxo-blue.pdf overlay 3
+ fxo-green.pdf overlay 2
+ page 4
+ fxo-blue.pdf underlay 5
+ fxo-green.pdf underlay 8
+ fxo-blue.pdf overlay 4
+ fxo-green.pdf overlay 1
+qpdf: wrote file a.pdf
diff --git a/qpdf/qtest/qpdf/uo-8.pdf b/qpdf/qtest/qpdf/uo-8.pdf
new file mode 100644
index 00000000..e414b4b7
--- /dev/null
+++ b/qpdf/qtest/qpdf/uo-8.pdf
@@ -0,0 +1,1240 @@
+%PDF-1.3
+%¿÷¢þ
+%QDF-1.0
+
+1 0 obj
+<<
+ /Pages 2 0 R
+ /Type /Catalog
+>>
+endobj
+
+2 0 obj
+<<
+ /Count 4
+ /Kids [
+ 3 0 R
+ 4 0 R
+ 5 0 R
+ 6 0 R
+ ]
+ /Type /Pages
+>>
+endobj
+
+%% Page 1
+3 0 obj
+<<
+ /Contents 7 0 R
+ /MediaBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Parent 2 0 R
+ /Resources <<
+ /XObject <<
+ /Fx0 9 0 R
+ /Fx1 11 0 R
+ /Fx2 13 0 R
+ /Fx3 15 0 R
+ /Fx4 17 0 R
+ >>
+ >>
+ /Type /Page
+>>
+endobj
+
+%% Page 2
+4 0 obj
+<<
+ /Contents 19 0 R
+ /MediaBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Parent 2 0 R
+ /Resources <<
+ /XObject <<
+ /Fx0 21 0 R
+ /Fx1 23 0 R
+ /Fx2 25 0 R
+ /Fx3 27 0 R
+ /Fx4 29 0 R
+ >>
+ >>
+ /Type /Page
+ /UserUnit 2
+>>
+endobj
+
+%% Page 3
+5 0 obj
+<<
+ /Contents 31 0 R
+ /MediaBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Parent 2 0 R
+ /Resources <<
+ /XObject <<
+ /Fx0 33 0 R
+ /Fx1 35 0 R
+ /Fx2 37 0 R
+ /Fx3 39 0 R
+ /Fx4 41 0 R
+ >>
+ >>
+ /Type /Page
+>>
+endobj
+
+%% Page 4
+6 0 obj
+<<
+ /Contents 43 0 R
+ /MediaBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Parent 2 0 R
+ /Resources <<
+ /XObject <<
+ /Fx0 45 0 R
+ /Fx1 47 0 R
+ /Fx2 49 0 R
+ /Fx3 51 0 R
+ /Fx4 53 0 R
+ >>
+ >>
+ /Type /Page
+>>
+endobj
+
+%% Contents for page 1
+7 0 obj
+<<
+ /Length 8 0 R
+>>
+stream
+q
+0.77273 0 0 0.77273 0 159.54545 cm
+/Fx1 Do
+Q
+q
+1 0 0 1 0 0 cm
+/Fx2 Do
+Q
+q
+1 0 0 1 0 0 cm
+/Fx0 Do
+Q
+q
+1 0 0 1 0 0 cm
+/Fx3 Do
+Q
+q
+0.77273 0 0 0.77273 0 159.54545 cm
+/Fx4 Do
+Q
+endstream
+endobj
+
+8 0 obj
+175
+endobj
+
+9 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 55 0 R
+ >>
+ /ProcSet 56 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 10 0 R
+>>
+stream
+1 0 0 RG
+1 0 0 rg
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Page 1 - red) Tj
+ET
+5 w
+0 0 612 792 re s
+271 371 60 60 re f
+endstream
+endobj
+
+10 0 obj
+108
+endobj
+
+11 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
+ ]
+ /Resources <<
+ /Font <<
+ /F1 57 0 R
+ >>
+ /ProcSet 58 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 12 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 8 - blue, 270) Tj
+ET
+5 w
+0 0 612 792 re s
+291 391 60 60 re f
+endstream
+endobj
+
+12 0 obj
+114
+endobj
+
+13 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 59 0 R
+ >>
+ /ProcSet 60 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 14 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 5 - green, 180) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+14 0 obj
+115
+endobj
+
+15 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 61 0 R
+ >>
+ /ProcSet 62 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 16 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 1 - blue) Tj
+ET
+5 w
+0 0 612 792 re s
+291 391 60 60 re f
+endstream
+endobj
+
+16 0 obj
+109
+endobj
+
+17 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
+ ]
+ /Resources <<
+ /Font <<
+ /F1 63 0 R
+ >>
+ /ProcSet 64 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 18 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 4 - green, 90) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+18 0 obj
+114
+endobj
+
+%% Contents for page 2
+19 0 obj
+<<
+ /Length 20 0 R
+>>
+stream
+q
+0.5 0 0 0.5 153 198 cm
+/Fx1 Do
+Q
+q
+0.5 0 0 0.5 153 198 cm
+/Fx2 Do
+Q
+q
+0.5 0 0 0.5 0 0 cm
+/Fx0 Do
+Q
+q
+0.5 0 0 0.5 108 243 cm
+/Fx3 Do
+Q
+q
+0.5 0 0 0.5 108 243 cm
+/Fx4 Do
+Q
+endstream
+endobj
+
+20 0 obj
+171
+endobj
+
+21 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 2
+ 0
+ 0
+ 2
+ 0
+ 0
+ ]
+ /Resources <<
+ /Font <<
+ /F1 55 0 R
+ >>
+ /ProcSet 56 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 22 0 R
+>>
+stream
+1 0 0 RG
+1 0 0 rg
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Page 2 - red, scale 2) Tj
+ET
+5 w
+0 0 612 792 re s
+271 371 60 60 re f
+endstream
+endobj
+
+22 0 obj
+117
+endobj
+
+23 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 57 0 R
+ >>
+ /ProcSet 58 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 24 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 7 - blue, 180) Tj
+ET
+5 w
+0 0 612 792 re s
+291 391 60 60 re f
+endstream
+endobj
+
+24 0 obj
+114
+endobj
+
+25 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ -1
+ 0
+ 0
+ -1
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 59 0 R
+ >>
+ /ProcSet 60 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 26 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 6 - green, 180) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+26 0 obj
+115
+endobj
+
+27 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
+ ]
+ /Resources <<
+ /Font <<
+ /F1 61 0 R
+ >>
+ /ProcSet 62 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 28 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 2 - blue, 90) Tj
+ET
+5 w
+0 0 612 792 re s
+291 391 60 60 re f
+endstream
+endobj
+
+28 0 obj
+113
+endobj
+
+29 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
+ ]
+ /Resources <<
+ /Font <<
+ /F1 63 0 R
+ >>
+ /ProcSet 64 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 30 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 3 - green, 90) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+30 0 obj
+114
+endobj
+
+%% Contents for page 3
+31 0 obj
+<<
+ /Length 32 0 R
+>>
+stream
+q
+0.77273 0 0 0.77273 0 159.54545 cm
+/Fx1 Do
+Q
+q
+0.77273 0 0 0.77273 0 159.54545 cm
+/Fx2 Do
+Q
+q
+1 0 0 1 0 0 cm
+/Fx0 Do
+Q
+q
+1 0 0 1 20 20 cm
+/Fx3 Do
+Q
+q
+1 0 0 1 0 0 cm
+/Fx4 Do
+Q
+endstream
+endobj
+
+32 0 obj
+177
+endobj
+
+33 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 55 0 R
+ >>
+ /ProcSet 56 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 34 0 R
+>>
+stream
+1 0 0 RG
+1 0 0 rg
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Page 3 - red) Tj
+ET
+5 w
+0 0 612 792 re s
+271 371 60 60 re f
+endstream
+endobj
+
+34 0 obj
+108
+endobj
+
+35 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 0
+ -1
+ 1
+ 0
+ 0
+ 612
+ ]
+ /Resources <<
+ /Font <<
+ /F1 57 0 R
+ >>
+ /ProcSet 58 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 36 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 6 - blue, 90) Tj
+ET
+5 w
+0 0 612 792 re s
+291 391 60 60 re f
+endstream
+endobj
+
+36 0 obj
+113
+endobj
+
+37 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
+ ]
+ /Resources <<
+ /Font <<
+ /F1 59 0 R
+ >>
+ /ProcSet 60 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 38 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 7 - green, 270) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+38 0 obj
+115
+endobj
+
+39 0 obj
+<<
+ /BBox [
+ 10
+ 10
+ 602
+ 782
+ ]
+ /Matrix [
+ -1
+ 0
+ 0
+ -1
+ 592
+ 772
+ ]
+ /Resources <<
+ /Font <<
+ /F1 61 0 R
+ >>
+ /ProcSet 62 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 40 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 3 - blue, 180, trim-to-crop=10) Tj
+ET
+5 w
+0 0 612 792 re s
+10 10 592 772 re s
+291 391 60 60 re f
+endstream
+endobj
+
+40 0 obj
+150
+endobj
+
+41 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 63 0 R
+ >>
+ /ProcSet 64 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 42 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 2 - green) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+42 0 obj
+110
+endobj
+
+%% Contents for page 4
+43 0 obj
+<<
+ /Length 44 0 R
+>>
+stream
+q
+1 0 0 1 0 0 cm
+/Fx1 Do
+Q
+q
+0.77273 0 0 0.77273 0 159.54545 cm
+/Fx2 Do
+Q
+q
+1 0 0 1 0 0 cm
+/Fx0 Do
+Q
+q
+0.81383 0 0 0.81383 16.2766 146.96809 cm
+/Fx3 Do
+Q
+q
+1 0 0 1 0 0 cm
+/Fx4 Do
+Q
+endstream
+endobj
+
+44 0 obj
+181
+endobj
+
+45 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 55 0 R
+ >>
+ /ProcSet 56 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 46 0 R
+>>
+stream
+1 0 0 RG
+1 0 0 rg
+BT
+ /F1 24 Tf
+ 72 720 Td
+ (Page 4 - red) Tj
+ET
+5 w
+0 0 612 792 re s
+271 371 60 60 re f
+endstream
+endobj
+
+46 0 obj
+108
+endobj
+
+47 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 57 0 R
+ >>
+ /ProcSet 58 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 48 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 5 - blue) Tj
+ET
+5 w
+0 0 612 792 re s
+291 391 60 60 re f
+endstream
+endobj
+
+48 0 obj
+109
+endobj
+
+49 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Matrix [
+ 0
+ 1
+ -1
+ 0
+ 792
+ 0
+ ]
+ /Resources <<
+ /Font <<
+ /F1 59 0 R
+ >>
+ /ProcSet 60 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 50 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 8 - green, 270) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+50 0 obj
+115
+endobj
+
+51 0 obj
+<<
+ /BBox [
+ 20
+ 20
+ 592
+ 772
+ ]
+ /Matrix [
+ 0
+ 1
+ -1
+ 0
+ 752
+ 0
+ ]
+ /Resources <<
+ /Font <<
+ /F1 61 0 R
+ >>
+ /ProcSet 62 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 52 0 R
+>>
+stream
+0 0 1 RG
+0 0 1 rg
+BT
+ /F1 24 Tf
+ 72 690 Td
+ (Page 4 - blue, 270, crop=10, trim=20) Tj
+ET
+5 w
+0 0 612 792 re s
+10 10 592 772 re s
+20 20 572 752 re s
+291 391 60 60 re f
+endstream
+endobj
+
+52 0 obj
+170
+endobj
+
+53 0 obj
+<<
+ /BBox [
+ 0
+ 0
+ 612
+ 792
+ ]
+ /Resources <<
+ /Font <<
+ /F1 63 0 R
+ >>
+ /ProcSet 64 0 R
+ >>
+ /Subtype /Form
+ /Type /XObject
+ /Length 54 0 R
+>>
+stream
+0 1 0 RG
+0 1 0 rg
+BT
+ /F1 24 Tf
+ 72 660 Td
+ (Page 1 - green) Tj
+ET
+5 w
+0 0 612 792 re s
+281 381 60 60 re f
+endstream
+endobj
+
+54 0 obj
+110
+endobj
+
+55 0 obj
+<<
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+56 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+57 0 obj
+<<
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+58 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+59 0 obj
+<<
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+60 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+61 0 obj
+<<
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+62 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+63 0 obj
+<<
+ /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font
+>>
+endobj
+
+64 0 obj
+[
+ /PDF
+ /Text
+]
+endobj
+
+xref
+0 65
+0000000000 65535 f
+0000000025 00000 n
+0000000079 00000 n
+0000000191 00000 n
+0000000450 00000 n
+0000000725 00000 n
+0000000986 00000 n
+0000001260 00000 n
+0000001490 00000 n
+0000001510 00000 n
+0000001828 00000 n
+0000001849 00000 n
+0000002229 00000 n
+0000002250 00000 n
+0000002634 00000 n
+0000002655 00000 n
+0000002975 00000 n
+0000002996 00000 n
+0000003376 00000 n
+0000003420 00000 n
+0000003648 00000 n
+0000003669 00000 n
+0000004049 00000 n
+0000004070 00000 n
+0000004453 00000 n
+0000004474 00000 n
+0000004858 00000 n
+0000004879 00000 n
+0000005258 00000 n
+0000005279 00000 n
+0000005659 00000 n
+0000005703 00000 n
+0000005937 00000 n
+0000005958 00000 n
+0000006277 00000 n
+0000006298 00000 n
+0000006677 00000 n
+0000006698 00000 n
+0000007079 00000 n
+0000007100 00000 n
+0000007521 00000 n
+0000007542 00000 n
+0000007863 00000 n
+0000007907 00000 n
+0000008145 00000 n
+0000008166 00000 n
+0000008485 00000 n
+0000008506 00000 n
+0000008826 00000 n
+0000008847 00000 n
+0000009228 00000 n
+0000009249 00000 n
+0000009687 00000 n
+0000009708 00000 n
+0000010029 00000 n
+0000010050 00000 n
+0000010169 00000 n
+0000010205 00000 n
+0000010324 00000 n
+0000010360 00000 n
+0000010479 00000 n
+0000010515 00000 n
+0000010634 00000 n
+0000010670 00000 n
+0000010789 00000 n
+trailer <<
+ /Root 1 0 R
+ /Size 65
+ /ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
+>>
+startxref
+10825
+%%EOF