diff options
| -rw-r--r-- | include/qpdf/JSON.hh | 7 | ||||
| -rw-r--r-- | libqpdf/JSON.cc | 11 | ||||
| -rw-r--r-- | libqpdf/QPDFJob.cc | 20 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-field-types---show-encryption-key.out | 1496 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-field-types.out | 1496 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams-all.out | 326 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams-small.out | 350 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams-specialized.out | 326 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams.out | 326 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-outlines-with-actions.out | 488 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out | 478 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-page-labels-and-outlines-objects.out | 476 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-page-labels-and-outlines.out | 476 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-page-labels-num-tree.out | 296 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/page_api_2-json-objects.out | 2 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/page_api_2-json-pages.out | 42 |
16 files changed, 3315 insertions, 3301 deletions
diff --git a/include/qpdf/JSON.hh b/include/qpdf/JSON.hh index a1a61ee4..fdacd442 100644 --- a/include/qpdf/JSON.hh +++ b/include/qpdf/JSON.hh @@ -92,6 +92,11 @@ class JSON std::string const& key, JSON const& value, size_t depth = 0); + // Write just the key of a new dictionary item, useful if writing + // nested structures. Calls writeNext. + QPDF_DLL + static void writeDictionaryKey( + Pipeline* p, bool& first, std::string const& key, size_t depth = 0); QPDF_DLL static void writeArrayItem( Pipeline*, bool& first, JSON const& element, size_t depth = 0); @@ -101,7 +106,7 @@ class JSON // for the parent object. Then start a new first for the nested // item. QPDF_DLL - static void writeNext(Pipeline* p, bool& first, size_t depth); + static void writeNext(Pipeline* p, bool& first, size_t depth = 0); // The JSON spec calls dictionaries "objects", but that creates // too much confusion when referring to instances of the JSON diff --git a/libqpdf/JSON.cc b/libqpdf/JSON.cc index 31675a42..1c49f9ee 100644 --- a/libqpdf/JSON.cc +++ b/libqpdf/JSON.cc @@ -78,6 +78,14 @@ JSON::writeArrayClose(Pipeline* p, bool first, size_t depth) } void +JSON::writeDictionaryKey( + Pipeline* p, bool& first, std::string const& key, size_t depth) +{ + writeNext(p, first, depth); + *p << "\"" << key << "\": "; +} + +void JSON::writeDictionaryItem( Pipeline* p, bool& first, @@ -85,8 +93,7 @@ JSON::writeDictionaryItem( JSON const& value, size_t depth) { - writeNext(p, first, depth); - *p << "\"" << key << "\": "; + writeDictionaryKey(p, first, key, depth); value.write(p, 1 + depth); } diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 5621ef5e..63fa0c34 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -1044,20 +1044,23 @@ QPDFJob::getWantedJSONObjects() void QPDFJob::doJSONObjects(Pipeline* p, bool& first, QPDF& pdf) { + JSON::writeDictionaryKey(p, first, "objects", 0); + bool first_object = true; + JSON::writeDictionaryOpen(p, first_object, 1); bool all_objects = m->json_objects.empty(); std::set<QPDFObjGen> wanted_og = getWantedJSONObjects(); - JSON j_objects = JSON::makeDictionary(); - if (all_objects || m->json_objects.count("trailer")) { - j_objects.addDictionaryMember( - "trailer", pdf.getTrailer().getJSON(true)); - } std::vector<QPDFObjectHandle> objects = pdf.getAllObjects(); for (auto& obj: objects) { if (all_objects || wanted_og.count(obj.getObjGen())) { - j_objects.addDictionaryMember(obj.unparse(), obj.getJSON(true)); + JSON::writeDictionaryItem( + p, first_object, obj.unparse(), obj.getJSON(true), 1); } } - JSON::writeDictionaryItem(p, first, "objects", j_objects, 0); + if (all_objects || m->json_objects.count("trailer")) { + JSON::writeDictionaryItem( + p, first_object, "trailer", pdf.getTrailer().getJSON(true), 1); + } + JSON::writeDictionaryClose(p, first_object, 1); } void @@ -1090,8 +1093,7 @@ QPDFJob::doJSONObjectinfo(Pipeline* p, bool& first, QPDF& pdf) void QPDFJob::doJSONPages(Pipeline* p, bool& first, QPDF& pdf) { - JSON::writeNext(p, first, 0); - *p << "\"pages\": "; + JSON::writeDictionaryKey(p, first, "pages", 0); bool first_page = true; JSON::writeArrayOpen(p, first_page, 1); QPDFPageDocumentHelper pdh(pdf); diff --git a/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out b/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out index 0376321f..106de5aa 100644 --- a/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out +++ b/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out @@ -465,6 +465,163 @@ "/StructTreeRoot": "17 0 R", "/Type": "/Catalog" }, + "2 0 R": { + "/CreationDate": "D:20190103125434-05'00'", + "/Creator": "Writer", + "/Producer": "LibreOffice 6.1" + }, + "3 0 R": { + "/Font": "18 0 R", + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "4 0 R": { + "/AP": { + "/N": "19 0 R" + }, + "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "", + "/F": 4, + "/FT": "/Tx", + "/P": "15 0 R", + "/Rect": [ + 123.499, + 689.901, + 260.801, + 704.699 + ], + "/Subtype": "/Widget", + "/T": "text", + "/Type": "/Annot", + "/V": "" + }, + "5 0 R": { + "/DV": "/1", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "21 0 R", + "22 0 R", + "23 0 R" + ], + "/P": "15 0 R", + "/T": "r1", + "/V": "/1" + }, + "6 0 R": { + "/AP": { + "/N": { + "/Off": "24 0 R", + "/Yes": "26 0 R" + } + }, + "/AS": "/Off", + "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 554.301, + 130.701, + 566.349 + ], + "/Subtype": "/Widget", + "/T": "checkbox1", + "/Type": "/Annot", + "/V": "/Off" + }, + "7 0 R": { + "/AP": { + "/N": { + "/Off": "29 0 R", + "/Yes": "31 0 R" + } + }, + "/AS": "/Yes", + "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Yes", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 527.751, + 130.701, + 539.799 + ], + "/Subtype": "/Widget", + "/T": "checkbox2", + "/Type": "/Annot", + "/V": "/Yes" + }, + "8 0 R": { + "/AP": { + "/N": { + "/Off": "33 0 R", + "/Yes": "35 0 R" + } + }, + "/AS": "/Off", + "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 500.501, + 130.701, + 512.549 + ], + "/Subtype": "/Widget", + "/T": "checkbox3", + "/Type": "/Annot", + "/V": "/Off" + }, + "9 0 R": { + "/DV": "/2", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "37 0 R", + "38 0 R", + "39 0 R" + ], + "/P": "15 0 R", + "/T": "r2", + "/V": "/2" + }, "10 0 R": { "/AP": { "/N": "40 0 R" @@ -488,79 +645,6 @@ "/Type": "/Annot", "/V": "salad πʬ" }, - "100 0 R": { - "/A": "167 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "101 0 R": { - "/A": "168 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "102 0 R": { - "/A": "169 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "103 0 R": { - "/A": "170 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "104 0 R": { - "/A": "171 0 R", - "/K": [ - 4 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "105 0 R": { - "/A": "172 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "106 0 R": { - "/A": "173 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "107 0 R": { - "/A": "174 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "108 0 R": { - "/A": "175 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "109 0 R": { - "/A": "176 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, "11 0 R": { "/AP": { "/N": "42 0 R" @@ -590,83 +674,6 @@ "/Type": "/Annot", "/V": "" }, - "110 0 R": { - "/A": "177 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "111 0 R": { - "/A": "178 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "112 0 R": { - "/A": "179 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "113 0 R": { - "/A": "180 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "114 0 R": { - "/A": "181 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "115 0 R": { - "/A": "182 0 R", - "/K": [ - 5 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "116 0 R": { - "/A": "183 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "117 0 R": { - "/A": "184 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "118 0 R": { - "/A": "185 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "119 0 R": { - "/A": "186 0 R", - "/K": [ - 6, - 7 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, "12 0 R": { "/AP": { "/N": "44 0 R" @@ -697,88 +704,6 @@ "/Type": "/Annot", "/V": "" }, - "120 0 R": { - "/A": "187 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "121 0 R": { - "/A": "188 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "122 0 R": { - "/A": "189 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "123 0 R": { - "/A": "190 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "124 0 R": { - "/A": "191 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "125 0 R": { - "/A": "192 0 R", - "/K": [ - 8, - 9 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "126 0 R": { - "/K": [ - 10 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "127 0 R": { - "/K": [ - 11 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "128 0 R": { - "/K": [ - 12 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "129 0 R": { - "/K": [ - 13 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, "13 0 R": { "/AP": { "/N": "46 0 R" @@ -809,96 +734,6 @@ "/Type": "/Annot", "/V": "" }, - "130 0 R": { - "/K": [ - 14 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "131 0 R": { - "/K": [ - 15 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "132 0 R": { - "/K": [ - 16 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "133 0 R": { - "/K": [ - 17 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "134 0 R": { - "/K": [ - 18 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "135 0 R": { - "/K": [ - 19 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "136 0 R": { - "/K": [ - 20 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "137 0 R": { - "/K": [ - 21 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "138 0 R": { - "/K": [ - 22 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "139 0 R": { - "/K": [ - 23 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, "14 0 R": { "/AP": { "/N": "48 0 R" @@ -929,93 +764,6 @@ "/Type": "/Annot", "/V": "" }, - "140 0 R": { - "/K": [ - 24 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "141 0 R": { - "/Ascent": 891, - "/CapHeight": 981, - "/Descent": -216, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1277, - 981 - ], - "/FontFile2": "193 0 R", - "/FontName": "/BAAAAA+LiberationSerif", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "142 0 R": { - "/Length": "143 0 R" - }, - "143 0 R": 702, - "144 0 R": { - "/Ascent": 905, - "/CapHeight": 979, - "/Descent": -211, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1300, - 979 - ], - "/FontName": "/LiberationSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "145 0 R": { - "/Ascent": 905, - "/CapHeight": 979, - "/Descent": -211, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1300, - 979 - ], - "/FontFile2": "195 0 R", - "/FontName": "/DAAAAA+LiberationSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "146 0 R": { - "/Length": "147 0 R" - }, - "147 0 R": 582, - "148 0 R": { - "/Ascent": 928, - "/CapHeight": 1232, - "/Descent": -235, - "/Flags": 4, - "/FontBBox": [ - -1020, - -462, - 1792, - 1232 - ], - "/FontName": "/DejaVuSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "149 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "15 0 R": { "/Annots": [ "4 0 R", @@ -1051,46 +799,6 @@ "/StructParents": 0, "/Type": "/Page" }, - "150 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "151 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "152 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "153 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "154 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "155 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "156 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "157 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "158 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "159 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "16 0 R": { "/Count": 1, "/Kids": [ @@ -1105,46 +813,6 @@ "/Resources": "3 0 R", "/Type": "/Pages" }, - "160 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "161 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "162 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "163 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "164 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "165 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "166 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "167 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "168 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "169 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "17 0 R": { "/K": [ "52 0 R" @@ -1156,46 +824,6 @@ }, "/Type": "/StructTreeRoot" }, - "170 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "171 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "172 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "173 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "174 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "175 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "176 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "177 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "178 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "179 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "18 0 R": { "/F1": "54 0 R", "/F2": "55 0 R", @@ -1203,46 +831,6 @@ "/F4": "57 0 R", "/ZaDi": "28 0 R" }, - "180 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "181 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "182 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "183 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "184 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "185 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "186 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "187 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "188 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "189 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "19 0 R": { "/BBox": [ 0, @@ -1255,33 +843,6 @@ "/Subtype": "/Form", "/Type": "/XObject" }, - "190 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "191 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "192 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "193 0 R": { - "/Length": "194 0 R", - "/Length1": 16184 - }, - "194 0 R": 16184, - "195 0 R": { - "/Length": "196 0 R", - "/Length1": 11088 - }, - "196 0 R": 11088, - "2 0 R": { - "/CreationDate": "D:20190103125434-05'00'", - "/Creator": "Writer", - "/Producer": "LibreOffice 6.1" - }, "20 0 R": 12, "21 0 R": { "/AP": { @@ -1416,13 +977,6 @@ "/Subtype": "/Form", "/Type": "/XObject" }, - "3 0 R": { - "/Font": "18 0 R", - "/ProcSet": [ - "/PDF", - "/Text" - ] - }, "30 0 R": 12, "31 0 R": { "/BBox": [ @@ -1553,29 +1107,6 @@ "/Subtype": "/Widget", "/Type": "/Annot" }, - "4 0 R": { - "/AP": { - "/N": "19 0 R" - }, - "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "", - "/F": 4, - "/FT": "/Tx", - "/P": "15 0 R", - "/Rect": [ - 123.499, - 689.901, - 260.801, - 704.699 - ], - "/Subtype": "/Widget", - "/T": "text", - "/Type": "/Annot", - "/V": "" - }, "40 0 R": { "/BBox": [ 0, @@ -1641,19 +1172,6 @@ "/Type": "/XObject" }, "49 0 R": 45, - "5 0 R": { - "/DV": "/1", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "21 0 R", - "22 0 R", - "23 0 R" - ], - "/P": "15 0 R", - "/T": "r1", - "/V": "/1" - }, "50 0 R": { "/Length": "51 0 R" }, @@ -2318,38 +1836,6 @@ "/Type": "/XObject" }, "59 0 R": 220, - "6 0 R": { - "/AP": { - "/N": { - "/Off": "24 0 R", - "/Yes": "26 0 R" - } - }, - "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 554.301, - 130.701, - 566.349 - ], - "/Subtype": "/Widget", - "/T": "checkbox1", - "/Type": "/Annot", - "/V": "/Off" - }, "60 0 R": { "/BBox": [ 0, @@ -2415,38 +1901,6 @@ "/Type": "/XObject" }, "69 0 R": 12, - "7 0 R": { - "/AP": { - "/N": { - "/Off": "29 0 R", - "/Yes": "31 0 R" - } - }, - "/AS": "/Yes", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Yes", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 527.751, - 130.701, - 539.799 - ], - "/Subtype": "/Widget", - "/T": "checkbox2", - "/Type": "/Annot", - "/V": "/Yes" - }, "70 0 R": { "/BBox": [ 0, @@ -2512,38 +1966,6 @@ "/Type": "/XObject" }, "79 0 R": 220, - "8 0 R": { - "/AP": { - "/N": { - "/Off": "33 0 R", - "/Yes": "35 0 R" - } - }, - "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 500.501, - 130.701, - 512.549 - ], - "/Subtype": "/Widget", - "/T": "checkbox3", - "/Type": "/Annot", - "/V": "/Off" - }, "80 0 R": { "/BBox": [ 0, @@ -2622,19 +2044,6 @@ "/S": "/Standard", "/Type": "/StructElem" }, - "9 0 R": { - "/DV": "/2", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "37 0 R", - "38 0 R", - "39 0 R" - ], - "/P": "15 0 R", - "/T": "r2", - "/V": "/2" - }, "90 0 R": { "/A": "157 0 R", "/P": "52 0 R", @@ -2708,6 +2117,597 @@ "/S": "/Standard", "/Type": "/StructElem" }, + "100 0 R": { + "/A": "167 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "101 0 R": { + "/A": "168 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "102 0 R": { + "/A": "169 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "103 0 R": { + "/A": "170 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "104 0 R": { + "/A": "171 0 R", + "/K": [ + 4 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "105 0 R": { + "/A": "172 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "106 0 R": { + "/A": "173 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "107 0 R": { + "/A": "174 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "108 0 R": { + "/A": "175 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "109 0 R": { + "/A": "176 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "110 0 R": { + "/A": "177 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "111 0 R": { + "/A": "178 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "112 0 R": { + "/A": "179 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "113 0 R": { + "/A": "180 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "114 0 R": { + "/A": "181 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "115 0 R": { + "/A": "182 0 R", + "/K": [ + 5 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "116 0 R": { + "/A": "183 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "117 0 R": { + "/A": "184 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "118 0 R": { + "/A": "185 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "119 0 R": { + "/A": "186 0 R", + "/K": [ + 6, + 7 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "120 0 R": { + "/A": "187 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "121 0 R": { + "/A": "188 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "122 0 R": { + "/A": "189 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "123 0 R": { + "/A": "190 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "124 0 R": { + "/A": "191 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "125 0 R": { + "/A": "192 0 R", + "/K": [ + 8, + 9 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "126 0 R": { + "/K": [ + 10 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "127 0 R": { + "/K": [ + 11 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "128 0 R": { + "/K": [ + 12 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "129 0 R": { + "/K": [ + 13 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "130 0 R": { + "/K": [ + 14 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "131 0 R": { + "/K": [ + 15 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "132 0 R": { + "/K": [ + 16 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "133 0 R": { + "/K": [ + 17 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "134 0 R": { + "/K": [ + 18 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "135 0 R": { + "/K": [ + 19 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "136 0 R": { + "/K": [ + 20 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "137 0 R": { + "/K": [ + 21 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "138 0 R": { + "/K": [ + 22 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "139 0 R": { + "/K": [ + 23 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "140 0 R": { + "/K": [ + 24 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "141 0 R": { + "/Ascent": 891, + "/CapHeight": 981, + "/Descent": -216, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1277, + 981 + ], + "/FontFile2": "193 0 R", + "/FontName": "/BAAAAA+LiberationSerif", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "142 0 R": { + "/Length": "143 0 R" + }, + "143 0 R": 702, + "144 0 R": { + "/Ascent": 905, + "/CapHeight": 979, + "/Descent": -211, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1300, + 979 + ], + "/FontName": "/LiberationSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "145 0 R": { + "/Ascent": 905, + "/CapHeight": 979, + "/Descent": -211, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1300, + 979 + ], + "/FontFile2": "195 0 R", + "/FontName": "/DAAAAA+LiberationSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "146 0 R": { + "/Length": "147 0 R" + }, + "147 0 R": 582, + "148 0 R": { + "/Ascent": 928, + "/CapHeight": 1232, + "/Descent": -235, + "/Flags": 4, + "/FontBBox": [ + -1020, + -462, + 1792, + 1232 + ], + "/FontName": "/DejaVuSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "149 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "150 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "151 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "152 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "153 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "154 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "155 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "156 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "157 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "158 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "159 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "160 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "161 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "162 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "163 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "164 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "165 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "166 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "167 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "168 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "169 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "170 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "171 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "172 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "173 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "174 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "175 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "176 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "177 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "178 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "179 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "180 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "181 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "182 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "183 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "184 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "185 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "186 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "187 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "188 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "189 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "190 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "191 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "192 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "193 0 R": { + "/Length": "194 0 R", + "/Length1": 16184 + }, + "194 0 R": 16184, + "195 0 R": { + "/Length": "196 0 R", + "/Length1": 11088 + }, + "196 0 R": 11088, "trailer": { "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", "/ID": [ diff --git a/qpdf/qtest/qpdf/json-field-types.out b/qpdf/qtest/qpdf/json-field-types.out index 0376321f..106de5aa 100644 --- a/qpdf/qtest/qpdf/json-field-types.out +++ b/qpdf/qtest/qpdf/json-field-types.out @@ -465,6 +465,163 @@ "/StructTreeRoot": "17 0 R", "/Type": "/Catalog" }, + "2 0 R": { + "/CreationDate": "D:20190103125434-05'00'", + "/Creator": "Writer", + "/Producer": "LibreOffice 6.1" + }, + "3 0 R": { + "/Font": "18 0 R", + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "4 0 R": { + "/AP": { + "/N": "19 0 R" + }, + "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "", + "/F": 4, + "/FT": "/Tx", + "/P": "15 0 R", + "/Rect": [ + 123.499, + 689.901, + 260.801, + 704.699 + ], + "/Subtype": "/Widget", + "/T": "text", + "/Type": "/Annot", + "/V": "" + }, + "5 0 R": { + "/DV": "/1", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "21 0 R", + "22 0 R", + "23 0 R" + ], + "/P": "15 0 R", + "/T": "r1", + "/V": "/1" + }, + "6 0 R": { + "/AP": { + "/N": { + "/Off": "24 0 R", + "/Yes": "26 0 R" + } + }, + "/AS": "/Off", + "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 554.301, + 130.701, + 566.349 + ], + "/Subtype": "/Widget", + "/T": "checkbox1", + "/Type": "/Annot", + "/V": "/Off" + }, + "7 0 R": { + "/AP": { + "/N": { + "/Off": "29 0 R", + "/Yes": "31 0 R" + } + }, + "/AS": "/Yes", + "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Yes", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 527.751, + 130.701, + 539.799 + ], + "/Subtype": "/Widget", + "/T": "checkbox2", + "/Type": "/Annot", + "/V": "/Yes" + }, + "8 0 R": { + "/AP": { + "/N": { + "/Off": "33 0 R", + "/Yes": "35 0 R" + } + }, + "/AS": "/Off", + "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 500.501, + 130.701, + 512.549 + ], + "/Subtype": "/Widget", + "/T": "checkbox3", + "/Type": "/Annot", + "/V": "/Off" + }, + "9 0 R": { + "/DV": "/2", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "37 0 R", + "38 0 R", + "39 0 R" + ], + "/P": "15 0 R", + "/T": "r2", + "/V": "/2" + }, "10 0 R": { "/AP": { "/N": "40 0 R" @@ -488,79 +645,6 @@ "/Type": "/Annot", "/V": "salad πʬ" }, - "100 0 R": { - "/A": "167 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "101 0 R": { - "/A": "168 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "102 0 R": { - "/A": "169 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "103 0 R": { - "/A": "170 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "104 0 R": { - "/A": "171 0 R", - "/K": [ - 4 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "105 0 R": { - "/A": "172 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "106 0 R": { - "/A": "173 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "107 0 R": { - "/A": "174 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "108 0 R": { - "/A": "175 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "109 0 R": { - "/A": "176 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, "11 0 R": { "/AP": { "/N": "42 0 R" @@ -590,83 +674,6 @@ "/Type": "/Annot", "/V": "" }, - "110 0 R": { - "/A": "177 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "111 0 R": { - "/A": "178 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "112 0 R": { - "/A": "179 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "113 0 R": { - "/A": "180 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "114 0 R": { - "/A": "181 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "115 0 R": { - "/A": "182 0 R", - "/K": [ - 5 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "116 0 R": { - "/A": "183 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "117 0 R": { - "/A": "184 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "118 0 R": { - "/A": "185 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "119 0 R": { - "/A": "186 0 R", - "/K": [ - 6, - 7 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, "12 0 R": { "/AP": { "/N": "44 0 R" @@ -697,88 +704,6 @@ "/Type": "/Annot", "/V": "" }, - "120 0 R": { - "/A": "187 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "121 0 R": { - "/A": "188 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "122 0 R": { - "/A": "189 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "123 0 R": { - "/A": "190 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "124 0 R": { - "/A": "191 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "125 0 R": { - "/A": "192 0 R", - "/K": [ - 8, - 9 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - }, - "126 0 R": { - "/K": [ - 10 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "127 0 R": { - "/K": [ - 11 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "128 0 R": { - "/K": [ - 12 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "129 0 R": { - "/K": [ - 13 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, "13 0 R": { "/AP": { "/N": "46 0 R" @@ -809,96 +734,6 @@ "/Type": "/Annot", "/V": "" }, - "130 0 R": { - "/K": [ - 14 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "131 0 R": { - "/K": [ - 15 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "132 0 R": { - "/K": [ - 16 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "133 0 R": { - "/K": [ - 17 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "134 0 R": { - "/K": [ - 18 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "135 0 R": { - "/K": [ - 19 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "136 0 R": { - "/K": [ - 20 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "137 0 R": { - "/K": [ - 21 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "138 0 R": { - "/K": [ - 22 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "139 0 R": { - "/K": [ - 23 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, "14 0 R": { "/AP": { "/N": "48 0 R" @@ -929,93 +764,6 @@ "/Type": "/Annot", "/V": "" }, - "140 0 R": { - "/K": [ - 24 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - }, - "141 0 R": { - "/Ascent": 891, - "/CapHeight": 981, - "/Descent": -216, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1277, - 981 - ], - "/FontFile2": "193 0 R", - "/FontName": "/BAAAAA+LiberationSerif", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "142 0 R": { - "/Length": "143 0 R" - }, - "143 0 R": 702, - "144 0 R": { - "/Ascent": 905, - "/CapHeight": 979, - "/Descent": -211, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1300, - 979 - ], - "/FontName": "/LiberationSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "145 0 R": { - "/Ascent": 905, - "/CapHeight": 979, - "/Descent": -211, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1300, - 979 - ], - "/FontFile2": "195 0 R", - "/FontName": "/DAAAAA+LiberationSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "146 0 R": { - "/Length": "147 0 R" - }, - "147 0 R": 582, - "148 0 R": { - "/Ascent": 928, - "/CapHeight": 1232, - "/Descent": -235, - "/Flags": 4, - "/FontBBox": [ - -1020, - -462, - 1792, - 1232 - ], - "/FontName": "/DejaVuSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - }, - "149 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "15 0 R": { "/Annots": [ "4 0 R", @@ -1051,46 +799,6 @@ "/StructParents": 0, "/Type": "/Page" }, - "150 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "151 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "152 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "153 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "154 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "155 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "156 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "157 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "158 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "159 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "16 0 R": { "/Count": 1, "/Kids": [ @@ -1105,46 +813,6 @@ "/Resources": "3 0 R", "/Type": "/Pages" }, - "160 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "161 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "162 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "163 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "164 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "165 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "166 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "167 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "168 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "169 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "17 0 R": { "/K": [ "52 0 R" @@ -1156,46 +824,6 @@ }, "/Type": "/StructTreeRoot" }, - "170 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "171 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "172 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "173 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "174 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "175 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "176 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "177 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "178 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "179 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "18 0 R": { "/F1": "54 0 R", "/F2": "55 0 R", @@ -1203,46 +831,6 @@ "/F4": "57 0 R", "/ZaDi": "28 0 R" }, - "180 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "181 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "182 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "183 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "184 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "185 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "186 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "187 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "188 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "189 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, "19 0 R": { "/BBox": [ 0, @@ -1255,33 +843,6 @@ "/Subtype": "/Form", "/Type": "/XObject" }, - "190 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "191 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "192 0 R": { - "/O": "/Layout", - "/Placement": "/Block" - }, - "193 0 R": { - "/Length": "194 0 R", - "/Length1": 16184 - }, - "194 0 R": 16184, - "195 0 R": { - "/Length": "196 0 R", - "/Length1": 11088 - }, - "196 0 R": 11088, - "2 0 R": { - "/CreationDate": "D:20190103125434-05'00'", - "/Creator": "Writer", - "/Producer": "LibreOffice 6.1" - }, "20 0 R": 12, "21 0 R": { "/AP": { @@ -1416,13 +977,6 @@ "/Subtype": "/Form", "/Type": "/XObject" }, - "3 0 R": { - "/Font": "18 0 R", - "/ProcSet": [ - "/PDF", - "/Text" - ] - }, "30 0 R": 12, "31 0 R": { "/BBox": [ @@ -1553,29 +1107,6 @@ "/Subtype": "/Widget", "/Type": "/Annot" }, - "4 0 R": { - "/AP": { - "/N": "19 0 R" - }, - "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "", - "/F": 4, - "/FT": "/Tx", - "/P": "15 0 R", - "/Rect": [ - 123.499, - 689.901, - 260.801, - 704.699 - ], - "/Subtype": "/Widget", - "/T": "text", - "/Type": "/Annot", - "/V": "" - }, "40 0 R": { "/BBox": [ 0, @@ -1641,19 +1172,6 @@ "/Type": "/XObject" }, "49 0 R": 45, - "5 0 R": { - "/DV": "/1", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "21 0 R", - "22 0 R", - "23 0 R" - ], - "/P": "15 0 R", - "/T": "r1", - "/V": "/1" - }, "50 0 R": { "/Length": "51 0 R" }, @@ -2318,38 +1836,6 @@ "/Type": "/XObject" }, "59 0 R": 220, - "6 0 R": { - "/AP": { - "/N": { - "/Off": "24 0 R", - "/Yes": "26 0 R" - } - }, - "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 554.301, - 130.701, - 566.349 - ], - "/Subtype": "/Widget", - "/T": "checkbox1", - "/Type": "/Annot", - "/V": "/Off" - }, "60 0 R": { "/BBox": [ 0, @@ -2415,38 +1901,6 @@ "/Type": "/XObject" }, "69 0 R": 12, - "7 0 R": { - "/AP": { - "/N": { - "/Off": "29 0 R", - "/Yes": "31 0 R" - } - }, - "/AS": "/Yes", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Yes", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 527.751, - 130.701, - 539.799 - ], - "/Subtype": "/Widget", - "/T": "checkbox2", - "/Type": "/Annot", - "/V": "/Yes" - }, "70 0 R": { "/BBox": [ 0, @@ -2512,38 +1966,6 @@ "/Type": "/XObject" }, "79 0 R": 220, - "8 0 R": { - "/AP": { - "/N": { - "/Off": "33 0 R", - "/Yes": "35 0 R" - } - }, - "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 500.501, - 130.701, - 512.549 - ], - "/Subtype": "/Widget", - "/T": "checkbox3", - "/Type": "/Annot", - "/V": "/Off" - }, "80 0 R": { "/BBox": [ 0, @@ -2622,19 +2044,6 @@ "/S": "/Standard", "/Type": "/StructElem" }, - "9 0 R": { - "/DV": "/2", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "37 0 R", - "38 0 R", - "39 0 R" - ], - "/P": "15 0 R", - "/T": "r2", - "/V": "/2" - }, "90 0 R": { "/A": "157 0 R", "/P": "52 0 R", @@ -2708,6 +2117,597 @@ "/S": "/Standard", "/Type": "/StructElem" }, + "100 0 R": { + "/A": "167 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "101 0 R": { + "/A": "168 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "102 0 R": { + "/A": "169 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "103 0 R": { + "/A": "170 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "104 0 R": { + "/A": "171 0 R", + "/K": [ + 4 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "105 0 R": { + "/A": "172 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "106 0 R": { + "/A": "173 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "107 0 R": { + "/A": "174 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "108 0 R": { + "/A": "175 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "109 0 R": { + "/A": "176 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "110 0 R": { + "/A": "177 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "111 0 R": { + "/A": "178 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "112 0 R": { + "/A": "179 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "113 0 R": { + "/A": "180 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "114 0 R": { + "/A": "181 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "115 0 R": { + "/A": "182 0 R", + "/K": [ + 5 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "116 0 R": { + "/A": "183 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "117 0 R": { + "/A": "184 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "118 0 R": { + "/A": "185 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "119 0 R": { + "/A": "186 0 R", + "/K": [ + 6, + 7 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "120 0 R": { + "/A": "187 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "121 0 R": { + "/A": "188 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "122 0 R": { + "/A": "189 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "123 0 R": { + "/A": "190 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "124 0 R": { + "/A": "191 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "125 0 R": { + "/A": "192 0 R", + "/K": [ + 8, + 9 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + }, + "126 0 R": { + "/K": [ + 10 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "127 0 R": { + "/K": [ + 11 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "128 0 R": { + "/K": [ + 12 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "129 0 R": { + "/K": [ + 13 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "130 0 R": { + "/K": [ + 14 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "131 0 R": { + "/K": [ + 15 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "132 0 R": { + "/K": [ + 16 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "133 0 R": { + "/K": [ + 17 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "134 0 R": { + "/K": [ + 18 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "135 0 R": { + "/K": [ + 19 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "136 0 R": { + "/K": [ + 20 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "137 0 R": { + "/K": [ + 21 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "138 0 R": { + "/K": [ + 22 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "139 0 R": { + "/K": [ + 23 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "140 0 R": { + "/K": [ + 24 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + }, + "141 0 R": { + "/Ascent": 891, + "/CapHeight": 981, + "/Descent": -216, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1277, + 981 + ], + "/FontFile2": "193 0 R", + "/FontName": "/BAAAAA+LiberationSerif", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "142 0 R": { + "/Length": "143 0 R" + }, + "143 0 R": 702, + "144 0 R": { + "/Ascent": 905, + "/CapHeight": 979, + "/Descent": -211, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1300, + 979 + ], + "/FontName": "/LiberationSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "145 0 R": { + "/Ascent": 905, + "/CapHeight": 979, + "/Descent": -211, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1300, + 979 + ], + "/FontFile2": "195 0 R", + "/FontName": "/DAAAAA+LiberationSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "146 0 R": { + "/Length": "147 0 R" + }, + "147 0 R": 582, + "148 0 R": { + "/Ascent": 928, + "/CapHeight": 1232, + "/Descent": -235, + "/Flags": 4, + "/FontBBox": [ + -1020, + -462, + 1792, + 1232 + ], + "/FontName": "/DejaVuSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + }, + "149 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "150 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "151 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "152 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "153 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "154 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "155 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "156 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "157 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "158 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "159 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "160 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "161 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "162 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "163 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "164 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "165 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "166 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "167 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "168 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "169 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "170 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "171 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "172 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "173 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "174 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "175 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "176 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "177 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "178 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "179 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "180 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "181 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "182 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "183 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "184 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "185 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "186 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "187 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "188 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "189 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "190 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "191 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "192 0 R": { + "/O": "/Layout", + "/Placement": "/Block" + }, + "193 0 R": { + "/Length": "194 0 R", + "/Length1": 16184 + }, + "194 0 R": 16184, + "195 0 R": { + "/Length": "196 0 R", + "/Length1": 11088 + }, + "196 0 R": 11088, "trailer": { "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", "/ID": [ diff --git a/qpdf/qtest/qpdf/json-image-streams-all.out b/qpdf/qtest/qpdf/json-image-streams-all.out index 524cc313..68404e4b 100644 --- a/qpdf/qtest/qpdf/json-image-streams-all.out +++ b/qpdf/qtest/qpdf/json-image-streams-all.out @@ -279,8 +279,23 @@ "/Pages": "2 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "27 0 R", + "2 0 R": { + "/Count": 9, + "/Kids": [ + "3 0 R", + "4 0 R", + "5 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R" + ], + "/Type": "/Pages" + }, + "3 0 R": { + "/Contents": "12 0 R", "/MediaBox": [ 0, 0, @@ -298,13 +313,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "28 0 R" + "/Im1": "14 0 R" } }, "/Type": "/Page" }, - "11 0 R": { - "/Contents": "29 0 R", + "4 0 R": { + "/Contents": "15 0 R", "/MediaBox": [ 0, 0, @@ -322,139 +337,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "30 0 R" + "/Im1": "16 0 R" } }, "/Type": "/Page" }, - "12 0 R": { - "/Length": 95 - }, - "13 0 R": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "14 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Height": 480, - "/Length": 768000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "15 0 R": { - "/Length": 101 - }, - "16 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 9364, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "17 0 R": { - "/Length": 107 - }, - "18 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 768998, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "19 0 R": { - "/Length": 94 - }, - "2 0 R": { - "/Count": 9, - "/Kids": [ - "3 0 R", - "4 0 R", - "5 0 R", - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R" - ], - "/Type": "/Pages" - }, - "20 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Height": 480, - "/Length": 576000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "21 0 R": { - "/Length": 100 - }, - "22 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 3650, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "23 0 R": { - "/Length": 106 - }, - "24 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 641497, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "25 0 R": { - "/Length": 95 - }, - "26 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Height": 480, - "/Length": 192000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "27 0 R": { - "/Length": 101 - }, - "28 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 2587, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "29 0 R": { - "/Length": 107 - }, - "3 0 R": { - "/Contents": "12 0 R", + "5 0 R": { + "/Contents": "17 0 R", "/MediaBox": [ 0, 0, @@ -472,23 +361,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "14 0 R" + "/Im1": "18 0 R" } }, "/Type": "/Page" }, - "30 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 3001, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "4 0 R": { - "/Contents": "15 0 R", + "6 0 R": { + "/Contents": "19 0 R", "/MediaBox": [ 0, 0, @@ -506,13 +385,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "16 0 R" + "/Im1": "20 0 R" } }, "/Type": "/Page" }, - "5 0 R": { - "/Contents": "17 0 R", + "7 0 R": { + "/Contents": "21 0 R", "/MediaBox": [ 0, 0, @@ -530,13 +409,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "18 0 R" + "/Im1": "22 0 R" } }, "/Type": "/Page" }, - "6 0 R": { - "/Contents": "19 0 R", + "8 0 R": { + "/Contents": "23 0 R", "/MediaBox": [ 0, 0, @@ -554,13 +433,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "20 0 R" + "/Im1": "24 0 R" } }, "/Type": "/Page" }, - "7 0 R": { - "/Contents": "21 0 R", + "9 0 R": { + "/Contents": "25 0 R", "/MediaBox": [ 0, 0, @@ -578,13 +457,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "22 0 R" + "/Im1": "26 0 R" } }, "/Type": "/Page" }, - "8 0 R": { - "/Contents": "23 0 R", + "10 0 R": { + "/Contents": "27 0 R", "/MediaBox": [ 0, 0, @@ -602,13 +481,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "24 0 R" + "/Im1": "28 0 R" } }, "/Type": "/Page" }, - "9 0 R": { - "/Contents": "25 0 R", + "11 0 R": { + "/Contents": "29 0 R", "/MediaBox": [ 0, 0, @@ -626,11 +505,132 @@ "/ImageC" ], "/XObject": { - "/Im1": "26 0 R" + "/Im1": "30 0 R" } }, "/Type": "/Page" }, + "12 0 R": { + "/Length": 95 + }, + "13 0 R": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + }, + "14 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Height": 480, + "/Length": 768000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "15 0 R": { + "/Length": 101 + }, + "16 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 9364, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "17 0 R": { + "/Length": 107 + }, + "18 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 768998, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "19 0 R": { + "/Length": 94 + }, + "20 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Height": 480, + "/Length": 576000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "21 0 R": { + "/Length": 100 + }, + "22 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 3650, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "23 0 R": { + "/Length": 106 + }, + "24 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 641497, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "25 0 R": { + "/Length": 95 + }, + "26 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Height": 480, + "/Length": 192000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "27 0 R": { + "/Length": 101 + }, + "28 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 2587, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "29 0 R": { + "/Length": 107 + }, + "30 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 3001, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, "trailer": { "/ID": [ "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", diff --git a/qpdf/qtest/qpdf/json-image-streams-small.out b/qpdf/qtest/qpdf/json-image-streams-small.out index 9dce43a4..a73db43b 100644 --- a/qpdf/qtest/qpdf/json-image-streams-small.out +++ b/qpdf/qtest/qpdf/json-image-streams-small.out @@ -279,8 +279,23 @@ "/Pages": "2 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "27 0 R", + "2 0 R": { + "/Count": 9, + "/Kids": [ + "3 0 R", + "4 0 R", + "5 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R" + ], + "/Type": "/Pages" + }, + "3 0 R": { + "/Contents": "12 0 R", "/MediaBox": [ 0, 0, @@ -298,13 +313,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "28 0 R" + "/Im1": "14 0 R" } }, "/Type": "/Page" }, - "11 0 R": { - "/Contents": "29 0 R", + "4 0 R": { + "/Contents": "15 0 R", "/MediaBox": [ 0, 0, @@ -322,151 +337,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "30 0 R" + "/Im1": "16 0 R" } }, "/Type": "/Page" }, - "12 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 - }, - "13 0 R": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "14 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Length": 51, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "15 0 R": { - "/Filter": "/FlateDecode", - "/Length": 102 - }, - "16 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Length": 454, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "17 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 - }, - "18 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Length": 7688, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "19 0 R": { - "/Filter": "/FlateDecode", - "/Length": 96 - }, - "2 0 R": { - "/Count": 9, - "/Kids": [ - "3 0 R", - "4 0 R", - "5 0 R", - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R" - ], - "/Type": "/Pages" - }, - "20 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Length": 46, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "21 0 R": { - "/Filter": "/FlateDecode", - "/Length": 99 - }, - "22 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Length": 849, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "23 0 R": { - "/Filter": "/FlateDecode", - "/Length": 106 - }, - "24 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Length": 6411, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "25 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 - }, - "26 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Length": 36, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "27 0 R": { - "/Filter": "/FlateDecode", - "/Length": 101 - }, - "28 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Length": 359, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "29 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 - }, - "3 0 R": { - "/Contents": "12 0 R", + "5 0 R": { + "/Contents": "17 0 R", "/MediaBox": [ 0, 0, @@ -484,23 +361,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "14 0 R" + "/Im1": "18 0 R" } }, "/Type": "/Page" }, - "30 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Length": 37, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - }, - "4 0 R": { - "/Contents": "15 0 R", + "6 0 R": { + "/Contents": "19 0 R", "/MediaBox": [ 0, 0, @@ -518,13 +385,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "16 0 R" + "/Im1": "20 0 R" } }, "/Type": "/Page" }, - "5 0 R": { - "/Contents": "17 0 R", + "7 0 R": { + "/Contents": "21 0 R", "/MediaBox": [ 0, 0, @@ -542,13 +409,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "18 0 R" + "/Im1": "22 0 R" } }, "/Type": "/Page" }, - "6 0 R": { - "/Contents": "19 0 R", + "8 0 R": { + "/Contents": "23 0 R", "/MediaBox": [ 0, 0, @@ -566,13 +433,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "20 0 R" + "/Im1": "24 0 R" } }, "/Type": "/Page" }, - "7 0 R": { - "/Contents": "21 0 R", + "9 0 R": { + "/Contents": "25 0 R", "/MediaBox": [ 0, 0, @@ -590,13 +457,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "22 0 R" + "/Im1": "26 0 R" } }, "/Type": "/Page" }, - "8 0 R": { - "/Contents": "23 0 R", + "10 0 R": { + "/Contents": "27 0 R", "/MediaBox": [ 0, 0, @@ -614,13 +481,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "24 0 R" + "/Im1": "28 0 R" } }, "/Type": "/Page" }, - "9 0 R": { - "/Contents": "25 0 R", + "11 0 R": { + "/Contents": "29 0 R", "/MediaBox": [ 0, 0, @@ -638,11 +505,144 @@ "/ImageC" ], "/XObject": { - "/Im1": "26 0 R" + "/Im1": "30 0 R" } }, "/Type": "/Page" }, + "12 0 R": { + "/Filter": "/FlateDecode", + "/Length": 97 + }, + "13 0 R": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + }, + "14 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/FlateDecode", + "/Height": 48, + "/Length": 51, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "15 0 R": { + "/Filter": "/FlateDecode", + "/Length": 102 + }, + "16 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 48, + "/Length": 454, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "17 0 R": { + "/Filter": "/FlateDecode", + "/Length": 108 + }, + "18 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 48, + "/Length": 7688, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "19 0 R": { + "/Filter": "/FlateDecode", + "/Length": 96 + }, + "20 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/FlateDecode", + "/Height": 48, + "/Length": 46, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "21 0 R": { + "/Filter": "/FlateDecode", + "/Length": 99 + }, + "22 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 48, + "/Length": 849, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "23 0 R": { + "/Filter": "/FlateDecode", + "/Length": 106 + }, + "24 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 48, + "/Length": 6411, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "25 0 R": { + "/Filter": "/FlateDecode", + "/Length": 97 + }, + "26 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/FlateDecode", + "/Height": 48, + "/Length": 36, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "27 0 R": { + "/Filter": "/FlateDecode", + "/Length": 101 + }, + "28 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 48, + "/Length": 359, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, + "29 0 R": { + "/Filter": "/FlateDecode", + "/Length": 108 + }, + "30 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 48, + "/Length": 37, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + }, "trailer": { "/ID": [ "Z§¯•Py»’~’46˛ı\u0011¢", diff --git a/qpdf/qtest/qpdf/json-image-streams-specialized.out b/qpdf/qtest/qpdf/json-image-streams-specialized.out index 8048464b..3479f3da 100644 --- a/qpdf/qtest/qpdf/json-image-streams-specialized.out +++ b/qpdf/qtest/qpdf/json-image-streams-specialized.out @@ -279,8 +279,23 @@ "/Pages": "2 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "27 0 R", + "2 0 R": { + "/Count": 9, + "/Kids": [ + "3 0 R", + "4 0 R", + "5 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R" + ], + "/Type": "/Pages" + }, + "3 0 R": { + "/Contents": "12 0 R", "/MediaBox": [ 0, 0, @@ -298,13 +313,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "28 0 R" + "/Im1": "14 0 R" } }, "/Type": "/Page" }, - "11 0 R": { - "/Contents": "29 0 R", + "4 0 R": { + "/Contents": "15 0 R", "/MediaBox": [ 0, 0, @@ -322,139 +337,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "30 0 R" + "/Im1": "16 0 R" } }, "/Type": "/Page" }, - "12 0 R": { - "/Length": 95 - }, - "13 0 R": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "14 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Height": 480, - "/Length": 768000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "15 0 R": { - "/Length": 101 - }, - "16 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 9364, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "17 0 R": { - "/Length": 107 - }, - "18 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 768998, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "19 0 R": { - "/Length": 94 - }, - "2 0 R": { - "/Count": 9, - "/Kids": [ - "3 0 R", - "4 0 R", - "5 0 R", - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R" - ], - "/Type": "/Pages" - }, - "20 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Height": 480, - "/Length": 576000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "21 0 R": { - "/Length": 100 - }, - "22 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 3650, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "23 0 R": { - "/Length": 106 - }, - "24 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 641497, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "25 0 R": { - "/Length": 95 - }, - "26 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Height": 480, - "/Length": 192000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "27 0 R": { - "/Length": 101 - }, - "28 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 2587, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "29 0 R": { - "/Length": 107 - }, - "3 0 R": { - "/Contents": "12 0 R", + "5 0 R": { + "/Contents": "17 0 R", "/MediaBox": [ 0, 0, @@ -472,23 +361,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "14 0 R" + "/Im1": "18 0 R" } }, "/Type": "/Page" }, - "30 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 3001, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "4 0 R": { - "/Contents": "15 0 R", + "6 0 R": { + "/Contents": "19 0 R", "/MediaBox": [ 0, 0, @@ -506,13 +385,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "16 0 R" + "/Im1": "20 0 R" } }, "/Type": "/Page" }, - "5 0 R": { - "/Contents": "17 0 R", + "7 0 R": { + "/Contents": "21 0 R", "/MediaBox": [ 0, 0, @@ -530,13 +409,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "18 0 R" + "/Im1": "22 0 R" } }, "/Type": "/Page" }, - "6 0 R": { - "/Contents": "19 0 R", + "8 0 R": { + "/Contents": "23 0 R", "/MediaBox": [ 0, 0, @@ -554,13 +433,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "20 0 R" + "/Im1": "24 0 R" } }, "/Type": "/Page" }, - "7 0 R": { - "/Contents": "21 0 R", + "9 0 R": { + "/Contents": "25 0 R", "/MediaBox": [ 0, 0, @@ -578,13 +457,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "22 0 R" + "/Im1": "26 0 R" } }, "/Type": "/Page" }, - "8 0 R": { - "/Contents": "23 0 R", + "10 0 R": { + "/Contents": "27 0 R", "/MediaBox": [ 0, 0, @@ -602,13 +481,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "24 0 R" + "/Im1": "28 0 R" } }, "/Type": "/Page" }, - "9 0 R": { - "/Contents": "25 0 R", + "11 0 R": { + "/Contents": "29 0 R", "/MediaBox": [ 0, 0, @@ -626,11 +505,132 @@ "/ImageC" ], "/XObject": { - "/Im1": "26 0 R" + "/Im1": "30 0 R" } }, "/Type": "/Page" }, + "12 0 R": { + "/Length": 95 + }, + "13 0 R": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + }, + "14 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Height": 480, + "/Length": 768000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "15 0 R": { + "/Length": 101 + }, + "16 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 9364, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "17 0 R": { + "/Length": 107 + }, + "18 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 768998, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "19 0 R": { + "/Length": 94 + }, + "20 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Height": 480, + "/Length": 576000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "21 0 R": { + "/Length": 100 + }, + "22 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 3650, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "23 0 R": { + "/Length": 106 + }, + "24 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 641497, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "25 0 R": { + "/Length": 95 + }, + "26 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Height": 480, + "/Length": 192000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "27 0 R": { + "/Length": 101 + }, + "28 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 2587, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "29 0 R": { + "/Length": 107 + }, + "30 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 3001, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, "trailer": { "/ID": [ "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", diff --git a/qpdf/qtest/qpdf/json-image-streams.out b/qpdf/qtest/qpdf/json-image-streams.out index e6a16b96..9aebe5a6 100644 --- a/qpdf/qtest/qpdf/json-image-streams.out +++ b/qpdf/qtest/qpdf/json-image-streams.out @@ -279,8 +279,23 @@ "/Pages": "2 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "27 0 R", + "2 0 R": { + "/Count": 9, + "/Kids": [ + "3 0 R", + "4 0 R", + "5 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R" + ], + "/Type": "/Pages" + }, + "3 0 R": { + "/Contents": "12 0 R", "/MediaBox": [ 0, 0, @@ -298,13 +313,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "28 0 R" + "/Im1": "14 0 R" } }, "/Type": "/Page" }, - "11 0 R": { - "/Contents": "29 0 R", + "4 0 R": { + "/Contents": "15 0 R", "/MediaBox": [ 0, 0, @@ -322,139 +337,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "30 0 R" + "/Im1": "16 0 R" } }, "/Type": "/Page" }, - "12 0 R": { - "/Length": 95 - }, - "13 0 R": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "14 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Height": 480, - "/Length": 768000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "15 0 R": { - "/Length": 101 - }, - "16 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 9364, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "17 0 R": { - "/Length": 107 - }, - "18 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 768998, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "19 0 R": { - "/Length": 94 - }, - "2 0 R": { - "/Count": 9, - "/Kids": [ - "3 0 R", - "4 0 R", - "5 0 R", - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R" - ], - "/Type": "/Pages" - }, - "20 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Height": 480, - "/Length": 576000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "21 0 R": { - "/Length": 100 - }, - "22 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 3650, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "23 0 R": { - "/Length": 106 - }, - "24 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 641497, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "25 0 R": { - "/Length": 95 - }, - "26 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Height": 480, - "/Length": 192000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "27 0 R": { - "/Length": 101 - }, - "28 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 2587, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "29 0 R": { - "/Length": 107 - }, - "3 0 R": { - "/Contents": "12 0 R", + "5 0 R": { + "/Contents": "17 0 R", "/MediaBox": [ 0, 0, @@ -472,23 +361,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "14 0 R" + "/Im1": "18 0 R" } }, "/Type": "/Page" }, - "30 0 R": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 3001, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - }, - "4 0 R": { - "/Contents": "15 0 R", + "6 0 R": { + "/Contents": "19 0 R", "/MediaBox": [ 0, 0, @@ -506,13 +385,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "16 0 R" + "/Im1": "20 0 R" } }, "/Type": "/Page" }, - "5 0 R": { - "/Contents": "17 0 R", + "7 0 R": { + "/Contents": "21 0 R", "/MediaBox": [ 0, 0, @@ -530,13 +409,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "18 0 R" + "/Im1": "22 0 R" } }, "/Type": "/Page" }, - "6 0 R": { - "/Contents": "19 0 R", + "8 0 R": { + "/Contents": "23 0 R", "/MediaBox": [ 0, 0, @@ -554,13 +433,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "20 0 R" + "/Im1": "24 0 R" } }, "/Type": "/Page" }, - "7 0 R": { - "/Contents": "21 0 R", + "9 0 R": { + "/Contents": "25 0 R", "/MediaBox": [ 0, 0, @@ -578,13 +457,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "22 0 R" + "/Im1": "26 0 R" } }, "/Type": "/Page" }, - "8 0 R": { - "/Contents": "23 0 R", + "10 0 R": { + "/Contents": "27 0 R", "/MediaBox": [ 0, 0, @@ -602,13 +481,13 @@ "/ImageC" ], "/XObject": { - "/Im1": "24 0 R" + "/Im1": "28 0 R" } }, "/Type": "/Page" }, - "9 0 R": { - "/Contents": "25 0 R", + "11 0 R": { + "/Contents": "29 0 R", "/MediaBox": [ 0, 0, @@ -626,11 +505,132 @@ "/ImageC" ], "/XObject": { - "/Im1": "26 0 R" + "/Im1": "30 0 R" } }, "/Type": "/Page" }, + "12 0 R": { + "/Length": 95 + }, + "13 0 R": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + }, + "14 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Height": 480, + "/Length": 768000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "15 0 R": { + "/Length": 101 + }, + "16 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 9364, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "17 0 R": { + "/Length": 107 + }, + "18 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 768998, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "19 0 R": { + "/Length": 94 + }, + "20 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Height": 480, + "/Length": 576000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "21 0 R": { + "/Length": 100 + }, + "22 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 3650, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "23 0 R": { + "/Length": 106 + }, + "24 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 641497, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "25 0 R": { + "/Length": 95 + }, + "26 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Height": 480, + "/Length": 192000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "27 0 R": { + "/Length": 101 + }, + "28 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 2587, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, + "29 0 R": { + "/Length": 107 + }, + "30 0 R": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 3001, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + }, "trailer": { "/ID": [ "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", diff --git a/qpdf/qtest/qpdf/json-outlines-with-actions.out b/qpdf/qtest/qpdf/json-outlines-with-actions.out index 11cf62c0..819448ef 100644 --- a/qpdf/qtest/qpdf/json-outlines-with-actions.out +++ b/qpdf/qtest/qpdf/json-outlines-with-actions.out @@ -629,8 +629,79 @@ "/Pages": "3 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "48 0 R", + "2 0 R": { + "/Count": 6, + "/First": "4 0 R", + "/Last": "5 0 R", + "/Type": "/Outlines" + }, + "3 0 R": { + "/Count": 30, + "/Kids": [ + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R", + "12 0 R", + "13 0 R", + "14 0 R", + "15 0 R", + "16 0 R", + "17 0 R", + "18 0 R", + "19 0 R", + "20 0 R", + "21 0 R", + "22 0 R", + "23 0 R", + "24 0 R", + "25 0 R", + "26 0 R", + "27 0 R", + "28 0 R", + "29 0 R", + "30 0 R", + "31 0 R", + "32 0 R", + "33 0 R", + "34 0 R", + "35 0 R" + ], + "/Type": "/Pages" + }, + "4 0 R": { + "/Count": 4, + "/Dest": [ + "11 0 R", + "/XYZ", + null, + null, + null + ], + "/First": "36 0 R", + "/Last": "37 0 R", + "/Next": "5 0 R", + "/Parent": "2 0 R", + "/Title": "Potato 1 -> 5: /XYZ null null null", + "/Type": "/Outline" + }, + "5 0 R": { + "/Dest": [ + "21 0 R", + "/XYZ", + 66, + 756, + 3 + ], + "/Parent": "2 0 R", + "/Prev": "4 0 R", + "/Title": "Salad 2 -> 15: /XYZ 66 756 3", + "/Type": "/Outline" + }, + "6 0 R": { + "/Contents": "38 0 R", "/MediaBox": [ 0, 0, @@ -646,118 +717,74 @@ }, "/Type": "/Page" }, - "100 0 R": { - "/Count": -2, - "/Dest": [ - "18 0 R", - "/FitV", - 100 + "7 0 R": { + "/Contents": "42 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/First": "104 0 R", - "/Last": "105 0 R", - "/Next": "101 0 R", - "/Parent": "36 0 R", - "/Title": "Biherbadem 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" }, - "101 0 R": { - "/Count": 1, - "/Dest": [ - "18 0 R", - "/XYZ", - null, - null, - null + "8 0 R": { + "/Contents": "44 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/First": "106 0 R", - "/Last": "106 0 R", - "/Parent": "36 0 R", - "/Prev": "100 0 R", - "/Title": "Gawehwehweh 1.1.2 -> 12: /XYZ null null null", - "/Type": "/Outline" - }, - "102 0 R": { - "/Dest": "gabeebee", - "/Next": "103 0 R", - "/Parent": "37 0 R", - "/Title": "Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", - "/Type": "/Outline" - }, - "103 0 R": { - "/A": { - "/D": [ - "6 0 R", - "/XYZ", - null, - null, - null - ], - "/S": "/GoTo", - "/Type": "/Action" + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" }, - "/Parent": "37 0 R", - "/Prev": "102 0 R", - "/Title": "Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" + "/Type": "/Page" }, - "104 0 R": { - "/A": { - "/D": "glarp", - "/S": "/GoTo", - "/Type": "/Action" + "9 0 R": { + "/Contents": "46 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" }, - "/Next": "105 0 R", - "/Parent": "100 0 R", - "/Title": "Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" + "/Type": "/Page" }, - "105 0 R": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null + "10 0 R": { + "/Contents": "48 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "100 0 R", - "/Prev": "104 0 R", - "/Title": "Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" - }, - "106 0 R": { - "/Dest": "108 0 R", - "/Parent": "101 0 R", - "/Title": "Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" - }, - "107 0 R": { - "/Names": [ - "gabeebee", - [ - "7 0 R", - "/FitR", - 66, - 714, - 180, - 770 - ], - "glarp", - [ - "24 0 R", - "/XYZ", - null, - null, - null - ] - ] + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" }, - "108 0 R": [ - "28 0 R", - "/XYZ", - null, - null, - null - ], "11 0 R": { "/Contents": "50 0 R", "/MediaBox": [ @@ -911,12 +938,6 @@ }, "/Type": "/Page" }, - "2 0 R": { - "/Count": 6, - "/First": "4 0 R", - "/Last": "5 0 R", - "/Type": "/Outlines" - }, "20 0 R": { "/Contents": "68 0 R", "/MediaBox": [ @@ -1087,42 +1108,6 @@ }, "/Type": "/Page" }, - "3 0 R": { - "/Count": 30, - "/Kids": [ - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R", - "12 0 R", - "13 0 R", - "14 0 R", - "15 0 R", - "16 0 R", - "17 0 R", - "18 0 R", - "19 0 R", - "20 0 R", - "21 0 R", - "22 0 R", - "23 0 R", - "24 0 R", - "25 0 R", - "26 0 R", - "27 0 R", - "28 0 R", - "29 0 R", - "30 0 R", - "31 0 R", - "32 0 R", - "33 0 R", - "34 0 R", - "35 0 R" - ], - "/Type": "/Pages" - }, "30 0 R": { "/Contents": "88 0 R", "/MediaBox": [ @@ -1256,22 +1241,6 @@ "/Length": "39 0 R" }, "39 0 R": 45, - "4 0 R": { - "/Count": 4, - "/Dest": [ - "11 0 R", - "/XYZ", - null, - null, - null - ], - "/First": "36 0 R", - "/Last": "37 0 R", - "/Next": "5 0 R", - "/Parent": "2 0 R", - "/Title": "Potato 1 -> 5: /XYZ null null null", - "/Type": "/Outline" - }, "40 0 R": { "/BaseFont": "/Helvetica", "/Encoding": "/WinAnsiEncoding", @@ -1299,19 +1268,6 @@ "/Length": "49 0 R" }, "49 0 R": 45, - "5 0 R": { - "/Dest": [ - "21 0 R", - "/XYZ", - 66, - 756, - 3 - ], - "/Parent": "2 0 R", - "/Prev": "4 0 R", - "/Title": "Salad 2 -> 15: /XYZ 66 756 3", - "/Type": "/Outline" - }, "50 0 R": { "/Length": "51 0 R" }, @@ -1332,23 +1288,6 @@ "/Length": "59 0 R" }, "59 0 R": 45, - "6 0 R": { - "/Contents": "38 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "60 0 R": { "/Length": "61 0 R" }, @@ -1369,23 +1308,6 @@ "/Length": "69 0 R" }, "69 0 R": 46, - "7 0 R": { - "/Contents": "42 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "70 0 R": { "/Length": "71 0 R" }, @@ -1406,23 +1328,6 @@ "/Length": "79 0 R" }, "79 0 R": 46, - "8 0 R": { - "/Contents": "44 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "80 0 R": { "/Length": "81 0 R" }, @@ -1443,23 +1348,6 @@ "/Length": "89 0 R" }, "89 0 R": 46, - "9 0 R": { - "/Contents": "46 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "90 0 R": { "/Length": "91 0 R" }, @@ -1480,6 +1368,118 @@ "/Length": "99 0 R" }, "99 0 R": 46, + "100 0 R": { + "/Count": -2, + "/Dest": [ + "18 0 R", + "/FitV", + 100 + ], + "/First": "104 0 R", + "/Last": "105 0 R", + "/Next": "101 0 R", + "/Parent": "36 0 R", + "/Title": "Biherbadem 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + }, + "101 0 R": { + "/Count": 1, + "/Dest": [ + "18 0 R", + "/XYZ", + null, + null, + null + ], + "/First": "106 0 R", + "/Last": "106 0 R", + "/Parent": "36 0 R", + "/Prev": "100 0 R", + "/Title": "Gawehwehweh 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + }, + "102 0 R": { + "/Dest": "gabeebee", + "/Next": "103 0 R", + "/Parent": "37 0 R", + "/Title": "Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + }, + "103 0 R": { + "/A": { + "/D": [ + "6 0 R", + "/XYZ", + null, + null, + null + ], + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Parent": "37 0 R", + "/Prev": "102 0 R", + "/Title": "Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + }, + "104 0 R": { + "/A": { + "/D": "glarp", + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Next": "105 0 R", + "/Parent": "100 0 R", + "/Title": "Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + }, + "105 0 R": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "104 0 R", + "/Title": "Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + }, + "106 0 R": { + "/Dest": "108 0 R", + "/Parent": "101 0 R", + "/Title": "Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + }, + "107 0 R": { + "/Names": [ + "gabeebee", + [ + "7 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "glarp", + [ + "24 0 R", + "/XYZ", + null, + null, + null + ] + ] + }, + "108 0 R": [ + "28 0 R", + "/XYZ", + null, + null, + null + ], "trailer": { "/ID": [ "Õ+\f\u0017Â\u0016Pib®gC¯ì&\u000f", diff --git a/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out b/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out index 41a555cf..2bb57b4d 100644 --- a/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out +++ b/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out @@ -744,129 +744,161 @@ "/Pages": "3 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "48 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" + "2 0 R": { + "/Count": 6, + "/First": "4 0 R", + "/Last": "5 0 R", + "/Type": "/Outlines" }, - "100 0 R": { - "/Count": -2, - "/Dest": [ + "3 0 R": { + "/Count": 30, + "/Kids": [ + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R", + "12 0 R", + "13 0 R", + "14 0 R", + "15 0 R", + "16 0 R", + "17 0 R", "18 0 R", - "/FitV", - 100 + "19 0 R", + "20 0 R", + "21 0 R", + "22 0 R", + "23 0 R", + "24 0 R", + "25 0 R", + "26 0 R", + "27 0 R", + "28 0 R", + "29 0 R", + "30 0 R", + "31 0 R", + "32 0 R", + "33 0 R", + "34 0 R", + "35 0 R" ], - "/First": "104 0 R", - "/Last": "105 0 R", - "/Next": "101 0 R", - "/Parent": "36 0 R", - "/Title": "•Biherbadem 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" + "/Type": "/Pages" }, - "101 0 R": { - "/Count": 1, + "4 0 R": { + "/Count": 4, "/Dest": [ - "18 0 R", + "11 0 R", "/XYZ", null, null, null ], - "/First": "106 0 R", - "/Last": "106 0 R", - "/Parent": "36 0 R", - "/Prev": "100 0 R", - "/Title": "•Gawehwehweh 1.1.2 -> 12: /XYZ null null null", + "/First": "36 0 R", + "/Last": "37 0 R", + "/Next": "5 0 R", + "/Parent": "2 0 R", + "/Title": "•Potato 1 -> 5: /XYZ null null null", "/Type": "/Outline" }, - "102 0 R": { - "/Dest": "/gabeebee", - "/Next": "103 0 R", - "/Parent": "37 0 R", - "/Title": "•Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", + "5 0 R": { + "/Dest": [ + "21 0 R", + "/XYZ", + 66, + 756, + 3 + ], + "/Parent": "2 0 R", + "/Prev": "4 0 R", + "/Title": "•Salad 2 -> 15: /XYZ 66 756 3", "/Type": "/Outline" }, - "103 0 R": { - "/A": { - "/D": [ - "6 0 R", - "/XYZ", - null, - null, - null - ], - "/S": "/GoTo", - "/Type": "/Action" + "6 0 R": { + "/Contents": "38 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" }, - "/Parent": "37 0 R", - "/Prev": "102 0 R", - "/Title": "•Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" + "/Type": "/Page" }, - "104 0 R": { - "/A": { - "/D": "/glarp", - "/S": "/GoTo", - "/Type": "/Action" + "7 0 R": { + "/Contents": "42 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" }, - "/Next": "105 0 R", - "/Parent": "100 0 R", - "/Title": "•Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" + "/Type": "/Page" }, - "105 0 R": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null + "8 0 R": { + "/Contents": "44 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "100 0 R", - "/Prev": "104 0 R", - "/Title": "•Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" }, - "106 0 R": { - "/Dest": [ - "28 0 R", - "/XYZ", - null, - null, - null + "9 0 R": { + "/Contents": "46 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "101 0 R", - "/Title": "•Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" }, - "107 0 R": { - "/gabeebee": [ - "7 0 R", - "/FitR", - 66, - 714, - 180, - 770 + "10 0 R": { + "/Contents": "48 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/glarp": [ - "24 0 R", - "/XYZ", - null, - null, - null - ] + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" }, "11 0 R": { "/Contents": "50 0 R", @@ -1021,12 +1053,6 @@ }, "/Type": "/Page" }, - "2 0 R": { - "/Count": 6, - "/First": "4 0 R", - "/Last": "5 0 R", - "/Type": "/Outlines" - }, "20 0 R": { "/Contents": "68 0 R", "/MediaBox": [ @@ -1197,42 +1223,6 @@ }, "/Type": "/Page" }, - "3 0 R": { - "/Count": 30, - "/Kids": [ - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R", - "12 0 R", - "13 0 R", - "14 0 R", - "15 0 R", - "16 0 R", - "17 0 R", - "18 0 R", - "19 0 R", - "20 0 R", - "21 0 R", - "22 0 R", - "23 0 R", - "24 0 R", - "25 0 R", - "26 0 R", - "27 0 R", - "28 0 R", - "29 0 R", - "30 0 R", - "31 0 R", - "32 0 R", - "33 0 R", - "34 0 R", - "35 0 R" - ], - "/Type": "/Pages" - }, "30 0 R": { "/Contents": "88 0 R", "/MediaBox": [ @@ -1366,22 +1356,6 @@ "/Length": "39 0 R" }, "39 0 R": 44, - "4 0 R": { - "/Count": 4, - "/Dest": [ - "11 0 R", - "/XYZ", - null, - null, - null - ], - "/First": "36 0 R", - "/Last": "37 0 R", - "/Next": "5 0 R", - "/Parent": "2 0 R", - "/Title": "•Potato 1 -> 5: /XYZ null null null", - "/Type": "/Outline" - }, "40 0 R": { "/BaseFont": "/Helvetica", "/Encoding": "/WinAnsiEncoding", @@ -1409,19 +1383,6 @@ "/Length": "49 0 R" }, "49 0 R": 44, - "5 0 R": { - "/Dest": [ - "21 0 R", - "/XYZ", - 66, - 756, - 3 - ], - "/Parent": "2 0 R", - "/Prev": "4 0 R", - "/Title": "•Salad 2 -> 15: /XYZ 66 756 3", - "/Type": "/Outline" - }, "50 0 R": { "/Length": "51 0 R" }, @@ -1442,23 +1403,6 @@ "/Length": "59 0 R" }, "59 0 R": 44, - "6 0 R": { - "/Contents": "38 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "60 0 R": { "/Length": "61 0 R" }, @@ -1479,23 +1423,6 @@ "/Length": "69 0 R" }, "69 0 R": 45, - "7 0 R": { - "/Contents": "42 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "70 0 R": { "/Length": "71 0 R" }, @@ -1516,23 +1443,6 @@ "/Length": "79 0 R" }, "79 0 R": 45, - "8 0 R": { - "/Contents": "44 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "80 0 R": { "/Length": "81 0 R" }, @@ -1553,23 +1463,6 @@ "/Length": "89 0 R" }, "89 0 R": 45, - "9 0 R": { - "/Contents": "46 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "90 0 R": { "/Length": "91 0 R" }, @@ -1590,6 +1483,113 @@ "/Length": "99 0 R" }, "99 0 R": 45, + "100 0 R": { + "/Count": -2, + "/Dest": [ + "18 0 R", + "/FitV", + 100 + ], + "/First": "104 0 R", + "/Last": "105 0 R", + "/Next": "101 0 R", + "/Parent": "36 0 R", + "/Title": "•Biherbadem 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + }, + "101 0 R": { + "/Count": 1, + "/Dest": [ + "18 0 R", + "/XYZ", + null, + null, + null + ], + "/First": "106 0 R", + "/Last": "106 0 R", + "/Parent": "36 0 R", + "/Prev": "100 0 R", + "/Title": "•Gawehwehweh 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + }, + "102 0 R": { + "/Dest": "/gabeebee", + "/Next": "103 0 R", + "/Parent": "37 0 R", + "/Title": "•Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + }, + "103 0 R": { + "/A": { + "/D": [ + "6 0 R", + "/XYZ", + null, + null, + null + ], + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Parent": "37 0 R", + "/Prev": "102 0 R", + "/Title": "•Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + }, + "104 0 R": { + "/A": { + "/D": "/glarp", + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Next": "105 0 R", + "/Parent": "100 0 R", + "/Title": "•Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + }, + "105 0 R": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "104 0 R", + "/Title": "•Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + }, + "106 0 R": { + "/Dest": [ + "28 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "101 0 R", + "/Title": "•Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + }, + "107 0 R": { + "/gabeebee": [ + "7 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "/glarp": [ + "24 0 R", + "/XYZ", + null, + null, + null + ] + }, "trailer": { "/ID": [ "Õ+\f\u0017Â\u0016Pib®gC¯ì&\u000f", diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects.out index c0427a9c..bbba10b8 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects.out @@ -70,8 +70,44 @@ "/Pages": "2 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "49 0 R", + "2 0 R": { + "/Count": 30, + "/Kids": [ + "3 0 R", + "4 0 R", + "5 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R", + "12 0 R", + "13 0 R", + "14 0 R", + "15 0 R", + "16 0 R", + "17 0 R", + "18 0 R", + "19 0 R", + "20 0 R", + "21 0 R", + "22 0 R", + "23 0 R", + "24 0 R", + "25 0 R", + "26 0 R", + "27 0 R", + "28 0 R", + "29 0 R", + "30 0 R", + "31 0 R", + "32 0 R" + ], + "/Type": "/Pages" + }, + "3 0 R": { + "/Contents": "33 0 R", "/MediaBox": [ 0, 0, @@ -87,100 +123,124 @@ }, "/Type": "/Page" }, - "100 0 R": { - "/Count": -2, - "/Dest": [ - "15 0 R", - "/FitV", - 100 + "4 0 R": { + "/Contents": "37 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/First": "102 0 R", - "/Last": "103 0 R", - "/Next": "101 0 R", - "/Parent": "98 0 R", - "/Title": "Isosicle 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "101 0 R": { - "/Count": 1, - "/Dest": [ - "15 0 R", - "/XYZ", - null, - null, - null + "5 0 R": { + "/Contents": "39 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/First": "104 0 R", - "/Last": "104 0 R", - "/Parent": "98 0 R", - "/Prev": "100 0 R", - "/Title": "Isosicle 1.1.2 -> 12: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "102 0 R": { - "/Dest": [ - "21 0 R", - "/XYZ", - null, - null, - null + "6 0 R": { + "/Contents": "41 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Next": "103 0 R", - "/Parent": "100 0 R", - "/Title": "Isosicle 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "103 0 R": { - "/Dest": [ - "22 0 R", - "/XYZ", - null, - null, - null + "7 0 R": { + "/Contents": "43 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "100 0 R", - "/Prev": "102 0 R", - "/Title": "Isosicle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "104 0 R": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null + "8 0 R": { + "/Contents": "45 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "101 0 R", - "/Title": "Isosicle 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "105 0 R": { - "/Dest": [ - "4 0 R", - "/FitR", - 66, - 714, - 180, - 770 + "9 0 R": { + "/Contents": "47 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Next": "106 0 R", - "/Parent": "99 0 R", - "/Title": "Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "106 0 R": { - "/Dest": [ - "3 0 R", - "/XYZ", - null, - null, - null + "10 0 R": { + "/Contents": "49 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "99 0 R", - "/Prev": "105 0 R", - "/Title": "Trepsicle 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, "11 0 R": { "/Contents": "51 0 R", @@ -335,42 +395,6 @@ }, "/Type": "/Page" }, - "2 0 R": { - "/Count": 30, - "/Kids": [ - "3 0 R", - "4 0 R", - "5 0 R", - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R", - "12 0 R", - "13 0 R", - "14 0 R", - "15 0 R", - "16 0 R", - "17 0 R", - "18 0 R", - "19 0 R", - "20 0 R", - "21 0 R", - "22 0 R", - "23 0 R", - "24 0 R", - "25 0 R", - "26 0 R", - "27 0 R", - "28 0 R", - "29 0 R", - "30 0 R", - "31 0 R", - "32 0 R" - ], - "/Type": "/Pages" - }, "20 0 R": { "/Contents": "69 0 R", "/MediaBox": [ @@ -541,23 +565,6 @@ }, "/Type": "/Page" }, - "3 0 R": { - "/Contents": "33 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "30 0 R": { "/Contents": "89 0 R", "/MediaBox": [ @@ -631,23 +638,6 @@ "39 0 R": { "/Length": "40 0 R" }, - "4 0 R": { - "/Contents": "37 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "40 0 R": 46, "41 0 R": { "/Length": "42 0 R" @@ -668,23 +658,6 @@ "49 0 R": { "/Length": "50 0 R" }, - "5 0 R": { - "/Contents": "39 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "50 0 R": 46, "51 0 R": { "/Length": "52 0 R" @@ -705,23 +678,6 @@ "59 0 R": { "/Length": "60 0 R" }, - "6 0 R": { - "/Contents": "41 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "60 0 R": 47, "61 0 R": { "/Length": "62 0 R" @@ -742,23 +698,6 @@ "69 0 R": { "/Length": "70 0 R" }, - "7 0 R": { - "/Contents": "43 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "70 0 R": 47, "71 0 R": { "/Length": "72 0 R" @@ -779,23 +718,6 @@ "79 0 R": { "/Length": "80 0 R" }, - "8 0 R": { - "/Contents": "45 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "80 0 R": 47, "81 0 R": { "/Length": "82 0 R" @@ -816,23 +738,6 @@ "89 0 R": { "/Length": "90 0 R" }, - "9 0 R": { - "/Contents": "47 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "90 0 R": 47, "91 0 R": { "/Length": "92 0 R" @@ -904,6 +809,101 @@ "/Title": "Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", "/Type": "/Outline" }, + "100 0 R": { + "/Count": -2, + "/Dest": [ + "15 0 R", + "/FitV", + 100 + ], + "/First": "102 0 R", + "/Last": "103 0 R", + "/Next": "101 0 R", + "/Parent": "98 0 R", + "/Title": "Isosicle 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + }, + "101 0 R": { + "/Count": 1, + "/Dest": [ + "15 0 R", + "/XYZ", + null, + null, + null + ], + "/First": "104 0 R", + "/Last": "104 0 R", + "/Parent": "98 0 R", + "/Prev": "100 0 R", + "/Title": "Isosicle 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + }, + "102 0 R": { + "/Dest": [ + "21 0 R", + "/XYZ", + null, + null, + null + ], + "/Next": "103 0 R", + "/Parent": "100 0 R", + "/Title": "Isosicle 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + }, + "103 0 R": { + "/Dest": [ + "22 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "102 0 R", + "/Title": "Isosicle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + }, + "104 0 R": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "101 0 R", + "/Title": "Isosicle 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + }, + "105 0 R": { + "/Dest": [ + "4 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "/Next": "106 0 R", + "/Parent": "99 0 R", + "/Title": "Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + }, + "106 0 R": { + "/Dest": [ + "3 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "99 0 R", + "/Prev": "105 0 R", + "/Title": "Trepsicle 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + }, "trailer": { "/Root": "1 0 R", "/Size": 107 diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines.out index dff3d9d8..52f36f21 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines.out @@ -861,8 +861,44 @@ "/Pages": "2 0 R", "/Type": "/Catalog" }, - "10 0 R": { - "/Contents": "49 0 R", + "2 0 R": { + "/Count": 30, + "/Kids": [ + "3 0 R", + "4 0 R", + "5 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R", + "12 0 R", + "13 0 R", + "14 0 R", + "15 0 R", + "16 0 R", + "17 0 R", + "18 0 R", + "19 0 R", + "20 0 R", + "21 0 R", + "22 0 R", + "23 0 R", + "24 0 R", + "25 0 R", + "26 0 R", + "27 0 R", + "28 0 R", + "29 0 R", + "30 0 R", + "31 0 R", + "32 0 R" + ], + "/Type": "/Pages" + }, + "3 0 R": { + "/Contents": "33 0 R", "/MediaBox": [ 0, 0, @@ -878,100 +914,124 @@ }, "/Type": "/Page" }, - "100 0 R": { - "/Count": -2, - "/Dest": [ - "15 0 R", - "/FitV", - 100 + "4 0 R": { + "/Contents": "37 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/First": "102 0 R", - "/Last": "103 0 R", - "/Next": "101 0 R", - "/Parent": "98 0 R", - "/Title": "Isosicle 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "101 0 R": { - "/Count": 1, - "/Dest": [ - "15 0 R", - "/XYZ", - null, - null, - null + "5 0 R": { + "/Contents": "39 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/First": "104 0 R", - "/Last": "104 0 R", - "/Parent": "98 0 R", - "/Prev": "100 0 R", - "/Title": "Isosicle 1.1.2 -> 12: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "102 0 R": { - "/Dest": [ - "21 0 R", - "/XYZ", - null, - null, - null + "6 0 R": { + "/Contents": "41 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Next": "103 0 R", - "/Parent": "100 0 R", - "/Title": "Isosicle 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "103 0 R": { - "/Dest": [ - "22 0 R", - "/XYZ", - null, - null, - null + "7 0 R": { + "/Contents": "43 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "100 0 R", - "/Prev": "102 0 R", - "/Title": "Isosicle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "104 0 R": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null + "8 0 R": { + "/Contents": "45 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "101 0 R", - "/Title": "Isosicle 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "105 0 R": { - "/Dest": [ - "4 0 R", - "/FitR", - 66, - 714, - 180, - 770 + "9 0 R": { + "/Contents": "47 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Next": "106 0 R", - "/Parent": "99 0 R", - "/Title": "Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, - "106 0 R": { - "/Dest": [ - "3 0 R", - "/XYZ", - null, - null, - null + "10 0 R": { + "/Contents": "49 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 ], - "/Parent": "99 0 R", - "/Prev": "105 0 R", - "/Title": "Trepsicle 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" }, "11 0 R": { "/Contents": "51 0 R", @@ -1126,42 +1186,6 @@ }, "/Type": "/Page" }, - "2 0 R": { - "/Count": 30, - "/Kids": [ - "3 0 R", - "4 0 R", - "5 0 R", - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R", - "12 0 R", - "13 0 R", - "14 0 R", - "15 0 R", - "16 0 R", - "17 0 R", - "18 0 R", - "19 0 R", - "20 0 R", - "21 0 R", - "22 0 R", - "23 0 R", - "24 0 R", - "25 0 R", - "26 0 R", - "27 0 R", - "28 0 R", - "29 0 R", - "30 0 R", - "31 0 R", - "32 0 R" - ], - "/Type": "/Pages" - }, "20 0 R": { "/Contents": "69 0 R", "/MediaBox": [ @@ -1332,23 +1356,6 @@ }, "/Type": "/Page" }, - "3 0 R": { - "/Contents": "33 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "30 0 R": { "/Contents": "89 0 R", "/MediaBox": [ @@ -1422,23 +1429,6 @@ "39 0 R": { "/Length": "40 0 R" }, - "4 0 R": { - "/Contents": "37 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "40 0 R": 46, "41 0 R": { "/Length": "42 0 R" @@ -1459,23 +1449,6 @@ "49 0 R": { "/Length": "50 0 R" }, - "5 0 R": { - "/Contents": "39 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "50 0 R": 46, "51 0 R": { "/Length": "52 0 R" @@ -1496,23 +1469,6 @@ "59 0 R": { "/Length": "60 0 R" }, - "6 0 R": { - "/Contents": "41 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "60 0 R": 47, "61 0 R": { "/Length": "62 0 R" @@ -1533,23 +1489,6 @@ "69 0 R": { "/Length": "70 0 R" }, - "7 0 R": { - "/Contents": "43 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "70 0 R": 47, "71 0 R": { "/Length": "72 0 R" @@ -1570,23 +1509,6 @@ "79 0 R": { "/Length": "80 0 R" }, - "8 0 R": { - "/Contents": "45 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "80 0 R": 47, "81 0 R": { "/Length": "82 0 R" @@ -1607,23 +1529,6 @@ "89 0 R": { "/Length": "90 0 R" }, - "9 0 R": { - "/Contents": "47 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - }, "90 0 R": 47, "91 0 R": { "/Length": "92 0 R" @@ -1695,6 +1600,101 @@ "/Title": "Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", "/Type": "/Outline" }, + "100 0 R": { + "/Count": -2, + "/Dest": [ + "15 0 R", + "/FitV", + 100 + ], + "/First": "102 0 R", + "/Last": "103 0 R", + "/Next": "101 0 R", + "/Parent": "98 0 R", + "/Title": "Isosicle 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + }, + "101 0 R": { + "/Count": 1, + "/Dest": [ + "15 0 R", + "/XYZ", + null, + null, + null + ], + "/First": "104 0 R", + "/Last": "104 0 R", + "/Parent": "98 0 R", + "/Prev": "100 0 R", + "/Title": "Isosicle 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + }, + "102 0 R": { + "/Dest": [ + "21 0 R", + "/XYZ", + null, + null, + null + ], + "/Next": "103 0 R", + "/Parent": "100 0 R", + "/Title": "Isosicle 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + }, + "103 0 R": { + "/Dest": [ + "22 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "102 0 R", + "/Title": "Isosicle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + }, + "104 0 R": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "101 0 R", + "/Title": "Isosicle 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + }, + "105 0 R": { + "/Dest": [ + "4 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "/Next": "106 0 R", + "/Parent": "99 0 R", + "/Title": "Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + }, + "106 0 R": { + "/Dest": [ + "3 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "99 0 R", + "/Prev": "105 0 R", + "/Title": "Trepsicle 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + }, "trailer": { "/Root": "1 0 R", "/Size": 107 diff --git a/qpdf/qtest/qpdf/json-page-labels-num-tree.out b/qpdf/qtest/qpdf/json-page-labels-num-tree.out index b1b4d114..a7a3dec0 100644 --- a/qpdf/qtest/qpdf/json-page-labels-num-tree.out +++ b/qpdf/qtest/qpdf/json-page-labels-num-tree.out @@ -543,6 +543,154 @@ "/Pages": "3 0 R", "/Type": "/Catalog" }, + "2 0 R": { + "/Kids": [ + "4 0 R", + "5 0 R" + ] + }, + "3 0 R": { + "/Count": 30, + "/Kids": [ + "6 0 R", + "7 0 R", + "8 0 R", + "9 0 R", + "10 0 R", + "11 0 R", + "12 0 R", + "13 0 R", + "14 0 R", + "15 0 R", + "16 0 R", + "17 0 R", + "18 0 R", + "19 0 R", + "20 0 R", + "21 0 R", + "22 0 R", + "23 0 R", + "24 0 R", + "25 0 R", + "26 0 R", + "27 0 R", + "28 0 R", + "29 0 R", + "30 0 R", + "31 0 R", + "32 0 R", + "33 0 R", + "34 0 R", + "35 0 R" + ], + "/Type": "/Pages" + }, + "4 0 R": { + "/Kids": [ + "36 0 R", + "37 0 R" + ], + "/Limits": [ + 0, + 19 + ] + }, + "5 0 R": { + "/Limits": [ + 20, + 29 + ], + "/Nums": [ + 20, + { + "/S": "/D", + "/St": 12 + }, + 22, + { + "/S": "/D", + "/St": 16059 + }, + 23, + { + "/S": "/R", + "/St": 50 + }, + 29, + { + "/S": "/r", + "/St": 54 + } + ] + }, + "6 0 R": { + "/Contents": "38 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + }, + "7 0 R": { + "/Contents": "42 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + }, + "8 0 R": { + "/Contents": "44 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + }, + "9 0 R": { + "/Contents": "46 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + }, "10 0 R": { "/Contents": "48 0 R", "/MediaBox": [ @@ -713,12 +861,6 @@ }, "/Type": "/Page" }, - "2 0 R": { - "/Kids": [ - "4 0 R", - "5 0 R" - ] - }, "20 0 R": { "/Contents": "68 0 R", "/MediaBox": [ @@ -889,42 +1031,6 @@ }, "/Type": "/Page" }, - "3 0 R": { - "/Count": 30, - "/Kids": [ - "6 0 R", - "7 0 R", - "8 0 R", - "9 0 R", - "10 0 R", - "11 0 R", - "12 0 R", - "13 0 R", - "14 0 R", - "15 0 R", - "16 0 R", - "17 0 R", - "18 0 R", - "19 0 R", - "20 0 R", - "21 0 R", - "22 0 R", - "23 0 R", - "24 0 R", - "25 0 R", - "26 0 R", - "27 0 R", - "28 0 R", - "29 0 R", - "30 0 R", - "31 0 R", - "32 0 R", - "33 0 R", - "34 0 R", - "35 0 R" - ], - "/Type": "/Pages" - }, "30 0 R": { "/Contents": "88 0 R", "/MediaBox": [ @@ -1093,16 +1199,6 @@ "/Length": "39 0 R" }, "39 0 R": 46, - "4 0 R": { - "/Kids": [ - "36 0 R", - "37 0 R" - ], - "/Limits": [ - 0, - 19 - ] - }, "40 0 R": { "/BaseFont": "/Helvetica", "/Encoding": "/WinAnsiEncoding", @@ -1130,34 +1226,6 @@ "/Length": "49 0 R" }, "49 0 R": 46, - "5 0 R": { - "/Limits": [ - 20, - 29 - ], - "/Nums": [ - 20, - { - "/S": "/D", - "/St": 12 - }, - 22, - { - "/S": "/D", - "/St": 16059 - }, - 23, - { - "/S": "/R", - "/St": 50 - }, - 29, - { - "/S": "/r", - "/St": 54 - } - ] - }, "50 0 R": { "/Length": "51 0 R" }, @@ -1178,23 +1246,6 @@ "/Length": "59 0 R" }, "59 0 R": 46, - "6 0 R": { - "/Contents": "38 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "60 0 R": { "/Length": "61 0 R" }, @@ -1215,23 +1266,6 @@ "/Length": "69 0 R" }, "69 0 R": 47, - "7 0 R": { - "/Contents": "42 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "70 0 R": { "/Length": "71 0 R" }, @@ -1252,23 +1286,6 @@ "/Length": "79 0 R" }, "79 0 R": 47, - "8 0 R": { - "/Contents": "44 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "80 0 R": { "/Length": "81 0 R" }, @@ -1289,23 +1306,6 @@ "/Length": "89 0 R" }, "89 0 R": 47, - "9 0 R": { - "/Contents": "46 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - }, "90 0 R": { "/Length": "91 0 R" }, diff --git a/qpdf/qtest/qpdf/page_api_2-json-objects.out b/qpdf/qtest/qpdf/page_api_2-json-objects.out index 6650ba07..d3d0619d 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-objects.out +++ b/qpdf/qtest/qpdf/page_api_2-json-objects.out @@ -8,7 +8,6 @@ "/Pages": "3 0 R", "/Type": "/Catalog" }, - "10 0 R": 47, "2 0 R": { "/CreationDate": "D:20120621124041", "/Producer": "Apex PDFWriter" @@ -75,6 +74,7 @@ "9 0 R": { "/Length": "10 0 R" }, + "10 0 R": 47, "trailer": { "/ID": [ "û˘·ƒÿ{5⁄\u0005Ú−S*º‘o", diff --git a/qpdf/qtest/qpdf/page_api_2-json-pages.out b/qpdf/qtest/qpdf/page_api_2-json-pages.out index 705a745e..fd5aef89 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-pages.out +++ b/qpdf/qtest/qpdf/page_api_2-json-pages.out @@ -40,27 +40,6 @@ "/Pages": "3 0 R", "/Type": "/Catalog" }, - "10 0 R": 47, - "11 0 R": { - "/Contents": "6 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] - }, - "/Type": "/Page" - }, "2 0 R": { "/CreationDate": "D:20120621124041", "/Producer": "Apex PDFWriter" @@ -127,6 +106,27 @@ "9 0 R": { "/Length": "10 0 R" }, + "10 0 R": 47, + "11 0 R": { + "/Contents": "6 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "8 0 R" + }, + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "/Type": "/Page" + }, "trailer": { "/ID": [ "û˘·ƒÿ{5⁄\u0005Ú−S*º‘o", |