From 6f43bf8de36b08c55b172b4f4133c79657651666 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Wed, 18 May 2022 18:22:57 -0400 Subject: [PATCH] Major rework -- see long comments * Replace --create-from-json=file with --json-input, which causes the regular input to be treated as json. * Eliminate --to-json * In --json=2, bring back "objects" and eliminate "objectinfo". Stream data is never present. * In --json-output=2, write "qpdf-v2" with "objects" and include stream data. --- TODO | 73 +- include/qpdf/QPDF.hh | 45 +- include/qpdf/QPDFJob.hh | 33 +- include/qpdf/auto_job_c_main.hh | 5 +- job.sums | 18 +- job.yml | 25 +- libqpdf/QPDFJob.cc | 280 +- libqpdf/QPDFJob_argv.cc | 7 - libqpdf/QPDFJob_config.cc | 30 +- libqpdf/QPDFJob_json.cc | 6 - libqpdf/QPDF_json.cc | 132 +- libqpdf/qpdf/auto_job_decl.hh | 1 - libqpdf/qpdf/auto_job_help.hh | 17 +- libqpdf/qpdf/auto_job_init.hh | 11 +- libqpdf/qpdf/auto_job_json_decl.hh | 1 - libqpdf/qpdf/auto_job_json_init.hh | 17 +- libqpdf/qpdf/auto_job_schema.hh | 4 +- manual/cli.rst | 51 +- qpdf/qpdf.testcov | 5 +- qpdf/qtest/json.test | 41 +- qpdf/qtest/pages_tree.test | 6 +- qpdf/qtest/qpdf/bad-data-json.out | 2 +- qpdf/qtest/qpdf/direct-pages-json-objects.out | 159 +- qpdf/qtest/qpdf/direct-pages-json-pages.out | 175 +- qpdf/qtest/qpdf/file-stdout-needs-prefix.out | 9 + .../qpdf/image-streams-small-to-json.out | 487 -- .../qtest/qpdf/json-bad-data-json-file-v2.out | 54 +- .../qpdf/json-bad-data-json-inline-v2.out | 54 +- ...n-field-types---show-encryption-key-v2.out | 5311 ++++++++--------- qpdf/qtest/qpdf/json-field-types-v2.out | 5311 ++++++++--------- .../qpdf/json-image-streams-all-file-v2.out | 7 +- qpdf/qtest/qpdf/json-image-streams-all-v2.out | 889 ++- ...json-image-streams-generalized-file-v2.out | 7 +- ...on-image-streams-generalized-inline-v2.out | 278 +- .../qpdf/json-image-streams-none-file-v2.out | 7 +- .../json-image-streams-none-inline-v2.out | 278 +- .../qpdf/json-image-streams-small-v2.out | 913 ++- ...json-image-streams-specialized-file-v2.out | 7 +- ...on-image-streams-specialized-inline-v2.out | 278 +- .../json-image-streams-specialized-v2.out | 889 ++- qpdf/qtest/qpdf/json-image-streams-v2.out | 889 ++- .../qpdf/json-outlines-with-actions-v2.out | 2283 ++++--- .../json-outlines-with-old-root-dests-v2.out | 2291 ++++--- ...els-and-outlines-objects-trailer-2-v1.out} | 0 ...bels-and-outlines-objects-trailer-2-v2.out | 52 + ...abels-and-outlines-objects-trailer-v1.out} | 0 ...labels-and-outlines-objects-trailer-v2.out | 14 + ...n-page-labels-and-outlines-objects-v1.out} | 0 ...on-page-labels-and-outlines-objects-v2.out | 1186 ++++ ...-labels-and-outlines-qpdf-trailer-2-v2.out | 57 - ...ge-labels-and-outlines-qpdf-trailer-v2.out | 19 - .../json-page-labels-and-outlines-qpdf-v2.out | 1191 ---- .../qpdf/json-page-labels-and-outlines-v2.out | 2235 ++++--- .../qpdf/json-page-labels-num-tree-v2.out | 2051 ++++--- qpdf/qtest/qpdf/page_api_2-json-objects.out | 207 +- qpdf/qtest/qpdf/page_api_2-json-pages.out | 249 +- qpdf/qtest/qpdf/qjson-bad-json-version1.json | 73 - qpdf/qtest/qpdf/qjson-bad-json-version1.out | 2 - qpdf/qtest/qpdf/qjson-bad-json-version2.json | 73 - qpdf/qtest/qpdf/qjson-bad-json-version2.out | 2 - qpdf/qtest/qpdf/qjson-bad-object-key.json | 7 +- qpdf/qtest/qpdf/qjson-bad-object-key.out | 2 +- qpdf/qtest/qpdf/qjson-bad-pdf-version1.json | 7 +- qpdf/qtest/qpdf/qjson-bad-pdf-version1.out | 2 +- qpdf/qtest/qpdf/qjson-bad-pdf-version2.json | 7 +- qpdf/qtest/qpdf/qjson-bad-pdf-version2.out | 2 +- qpdf/qtest/qpdf/qjson-missing-objects.json | 7 +- qpdf/qtest/qpdf/qjson-missing-objects.out | 2 +- qpdf/qtest/qpdf/qjson-missing-trailer.json | 7 +- qpdf/qtest/qpdf/qjson-missing-trailer.out | 2 +- qpdf/qtest/qpdf/qjson-no-json-version.json | 72 - qpdf/qtest/qpdf/qjson-no-json-version.out | 2 - qpdf/qtest/qpdf/qjson-no-pdf-version.json | 7 +- qpdf/qtest/qpdf/qjson-no-pdf-version.out | 2 +- qpdf/qtest/qpdf/qjson-obj-key-errors.json | 7 +- qpdf/qtest/qpdf/qjson-obj-key-errors.out | 12 +- qpdf/qtest/qpdf/qjson-object-not-dict.json | 7 +- qpdf/qtest/qpdf/qjson-object-not-dict.out | 2 +- qpdf/qtest/qpdf/qjson-objects-not-dict.json | 3 +- qpdf/qtest/qpdf/qjson-objects-not-dict.out | 4 +- .../qpdf/qjson-stream-dict-not-dict.json | 3 +- .../qtest/qpdf/qjson-stream-dict-not-dict.out | 8 +- qpdf/qtest/qpdf/qjson-stream-not-dict.json | 3 +- qpdf/qtest/qpdf/qjson-stream-not-dict.out | 4 +- qpdf/qtest/qpdf/qjson-trailer-not-dict.json | 7 +- qpdf/qtest/qpdf/qjson-trailer-not-dict.out | 2 +- qpdf/qtest/qpdf/qjson-trailer-stream.json | 7 +- qpdf/qtest/qpdf/qjson-trailer-stream.out | 2 +- qpdf/qtest/{qpdf-json.test => qpdf_json.test} | 5 +- 89 files changed, 13633 insertions(+), 15368 deletions(-) create mode 100644 qpdf/qtest/qpdf/file-stdout-needs-prefix.out delete mode 100644 qpdf/qtest/qpdf/image-streams-small-to-json.out rename qpdf/qtest/qpdf/{json-page-labels-and-outlines-qpdf-trailer-2-v1.out => json-page-labels-and-outlines-objects-trailer-2-v1.out} (100%) create mode 100644 qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-2-v2.out rename qpdf/qtest/qpdf/{json-page-labels-and-outlines-qpdf-trailer-v1.out => json-page-labels-and-outlines-objects-trailer-v1.out} (100%) create mode 100644 qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-v2.out rename qpdf/qtest/qpdf/{json-page-labels-and-outlines-qpdf-v1.out => json-page-labels-and-outlines-objects-v1.out} (100%) create mode 100644 qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-v2.out delete mode 100644 qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v2.out delete mode 100644 qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v2.out delete mode 100644 qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out delete mode 100644 qpdf/qtest/qpdf/qjson-bad-json-version1.json delete mode 100644 qpdf/qtest/qpdf/qjson-bad-json-version1.out delete mode 100644 qpdf/qtest/qpdf/qjson-bad-json-version2.json delete mode 100644 qpdf/qtest/qpdf/qjson-bad-json-version2.out delete mode 100644 qpdf/qtest/qpdf/qjson-no-json-version.json delete mode 100644 qpdf/qtest/qpdf/qjson-no-json-version.out rename qpdf/qtest/{qpdf-json.test => qpdf_json.test} (86%) diff --git a/TODO b/TODO index f3eaebaf..fbf10c05 100644 --- a/TODO +++ b/TODO @@ -54,6 +54,10 @@ Soon: Break ground on "Document-level work" Output JSON v2 ============== +Some of this documentation has drifted from the actual implementation. + +Make sure pages tree repair generates warnings. + * Reread from perspective of update * Test all ignore cases with QTC * Test case of correct file with dict before data/datafile @@ -62,6 +66,7 @@ Output JSON v2 after creation. * Test invalid data, invalid data file * Tests: round-trip through json, round-trip through qpdf --qdf +* Test to see if we get CR/NL on Windows, which is okay Try to never flatten pages tree. Make sure we do something reasonable with pages tree repair. The problem is that if pages tree repair is @@ -75,6 +80,9 @@ General things to remember: * Make sure all the information from --check and other informational options (--show-linearization, --show-encryption, --show-xref, --list-attachments, --show-npages) is available in the json output. + Consider having --check, --show-encryption, etc., just select the + right keys when in json mode. I don't think I want check on by + default, so that might be different. * Consider changing the contract to allow fields to be absent even when present in the schema. It's reasonable for people to check for @@ -95,41 +103,32 @@ General things to remember: JSON to PDF: -Have --create-from-json and --update-from-json. With ---create-from-json, the json file must be complete, meaning all stream -data, the trailer, and the PDF version must be present. In ---update-from-json, an object explicitly set to null (not "value": -null) is deleted. For streams with no stream data, the dictionary is -updated but the data is left untouched. Other things that are omitted -are left alone. Make sure document that, when writing a PDF file from -QPDF, there is no expectation of object numbers being preserved. As -such, --update-from-json can only be used to update the exact file -that the json was created from. You can put multiple objects in the -update file, but you can't use a json from one file to update the -output of a previous update since the object numbers will have -changed. Note that, when creating from a JSON, object numbers are -preserved in the resulting QPDF object but still modified by -QPDFWriter for the output. This would be visible by combining ---to-json and --create-from-json. Also using --qdf with ---create-from-json would show original object IDs in comments. It will -be important to capture this in the documentation. +Have --json-input and --update-from-json. With --json-input, the json +file must be complete, meaning all stream data, the trailer, and the +PDF version must be present. In --update-from-json, an object +explicitly set to null (not "value": null) is deleted. For streams +with no stream data, the dictionary is updated but the data is left +untouched. Other things that are omitted are left alone. Make sure +document that, when writing a PDF file from QPDF, there is no +expectation of object numbers being preserved. As such, +--update-from-json can only be used to update the exact file that the +json was created from. You can put multiple objects in the update +file, but you can't use a json from one file to update the output of a +previous update since the object numbers will have changed. Note that, +when creating from a JSON, object numbers are preserved in the +resulting QPDF object but still modified by QPDFWriter for the output. +This would be visible by combining --json-output and --json-input. +Also using --qdf with --create-from-json would show original object +IDs in comments. It will be important to capture this in the +documentation. When reading a JSON string, any string that doesn't look like a name or indirect object or start with "b:" or "u:" should be considered an error. Just use newUnicodeString on "u:" strings. For "b:" strings, decode the bytes with hex_decode and use newString. -For going back from JSON to PDF, we can have -QPDF::createFromJSON(std::shared_ptr) -which will have logic similar to copyForeignObject. Note that this -InputSource is not going to be this->file. We have to keep it -separately. There's also non-static QPDF::updateFromJSON. Both -createFromJSON and updateFromJSON will call the same internal method -with different options. That method will use a reactor that is a -private QPDF class that just proxies to private QPDF methods. - -Test case: combine --create-from-json and --to-json to preservation of -object numbers. QPDFWriter won't show that although --qdf with the +Test case: combine --json-input and --json-output to show preservation +of object numbers. QPDFWriter won't show that although --qdf with the original object ID comments would. The backing input source for createFromJSON is this memory block: @@ -145,8 +144,7 @@ startxref %%EOF ``` -* Ignore all keys except .qpdf. -* Verify that .qpdf.jsonVersion is 2 +* Ignore all keys except .qpdf-v2. * Set this->m->pdf_version based on the .qpdf.pdfVersion key * For each object in .qpdf.objects: * Walk through the object detecting any indirect objects. For each @@ -170,15 +168,14 @@ Documentation: Serialized PDF: -The JSON output will have a "qpdf" key containing -* jsonversion +The JSON output will have a "qpdf-v2" key containing * pdfversion * maxobjectid * objects -The "qpdf" key replaces "objects" and "objectinfo" in v1 JSON. +In regular json mode, "objectinfo" is gone. -Within .qpdf.objects, the key is "obj:o g R" or "trailer", and the +Within .objects, the key is "obj:o g R" or "trailer", and the value is a dictionary with exactly one of "value" or "stream" as its single key. @@ -222,11 +219,11 @@ for when the file is read back in. CLI: Example workflow: -* qpdf in.pdf --to-json > pdf.json +* qpdf in.pdf --json-output=2 pdf.json * edit pdf.json -* qpdf --create-from-json=pdf.json out.pdf +* qpdf --json-input pdf.json out.pdf -* qpdf in.pdf --to-json > pdf.json +* qpdf in.pdf --json-output=2 pdf.json * edit pdf.json keeping only objects that need to be changed * qpdf in.pdf --update-from-json=pdf.json out.pdf diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index 146015dc..fc515898 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -111,23 +111,38 @@ class QPDF processInputSource(std::shared_ptr, char const* password = 0); // Create a PDF from an input source that contains JSON as written - // by qpdf --json (version 2 or higher). The JSON must be a - // complete representation of a PDF. See "QPDF JSON Format" in the - // manual for details. + // by writeJSON (or qpdf --json-output, version 2 or higher). The + // JSON must be a complete representation of a PDF. See "QPDF JSON + // Format" in the manual for details. QPDF_DLL void createFromJSON(std::string const& json_file); QPDF_DLL void createFromJSON(std::shared_ptr); // Update a PDF from an input source that contains JSON in the - // same format as is written by qpdf --json (version 2 or higher). - // Objects in the PDF and not in the JSON are not modified. See - // "QPDF JSON Format" in the manual for details. + // same format as is written by writeJSON (or qpdf --json-output, + // version 2 or higher). Objects in the PDF and not in the JSON + // are not modified. See "QPDF JSON Format" in the manual for + // details. QPDF_DLL void updateFromJSON(std::string const& json_file); QPDF_DLL void updateFromJSON(std::shared_ptr); + // Write qpdf json format. The only supported version is 2. If + // wanted_objects is empty, write all objects. Otherwise, write + // only objects whose keys are in wanted_objects. Keys may be + // either "trailer" or of the form "obj:n n R". Invalid keys are + // ignored. + QPDF_DLL + void writeJSON( + int version, + Pipeline*, + qpdf_stream_decode_level_e, + qpdf_json_stream_data_e, + std::string const& file_prefix, + std::set wanted_objects); + // Close or otherwise release the input source. Once this has been // called, no other methods of qpdf can be called safely except // for getWarnings and anyWarnings(). After this has been called, @@ -1040,7 +1055,6 @@ class QPDF bool parse_error; bool saw_qpdf; bool saw_objects; - bool saw_json_version; bool saw_pdf_version; bool saw_trailer; state_e state; @@ -1571,6 +1585,23 @@ class QPDF // JSON import void importJSON(std::shared_ptr, bool must_be_complete); + // JSON write + void writeJSONStream( + int version, + Pipeline* p, + bool& first, + std::string const& key, + QPDFObjectHandle&, + qpdf_stream_decode_level_e, + qpdf_json_stream_data_e, + std::string const& file_prefix); + void writeJSONObject( + int version, + Pipeline* p, + bool& first, + std::string const& key, + QPDFObjectHandle&); + // Type conversion helper methods template static qpdf_offset_t diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh index a7d86337..b0a3c560 100644 --- a/include/qpdf/QPDFJob.hh +++ b/include/qpdf/QPDFJob.hh @@ -323,8 +323,6 @@ class QPDFJob Config* outputFile(std::string const& filename); QPDF_DLL Config* replaceInput(); - QPDF_DLL - Config* createFromJson(std::string const& filename); QPDF_DLL std::shared_ptr copyAttachmentsFrom(); @@ -455,7 +453,10 @@ class QPDFJob // Basic file processing std::shared_ptr processFile( - char const* filename, char const* password, bool used_for_input); + char const* filename, + char const* password, + bool used_for_input, + bool main_input); std::shared_ptr processInputSource( std::shared_ptr is, char const* password, @@ -464,12 +465,14 @@ class QPDFJob std::function fn, char const* password, bool empty, - bool used_for_input); + bool used_for_input, + bool main_input); std::shared_ptr doProcessOnce( std::function fn, char const* password, bool empty, - bool used_for_input); + bool used_for_input, + bool main_input); // Transformations void setQPDFOptions(QPDF& pdf); @@ -511,31 +514,21 @@ class QPDFJob void setEncryptionOptions(QPDF&, QPDFWriter&); void maybeFixWritePassword(int R, std::string& password); void writeOutfile(QPDF& pdf); + void writeJSON(QPDF& pdf); // JSON void doJSON(QPDF& pdf, Pipeline*); std::set getWantedJSONObjects(); + void doJSONObject( + Pipeline* p, bool& first, std::string const& key, QPDFObjectHandle&); void doJSONObjects(Pipeline* p, bool& first, QPDF& pdf); void doJSONObjectinfo(Pipeline* p, bool& first, QPDF& pdf); - void doJSONQpdf(Pipeline* p, bool& first, QPDF& pdf); void doJSONPages(Pipeline* p, bool& first, QPDF& pdf); void doJSONPageLabels(Pipeline* p, bool& first, QPDF& pdf); void doJSONOutlines(Pipeline* p, bool& first, QPDF& pdf); void doJSONAcroform(Pipeline* p, bool& first, QPDF& pdf); void doJSONEncrypt(Pipeline* p, bool& first, QPDF& pdf); void doJSONAttachments(Pipeline* p, bool& first, QPDF& pdf); - void doJSONStream( - Pipeline* p, - bool& first, - QPDF& pdf, - QPDFObjectHandle& obj, - std::string const& file_prefix); - void doJSONObject( - Pipeline* p, - bool& first, - QPDF& pdf, - std::string const& key, - QPDFObjectHandle& obj); void addOutlinesToJson( std::vector outlines, JSON& j, @@ -654,6 +647,7 @@ class QPDFJob std::set json_keys; std::set json_objects; qpdf_json_stream_data_e json_stream_data; + bool json_stream_data_set; std::string json_stream_prefix; bool test_json_schema; bool check; @@ -676,7 +670,8 @@ class QPDFJob bool check_requires_password; std::shared_ptr infilename; std::shared_ptr outfilename; - std::string create_from_json; + bool json_input; + int json_output; std::string update_from_json; }; std::shared_ptr m; diff --git a/include/qpdf/auto_job_c_main.hh b/include/qpdf/auto_job_c_main.hh index cc1bf469..0b2b559d 100644 --- a/include/qpdf/auto_job_c_main.hh +++ b/include/qpdf/auto_job_c_main.hh @@ -17,6 +17,7 @@ QPDF_DLL Config* flattenRotation(); QPDF_DLL Config* generateAppearances(); QPDF_DLL Config* ignoreXrefStreams(); QPDF_DLL Config* isEncrypted(); +QPDF_DLL Config* jsonInput(); QPDF_DLL Config* keepInlineImages(); QPDF_DLL Config* linearize(); QPDF_DLL Config* listAttachments(); @@ -44,7 +45,6 @@ QPDF_DLL Config* staticId(); QPDF_DLL Config* suppressPasswordRecovery(); QPDF_DLL Config* suppressRecovery(); QPDF_DLL Config* testJsonSchema(); -QPDF_DLL Config* toJson(); QPDF_DLL Config* verbose(); QPDF_DLL Config* warningExit0(); QPDF_DLL Config* withImages(); @@ -77,12 +77,13 @@ QPDF_DLL Config* compressStreams(std::string const& parameter); QPDF_DLL Config* decodeLevel(std::string const& parameter); QPDF_DLL Config* flattenAnnotations(std::string const& parameter); QPDF_DLL Config* jsonKey(std::string const& parameter); +QPDF_DLL Config* jsonOutput(std::string const& parameter); +QPDF_DLL Config* jsonStreamData(std::string const& parameter); QPDF_DLL Config* keepFilesOpen(std::string const& parameter); QPDF_DLL Config* normalizeContent(std::string const& parameter); QPDF_DLL Config* objectStreams(std::string const& parameter); QPDF_DLL Config* passwordMode(std::string const& parameter); QPDF_DLL Config* removeUnreferencedResources(std::string const& parameter); QPDF_DLL Config* streamData(std::string const& parameter); -QPDF_DLL Config* jsonStreamData(std::string const& parameter); QPDF_DLL Config* json(std::string const& parameter); QPDF_DLL Config* json(); diff --git a/job.sums b/job.sums index 3814155a..5cb04368 100644 --- a/job.sums +++ b/job.sums @@ -3,15 +3,15 @@ generate_auto_job 0514289f2deb3bf7c1a6e85ef7d99ad120321ef5a6fe49d76c5274c6a658d3 include/qpdf/auto_job_c_att.hh 4c2b171ea00531db54720bf49a43f8b34481586ae7fb6cbf225099ee42bc5bb4 include/qpdf/auto_job_c_copy_att.hh 50609012bff14fd82f0649185940d617d05d530cdc522185c7f3920a561ccb42 include/qpdf/auto_job_c_enc.hh 28446f3c32153a52afa239ea40503e6cc8ac2c026813526a349e0cd4ae17ddd5 -include/qpdf/auto_job_c_main.hh 178a0c98c80d53036910ec67165dbc3902aa8da857de8a0df52911f005918c54 +include/qpdf/auto_job_c_main.hh c21395ba79b98b3054f6d73266285d216b77568ea55ca7149d3e6a157604d682 include/qpdf/auto_job_c_pages.hh b3cc0f21029f6d89efa043dcdbfa183cb59325b6506001c18911614fe8e568ec include/qpdf/auto_job_c_uo.hh ae21b69a1efa9333050f4833d465f6daff87e5b38e5106e49bbef5d4132e4ed1 -job.yml a95b2446066293f409b36032a0ee411dbe570a7a94f5fd295048d009215f993f -libqpdf/qpdf/auto_job_decl.hh 833bde9c1f8fc17b914f16498e26d9d1315361645b4ac5c50c1f830a76618ca7 -libqpdf/qpdf/auto_job_help.hh 38bf89067ca7dc244e4e697c598ba0ba8a827600a78b9195fc69f0ac1663f3a2 -libqpdf/qpdf/auto_job_init.hh f0ffab312430b232a7288b8443382ed859021e6ad6ed2c8c9a4dbbd2b33e2aa7 -libqpdf/qpdf/auto_job_json_decl.hh 81d09d4b82b2e042a64246ed1d7a187bdc83b671b45e7b8ee60ad37c0c11e9a7 -libqpdf/qpdf/auto_job_json_init.hh 2fcdae08365abe351d2dfb6a823e2b3af27a6510632de23cabef6cefa5dfb199 -libqpdf/qpdf/auto_job_schema.hh 1a80be3b8d97e9b5a55b8aa45a4b312668b1687eab6f038c4ee5f4662ab71997 +job.yml feae32412cc75f84fb9ff7521121466f9582e85547f45613c3a7083a929f01e6 +libqpdf/qpdf/auto_job_decl.hh 74df4d7fdbdf51ecd0d58ce1e9844bb5525b9adac5a45f7c9a787ecdda2868df +libqpdf/qpdf/auto_job_help.hh 5ca1d2b73f6a70f1ef47896b49553ae8ded4a6459bbb1f6697947e2cc598d799 +libqpdf/qpdf/auto_job_init.hh 3acc779ff96bde839c8c95a844145df830c53ee58fbf61b8ce056a1751bc11f2 +libqpdf/qpdf/auto_job_json_decl.hh 06caa46eaf71db8a50c046f91866baa8087745a9474319fb7c86d92634cc8297 +libqpdf/qpdf/auto_job_json_init.hh 0441fd710ded1512a84976b542910fec16e8b9ab665e5efb5b37c5a29fd8654f +libqpdf/qpdf/auto_job_schema.hh 9d543cd4a43eafffc2c4b8a6fee29e399c271c52cb6f7d417ae5497b3c1127dc manual/_ext/qpdf.py 6add6321666031d55ed4aedf7c00e5662bba856dfcd66ccb526563bffefbb580 -manual/cli.rst 4550dd1b459721d8ef9affa7c9c07f351a06379498ec1291f702f1a5994b6d84 +manual/cli.rst 3d133669f2b1f845bbc09e51e5b6fff6dd8803282b71aff0db2c55878b1ec508 diff --git a/job.yml b/job.yml index b4fb7370..20e87ad7 100644 --- a/job.yml +++ b/job.yml @@ -36,10 +36,6 @@ choices: - all - print - screen - json_version: - - 1 - - 2 - - latest json_key: # The list of selectable top-level keys id duplicated in the # following places: job.yml, QPDFJob::json_schema, and @@ -48,15 +44,21 @@ choices: - attachments - encrypt - objectinfo # only v1 - - objects # only v1 + - objects - outlines - pagelabels - pages - - qpdf # only v2 + json_output: + - 2 + - latest json_stream_data: - none - inline - file + json_version: + - 1 + - 2 + - latest print128: - full - low @@ -86,7 +88,6 @@ options: - underlay - empty - replace-input - - create-from-json positional: true bare: - add-attachment @@ -105,6 +106,7 @@ options: - generate-appearances - ignore-xref-streams - is-encrypted + - json-input - keep-inline-images - linearize - list-attachments @@ -135,7 +137,6 @@ options: - suppress-password-recovery - suppress-recovery - test-json-schema - - to-json - underlay - verbose - warning-exit-0 @@ -164,20 +165,20 @@ options: show-attachment: attachment show-object: trailer json-stream-prefix: stream-file-prefix - create-from-json: qpdf-json file update-from-json: qpdf-json file required_choices: compress-streams: yn decode-level: decode_level flatten-annotations: flatten json-key: json_key + json-output: json_output + json-stream-data: json_stream_data keep-files-open: yn normalize-content: yn object-streams: object_streams password-mode: password_mode remove-unreferenced-resources: remove_unref stream-data: stream_data - json-stream-data: json_stream_data optional_choices: json: json_version - table: pages @@ -281,7 +282,7 @@ json: main.password: password-file: empty: - create-from-json: + json-input: # output _outputFile: "output filename" replace-input: @@ -308,6 +309,7 @@ json: force-version: progress: split-pages: + json-output: encrypt: _user-password: "user password" _owner-password: "owner password" @@ -362,7 +364,6 @@ json: - null json-stream-data: json-stream-prefix: - to-json: # other options update-from-json: allow-weak-crypto: diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 41e57c58..3190e39f 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -402,6 +402,7 @@ QPDFJob::Members::Members() : list_attachments(false), json_version(0), json_stream_data(qpdf_sj_none), + json_stream_data_set(false), test_json_schema(false), check(false), optimize_images(false), @@ -418,7 +419,9 @@ QPDFJob::Members::Members() : require_outfile(true), replace_input(false), check_is_encrypted(false), - check_requires_password(false) + check_requires_password(false), + json_input(false), + json_output(0) { } @@ -533,7 +536,8 @@ QPDFJob::run() checkConfiguration(); std::shared_ptr pdf_ph; try { - pdf_ph = processFile(m->infilename.get(), m->password.get(), true); + pdf_ph = + processFile(m->infilename.get(), m->password.get(), true, true); } catch (QPDFExc& e) { if ((e.getErrorCode() == qpdf_e_password) && (m->check_is_encrypted || m->check_requires_password)) { @@ -704,15 +708,8 @@ QPDFJob::checkConfiguration() " overwrite the input file"); } - if (m->json_version == 1) { - if (m->json_keys.count("qpdf")) { - usage("json key \"qpdf\" is not valid for json version 1"); - } - } else { - if (m->json_keys.count("objects") || m->json_keys.count("objectinfo")) { - usage("json keys \"objects\" and \"objectinfo\" are only valid for " - "json version 1"); - } + if (m->json_keys.count("objectinfo")) { + usage("json key \"objectinfo\" is only valid for json version 1"); } } @@ -1060,6 +1057,26 @@ QPDFJob::getWantedJSONObjects() return wanted_og; } +void +QPDFJob::doJSONObject( + Pipeline* p, bool& first, std::string const& key, QPDFObjectHandle& obj) +{ + if (this->m->json_version == 1) { + JSON::writeDictionaryItem(p, first, key, obj.getJSON(1, true), 1); + } else { + auto j = JSON::makeDictionary(); + if (obj.isStream()) { + j.addDictionaryMember("stream", JSON::makeDictionary()) + .addDictionaryMember( + "dict", obj.getDict().getJSON(this->m->json_version, true)); + } else { + j.addDictionaryMember( + "value", obj.getJSON(this->m->json_version, true)); + } + JSON::writeDictionaryItem(p, first, key, j, 1); + } +} + void QPDFJob::doJSONObjects(Pipeline* p, bool& first, QPDF& pdf) { @@ -1070,22 +1087,17 @@ QPDFJob::doJSONObjects(Pipeline* p, bool& first, QPDF& pdf) std::set wanted_og = getWantedJSONObjects(); std::vector objects = pdf.getAllObjects(); for (auto& obj: objects) { + std::string key = obj.unparse(); + if (this->m->json_version > 1) { + key = "obj:" + key; + } if (all_objects || wanted_og.count(obj.getObjGen())) { - JSON::writeDictionaryItem( - p, - first_object, - obj.unparse(), - obj.getJSON(this->m->json_version, true), - 1); + doJSONObject(p, first_object, key, obj); } } if (all_objects || m->json_objects.count("trailer")) { - JSON::writeDictionaryItem( - p, - first_object, - "trailer", - pdf.getTrailer().getJSON(this->m->json_version, true), - 1); + auto trailer = pdf.getTrailer(); + doJSONObject(p, first_object, "trailer", trailer); } JSON::writeDictionaryClose(p, first_object, 1); } @@ -1122,108 +1134,6 @@ QPDFJob::doJSONObjectinfo(Pipeline* p, bool& first, QPDF& pdf) JSON::writeDictionaryClose(p, first_object, 1); } -void -QPDFJob::doJSONStream( - Pipeline* p, - bool& first, - QPDF& pdf, - QPDFObjectHandle& obj, - std::string const& file_prefix) -{ - Pipeline* stream_p = nullptr; - FILE* f = nullptr; - std::shared_ptr f_pl; - std::string filename; - if (this->m->json_stream_data == qpdf_sj_file) { - filename = file_prefix + "-" + QUtil::int_to_string(obj.getObjectID()); - f = QUtil::safe_fopen(filename.c_str(), "wb"); - f_pl = std::make_shared("stream data", f); - stream_p = f_pl.get(); - } - auto j = JSON::makeDictionary(); - j.addDictionaryMember( - "stream", - obj.getStreamJSON( - this->m->json_version, - this->m->json_stream_data, - this->m->decode_level, - stream_p, - filename)); - - JSON::writeDictionaryItem(p, first, "obj:" + obj.unparse(), j, 2); - if (f) { - f_pl->finish(); - f_pl = nullptr; - fclose(f); - } -} - -void -QPDFJob::doJSONObject( - Pipeline* p, - bool& first, - QPDF& pdf, - std::string const& key, - QPDFObjectHandle& obj) -{ - auto j = JSON::makeDictionary(); - j.addDictionaryMember("value", obj.getJSON(this->m->json_version, true)); - JSON::writeDictionaryItem(p, first, key, j, 2); -} - -void -QPDFJob::doJSONQpdf(Pipeline* p, bool& first, QPDF& pdf) -{ - std::string file_prefix = this->m->json_stream_prefix; - if (this->m->json_stream_data == qpdf_sj_file) { - if (file_prefix.empty()) { - if (this->m->infilename.get()) { - file_prefix = this->m->infilename.get(); - } - if (file_prefix.empty()) { - usage( - "please specify --json-stream-prefix since the input file " - "name is unknown"); - } - } - } - - JSON::writeDictionaryKey(p, first, "qpdf", 0); - bool first_qpdf = true; - JSON::writeDictionaryOpen(p, first_qpdf, 1); - JSON::writeDictionaryItem( - p, first_qpdf, "jsonversion", JSON::makeInt(this->m->json_version), 1); - JSON::writeDictionaryItem( - p, first_qpdf, "pdfversion", JSON::makeString(pdf.getPDFVersion()), 1); - JSON::writeDictionaryItem( - p, - first_qpdf, - "maxobjectid", - JSON::makeInt(QIntC::to_longlong(pdf.getObjectCount())), - 1); - JSON::writeDictionaryKey(p, first_qpdf, "objects", 1); - bool first_object = true; - JSON::writeDictionaryOpen(p, first_object, 2); - bool all_objects = m->json_objects.empty(); - std::set wanted_og = getWantedJSONObjects(); - std::vector objects = pdf.getAllObjects(); - for (auto& obj: objects) { - if (all_objects || wanted_og.count(obj.getObjGen())) { - if (obj.isStream()) { - doJSONStream(p, first_object, pdf, obj, file_prefix); - } else { - doJSONObject(p, first_object, pdf, "obj:" + obj.unparse(), obj); - } - } - } - if (all_objects || m->json_objects.count("trailer")) { - auto trailer = pdf.getTrailer(); - doJSONObject(p, first_object, pdf, "trailer", trailer); - } - JSON::writeDictionaryClose(p, first_object, 2); - JSON::writeDictionaryClose(p, first_qpdf, 1); -} - void QPDFJob::doJSONPages(Pipeline* p, bool& first, QPDF& pdf) { @@ -1603,12 +1513,12 @@ QPDFJob::json_schema(int json_version, std::set* keys) // The list of selectable top-level keys id duplicated in the // following places: job.yml, QPDFJob::json_schema, and // QPDFJob::doJSON. - if (json_version == 1) { - if (all_keys || keys->count("objects")) { - schema.addDictionaryMember("objects", JSON::parse(R"({ + if (all_keys || keys->count("objects")) { + schema.addDictionaryMember("objects", JSON::parse(R"({ "": "json representation of object" })")); - } + } + if (json_version == 1) { if (all_keys || keys->count("objectinfo")) { JSON objectinfo = schema.addDictionaryMember("objectinfo", JSON::parse(R"({ @@ -1619,17 +1529,6 @@ QPDFJob::json_schema(int json_version, std::set* keys) "length": "if stream, its length, otherwise null" } } -})")); - } - } else { - if (all_keys || keys->count("qpdf")) { - schema.addDictionaryMember("qpdf", JSON::parse(R"({ - "jsonversion": "qpdf json output version", - "pdfversion": "PDF version from PDF header", - "maxobjectid": "Highest object ID; needed for adding new objects", - "objects": { - "": "json representation of object" - } })")); } } @@ -1843,17 +1742,15 @@ QPDFJob::doJSON(QPDF& pdf, Pipeline* p) // repairing the page tree. To see the original file with any page // tree problems and the page tree not flattened, select // objects/objectinfo without other keys. + if (all_keys || m->json_keys.count("objects")) { + doJSONObjects(p, first, pdf); + } if (this->m->json_version == 1) { - if (all_keys || m->json_keys.count("objects")) { - doJSONObjects(p, first, pdf); - } + // "objectinfo" is not needed for version >1 since you can + // tell streams from other objects in "objects". if (all_keys || m->json_keys.count("objectinfo")) { doJSONObjectinfo(p, first, pdf); } - } else { - if (all_keys || m->json_keys.count("qpdf")) { - doJSONQpdf(p, first, pdf); - } } JSON::writeDictionaryClose(p, first, 0); @@ -1939,16 +1836,15 @@ QPDFJob::doProcessOnce( std::function fn, char const* password, bool empty, - bool used_for_input) + bool used_for_input, + bool main_input) { auto pdf = std::make_shared(); setQPDFOptions(*pdf); if (empty) { - if (!this->m->create_from_json.empty()) { - pdf->createFromJSON(this->m->create_from_json); - } else { - pdf->emptyPDF(); - } + pdf->emptyPDF(); + } else if (main_input && this->m->json_input) { + pdf->createFromJSON(this->m->infilename.get()); } else { fn(pdf.get(), password); } @@ -1964,7 +1860,8 @@ QPDFJob::doProcess( std::function fn, char const* password, bool empty, - bool used_for_input) + bool used_for_input, + bool main_input) { // If a password has been specified but doesn't work, try other // passwords that are equivalent in different character encodings. @@ -1990,7 +1887,7 @@ QPDFJob::doProcess( m->suppress_password_recovery) { // There is no password, or we're not doing recovery, so just // do the normal processing with the supplied password. - return doProcessOnce(fn, password, empty, used_for_input); + return doProcessOnce(fn, password, empty, used_for_input, main_input); } // Get a list of otherwise encoded strings. Keep in scope for this @@ -2018,7 +1915,7 @@ QPDFJob::doProcess( bool warned = false; for (auto iter = passwords.begin(); iter != passwords.end(); ++iter) { try { - return doProcessOnce(fn, *iter, empty, used_for_input); + return doProcessOnce(fn, *iter, empty, used_for_input, main_input); } catch (QPDFExc& e) { auto next = iter; ++next; @@ -2042,12 +1939,16 @@ QPDFJob::doProcess( std::shared_ptr QPDFJob::processFile( - char const* filename, char const* password, bool used_for_input) + char const* filename, + char const* password, + bool used_for_input, + bool main_input) { auto f1 = std::mem_fn(&QPDF::processFile); auto fn = std::bind(f1, std::placeholders::_1, filename, std::placeholders::_2); - return doProcess(fn, password, strcmp(filename, "") == 0, used_for_input); + return doProcess( + fn, password, strcmp(filename, "") == 0, used_for_input, main_input); } std::shared_ptr @@ -2056,7 +1957,7 @@ QPDFJob::processInputSource( { auto f1 = std::mem_fn(&QPDF::processInputSource); auto fn = std::bind(f1, std::placeholders::_1, is, std::placeholders::_2); - return doProcess(fn, password, false, used_for_input); + return doProcess(fn, password, false, used_for_input, false); } void @@ -2067,7 +1968,8 @@ QPDFJob::validateUnderOverlay(QPDF& pdf, UnderOverlay* uo) } QPDFPageDocumentHelper main_pdh(pdf); int main_npages = QIntC::to_int(main_pdh.getAllPages().size()); - uo->pdf = processFile(uo->filename.c_str(), uo->password.get(), true); + uo->pdf = + processFile(uo->filename.c_str(), uo->password.get(), true, false); QPDFPageDocumentHelper uo_pdh(*(uo->pdf)); int uo_npages = QIntC::to_int(uo_pdh.getAllPages().size()); try { @@ -2324,8 +2226,8 @@ QPDFJob::copyAttachments(QPDF& pdf) cout << prefix << ": copying attachments from " << to_copy.path << std::endl; }); - auto other = - processFile(to_copy.path.c_str(), to_copy.password.c_str(), false); + auto other = processFile( + to_copy.path.c_str(), to_copy.password.c_str(), false, false); QPDFEmbeddedFileDocumentHelper other_efdh(*other); auto other_attachments = other_efdh.getEmbeddedFiles(); for (auto const& iter: other_attachments) { @@ -3176,6 +3078,7 @@ QPDFJob::setWriterOptions(QPDF& pdf, QPDFWriter& w) std::shared_ptr encryption_pdf = processFile( m->encryption_file.c_str(), m->encryption_file_password.get(), + false, false); w.copyEncryptionParameters(*encryption_pdf); } @@ -3332,10 +3235,13 @@ QPDFJob::writeOutfile(QPDF& pdf) // goes out of scope. m->outfilename = temp_out; } else if (strcmp(m->outfilename.get(), "-") == 0) { - m->outfilename = 0; + m->outfilename = nullptr; } - { - // Private scope so QPDFWriter will close the output file + if (this->m->json_output) { + writeJSON(pdf); + } else { + // QPDFWriter must have block scope so the output file will be + // closed after write() finishes. QPDFWriter w(pdf, m->outfilename.get()); setWriterOptions(pdf, w); w.write(); @@ -3375,3 +3281,47 @@ QPDFJob::writeOutfile(QPDF& pdf) } } } + +void +QPDFJob::writeJSON(QPDF& pdf) +{ + // File pipeline must have block scope so it will be closed + // after write. + std::shared_ptr fc; + std::shared_ptr fp; + std::string file_prefix = this->m->json_stream_prefix; + if (m->outfilename.get()) { + QTC::TC("qpdf", "QPDFJob write json to file"); + if (file_prefix.empty()) { + file_prefix = this->m->outfilename.get(); + } + fc = std::make_shared( + QUtil::safe_fopen(this->m->outfilename.get(), "w")); + fp = std::make_shared("json output", fc->f); + } else if ( + (this->m->json_stream_data == qpdf_sj_file) && file_prefix.empty()) { + QTC::TC("qpdf", "QPDFJob need json-stream-prefix for stdout"); + usage("please specify --json-stream-prefix since the input file " + "name is unknown"); + } else { + QTC::TC("qpdf", "QPDFJob write json to stdout"); + fp = std::make_shared("json output", *this->m->cout); + } + std::set json_objects; + if (this->m->json_objects.count("trailer")) { + json_objects.insert("trailer"); + } + auto wanted = getWantedJSONObjects(); + for (auto const& og: wanted) { + std::ostringstream s; + s << "obj:" << og.getObj() << " " << og.getGen() << " R"; + json_objects.insert(s.str()); + } + pdf.writeJSON( + this->m->json_output, + fp.get(), + this->m->decode_level, + this->m->json_stream_data, + file_prefix, + json_objects); +} diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index 3058d166..a6fb5df7 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -100,13 +100,6 @@ ArgParser::argReplaceInput() this->gave_output = true; } -void -ArgParser::argCreateFromJson(std::string const& arg) -{ - c_main->createFromJson(arg); - this->gave_input = true; -} - void ArgParser::argVersion() { diff --git a/libqpdf/QPDFJob_config.cc b/libqpdf/QPDFJob_config.cc index 1aa680e8..ecdeafe3 100644 --- a/libqpdf/QPDFJob_config.cc +++ b/libqpdf/QPDFJob_config.cc @@ -27,8 +27,7 @@ QPDFJob::Config::emptyInput() // Various places in QPDFJob.cc know that the empty string for // infile means empty. We set it to something other than a // null pointer as an indication that some input source has - // been specified. The --create-from-json option also sets - // infilename to empty. This approach means that passing "" as + // been specified. This approach means that passing "" as // the argument to inputFile in job JSON, or equivalently // using "" as a positional command-line argument would be the // same as --empty. This probably isn't worth blocking or @@ -265,6 +264,7 @@ QPDFJob::Config::jsonObject(std::string const& parameter) QPDFJob::Config* QPDFJob::Config::jsonStreamData(std::string const& parameter) { + o.m->json_stream_data_set = true; if (parameter == "none") { o.m->json_stream_data = qpdf_sj_none; } else if (parameter == "inline") { @@ -286,22 +286,28 @@ QPDFJob::Config::jsonStreamPrefix(std::string const& parameter) } QPDFJob::Config* -QPDFJob::Config::toJson() +QPDFJob::Config::jsonInput() { - json("latest"); - jsonStreamData("inline"); - jsonKey("qpdf"); - decodeLevel("none"); + o.m->json_input = true; return this; } QPDFJob::Config* -QPDFJob::Config::createFromJson(std::string const& parameter) +QPDFJob::Config::jsonOutput(std::string const& parameter) { - // See comments in emptyInput() about setting infilename to the - // empty string. - o.m->infilename = QUtil::make_shared_cstr(""); - o.m->create_from_json = parameter; + std::string v = parameter; + if (parameter == "latest") { + v = "2"; + } + if (v != "2") { + usage("only version 2 is supported for --json-output"); + } + o.m->json_output = QUtil::string_to_int(v.c_str()); + if (!o.m->json_stream_data_set) { + // No need to set json_stream_data_set -- that indicates + // explicit use of --json-stream-data. + o.m->json_stream_data = qpdf_sj_inline; + } return this; } diff --git a/libqpdf/QPDFJob_json.cc b/libqpdf/QPDFJob_json.cc index 9538153a..fcdeb666 100644 --- a/libqpdf/QPDFJob_json.cc +++ b/libqpdf/QPDFJob_json.cc @@ -250,12 +250,6 @@ Handlers::setupEmpty() addBare([this]() { c_main->emptyInput(); }); } -void -Handlers::setupCreateFromJson() -{ - addParameter([this](char const* p) { c_main->createFromJson(p); }); -} - void Handlers::setupOutputFile() { diff --git a/libqpdf/QPDF_json.cc b/libqpdf/QPDF_json.cc index 1037a2cf..c421ce41 100644 --- a/libqpdf/QPDF_json.cc +++ b/libqpdf/QPDF_json.cc @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -13,7 +14,7 @@ // | st_initial // { | -> st_top -// "qpdf": { | -> st_qpdf +// "qpdf-v2": { | -> st_qpdf // "objects": { | -> st_objects // "obj:1 0 R": { | -> st_object_top // "value": { | -> st_object @@ -93,7 +94,6 @@ QPDF::JSONReactor::JSONReactor( parse_error(false), saw_qpdf(false), saw_objects(false), - saw_json_version(false), saw_pdf_version(false), saw_trailer(false), state(st_initial), @@ -154,21 +154,17 @@ QPDF::JSONReactor::containerEnd(JSON const& value) QTC::TC("qpdf", "QPDF_json missing qpdf"); error(0, "\"qpdf\" object was not seen"); } else { - if (!this->saw_json_version) { - QTC::TC("qpdf", "QPDF_json missing json version"); - error(0, "\"qpdf.jsonversion\" was not seen"); - } if (must_be_complete && !this->saw_pdf_version) { QTC::TC("qpdf", "QPDF_json missing pdf version"); - error(0, "\"qpdf.pdfversion\" was not seen"); + error(0, "\"qpdf-v2.pdfversion\" was not seen"); } if (!this->saw_objects) { QTC::TC("qpdf", "QPDF_json missing objects"); - error(0, "\"qpdf.objects\" was not seen"); + error(0, "\"qpdf-v2.objects\" was not seen"); } else { if (must_be_complete && !this->saw_trailer) { QTC::TC("qpdf", "QPDF_json missing trailer"); - error(0, "\"qpdf.objects.trailer\" was not seen"); + error(0, "\"qpdf-v2.objects.trailer\" was not seen"); } } } @@ -279,7 +275,7 @@ QPDF::JSONReactor::dictionaryItem(std::string const& key, JSON const& value) QTC::TC("qpdf", "QPDF_json ignoring in st_ignore"); // ignore } else if (state == st_top) { - if (key == "qpdf") { + if (key == "qpdf-v2") { this->saw_qpdf = true; nestedState(key, value, st_qpdf); } else { @@ -289,14 +285,7 @@ QPDF::JSONReactor::dictionaryItem(std::string const& key, JSON const& value) next_state = st_ignore; } } else if (state == st_qpdf) { - if (key == "jsonversion") { - this->saw_json_version = true; - std::string v; - if (!(value.getNumber(v) && (v == "2"))) { - QTC::TC("qpdf", "QPDF_json bad json version"); - error(value.getStart(), "only JSON version 2 is supported"); - } - } else if (key == "pdfversion") { + if (key == "pdfversion") { this->saw_pdf_version = true; bool version_okay = false; std::string v; @@ -567,3 +556,110 @@ QPDF::importJSON(std::shared_ptr is, bool must_be_complete) // std::cout << oh.unparseResolved() << std::endl; // } } + +void +QPDF::writeJSONStream( + int version, + Pipeline* p, + bool& first, + std::string const& key, + QPDFObjectHandle& obj, + qpdf_stream_decode_level_e decode_level, + qpdf_json_stream_data_e json_stream_data, + std::string const& file_prefix) +{ + Pipeline* stream_p = nullptr; + FILE* f = nullptr; + std::shared_ptr f_pl; + std::string filename; + if (json_stream_data == qpdf_sj_file) { + filename = file_prefix + "-" + QUtil::int_to_string(obj.getObjectID()); + f = QUtil::safe_fopen(filename.c_str(), "wb"); + f_pl = std::make_shared("stream data", f); + stream_p = f_pl.get(); + } + auto j = JSON::makeDictionary(); + j.addDictionaryMember( + "stream", + obj.getStreamJSON( + version, json_stream_data, decode_level, stream_p, filename)); + + JSON::writeDictionaryItem(p, first, key, j, 2); + if (f) { + f_pl->finish(); + f_pl = nullptr; + fclose(f); + } +} + +void +QPDF::writeJSONObject( + int version, + Pipeline* p, + bool& first, + std::string const& key, + QPDFObjectHandle& obj) +{ + auto j = JSON::makeDictionary(); + j.addDictionaryMember("value", obj.getJSON(version, true)); + JSON::writeDictionaryItem(p, first, key, j, 2); +} + +void +QPDF::writeJSON( + int version, + Pipeline* p, + qpdf_stream_decode_level_e decode_level, + qpdf_json_stream_data_e json_stream_data, + std::string const& file_prefix, + std::set wanted_objects) +{ + if (version != 2) { + throw std::runtime_error( + "QPDF::writeJSON: only version 2 is supported"); + } + bool first = true; + JSON::writeDictionaryOpen(p, first, 0); + JSON::writeDictionaryKey(p, first, "qpdf-v2", 0); + bool first_qpdf = true; + JSON::writeDictionaryOpen(p, first_qpdf, 1); + JSON::writeDictionaryItem( + p, first_qpdf, "pdfversion", JSON::makeString(getPDFVersion()), 1); + JSON::writeDictionaryItem( + p, + first_qpdf, + "maxobjectid", + JSON::makeInt(QIntC::to_longlong(getObjectCount())), + 1); + JSON::writeDictionaryKey(p, first_qpdf, "objects", 1); + bool first_object = true; + JSON::writeDictionaryOpen(p, first_object, 2); + bool all_objects = wanted_objects.empty(); + std::vector objects = getAllObjects(); + for (auto& obj: objects) { + std::string key = "obj:" + obj.unparse(); + if (all_objects || wanted_objects.count(key)) { + if (obj.isStream()) { + writeJSONStream( + version, + p, + first_object, + key, + obj, + decode_level, + json_stream_data, + file_prefix); + } else { + writeJSONObject(version, p, first_object, key, obj); + } + } + } + if (all_objects || wanted_objects.count("trailer")) { + auto trailer = getTrailer(); + writeJSONObject(version, p, first_object, "trailer", trailer); + } + JSON::writeDictionaryClose(p, first_object, 2); + JSON::writeDictionaryClose(p, first_qpdf, 1); + JSON::writeDictionaryClose(p, first, 0); + *p << "\n"; +} diff --git a/libqpdf/qpdf/auto_job_decl.hh b/libqpdf/qpdf/auto_job_decl.hh index 8c656986..02f0ca91 100644 --- a/libqpdf/qpdf/auto_job_decl.hh +++ b/libqpdf/qpdf/auto_job_decl.hh @@ -28,7 +28,6 @@ void argOverlay(); void argPages(); void argReplaceInput(); void argUnderlay(); -void argCreateFromJson(std::string const&); void argPagesPositional(std::string const&); void argPagesPassword(std::string const&); void argEndPages(); diff --git a/libqpdf/qpdf/auto_job_help.hh b/libqpdf/qpdf/auto_job_help.hh index e17412d0..7d88155b 100644 --- a/libqpdf/qpdf/auto_job_help.hh +++ b/libqpdf/qpdf/auto_job_help.hh @@ -798,10 +798,6 @@ depth in the JSON section of the manual. "version" may be a specific version or "latest". Run qpdf --json-help for a description of the generated JSON object. )"); -ap.addOptionHelp("--to-json", "json", "serialize to JSON", R"(Shortcut for options useful for serializing PDF to JSON: ---json=latest --json-stream-data=inline - --json-key=qpdf --decode-level=none -)"); ap.addOptionHelp("--json-help", "json", "show format of JSON output", R"(Describe the format of the JSON output by writing to standard output a JSON object with the same keys and with values containing descriptive text. @@ -836,11 +832,16 @@ name as the prefix for stream data files. Whatever is given here will be appended with -nnn to create the name of the file that will contain the data for the stream stream in object nnn. )"); -ap.addOptionHelp("--create-from-json", "json", "create PDF from qpdf JSON", R"(--create-from-json=qpdf-json-file +ap.addOptionHelp("--json-output", "json", "serialize to JSON", R"(--json-output=version -Create a PDF file from the prior output of qpdf --json. See the -"QPDF JSON Format" section of the manual for information about -how to use this option. +The output file will be qpdf JSON format at the given version. +Only version 2 is supported. See also --json-stream-data +and --json-stream-prefix +)"); +ap.addOptionHelp("--json-input", "json", "input file is qpdf JSON", R"(Treat the input file as a JSON file in qpdf JSON format as +written by qpdf --json-output. See the "QPDF JSON Format" +section of the manual for information about how to use this +option. )"); ap.addOptionHelp("--update-from-json", "json", "update a PDF from qpdf JSON", R"(--update-from-json=qpdf-json-file diff --git a/libqpdf/qpdf/auto_job_init.hh b/libqpdf/qpdf/auto_job_init.hh index 9446811f..f582c6ec 100644 --- a/libqpdf/qpdf/auto_job_init.hh +++ b/libqpdf/qpdf/auto_job_init.hh @@ -19,9 +19,10 @@ static char const* decode_level_choices[] = {"none", "generalized", "specialized static char const* object_streams_choices[] = {"disable", "preserve", "generate", 0}; static char const* remove_unref_choices[] = {"auto", "yes", "no", 0}; static char const* flatten_choices[] = {"all", "print", "screen", 0}; -static char const* json_version_choices[] = {"1", "2", "latest", 0}; -static char const* json_key_choices[] = {"acroform", "attachments", "encrypt", "objectinfo", "objects", "outlines", "pagelabels", "pages", "qpdf", 0}; +static char const* json_key_choices[] = {"acroform", "attachments", "encrypt", "objectinfo", "objects", "outlines", "pagelabels", "pages", 0}; +static char const* json_output_choices[] = {"2", "latest", 0}; static char const* json_stream_data_choices[] = {"none", "inline", "file", 0}; +static char const* json_version_choices[] = {"1", "2", "latest", 0}; static char const* print128_choices[] = {"full", "low", "none", 0}; static char const* modify128_choices[] = {"all", "annotate", "form", "assembly", "none", 0}; @@ -49,6 +50,7 @@ this->ap.addBare("flatten-rotation", [this](){c_main->flattenRotation();}); this->ap.addBare("generate-appearances", [this](){c_main->generateAppearances();}); this->ap.addBare("ignore-xref-streams", [this](){c_main->ignoreXrefStreams();}); this->ap.addBare("is-encrypted", [this](){c_main->isEncrypted();}); +this->ap.addBare("json-input", [this](){c_main->jsonInput();}); this->ap.addBare("keep-inline-images", [this](){c_main->keepInlineImages();}); this->ap.addBare("linearize", [this](){c_main->linearize();}); this->ap.addBare("list-attachments", [this](){c_main->listAttachments();}); @@ -79,7 +81,6 @@ this->ap.addBare("static-id", [this](){c_main->staticId();}); this->ap.addBare("suppress-password-recovery", [this](){c_main->suppressPasswordRecovery();}); this->ap.addBare("suppress-recovery", [this](){c_main->suppressRecovery();}); this->ap.addBare("test-json-schema", [this](){c_main->testJsonSchema();}); -this->ap.addBare("to-json", [this](){c_main->toJson();}); this->ap.addBare("underlay", b(&ArgParser::argUnderlay)); this->ap.addBare("verbose", [this](){c_main->verbose();}); this->ap.addBare("warning-exit-0", [this](){c_main->warningExit0();}); @@ -104,7 +105,6 @@ this->ap.addRequiredParameter("rotate", [this](std::string const& x){c_main->rot this->ap.addRequiredParameter("show-attachment", [this](std::string const& x){c_main->showAttachment(x);}, "attachment"); this->ap.addRequiredParameter("show-object", [this](std::string const& x){c_main->showObject(x);}, "trailer"); this->ap.addRequiredParameter("json-stream-prefix", [this](std::string const& x){c_main->jsonStreamPrefix(x);}, "stream-file-prefix"); -this->ap.addRequiredParameter("create-from-json", p(&ArgParser::argCreateFromJson), "qpdf-json file"); this->ap.addRequiredParameter("update-from-json", [this](std::string const& x){c_main->updateFromJson(x);}, "qpdf-json file"); this->ap.addOptionalParameter("collate", [this](std::string const& x){c_main->collate(x);}); this->ap.addOptionalParameter("split-pages", [this](std::string const& x){c_main->splitPages(x);}); @@ -112,13 +112,14 @@ this->ap.addChoices("compress-streams", [this](std::string const& x){c_main->com this->ap.addChoices("decode-level", [this](std::string const& x){c_main->decodeLevel(x);}, true, decode_level_choices); this->ap.addChoices("flatten-annotations", [this](std::string const& x){c_main->flattenAnnotations(x);}, true, flatten_choices); this->ap.addChoices("json-key", [this](std::string const& x){c_main->jsonKey(x);}, true, json_key_choices); +this->ap.addChoices("json-output", [this](std::string const& x){c_main->jsonOutput(x);}, true, json_output_choices); +this->ap.addChoices("json-stream-data", [this](std::string const& x){c_main->jsonStreamData(x);}, true, json_stream_data_choices); this->ap.addChoices("keep-files-open", [this](std::string const& x){c_main->keepFilesOpen(x);}, true, yn_choices); this->ap.addChoices("normalize-content", [this](std::string const& x){c_main->normalizeContent(x);}, true, yn_choices); this->ap.addChoices("object-streams", [this](std::string const& x){c_main->objectStreams(x);}, true, object_streams_choices); this->ap.addChoices("password-mode", [this](std::string const& x){c_main->passwordMode(x);}, true, password_mode_choices); this->ap.addChoices("remove-unreferenced-resources", [this](std::string const& x){c_main->removeUnreferencedResources(x);}, true, remove_unref_choices); this->ap.addChoices("stream-data", [this](std::string const& x){c_main->streamData(x);}, true, stream_data_choices); -this->ap.addChoices("json-stream-data", [this](std::string const& x){c_main->jsonStreamData(x);}, true, json_stream_data_choices); this->ap.addChoices("json", [this](std::string const& x){c_main->json(x);}, false, json_version_choices); this->ap.registerOptionTable("pages", b(&ArgParser::argEndPages)); this->ap.addPositional(p(&ArgParser::argPagesPositional)); diff --git a/libqpdf/qpdf/auto_job_json_decl.hh b/libqpdf/qpdf/auto_job_json_decl.hh index 8160ca5a..f02dc657 100644 --- a/libqpdf/qpdf/auto_job_json_decl.hh +++ b/libqpdf/qpdf/auto_job_json_decl.hh @@ -8,7 +8,6 @@ void setupInputFile(); void setupPassword(); void setupEmpty(); -void setupCreateFromJson(); void setupOutputFile(); void setupReplaceInput(); void beginEncrypt(JSON); diff --git a/libqpdf/qpdf/auto_job_json_init.hh b/libqpdf/qpdf/auto_job_json_init.hh index ee124d0d..125250e6 100644 --- a/libqpdf/qpdf/auto_job_json_init.hh +++ b/libqpdf/qpdf/auto_job_json_init.hh @@ -12,9 +12,10 @@ static char const* decode_level_choices[] = {"none", "generalized", "specialized static char const* object_streams_choices[] = {"disable", "preserve", "generate", 0}; static char const* remove_unref_choices[] = {"auto", "yes", "no", 0}; static char const* flatten_choices[] = {"all", "print", "screen", 0}; -static char const* json_version_choices[] = {"1", "2", "latest", 0}; -static char const* json_key_choices[] = {"acroform", "attachments", "encrypt", "objectinfo", "objects", "outlines", "pagelabels", "pages", "qpdf", 0}; +static char const* json_key_choices[] = {"acroform", "attachments", "encrypt", "objectinfo", "objects", "outlines", "pagelabels", "pages", 0}; +static char const* json_output_choices[] = {"2", "latest", 0}; static char const* json_stream_data_choices[] = {"none", "inline", "file", 0}; +static char const* json_version_choices[] = {"1", "2", "latest", 0}; static char const* print128_choices[] = {"full", "low", "none", 0}; static char const* modify128_choices[] = {"all", "annotate", "form", "assembly", "none", 0}; @@ -30,9 +31,9 @@ popHandler(); // key: passwordFile pushKey("empty"); setupEmpty(); popHandler(); // key: empty -pushKey("createFromJson"); -setupCreateFromJson(); -popHandler(); // key: createFromJson +pushKey("jsonInput"); +addBare([this]() { c_main->jsonInput(); }); +popHandler(); // key: jsonInput pushKey("outputFile"); setupOutputFile(); popHandler(); // key: outputFile @@ -105,6 +106,9 @@ popHandler(); // key: progress pushKey("splitPages"); addParameter([this](std::string const& p) { c_main->splitPages(p); }); popHandler(); // key: splitPages +pushKey("jsonOutput"); +addChoices(json_output_choices, true, [this](std::string const& p) { c_main->jsonOutput(p); }); +popHandler(); // key: jsonOutput pushKey("encrypt"); beginDict(bindJSON(&Handlers::beginEncrypt), bindBare(&Handlers::endEncrypt)); // .encrypt pushKey("userPassword"); @@ -262,9 +266,6 @@ popHandler(); // key: jsonStreamData pushKey("jsonStreamPrefix"); addParameter([this](std::string const& p) { c_main->jsonStreamPrefix(p); }); popHandler(); // key: jsonStreamPrefix -pushKey("toJson"); -addBare([this]() { c_main->toJson(); }); -popHandler(); // key: toJson pushKey("updateFromJson"); addParameter([this](std::string const& p) { c_main->updateFromJson(p); }); popHandler(); // key: updateFromJson diff --git a/libqpdf/qpdf/auto_job_schema.hh b/libqpdf/qpdf/auto_job_schema.hh index 0b9e29a9..0fc187fe 100644 --- a/libqpdf/qpdf/auto_job_schema.hh +++ b/libqpdf/qpdf/auto_job_schema.hh @@ -3,7 +3,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ "password": "password for encrypted file", "passwordFile": "read password from a file", "empty": "use empty file as input", - "createFromJson": "create PDF from qpdf JSON", + "jsonInput": "input file is qpdf JSON", "outputFile": "output filename", "replaceInput": "overwrite input with output", "qdf": "enable viewing PDF code in a text editor", @@ -28,6 +28,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ "forceVersion": "set output PDF version", "progress": "show progress when writing", "splitPages": "write pages to separate files", + "jsonOutput": "serialize to JSON", "encrypt": { "userPassword": "user password", "ownerPassword": "owner password", @@ -87,7 +88,6 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ ], "jsonStreamData": "how to handle streams in json output", "jsonStreamPrefix": "prefix for json stream data files", - "toJson": "serialize to JSON", "updateFromJson": "update a PDF from qpdf JSON", "allowWeakCrypto": "allow insecure cryptographic algorithms", "keepFilesOpen": "manage keeping multiple files open", diff --git a/manual/cli.rst b/manual/cli.rst index 57a164cb..6cfae38b 100644 --- a/manual/cli.rst +++ b/manual/cli.rst @@ -3174,20 +3174,6 @@ Related Options :qpdf:ref:`--json-help` option to get a description of the JSON object. -.. qpdf:option:: --to-json - - .. help: serialize to JSON - - Shortcut for options useful for serializing PDF to JSON: - --json=latest --json-stream-data=inline - --json-key=qpdf --decode-level=none - - This option is a shorthand for - ``--json=latest --json-stream-data=inline --json-key=qpdf --decode-level=none``. - These are good options for serializing a PDF to JSON in manner that - allows qpdf to read it back in. You can override any of these - options by specifying other options after them. - .. qpdf:option:: --json-help .. help: show format of JSON output @@ -3253,7 +3239,8 @@ Related Options inline (base64-encoded) or written to a file. If ``file`` is chosen, the file will be the name of the input file appended with :samp:`-{nnn}` where :samp:`{nnn}` is the object number. The prefix - can be overridden with :qpdf:ref:`--json-stream-prefix`. + can be overridden with :qpdf:ref:`--json-stream-prefix`. This + option only applies when used with :qpdf:ref:`--json-output`. .. qpdf:option:: --json-stream-prefix=file-prefix @@ -3268,20 +3255,34 @@ Related Options ``file``, override the input file name as the prefix for stream data files. Whatever is given here will be appended with :samp:`-{nnn}` to create the name of the file that will contain the - data for the stream stream in object :samp:`{nnn}`. + data for the stream stream in object :samp:`{nnn}`. This + option only applies when used with :qpdf:ref:`--json-output`. -.. qpdf:option:: --create-from-json=qpdf-json-file +.. qpdf:option:: --json-output=version - .. help: create PDF from qpdf JSON + .. help: serialize to JSON - Create a PDF file from the prior output of qpdf --json. See the - "QPDF JSON Format" section of the manual for information about - how to use this option. + The output file will be qpdf JSON format at the given version. + Only version 2 is supported. See also --json-stream-data + and --json-stream-prefix - This option creates a PDF file from the previous output of ``qpdf - --json`` that includes stream data and information about all - objects. For information about converting between PDF and JSON, - please see :ref:`qpdf-json`. + The output file will be qpdf JSON format at the given version. Only + version 2 is supported. See also :qpdf:ref:`--json-stream-data` and + :qpdf:ref:`--json-stream-prefix`. + +.. qpdf:option:: --json-input + + .. help: input file is qpdf JSON + + Treat the input file as a JSON file in qpdf JSON format as + written by qpdf --json-output. See the "QPDF JSON Format" + section of the manual for information about how to use this + option. + + Treat the input file as a JSON file in qpdf JSON format as written + by ``qpdf --json-output``. The input file must be complete and + include all stream data. For information about converting between + PDF and JSON, please see :ref:`qpdf-json`. .. qpdf:option:: --update-from-json=qpdf-json-file diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov index efb4d723..a7dfa05c 100644 --- a/qpdf/qpdf.testcov +++ b/qpdf/qpdf.testcov @@ -651,10 +651,8 @@ QPDFJob json encrypt missing password 0 QPDFJob json pages no file 0 qpdf-c called qpdf_empty_pdf 0 QPDF_json missing qpdf 0 -QPDF_json missing json version 0 QPDF_json missing pdf version 0 QPDF_json top-level scalar 0 -QPDF_json bad json version 0 QPDF_json bad pdf version 0 QPDF_json top-level array 0 QPDF_json bad object key 0 @@ -668,3 +666,6 @@ QPDF_json data datafile both or neither 0 QPDF_json stream no dict 0 QPDF_json trailer no value 0 QPDF_json value stream both or neither 0 +QPDFJob need json-stream-prefix for stdout 0 +QPDFJob write json to stdout 0 +QPDFJob write json to file 0 diff --git a/qpdf/qtest/json.test b/qpdf/qtest/json.test index fc52ad65..a013c845 100644 --- a/qpdf/qtest/json.test +++ b/qpdf/qtest/json.test @@ -26,16 +26,16 @@ my @json_files = ( ['field-types', ['--show-encryption-key']], ['image-streams', ['--decode-level=all']], ['image-streams', ['--decode-level=specialized']], - ['page-labels-and-outlines', ['--json-key=qpdf']], + ['page-labels-and-outlines', ['--json-key=objects']], ['page-labels-and-outlines', ['--json-key=pages']], ['page-labels-and-outlines', ['--json-key=pagelabels']], ['page-labels-and-outlines', ['--json-key=outlines']], ['page-labels-and-outlines', ['--json-key=outlines', '--json-key=pages']], ['page-labels-and-outlines', - ['--json-key=qpdf', '--json-object=trailer']], + ['--json-key=objects', '--json-object=trailer']], ['page-labels-and-outlines', - ['--json-key=qpdf', '--json-object=trailer', '--json-object=2 0 R']], + ['--json-key=objects', '--json-object=trailer', '--json-object=2 0 R']], ['field-types', ['--json-key=acroform']], ['need-appearances', ['--json-key=acroform']], ['V4-aes', ['--json-key=encrypt']], @@ -46,27 +46,18 @@ foreach my $d (@json_files) { my ($file, $xargs) = @$d; my $out = "json-$file"; - my @v1_xargs = (); foreach my $x (@$xargs) { my $y = $x; $y =~ s/^.*=//; $y =~ s/\s.*//; $out .= "-$y"; - if ($x eq '--json-key=qpdf') - { - push(@v1_xargs, '--json-key=objects'); - } - else - { - push(@v1_xargs, $x); - } } my $in = "$file.pdf"; $td->runtest("json v1 $out", {$td->COMMAND => ['qpdf', '--json=1', '--test-json-schema', - @v1_xargs, $in]}, + @$xargs, $in]}, {$td->FILE => "$out-v1.out", $td->EXIT_STATUS => 0}, $td->NORMALIZE_NEWLINES); $td->runtest("json v2 $out", @@ -78,8 +69,8 @@ foreach my $d (@json_files) $td->runtest("bad json stream data (inline)", {$td->COMMAND => - "qpdf --json=2 --test-json-schema" . - " --json-stream-data=inline bad-data.pdf > a.json"}, + "qpdf --json-output=2" . + " --json-stream-data=inline bad-data.pdf a.json"}, {$td->FILE => "bad-data-json.out", $td->EXIT_STATUS => 3}, $td->NORMALIZE_NEWLINES); $td->runtest("check (inline)", @@ -88,9 +79,9 @@ $td->runtest("check (inline)", $td->NORMALIZE_NEWLINES); $td->runtest("bad json stream data (file)", {$td->COMMAND => - "qpdf --json=2 --test-json-schema" . + "qpdf --json-output=2 " . " --json-stream-data=file --json-stream-prefix=auto" . - " bad-data.pdf > a.json"}, + " bad-data.pdf a.json"}, {$td->FILE => "bad-data-json.out", $td->EXIT_STATUS => 3}, $td->NORMALIZE_NEWLINES); $td->runtest("check (file)", @@ -110,7 +101,7 @@ foreach my $l (qw(none generalized specialized all)) # library is use. $td->runtest("image-streams json inline: $l", {$td->COMMAND => - "qpdf image-streams-small.pdf --json=2" . + "qpdf image-streams-small.pdf - --json-output=2" . " --decode-level=$l --json-stream-data=inline"}, {$td->FILE => "json-image-streams-$l-inline-v2.out", $td->EXIT_STATUS => 0}, @@ -118,9 +109,9 @@ foreach my $l (qw(none generalized specialized all)) } $td->runtest("image-streams json file: $l", {$td->COMMAND => - "qpdf image-streams-small.pdf --json=2" . + "qpdf image-streams-small.pdf - --json-output=2" . " --decode-level=$l --json-stream-data=file" . - " --json-stream-prefix=auto --json-key=qpdf" . + " --json-stream-prefix=auto" . " --json-object=12 --json-object=16 --json-object=18"}, {$td->FILE => "json-image-streams-$l-file-v2.out", $td->EXIT_STATUS => 0}, @@ -159,10 +150,12 @@ foreach my $l (qw(none generalized specialized all)) } } -$td->runtest("use --to-json option", - {$td->COMMAND => "qpdf --to-json image-streams-small.pdf"}, - {$td->FILE => "image-streams-small-to-json.out", - $td->EXIT_STATUS => 0}, +$td->runtest("file to stdout without prefix", + {$td->COMMAND => + "qpdf image-streams-small.pdf - --json-output=2" . + " -json-stream-data=file"}, + {$td->FILE => "file-stdout-needs-prefix.out", + $td->EXIT_STATUS => 2}, $td->NORMALIZE_NEWLINES); cleanup(); diff --git a/qpdf/qtest/pages_tree.test b/qpdf/qtest/pages_tree.test index 53cc37b2..c0f4b77f 100644 --- a/qpdf/qtest/pages_tree.test +++ b/qpdf/qtest/pages_tree.test @@ -50,19 +50,19 @@ $td->runtest("show direct pages", # Json mode for direct and duplicated pages illustrates that the # "objects" section the original objects before correction when -# "pages" is not output but after correct when it is.# numbers. +# "pages" is not output but after correct when it is. foreach my $f (qw(page_api_2 direct-pages)) { $td->runtest("json for $f (objects only)", {$td->COMMAND => "qpdf --json=latest $f.pdf" . - " --json-key=qpdf"}, + " --json-key=objects"}, {$td->FILE => "$f-json-objects.out", $td->EXIT_STATUS => 0}, $td->NORMALIZE_NEWLINES); $td->runtest("json for $f (with pages)", {$td->COMMAND => "qpdf --json=latest $f.pdf" . - " --json-key=qpdf --json-key=pages"}, + " --json-key=objects --json-key=pages"}, {$td->FILE => "$f-json-pages.out", $td->EXIT_STATUS => 0}, $td->NORMALIZE_NEWLINES); } diff --git a/qpdf/qtest/qpdf/bad-data-json.out b/qpdf/qtest/qpdf/bad-data-json.out index 00019fec..56931267 100644 --- a/qpdf/qtest/qpdf/bad-data-json.out +++ b/qpdf/qtest/qpdf/bad-data-json.out @@ -1,3 +1,3 @@ WARNING: bad-data.pdf (offset 319): error decoding stream data for object 4 0: LZWDecoder: bad code received WARNING: bad-data.pdf (offset 319): stream will be re-processed without filtering to avoid data loss -qpdf: operation succeeded with warnings +qpdf: operation succeeded with warnings; resulting file may have some problems diff --git a/qpdf/qtest/qpdf/direct-pages-json-objects.out b/qpdf/qtest/qpdf/direct-pages-json-objects.out index 0746a925..29bda2a4 100644 --- a/qpdf/qtest/qpdf/direct-pages-json-objects.out +++ b/qpdf/qtest/qpdf/direct-pages-json-objects.out @@ -3,93 +3,88 @@ "parameters": { "decodelevel": "generalized" }, - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 6, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/Count": 2, - "/Kids": [ - { - "/Contents": "3 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "5 0 R" - }, - "/ProcSet": "6 0 R" + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/Count": 2, + "/Kids": [ + { + "/Contents": "3 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "5 0 R" }, - "/Type": "/Page" + "/ProcSet": "6 0 R" }, - { - "/Contents": "3 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "5 0 R" - }, - "/ProcSet": "6 0 R" + "/Type": "/Page" + }, + { + "/Contents": "3 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "5 0 R" }, - "/Type": "/Page" - } - ], - "/Type": "/Pages" - } - }, - "obj:3 0 R": { - "stream": { - "dict": { - "/Length": "4 0 R" + "/ProcSet": "6 0 R" + }, + "/Type": "/Page" } + ], + "/Type": "/Pages" + } + }, + "obj:3 0 R": { + "stream": { + "dict": { + "/Length": "4 0 R" } - }, - "obj:4 0 R": { - "value": 44 - }, - "obj:5 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:6 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "trailer": { - "value": { - "/ID": [ - "b:1323a5937c577a66735583a93698ce3c", - "b:372cbf44f6db88ab60d9263c0f0bd26a" - ], - "/Root": "1 0 R", - "/Size": 7 - } + } + }, + "obj:4 0 R": { + "value": 44 + }, + "obj:5 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:6 0 R": { + "value": [ + "/PDF", + "/Text" + ] + }, + "trailer": { + "value": { + "/ID": [ + "b:1323a5937c577a66735583a93698ce3c", + "b:372cbf44f6db88ab60d9263c0f0bd26a" + ], + "/Root": "1 0 R", + "/Size": 7 } } } diff --git a/qpdf/qtest/qpdf/direct-pages-json-pages.out b/qpdf/qtest/qpdf/direct-pages-json-pages.out index 9f9e41f3..667b73f6 100644 --- a/qpdf/qtest/qpdf/direct-pages-json-pages.out +++ b/qpdf/qtest/qpdf/direct-pages-json-pages.out @@ -25,99 +25,94 @@ "pageposfrom1": 2 } ], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 8, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/Count": 2, + "/Kids": [ + "7 0 R", + "8 0 R" + ], + "/Type": "/Pages" + } + }, + "obj:3 0 R": { + "stream": { + "dict": { + "/Length": "4 0 R" } - }, - "obj:2 0 R": { - "value": { - "/Count": 2, - "/Kids": [ - "7 0 R", - "8 0 R" - ], - "/Type": "/Pages" - } - }, - "obj:3 0 R": { - "stream": { - "dict": { - "/Length": "4 0 R" - } - } - }, - "obj:4 0 R": { - "value": 44 - }, - "obj:5 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:6 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:7 0 R": { - "value": { - "/Contents": "3 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "5 0 R" - }, - "/ProcSet": "6 0 R" + } + }, + "obj:4 0 R": { + "value": 44 + }, + "obj:5 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:6 0 R": { + "value": [ + "/PDF", + "/Text" + ] + }, + "obj:7 0 R": { + "value": { + "/Contents": "3 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "5 0 R" }, - "/Type": "/Page" - } - }, - "obj:8 0 R": { - "value": { - "/Contents": "3 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "5 0 R" - }, - "/ProcSet": "6 0 R" + "/ProcSet": "6 0 R" + }, + "/Type": "/Page" + } + }, + "obj:8 0 R": { + "value": { + "/Contents": "3 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "5 0 R" }, - "/Type": "/Page" - } - }, - "trailer": { - "value": { - "/ID": [ - "b:1323a5937c577a66735583a93698ce3c", - "b:372cbf44f6db88ab60d9263c0f0bd26a" - ], - "/Root": "1 0 R", - "/Size": 7 - } + "/ProcSet": "6 0 R" + }, + "/Type": "/Page" + } + }, + "trailer": { + "value": { + "/ID": [ + "b:1323a5937c577a66735583a93698ce3c", + "b:372cbf44f6db88ab60d9263c0f0bd26a" + ], + "/Root": "1 0 R", + "/Size": 7 } } } diff --git a/qpdf/qtest/qpdf/file-stdout-needs-prefix.out b/qpdf/qtest/qpdf/file-stdout-needs-prefix.out new file mode 100644 index 00000000..9222e630 --- /dev/null +++ b/qpdf/qtest/qpdf/file-stdout-needs-prefix.out @@ -0,0 +1,9 @@ + +qpdf: please specify --json-stream-prefix since the input file name is unknown + +For help: + qpdf --help=usage usage information + qpdf --help=topic help on a topic + qpdf --help=--option help on an option + qpdf --help general help and a topic list + diff --git a/qpdf/qtest/qpdf/image-streams-small-to-json.out b/qpdf/qtest/qpdf/image-streams-small-to-json.out deleted file mode 100644 index 3fd3e143..00000000 --- a/qpdf/qtest/qpdf/image-streams-small-to-json.out +++ /dev/null @@ -1,487 +0,0 @@ -{ - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 30, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/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" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "12 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "14 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "15 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "16 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "17 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "18 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:6 0 R": { - "value": { - "/Contents": "19 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "20 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:7 0 R": { - "value": { - "/Contents": "21 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "22 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:8 0 R": { - "value": { - "/Contents": "23 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "24 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:9 0 R": { - "value": { - "/Contents": "25 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "26 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:10 0 R": { - "value": { - "/Contents": "27 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "28 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "29 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "30 0 R" - } - }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "stream": { - "data": "eJxzClHQdzNUMDJRCElTMDdSMDYyUAhJUdDQd0kty0xOdfaN9FYozyzJUEjLzClJLVLIK83J0VQIyVJwDeEqBGozUTAAQkMgbWgBxAYGCsm5CvqeuYYKLvkKgVwArrQYWw==", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:13 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:14 0 R": { - "stream": { - "data": "eJzt1rENAEAMAjH2Xzr/W1BgndxTRbkkBzCoPgCgpT4AoEOSZvtnEGBR/QEFKHlcqfaI", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:15 0 R": { - "stream": { - "data": "eJwNi70KgzAYAHef4kY75adCO2ssiHQofEvn+IkpBmkRff2G47jpWsE8HL5BZm6eq7fIRG2CHilq93yPnGlfmNO66w8TOgkat0kvyIdeqm+ZG2zBlbp70VpixgzZETZe1R9O7hnu", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:16 0 R": { - "stream": { - "data": "/9j/7gAOQWRvYmUAZAAAAAAA/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/8AAFAgAMAAoBEMRAE0RAFkRAEsRAP/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/aAA4EQwBNAFkASwAAPwD3+vn+vn+vn+iiiiiiiiiiiiiiiivgCvv+iiiiiiiiiiiiiiiiiiivgCvv+iiiiiiiiiiiiiiiiivv+iiiiiiiiiiiiiiiiiiiivv+vgCiiiiiiiiiiiiiiiiivgCvgCivv+iiiiiiiiiiiiiiiiv/2Q==", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:17 0 R": { - "stream": { - "data": "eJwNjL0KwjAYAPc+xY12yo8FnTUKYh2Ub3FOv9oU26JEfX3Dcdx2O8EcHb5BejaetbdIx8oE/aao+8v9zC/lgT49s74xt8/c6vzIQ9C4dFojIwepXmXRYAuu1G2L1hInzGlyhIVr9Qc2lxyq", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:18 0 R": { - "stream": { - "data": "AP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//QAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/9AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wB//wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wAB/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A///8AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA//4AAP/+AAD//gAA/4A=", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:19 0 R": { - "stream": { - "data": "eJxzClHQdzNUMDJRCElTMDdSMDYyUAhJUdDQd0kty0xODXJ3UijPLMlQSMvMKUktUsgrzcnRVAjJUnAN4SoE6jJRMABCQyBtaAHEBgYKybkK+p65hgou+QqBXACRFBgC", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:20 0 R": { - "stream": { - "data": "eJztzsEJAAAIAzH3X7ru4EcKOTLAZSZAp/8D4Oz/ADgK0Ov/ADiS1NsCy1K3uQ==", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:21 0 R": { - "stream": { - "data": "eJwNizsKg0AUAHtPMWWs9hNBa90kpFTeDdYnrkTEIHp9l2GYalrBvB2+QiZqz9NbZORhgp4p6vBpudIxM6XfoX9M6CRo3EYtkYWXFHt+K2zG5bomay1xxXxXR9joixsvOBmV", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:22 0 R": { - "stream": { - "data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAAwACgDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDi6K9Kor4f+0f7v4/8A6f+Ivf9Qf8A5U/+0PNaK9Koo/tH+7+P/AD/AIi9/wBQf/lT/wC0PNaK9Koo/tH+7+P/AAA/4i9/1B/+VP8A7Q8Gor0yiv6W/tH+7+P/AAD3f9S/+n//AJL/APbHmdFemUUf2j/d/H/gB/qX/wBP/wDyX/7Y8zor0yij+0f7v4/8AP8AUv8A6f8A/kv/ANse80V8O0V/NH+pf/T/AP8AJf8A7Y8L6x5H3FRXw7RR/qX/ANP/APyX/wC2D6x5H3FRXw7RR/qX/wBP/wDyX/7YPrHkf//Z", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:23 0 R": { - "stream": { - "data": "eJwNjDsKwkAUAPucYkqt9mNA67AaBBvDu8HmxWzIB8Oq13cZhummEczN4Wtk4Ow5eYv0HEzQb4ratQ2/lEeGNGfdMd1nfej6ymPQuPV6RCauUr3LocYWXKm7FK0lLpj74ggbz+oPFMscUQ==", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:24 0 R": { - "stream": { - "data": "AP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//gAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP/+AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP7/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//4EAgQCBAIEAgQCBAIEAwACA", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:25 0 R": { - "stream": { - "data": "eJxzClHQdzNUMDJRCElTMDdSMDYyUAhJUdDQd0kty0xOdS9KrFQozyzJUEjLzClJLVLIK83J0VQIyVJwDeEqBGozUTAAQkMgbWgBxAYGCsm5CvqeuYYKLvkKgVwAxbUYug==", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:26 0 R": { - "stream": { - "data": "eJx7924UUALOjAKKwMxRQBFIGwUUAeNRQBFgGAUUAQBWa6cu", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:27 0 R": { - "stream": { - "data": "eJwNizsKg0AUAHtPMWWs9qOQ1HFNsBTeBWR9kpWIKJLg7V2GYap5Cubl8DUycfdU3iIjNxP0l6K+9+Hkn44PU/oeumNCI0HjOmqJzLRSbHmusRmX6x5Za4kLplscYaUvLmgpGk0=", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:28 0 R": { - "stream": { - "data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wAALCAAwACgBAREA/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9oACAEBAAA/APbqKKKK52iiiiuMoooorjKKKKK4yiiiiuMoooor/9k=", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:29 0 R": { - "stream": { - "data": "eJwNjDsKwkAUAPucYkqt9mNAa1kTBBvlXUA2L2YlHwyr4u1dhmG6OQqmcfga6dl7dt4iHRsT9JOituv9xzflgT6NWVfM7T1fdH7kIWhcOt0iT05SvcqixhZcqTsUrSVOmPPkCAvX6g9SDB0J", - "dict": { - "/Filter": "/FlateDecode" - } - } - }, - "obj:30 0 R": { - "stream": { - "data": "ge6B7sHugcyBzMHMgZmBmcGZgWaBZsFmgTOBM8EzgQCBAMEAgA==", - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "trailer": { - "value": { - "/ID": [ - "b:5aa7af805079bb907e9034361d9a11a2", - "b:5aa7af805079bb907e9034361d9a11a2" - ], - "/Root": "1 0 R", - "/Size": 31 - } - } - } - } -} diff --git a/qpdf/qtest/qpdf/json-bad-data-json-file-v2.out b/qpdf/qtest/qpdf/json-bad-data-json-file-v2.out index 79e739ed..8b2c825b 100644 --- a/qpdf/qtest/qpdf/json-bad-data-json-file-v2.out +++ b/qpdf/qtest/qpdf/json-bad-data-json-file-v2.out @@ -1,57 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "generalized" - }, - "pages": [ - { - "contents": [ - "4 0 R" - ], - "images": [], - "label": null, - "object": "3 0 R", - "outlines": [], - "pageposfrom1": 1 - } - ], - "pagelabels": [], - "acroform": { - "fields": [], - "hasacroform": false, - "needappearances": false - }, - "attachments": {}, - "encrypt": { - "capabilities": { - "accessibility": true, - "extract": true, - "modify": true, - "modifyannotations": true, - "modifyassembly": true, - "modifyforms": true, - "modifyother": true, - "printhigh": true, - "printlow": true - }, - "encrypted": false, - "ownerpasswordmatched": false, - "parameters": { - "P": 0, - "R": 0, - "V": 0, - "bits": 0, - "filemethod": "none", - "key": null, - "method": "none", - "streammethod": "none", - "stringmethod": "none" - }, - "userpasswordmatched": false - }, - "outlines": [], - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/json-bad-data-json-inline-v2.out b/qpdf/qtest/qpdf/json-bad-data-json-inline-v2.out index 8c65e1c2..c90bbf07 100644 --- a/qpdf/qtest/qpdf/json-bad-data-json-inline-v2.out +++ b/qpdf/qtest/qpdf/json-bad-data-json-inline-v2.out @@ -1,57 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "generalized" - }, - "pages": [ - { - "contents": [ - "4 0 R" - ], - "images": [], - "label": null, - "object": "3 0 R", - "outlines": [], - "pageposfrom1": 1 - } - ], - "pagelabels": [], - "acroform": { - "fields": [], - "hasacroform": false, - "needappearances": false - }, - "attachments": {}, - "encrypt": { - "capabilities": { - "accessibility": true, - "extract": true, - "modify": true, - "modifyannotations": true, - "modifyassembly": true, - "modifyforms": true, - "modifyother": true, - "printhigh": true, - "printlow": true - }, - "encrypted": false, - "ownerpasswordmatched": false, - "parameters": { - "P": 0, - "R": 0, - "V": 0, - "bits": 0, - "filemethod": "none", - "key": null, - "method": "none", - "streammethod": "none", - "stringmethod": "none" - }, - "userpasswordmatched": false - }, - "outlines": [], - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/json-field-types---show-encryption-key-v2.out b/qpdf/qtest/qpdf/json-field-types---show-encryption-key-v2.out index d4948608..f5229296 100644 --- a/qpdf/qtest/qpdf/json-field-types---show-encryption-key-v2.out +++ b/qpdf/qtest/qpdf/json-field-types---show-encryption-key-v2.out @@ -431,929 +431,962 @@ "userpasswordmatched": false }, "outlines": [], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.5", - "maxobjectid": 196, - "objects": { - "obj:1 0 R": { - "value": { - "/AcroForm": { - "/DR": "3 0 R", - "/Fields": [ - "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" - ], - "/NeedAppearances": true - }, - "/Lang": "u:en-US", - "/MarkInfo": { - "/Marked": true - }, - "/OpenAction": [ - "15 0 R", - "/XYZ", - null, - null, - 0 - ], - "/Pages": "16 0 R", - "/StructTreeRoot": "17 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/CreationDate": "u:D:20190103125434-05'00'", - "/Creator": "u:Writer", - "/Producer": "u:LibreOffice 6.1" - } - }, - "obj:3 0 R": { - "value": { - "/Font": "18 0 R", - "/ProcSet": [ - "/PDF", - "/Text" - ] - } - }, - "obj:4 0 R": { - "value": { - "/AP": { - "/N": "19 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Tx", - "/P": "15 0 R", - "/Rect": [ - 123.499, - 689.901, - 260.801, - 704.699 - ], - "/Subtype": "/Widget", - "/T": "u:text", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:5 0 R": { - "value": { - "/DV": "/1", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "21 0 R", - "22 0 R", - "23 0 R" - ], - "/P": "15 0 R", - "/T": "u:r1", - "/V": "/1" - } - }, - "obj:6 0 R": { - "value": { - "/AP": { - "/N": { - "/Off": "24 0 R", - "/Yes": "26 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 554.301, - 130.701, - 566.349 - ], - "/Subtype": "/Widget", - "/T": "u:checkbox1", - "/Type": "/Annot", - "/V": "/Off" - } - }, - "obj:7 0 R": { - "value": { - "/AP": { - "/N": { - "/Off": "29 0 R", - "/Yes": "31 0 R" - } - }, - "/AS": "/Yes", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Yes", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 527.751, - 130.701, - 539.799 - ], - "/Subtype": "/Widget", - "/T": "u:checkbox2", - "/Type": "/Annot", - "/V": "/Yes" - } - }, - "obj:8 0 R": { - "value": { - "/AP": { - "/N": { - "/Off": "33 0 R", - "/Yes": "35 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 500.501, - 130.701, - 512.549 - ], - "/Subtype": "/Widget", - "/T": "u:checkbox3", - "/Type": "/Annot", - "/V": "/Off" - } - }, - "obj:9 0 R": { - "value": { - "/DV": "/2", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "37 0 R", - "38 0 R", - "39 0 R" - ], - "/P": "15 0 R", - "/T": "u:r2", - "/V": "/2" - } - }, - "obj:10 0 R": { - "value": { - "/AP": { - "/N": "40 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:salad πʬ", - "/F": 4, - "/FT": "/Tx", - "/P": "15 0 R", - "/Rect": [ - 113.649, - 260.151, - 351.101, - 278.099 - ], - "/Subtype": "/Widget", - "/T": "u:text2", - "/Type": "/Annot", - "/V": "u:salad πʬ" - } - }, - "obj:11 0 R": { - "value": { - "/AP": { - "/N": "42 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Opt": [ - "u:five", - "u:six", - "u:seven", - "u:eight" - ], - "/P": "15 0 R", - "/Rect": [ - 158.449, - 156.651, - 221.001, - 232.849 - ], - "/Subtype": "/Widget", - "/T": "u:list1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:12 0 R": { - "value": { - "/AP": { - "/N": "44 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Ff": 131072, - "/Opt": [ - "u:nine", - "u:ten", - "u:elephant", - "u:twelve" - ], - "/P": "15 0 R", - "/Rect": [ - 159.149, - 107.251, - 244.201, - 130.949 - ], - "/Subtype": "/Widget", - "/T": "u:drop1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:13 0 R": { - "value": { - "/AP": { - "/N": "46 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Ff": 393216, - "/Opt": [ - "u:one", - "u:two", - "u:pi", - "u:four" - ], - "/P": "15 0 R", - "/Rect": [ - 403.949, - 159.401, - 459.001, - 232.849 - ], - "/Subtype": "/Widget", - "/T": "u:combolist1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:14 0 R": { - "value": { - "/AP": { - "/N": "48 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Ff": 393216, - "/Opt": [ - "u:alpha", - "u:beta", - "u:gamma", - "u:delta" - ], - "/P": "15 0 R", - "/Rect": [ - 404.599, - 101.451, - 476.701, - 135.349 - ], - "/Subtype": "/Widget", - "/T": "u:combodrop1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:15 0 R": { - "value": { - "/Annots": [ + "objects": { + "obj:1 0 R": { + "value": { + "/AcroForm": { + "/DR": "3 0 R", + "/Fields": [ "4 0 R", - "21 0 R", - "22 0 R", - "23 0 R", + "5 0 R", "6 0 R", "7 0 R", "8 0 R", - "37 0 R", - "38 0 R", - "39 0 R", + "9 0 R", "10 0 R", - "13 0 R", "11 0 R", "12 0 R", + "13 0 R", "14 0 R" ], - "/Contents": "50 0 R", - "/Group": { - "/CS": "/DeviceRGB", - "/I": true, - "/S": "/Transparency" - }, - "/MediaBox": [ + "/NeedAppearances": true + }, + "/Lang": "u:en-US", + "/MarkInfo": { + "/Marked": true + }, + "/OpenAction": [ + "15 0 R", + "/XYZ", + null, + null, + 0 + ], + "/Pages": "16 0 R", + "/StructTreeRoot": "17 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/CreationDate": "u:D:20190103125434-05'00'", + "/Creator": "u:Writer", + "/Producer": "u:LibreOffice 6.1" + } + }, + "obj:3 0 R": { + "value": { + "/Font": "18 0 R", + "/ProcSet": [ + "/PDF", + "/Text" + ] + } + }, + "obj:4 0 R": { + "value": { + "/AP": { + "/N": "19 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Tx", + "/P": "15 0 R", + "/Rect": [ + 123.499, + 689.901, + 260.801, + 704.699 + ], + "/Subtype": "/Widget", + "/T": "u:text", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:5 0 R": { + "value": { + "/DV": "/1", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "21 0 R", + "22 0 R", + "23 0 R" + ], + "/P": "15 0 R", + "/T": "u:r1", + "/V": "/1" + } + }, + "obj:6 0 R": { + "value": { + "/AP": { + "/N": { + "/Off": "24 0 R", + "/Yes": "26 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 554.301, + 130.701, + 566.349 + ], + "/Subtype": "/Widget", + "/T": "u:checkbox1", + "/Type": "/Annot", + "/V": "/Off" + } + }, + "obj:7 0 R": { + "value": { + "/AP": { + "/N": { + "/Off": "29 0 R", + "/Yes": "31 0 R" + } + }, + "/AS": "/Yes", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Yes", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 527.751, + 130.701, + 539.799 + ], + "/Subtype": "/Widget", + "/T": "u:checkbox2", + "/Type": "/Annot", + "/V": "/Yes" + } + }, + "obj:8 0 R": { + "value": { + "/AP": { + "/N": { + "/Off": "33 0 R", + "/Yes": "35 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 500.501, + 130.701, + 512.549 + ], + "/Subtype": "/Widget", + "/T": "u:checkbox3", + "/Type": "/Annot", + "/V": "/Off" + } + }, + "obj:9 0 R": { + "value": { + "/DV": "/2", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "37 0 R", + "38 0 R", + "39 0 R" + ], + "/P": "15 0 R", + "/T": "u:r2", + "/V": "/2" + } + }, + "obj:10 0 R": { + "value": { + "/AP": { + "/N": "40 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:salad πʬ", + "/F": 4, + "/FT": "/Tx", + "/P": "15 0 R", + "/Rect": [ + 113.649, + 260.151, + 351.101, + 278.099 + ], + "/Subtype": "/Widget", + "/T": "u:text2", + "/Type": "/Annot", + "/V": "u:salad πʬ" + } + }, + "obj:11 0 R": { + "value": { + "/AP": { + "/N": "42 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Opt": [ + "u:five", + "u:six", + "u:seven", + "u:eight" + ], + "/P": "15 0 R", + "/Rect": [ + 158.449, + 156.651, + 221.001, + 232.849 + ], + "/Subtype": "/Widget", + "/T": "u:list1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:12 0 R": { + "value": { + "/AP": { + "/N": "44 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Ff": 131072, + "/Opt": [ + "u:nine", + "u:ten", + "u:elephant", + "u:twelve" + ], + "/P": "15 0 R", + "/Rect": [ + 159.149, + 107.251, + 244.201, + 130.949 + ], + "/Subtype": "/Widget", + "/T": "u:drop1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:13 0 R": { + "value": { + "/AP": { + "/N": "46 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Ff": 393216, + "/Opt": [ + "u:one", + "u:two", + "u:pi", + "u:four" + ], + "/P": "15 0 R", + "/Rect": [ + 403.949, + 159.401, + 459.001, + 232.849 + ], + "/Subtype": "/Widget", + "/T": "u:combolist1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:14 0 R": { + "value": { + "/AP": { + "/N": "48 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Ff": 393216, + "/Opt": [ + "u:alpha", + "u:beta", + "u:gamma", + "u:delta" + ], + "/P": "15 0 R", + "/Rect": [ + 404.599, + 101.451, + 476.701, + 135.349 + ], + "/Subtype": "/Widget", + "/T": "u:combodrop1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:15 0 R": { + "value": { + "/Annots": [ + "4 0 R", + "21 0 R", + "22 0 R", + "23 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "37 0 R", + "38 0 R", + "39 0 R", + "10 0 R", + "13 0 R", + "11 0 R", + "12 0 R", + "14 0 R" + ], + "/Contents": "50 0 R", + "/Group": { + "/CS": "/DeviceRGB", + "/I": true, + "/S": "/Transparency" + }, + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "16 0 R", + "/Resources": "3 0 R", + "/StructParents": 0, + "/Type": "/Page" + } + }, + "obj:16 0 R": { + "value": { + "/Count": 1, + "/Kids": [ + "15 0 R" + ], + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Resources": "3 0 R", + "/Type": "/Pages" + } + }, + "obj:17 0 R": { + "value": { + "/K": [ + "52 0 R" + ], + "/ParentTree": "53 0 R", + "/RoleMap": { + "/Document": "/Document", + "/Standard": "/P" + }, + "/Type": "/StructTreeRoot" + } + }, + "obj:18 0 R": { + "value": { + "/F1": "54 0 R", + "/F2": "55 0 R", + "/F3": "56 0 R", + "/F4": "57 0 R", + "/ZaDi": "28 0 R" + } + }, + "obj:19 0 R": { + "stream": { + "dict": { + "/BBox": [ 0, 0, - 612, - 792 + 137.3, + 14.8 ], - "/Parent": "16 0 R", + "/Length": "20 0 R", "/Resources": "3 0 R", - "/StructParents": 0, - "/Type": "/Page" + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:16 0 R": { - "value": { - "/Count": 1, - "/Kids": [ - "15 0 R" - ], - "/MediaBox": [ + } + }, + "obj:20 0 R": { + "value": 12 + }, + "obj:21 0 R": { + "value": { + "/AP": { + "/N": { + "/1": "58 0 R", + "/Off": "60 0 R" + } + }, + "/AS": "/1", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "5 0 R", + "/Rect": [ + 152.749, + 648.501, + 164.801, + 660.549 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:22 0 R": { + "value": { + "/AP": { + "/N": { + "/2": "62 0 R", + "/Off": "64 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "5 0 R", + "/Rect": [ + 152.749, + 627.301, + 164.801, + 639.349 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:23 0 R": { + "value": { + "/AP": { + "/N": { + "/3": "66 0 R", + "/Off": "68 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "5 0 R", + "/Rect": [ + 151.399, + 606.501, + 163.451, + 618.549 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:24 0 R": { + "stream": { + "dict": { + "/BBox": [ 0, 0, - 612, - 792 + 12.05, + 12.05 ], + "/Length": "25 0 R", "/Resources": "3 0 R", - "/Type": "/Pages" + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:17 0 R": { - "value": { - "/K": [ - "52 0 R" + } + }, + "obj:25 0 R": { + "value": 12 + }, + "obj:26 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/ParentTree": "53 0 R", - "/RoleMap": { - "/Document": "/Document", - "/Standard": "/P" - }, - "/Type": "/StructTreeRoot" + "/Length": "27 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:18 0 R": { - "value": { - "/F1": "54 0 R", - "/F2": "55 0 R", - "/F3": "56 0 R", - "/F4": "57 0 R", - "/ZaDi": "28 0 R" - } - }, - "obj:19 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 137.3, - 14.8 - ], - "/Length": "20 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:20 0 R": { - "value": 12 - }, - "obj:21 0 R": { - "value": { - "/AP": { - "/N": { - "/1": "58 0 R", - "/Off": "60 0 R" - } - }, - "/AS": "/1", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "5 0 R", - "/Rect": [ - 152.749, - 648.501, - 164.801, - 660.549 + } + }, + "obj:27 0 R": { + "value": 82 + }, + "obj:28 0 R": { + "value": { + "/BaseFont": "/ZapfDingbats", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:29 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "30 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:22 0 R": { - "value": { - "/AP": { - "/N": { - "/2": "62 0 R", - "/Off": "64 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "5 0 R", - "/Rect": [ - 152.749, - 627.301, - 164.801, - 639.349 + } + }, + "obj:30 0 R": { + "value": 12 + }, + "obj:31 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "32 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:23 0 R": { - "value": { - "/AP": { - "/N": { - "/3": "66 0 R", - "/Off": "68 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "5 0 R", - "/Rect": [ - 151.399, - 606.501, - 163.451, - 618.549 + } + }, + "obj:32 0 R": { + "value": 82 + }, + "obj:33 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "34 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:24 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "25 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:25 0 R": { - "value": 12 - }, - "obj:26 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "27 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:27 0 R": { - "value": 82 - }, - "obj:28 0 R": { - "value": { - "/BaseFont": "/ZapfDingbats", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:29 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "30 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:30 0 R": { - "value": 12 - }, - "obj:31 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "32 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:32 0 R": { - "value": 82 - }, - "obj:33 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "34 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:34 0 R": { - "value": 12 - }, - "obj:35 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "36 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:36 0 R": { - "value": 82 - }, - "obj:37 0 R": { - "value": { - "/AP": { - "/N": { - "/1": "70 0 R", - "/Off": "72 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "9 0 R", - "/Rect": [ - 118.649, - 388.101, - 130.701, - 400.149 + } + }, + "obj:34 0 R": { + "value": 12 + }, + "obj:35 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "36 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:38 0 R": { - "value": { - "/AP": { - "/N": { - "/2": "74 0 R", - "/Off": "76 0 R" - } - }, - "/AS": "/2", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "9 0 R", - "/Rect": [ - 119.349, - 362.201, - 131.401, - 374.249 + } + }, + "obj:36 0 R": { + "value": 82 + }, + "obj:37 0 R": { + "value": { + "/AP": { + "/N": { + "/1": "70 0 R", + "/Off": "72 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "9 0 R", + "/Rect": [ + 118.649, + 388.101, + 130.701, + 400.149 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:38 0 R": { + "value": { + "/AP": { + "/N": { + "/2": "74 0 R", + "/Off": "76 0 R" + } + }, + "/AS": "/2", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "9 0 R", + "/Rect": [ + 119.349, + 362.201, + 131.401, + 374.249 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:39 0 R": { + "value": { + "/AP": { + "/N": { + "/3": "78 0 R", + "/Off": "80 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "9 0 R", + "/Rect": [ + 119.349, + 333.551, + 131.401, + 345.599 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:40 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 237.45, + 17.95 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "41 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:39 0 R": { - "value": { - "/AP": { - "/N": { - "/3": "78 0 R", - "/Off": "80 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "9 0 R", - "/Rect": [ - 119.349, - 333.551, - 131.401, - 345.599 + } + }, + "obj:41 0 R": { + "value": 12 + }, + "obj:42 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 62.55, + 76.2 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "43 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:40 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 237.45, - 17.95 - ], - "/Length": "41 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:43 0 R": { + "value": 46 + }, + "obj:44 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 85.05, + 23.7 + ], + "/Length": "45 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:41 0 R": { - "value": 12 - }, - "obj:42 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 62.55, - 76.2 - ], - "/Length": "43 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:45 0 R": { + "value": 46 + }, + "obj:46 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 55.05, + 73.45 + ], + "/Length": "47 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:43 0 R": { - "value": 46 - }, - "obj:44 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 85.05, - 23.7 - ], - "/Length": "45 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:47 0 R": { + "value": 47 + }, + "obj:48 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 72.1, + 33.9 + ], + "/Length": "49 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:45 0 R": { - "value": 46 - }, - "obj:46 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 55.05, - 73.45 - ], - "/Length": "47 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:49 0 R": { + "value": 45 + }, + "obj:50 0 R": { + "stream": { + "dict": { + "/Length": "51 0 R" } - }, - "obj:47 0 R": { - "value": 47 - }, - "obj:48 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 72.1, - 33.9 - ], - "/Length": "49 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:49 0 R": { - "value": 45 - }, - "obj:50 0 R": { - "stream": { - "dict": { - "/Length": "51 0 R" - } - } - }, - "obj:51 0 R": { - "value": 4747 - }, - "obj:52 0 R": { - "value": { - "/K": [ + } + }, + "obj:51 0 R": { + "value": 4747 + }, + "obj:52 0 R": { + "value": { + "/K": [ + "82 0 R", + "83 0 R", + "84 0 R", + "85 0 R", + "86 0 R", + "87 0 R", + "88 0 R", + "89 0 R", + "90 0 R", + "91 0 R", + "92 0 R", + "93 0 R", + "94 0 R", + "95 0 R", + "96 0 R", + "97 0 R", + "98 0 R", + "99 0 R", + "100 0 R", + "101 0 R", + "102 0 R", + "103 0 R", + "104 0 R", + "105 0 R", + "106 0 R", + "107 0 R", + "108 0 R", + "109 0 R", + "110 0 R", + "111 0 R", + "112 0 R", + "113 0 R", + "114 0 R", + "115 0 R", + "116 0 R", + "117 0 R", + "118 0 R", + "119 0 R", + "120 0 R", + "121 0 R", + "122 0 R", + "123 0 R", + "124 0 R", + "125 0 R", + "126 0 R", + "127 0 R", + "128 0 R", + "129 0 R", + "130 0 R", + "131 0 R", + "132 0 R", + "133 0 R", + "134 0 R", + "135 0 R", + "136 0 R", + "137 0 R", + "138 0 R", + "139 0 R", + "140 0 R" + ], + "/P": "17 0 R", + "/Pg": "15 0 R", + "/S": "/Document", + "/Type": "/StructElem" + } + }, + "obj:53 0 R": { + "value": { + "/Nums": [ + 0, + [ "82 0 R", - "83 0 R", "84 0 R", - "85 0 R", "86 0 R", - "87 0 R", - "88 0 R", - "89 0 R", - "90 0 R", - "91 0 R", - "92 0 R", "93 0 R", - "94 0 R", - "95 0 R", - "96 0 R", - "97 0 R", - "98 0 R", - "99 0 R", - "100 0 R", - "101 0 R", - "102 0 R", - "103 0 R", "104 0 R", - "105 0 R", - "106 0 R", - "107 0 R", - "108 0 R", - "109 0 R", - "110 0 R", - "111 0 R", - "112 0 R", - "113 0 R", - "114 0 R", "115 0 R", - "116 0 R", - "117 0 R", - "118 0 R", "119 0 R", - "120 0 R", - "121 0 R", - "122 0 R", - "123 0 R", - "124 0 R", + "119 0 R", + "125 0 R", "125 0 R", "126 0 R", "127 0 R", @@ -1370,1809 +1403,1771 @@ "138 0 R", "139 0 R", "140 0 R" - ], - "/P": "17 0 R", - "/Pg": "15 0 R", - "/S": "/Document", - "/Type": "/StructElem" - } - }, - "obj:53 0 R": { - "value": { - "/Nums": [ - 0, - [ - "82 0 R", - "84 0 R", - "86 0 R", - "93 0 R", - "104 0 R", - "115 0 R", - "119 0 R", - "119 0 R", - "125 0 R", - "125 0 R", - "126 0 R", - "127 0 R", - "128 0 R", - "129 0 R", - "130 0 R", - "131 0 R", - "132 0 R", - "133 0 R", - "134 0 R", - "135 0 R", - "136 0 R", - "137 0 R", - "138 0 R", - "139 0 R", - "140 0 R" - ] ] - } - }, - "obj:54 0 R": { - "value": { - "/BaseFont": "/BAAAAA+LiberationSerif", - "/FirstChar": 0, - "/FontDescriptor": "141 0 R", - "/LastChar": 32, - "/Subtype": "/TrueType", - "/ToUnicode": "142 0 R", - "/Type": "/Font", - "/Widths": [ - 777, - 943, - 500, - 443, - 333, - 333, - 389, - 250, - 777, - 500, - 333, - 500, - 443, - 610, - 500, - 277, - 556, - 277, - 277, - 500, - 443, - 500, - 443, - 500, - 500, - 556, - 610, - 666, - 500, - 722, - 500, - 722, - 500 - ] - } - }, - "obj:55 0 R": { - "value": { - "/BaseFont": "/LiberationSans", - "/Encoding": "/WinAnsiEncoding", - "/FirstChar": 32, - "/FontDescriptor": "144 0 R", - "/LastChar": 255, - "/Subtype": "/TrueType", - "/Type": "/Font", - "/Widths": [ - 277, - 277, - 354, - 556, - 556, - 889, - 666, - 190, - 333, - 333, - 389, - 583, - 277, - 333, - 277, - 277, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 277, - 277, - 583, - 583, - 583, - 556, - 1015, - 666, - 666, - 722, - 722, - 666, - 610, - 777, - 722, - 277, - 500, - 666, - 556, - 833, - 722, - 777, - 666, - 777, - 722, - 666, - 610, - 722, - 666, - 943, - 666, - 666, - 610, - 277, - 277, - 277, - 469, - 556, - 333, - 556, - 556, - 500, - 556, - 556, - 277, - 556, - 556, - 222, - 222, - 500, - 222, - 833, - 556, - 556, - 556, - 556, - 333, - 500, - 277, - 556, - 500, - 722, - 500, - 500, - 500, - 333, - 259, - 333, - 583, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 277, - 333, - 556, - 556, - 556, - 556, - 259, - 556, - 333, - 736, - 370, - 556, - 583, - 333, - 736, - 552, - 399, - 548, - 333, - 333, - 333, - 576, - 537, - 333, - 333, - 333, - 365, - 556, - 833, - 833, - 833, - 610, - 666, - 666, - 666, - 666, - 666, - 666, - 1000, - 722, - 666, - 666, - 666, - 666, - 277, - 277, - 277, - 277, - 722, - 722, - 777, - 777, - 777, - 777, - 777, - 583, - 777, - 722, - 722, - 722, - 722, - 666, - 666, - 610, - 556, - 556, - 556, - 556, - 556, - 556, - 889, - 500, - 556, - 556, - 556, - 556, - 277, - 277, - 277, - 277, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 548, - 610, - 556, - 556, - 556, - 556, - 500, - 556, - 500 - ] - } - }, - "obj:56 0 R": { - "value": { - "/BaseFont": "/DAAAAA+LiberationSans", - "/FirstChar": 0, - "/FontDescriptor": "145 0 R", - "/LastChar": 22, - "/Subtype": "/TrueType", - "/ToUnicode": "146 0 R", - "/Type": "/Font", - "/Widths": [ - 750, - 333, - 556, - 333, - 556, - 556, - 500, - 722, - 556, - 556, - 500, - 277, - 666, - 556, - 500, - 556, - 556, - 777, - 556, - 277, - 222, - 556, - 556 - ] - } - }, - "obj:57 0 R": { - "value": { - "/BaseFont": "/DejaVuSans", - "/Encoding": "/WinAnsiEncoding", - "/FirstChar": 32, - "/FontDescriptor": "148 0 R", - "/LastChar": 255, - "/Subtype": "/TrueType", - "/Type": "/Font", - "/Widths": [ - 317, - 400, - 459, - 837, - 636, - 950, - 779, - 274, - 390, - 390, - 500, - 837, - 317, - 360, - 317, - 336, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 336, - 336, - 837, - 837, - 837, - 530, - 1000, - 684, - 686, - 698, - 770, - 631, - 575, - 774, - 751, - 294, - 294, - 655, - 557, - 862, - 748, - 787, - 603, - 787, - 694, - 634, - 610, - 731, - 684, - 988, - 685, - 610, - 685, - 390, - 336, - 390, - 837, - 500, - 500, - 612, - 634, - 549, - 634, - 615, - 352, - 634, - 633, - 277, - 277, - 579, - 277, - 974, - 633, - 611, - 634, - 634, - 411, - 520, - 392, - 633, - 591, - 817, - 591, - 591, - 524, - 636, - 336, - 636, - 837, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 317, - 400, - 636, - 636, - 636, - 636, - 336, - 500, - 500, - 1000, - 471, - 611, - 837, - 360, - 1000, - 500, - 500, - 837, - 400, - 400, - 500, - 636, - 636, - 317, - 500, - 400, - 471, - 611, - 969, - 969, - 969, - 530, - 684, - 684, - 684, - 684, - 684, - 684, - 974, - 698, - 631, - 631, - 631, - 631, - 294, - 294, - 294, - 294, - 774, - 748, - 787, - 787, - 787, - 787, - 787, - 837, - 787, - 731, - 731, - 731, - 731, - 610, - 604, - 629, - 612, - 612, - 612, - 612, - 612, - 612, - 981, - 549, - 615, - 615, - 615, - 615, - 277, - 277, - 277, - 277, - 611, - 633, - 611, - 611, - 611, - 611, - 611, - 837, - 611, - 633, - 633, - 633, - 633, - 591, - 634, - 591 - ] - } - }, - "obj:58 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "59 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:59 0 R": { - "value": 220 - }, - "obj:60 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "61 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:61 0 R": { - "value": 12 - }, - "obj:62 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "63 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:63 0 R": { - "value": 220 - }, - "obj:64 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "65 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:65 0 R": { - "value": 12 - }, - "obj:66 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "67 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:67 0 R": { - "value": 220 - }, - "obj:68 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "69 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:69 0 R": { - "value": 12 - }, - "obj:70 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "71 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:71 0 R": { - "value": 220 - }, - "obj:72 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "73 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:73 0 R": { - "value": 12 - }, - "obj:74 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "75 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:75 0 R": { - "value": 220 - }, - "obj:76 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "77 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:77 0 R": { - "value": 12 - }, - "obj:78 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "79 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:79 0 R": { - "value": 220 - }, - "obj:80 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "81 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:81 0 R": { - "value": 12 - }, - "obj:82 0 R": { - "value": { - "/A": "149 0 R", - "/K": [ - 0 + ] + } + }, + "obj:54 0 R": { + "value": { + "/BaseFont": "/BAAAAA+LiberationSerif", + "/FirstChar": 0, + "/FontDescriptor": "141 0 R", + "/LastChar": 32, + "/Subtype": "/TrueType", + "/ToUnicode": "142 0 R", + "/Type": "/Font", + "/Widths": [ + 777, + 943, + 500, + 443, + 333, + 333, + 389, + 250, + 777, + 500, + 333, + 500, + 443, + 610, + 500, + 277, + 556, + 277, + 277, + 500, + 443, + 500, + 443, + 500, + 500, + 556, + 610, + 666, + 500, + 722, + 500, + 722, + 500 + ] + } + }, + "obj:55 0 R": { + "value": { + "/BaseFont": "/LiberationSans", + "/Encoding": "/WinAnsiEncoding", + "/FirstChar": 32, + "/FontDescriptor": "144 0 R", + "/LastChar": 255, + "/Subtype": "/TrueType", + "/Type": "/Font", + "/Widths": [ + 277, + 277, + 354, + 556, + 556, + 889, + 666, + 190, + 333, + 333, + 389, + 583, + 277, + 333, + 277, + 277, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 277, + 277, + 583, + 583, + 583, + 556, + 1015, + 666, + 666, + 722, + 722, + 666, + 610, + 777, + 722, + 277, + 500, + 666, + 556, + 833, + 722, + 777, + 666, + 777, + 722, + 666, + 610, + 722, + 666, + 943, + 666, + 666, + 610, + 277, + 277, + 277, + 469, + 556, + 333, + 556, + 556, + 500, + 556, + 556, + 277, + 556, + 556, + 222, + 222, + 500, + 222, + 833, + 556, + 556, + 556, + 556, + 333, + 500, + 277, + 556, + 500, + 722, + 500, + 500, + 500, + 333, + 259, + 333, + 583, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 277, + 333, + 556, + 556, + 556, + 556, + 259, + 556, + 333, + 736, + 370, + 556, + 583, + 333, + 736, + 552, + 399, + 548, + 333, + 333, + 333, + 576, + 537, + 333, + 333, + 333, + 365, + 556, + 833, + 833, + 833, + 610, + 666, + 666, + 666, + 666, + 666, + 666, + 1000, + 722, + 666, + 666, + 666, + 666, + 277, + 277, + 277, + 277, + 722, + 722, + 777, + 777, + 777, + 777, + 777, + 583, + 777, + 722, + 722, + 722, + 722, + 666, + 666, + 610, + 556, + 556, + 556, + 556, + 556, + 556, + 889, + 500, + 556, + 556, + 556, + 556, + 277, + 277, + 277, + 277, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 548, + 610, + 556, + 556, + 556, + 556, + 500, + 556, + 500 + ] + } + }, + "obj:56 0 R": { + "value": { + "/BaseFont": "/DAAAAA+LiberationSans", + "/FirstChar": 0, + "/FontDescriptor": "145 0 R", + "/LastChar": 22, + "/Subtype": "/TrueType", + "/ToUnicode": "146 0 R", + "/Type": "/Font", + "/Widths": [ + 750, + 333, + 556, + 333, + 556, + 556, + 500, + 722, + 556, + 556, + 500, + 277, + 666, + 556, + 500, + 556, + 556, + 777, + 556, + 277, + 222, + 556, + 556 + ] + } + }, + "obj:57 0 R": { + "value": { + "/BaseFont": "/DejaVuSans", + "/Encoding": "/WinAnsiEncoding", + "/FirstChar": 32, + "/FontDescriptor": "148 0 R", + "/LastChar": 255, + "/Subtype": "/TrueType", + "/Type": "/Font", + "/Widths": [ + 317, + 400, + 459, + 837, + 636, + 950, + 779, + 274, + 390, + 390, + 500, + 837, + 317, + 360, + 317, + 336, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 336, + 336, + 837, + 837, + 837, + 530, + 1000, + 684, + 686, + 698, + 770, + 631, + 575, + 774, + 751, + 294, + 294, + 655, + 557, + 862, + 748, + 787, + 603, + 787, + 694, + 634, + 610, + 731, + 684, + 988, + 685, + 610, + 685, + 390, + 336, + 390, + 837, + 500, + 500, + 612, + 634, + 549, + 634, + 615, + 352, + 634, + 633, + 277, + 277, + 579, + 277, + 974, + 633, + 611, + 634, + 634, + 411, + 520, + 392, + 633, + 591, + 817, + 591, + 591, + 524, + 636, + 336, + 636, + 837, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 317, + 400, + 636, + 636, + 636, + 636, + 336, + 500, + 500, + 1000, + 471, + 611, + 837, + 360, + 1000, + 500, + 500, + 837, + 400, + 400, + 500, + 636, + 636, + 317, + 500, + 400, + 471, + 611, + 969, + 969, + 969, + 530, + 684, + 684, + 684, + 684, + 684, + 684, + 974, + 698, + 631, + 631, + 631, + 631, + 294, + 294, + 294, + 294, + 774, + 748, + 787, + 787, + 787, + 787, + 787, + 837, + 787, + 731, + 731, + 731, + 731, + 610, + 604, + 629, + 612, + 612, + 612, + 612, + 612, + 612, + 981, + 549, + 615, + 615, + 615, + 615, + 277, + 277, + 277, + 277, + 611, + 633, + 611, + 611, + 611, + 611, + 611, + 837, + 611, + 633, + 633, + 633, + 633, + 591, + 634, + 591 + ] + } + }, + "obj:58 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "59 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:83 0 R": { - "value": { - "/A": "150 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:84 0 R": { - "value": { - "/A": "151 0 R", - "/K": [ - 1 + } + }, + "obj:59 0 R": { + "value": 220 + }, + "obj:60 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "61 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:85 0 R": { - "value": { - "/A": "152 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:86 0 R": { - "value": { - "/A": "153 0 R", - "/K": [ - 2 + } + }, + "obj:61 0 R": { + "value": 12 + }, + "obj:62 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "63 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:87 0 R": { - "value": { - "/A": "154 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:88 0 R": { - "value": { - "/A": "155 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:89 0 R": { - "value": { - "/A": "156 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:90 0 R": { - "value": { - "/A": "157 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:91 0 R": { - "value": { - "/A": "158 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:92 0 R": { - "value": { - "/A": "159 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:93 0 R": { - "value": { - "/A": "160 0 R", - "/K": [ - 3 + } + }, + "obj:63 0 R": { + "value": 220 + }, + "obj:64 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "65 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:94 0 R": { - "value": { - "/A": "161 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:95 0 R": { - "value": { - "/A": "162 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:96 0 R": { - "value": { - "/A": "163 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:97 0 R": { - "value": { - "/A": "164 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:98 0 R": { - "value": { - "/A": "165 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:99 0 R": { - "value": { - "/A": "166 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:100 0 R": { - "value": { - "/A": "167 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:101 0 R": { - "value": { - "/A": "168 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:102 0 R": { - "value": { - "/A": "169 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:103 0 R": { - "value": { - "/A": "170 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:104 0 R": { - "value": { - "/A": "171 0 R", - "/K": [ - 4 + } + }, + "obj:65 0 R": { + "value": 12 + }, + "obj:66 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "67 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:105 0 R": { - "value": { - "/A": "172 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:106 0 R": { - "value": { - "/A": "173 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:107 0 R": { - "value": { - "/A": "174 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:108 0 R": { - "value": { - "/A": "175 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:109 0 R": { - "value": { - "/A": "176 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:110 0 R": { - "value": { - "/A": "177 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:111 0 R": { - "value": { - "/A": "178 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:112 0 R": { - "value": { - "/A": "179 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:113 0 R": { - "value": { - "/A": "180 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:114 0 R": { - "value": { - "/A": "181 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:115 0 R": { - "value": { - "/A": "182 0 R", - "/K": [ - 5 + } + }, + "obj:67 0 R": { + "value": 220 + }, + "obj:68 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "69 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:116 0 R": { - "value": { - "/A": "183 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:117 0 R": { - "value": { - "/A": "184 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:118 0 R": { - "value": { - "/A": "185 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:119 0 R": { - "value": { - "/A": "186 0 R", - "/K": [ - 6, - 7 + } + }, + "obj:69 0 R": { + "value": 12 + }, + "obj:70 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "71 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:120 0 R": { - "value": { - "/A": "187 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:121 0 R": { - "value": { - "/A": "188 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:122 0 R": { - "value": { - "/A": "189 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:123 0 R": { - "value": { - "/A": "190 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:124 0 R": { - "value": { - "/A": "191 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:125 0 R": { - "value": { - "/A": "192 0 R", - "/K": [ - 8, - 9 + } + }, + "obj:71 0 R": { + "value": 220 + }, + "obj:72 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "73 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:126 0 R": { - "value": { - "/K": [ - 10 + } + }, + "obj:73 0 R": { + "value": 12 + }, + "obj:74 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" + "/Length": "75 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:127 0 R": { - "value": { - "/K": [ - 11 + } + }, + "obj:75 0 R": { + "value": 220 + }, + "obj:76 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" + "/Length": "77 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:128 0 R": { - "value": { - "/K": [ - 12 + } + }, + "obj:77 0 R": { + "value": 12 + }, + "obj:78 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" + "/Length": "79 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:129 0 R": { - "value": { - "/K": [ - 13 + } + }, + "obj:79 0 R": { + "value": 220 + }, + "obj:80 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:130 0 R": { - "value": { - "/K": [ - 14 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:131 0 R": { - "value": { - "/K": [ - 15 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:132 0 R": { - "value": { - "/K": [ - 16 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:133 0 R": { - "value": { - "/K": [ - 17 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:134 0 R": { - "value": { - "/K": [ - 18 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:135 0 R": { - "value": { - "/K": [ - 19 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:136 0 R": { - "value": { - "/K": [ - 20 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:137 0 R": { - "value": { - "/K": [ - 21 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:138 0 R": { - "value": { - "/K": [ - 22 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:139 0 R": { - "value": { - "/K": [ - 23 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:140 0 R": { - "value": { - "/K": [ - 24 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:141 0 R": { - "value": { - "/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" - } - }, - "obj:142 0 R": { - "stream": { - "dict": { - "/Length": "143 0 R" - } - } - }, - "obj:143 0 R": { - "value": 702 - }, - "obj:144 0 R": { - "value": { - "/Ascent": 905, - "/CapHeight": 979, - "/Descent": -211, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1300, - 979 - ], - "/FontName": "/LiberationSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - } - }, - "obj:145 0 R": { - "value": { - "/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" - } - }, - "obj:146 0 R": { - "stream": { - "dict": { - "/Length": "147 0 R" - } - } - }, - "obj:147 0 R": { - "value": 582 - }, - "obj:148 0 R": { - "value": { - "/Ascent": 928, - "/CapHeight": 1232, - "/Descent": -235, - "/Flags": 4, - "/FontBBox": [ - -1020, - -462, - 1792, - 1232 - ], - "/FontName": "/DejaVuSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - } - }, - "obj:149 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:150 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:151 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:152 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:153 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:154 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:155 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:156 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:157 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:158 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:159 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:160 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:161 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:162 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:163 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:164 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:165 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:166 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:167 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:168 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:169 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:170 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:171 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:172 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:173 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:174 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:175 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:176 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:177 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:178 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:179 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:180 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:181 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:182 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:183 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:184 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:185 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:186 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:187 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:188 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:189 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:190 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:191 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:192 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:193 0 R": { - "stream": { - "dict": { - "/Length": "194 0 R", - "/Length1": 16184 - } - } - }, - "obj:194 0 R": { - "value": 16184 - }, - "obj:195 0 R": { - "stream": { - "dict": { - "/Length": "196 0 R", - "/Length1": 11088 - } - } - }, - "obj:196 0 R": { - "value": 11088 - }, - "trailer": { - "value": { - "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", - "/ID": [ - "b:f8abc47bb1df544a0df9c15a75ef0046", - "b:ecae7a672bccf334835b54867b208438" - ], - "/Info": "2 0 R", - "/Root": "1 0 R", - "/Size": 197 - } + "/Length": "81 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" + } + } + }, + "obj:81 0 R": { + "value": 12 + }, + "obj:82 0 R": { + "value": { + "/A": "149 0 R", + "/K": [ + 0 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:83 0 R": { + "value": { + "/A": "150 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:84 0 R": { + "value": { + "/A": "151 0 R", + "/K": [ + 1 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:85 0 R": { + "value": { + "/A": "152 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:86 0 R": { + "value": { + "/A": "153 0 R", + "/K": [ + 2 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:87 0 R": { + "value": { + "/A": "154 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:88 0 R": { + "value": { + "/A": "155 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:89 0 R": { + "value": { + "/A": "156 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:90 0 R": { + "value": { + "/A": "157 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:91 0 R": { + "value": { + "/A": "158 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:92 0 R": { + "value": { + "/A": "159 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:93 0 R": { + "value": { + "/A": "160 0 R", + "/K": [ + 3 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:94 0 R": { + "value": { + "/A": "161 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:95 0 R": { + "value": { + "/A": "162 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:96 0 R": { + "value": { + "/A": "163 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:97 0 R": { + "value": { + "/A": "164 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:98 0 R": { + "value": { + "/A": "165 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:99 0 R": { + "value": { + "/A": "166 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:100 0 R": { + "value": { + "/A": "167 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:101 0 R": { + "value": { + "/A": "168 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:102 0 R": { + "value": { + "/A": "169 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:103 0 R": { + "value": { + "/A": "170 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:104 0 R": { + "value": { + "/A": "171 0 R", + "/K": [ + 4 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:105 0 R": { + "value": { + "/A": "172 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:106 0 R": { + "value": { + "/A": "173 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:107 0 R": { + "value": { + "/A": "174 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:108 0 R": { + "value": { + "/A": "175 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:109 0 R": { + "value": { + "/A": "176 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:110 0 R": { + "value": { + "/A": "177 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:111 0 R": { + "value": { + "/A": "178 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:112 0 R": { + "value": { + "/A": "179 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:113 0 R": { + "value": { + "/A": "180 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:114 0 R": { + "value": { + "/A": "181 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:115 0 R": { + "value": { + "/A": "182 0 R", + "/K": [ + 5 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:116 0 R": { + "value": { + "/A": "183 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:117 0 R": { + "value": { + "/A": "184 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:118 0 R": { + "value": { + "/A": "185 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:119 0 R": { + "value": { + "/A": "186 0 R", + "/K": [ + 6, + 7 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:120 0 R": { + "value": { + "/A": "187 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:121 0 R": { + "value": { + "/A": "188 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:122 0 R": { + "value": { + "/A": "189 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:123 0 R": { + "value": { + "/A": "190 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:124 0 R": { + "value": { + "/A": "191 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:125 0 R": { + "value": { + "/A": "192 0 R", + "/K": [ + 8, + 9 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:126 0 R": { + "value": { + "/K": [ + 10 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:127 0 R": { + "value": { + "/K": [ + 11 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:128 0 R": { + "value": { + "/K": [ + 12 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:129 0 R": { + "value": { + "/K": [ + 13 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:130 0 R": { + "value": { + "/K": [ + 14 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:131 0 R": { + "value": { + "/K": [ + 15 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:132 0 R": { + "value": { + "/K": [ + 16 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:133 0 R": { + "value": { + "/K": [ + 17 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:134 0 R": { + "value": { + "/K": [ + 18 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:135 0 R": { + "value": { + "/K": [ + 19 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:136 0 R": { + "value": { + "/K": [ + 20 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:137 0 R": { + "value": { + "/K": [ + 21 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:138 0 R": { + "value": { + "/K": [ + 22 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:139 0 R": { + "value": { + "/K": [ + 23 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:140 0 R": { + "value": { + "/K": [ + 24 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:141 0 R": { + "value": { + "/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" + } + }, + "obj:142 0 R": { + "stream": { + "dict": { + "/Length": "143 0 R" + } + } + }, + "obj:143 0 R": { + "value": 702 + }, + "obj:144 0 R": { + "value": { + "/Ascent": 905, + "/CapHeight": 979, + "/Descent": -211, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1300, + 979 + ], + "/FontName": "/LiberationSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + } + }, + "obj:145 0 R": { + "value": { + "/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" + } + }, + "obj:146 0 R": { + "stream": { + "dict": { + "/Length": "147 0 R" + } + } + }, + "obj:147 0 R": { + "value": 582 + }, + "obj:148 0 R": { + "value": { + "/Ascent": 928, + "/CapHeight": 1232, + "/Descent": -235, + "/Flags": 4, + "/FontBBox": [ + -1020, + -462, + 1792, + 1232 + ], + "/FontName": "/DejaVuSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + } + }, + "obj:149 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:150 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:151 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:152 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:153 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:154 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:155 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:156 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:157 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:158 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:159 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:160 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:161 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:162 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:163 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:164 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:165 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:166 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:167 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:168 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:169 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:170 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:171 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:172 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:173 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:174 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:175 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:176 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:177 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:178 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:179 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:180 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:181 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:182 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:183 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:184 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:185 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:186 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:187 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:188 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:189 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:190 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:191 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:192 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:193 0 R": { + "stream": { + "dict": { + "/Length": "194 0 R", + "/Length1": 16184 + } + } + }, + "obj:194 0 R": { + "value": 16184 + }, + "obj:195 0 R": { + "stream": { + "dict": { + "/Length": "196 0 R", + "/Length1": 11088 + } + } + }, + "obj:196 0 R": { + "value": 11088 + }, + "trailer": { + "value": { + "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", + "/ID": [ + "b:f8abc47bb1df544a0df9c15a75ef0046", + "b:ecae7a672bccf334835b54867b208438" + ], + "/Info": "2 0 R", + "/Root": "1 0 R", + "/Size": 197 } } } diff --git a/qpdf/qtest/qpdf/json-field-types-v2.out b/qpdf/qtest/qpdf/json-field-types-v2.out index d4948608..f5229296 100644 --- a/qpdf/qtest/qpdf/json-field-types-v2.out +++ b/qpdf/qtest/qpdf/json-field-types-v2.out @@ -431,929 +431,962 @@ "userpasswordmatched": false }, "outlines": [], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.5", - "maxobjectid": 196, - "objects": { - "obj:1 0 R": { - "value": { - "/AcroForm": { - "/DR": "3 0 R", - "/Fields": [ - "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" - ], - "/NeedAppearances": true - }, - "/Lang": "u:en-US", - "/MarkInfo": { - "/Marked": true - }, - "/OpenAction": [ - "15 0 R", - "/XYZ", - null, - null, - 0 - ], - "/Pages": "16 0 R", - "/StructTreeRoot": "17 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/CreationDate": "u:D:20190103125434-05'00'", - "/Creator": "u:Writer", - "/Producer": "u:LibreOffice 6.1" - } - }, - "obj:3 0 R": { - "value": { - "/Font": "18 0 R", - "/ProcSet": [ - "/PDF", - "/Text" - ] - } - }, - "obj:4 0 R": { - "value": { - "/AP": { - "/N": "19 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Tx", - "/P": "15 0 R", - "/Rect": [ - 123.499, - 689.901, - 260.801, - 704.699 - ], - "/Subtype": "/Widget", - "/T": "u:text", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:5 0 R": { - "value": { - "/DV": "/1", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "21 0 R", - "22 0 R", - "23 0 R" - ], - "/P": "15 0 R", - "/T": "u:r1", - "/V": "/1" - } - }, - "obj:6 0 R": { - "value": { - "/AP": { - "/N": { - "/Off": "24 0 R", - "/Yes": "26 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 554.301, - 130.701, - 566.349 - ], - "/Subtype": "/Widget", - "/T": "u:checkbox1", - "/Type": "/Annot", - "/V": "/Off" - } - }, - "obj:7 0 R": { - "value": { - "/AP": { - "/N": { - "/Off": "29 0 R", - "/Yes": "31 0 R" - } - }, - "/AS": "/Yes", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Yes", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 527.751, - 130.701, - 539.799 - ], - "/Subtype": "/Widget", - "/T": "u:checkbox2", - "/Type": "/Annot", - "/V": "/Yes" - } - }, - "obj:8 0 R": { - "value": { - "/AP": { - "/N": { - "/Off": "33 0 R", - "/Yes": "35 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/DV": "/Off", - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:8" - }, - "/P": "15 0 R", - "/Rect": [ - 118.649, - 500.501, - 130.701, - 512.549 - ], - "/Subtype": "/Widget", - "/T": "u:checkbox3", - "/Type": "/Annot", - "/V": "/Off" - } - }, - "obj:9 0 R": { - "value": { - "/DV": "/2", - "/FT": "/Btn", - "/Ff": 49152, - "/Kids": [ - "37 0 R", - "38 0 R", - "39 0 R" - ], - "/P": "15 0 R", - "/T": "u:r2", - "/V": "/2" - } - }, - "obj:10 0 R": { - "value": { - "/AP": { - "/N": "40 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:salad πʬ", - "/F": 4, - "/FT": "/Tx", - "/P": "15 0 R", - "/Rect": [ - 113.649, - 260.151, - 351.101, - 278.099 - ], - "/Subtype": "/Widget", - "/T": "u:text2", - "/Type": "/Annot", - "/V": "u:salad πʬ" - } - }, - "obj:11 0 R": { - "value": { - "/AP": { - "/N": "42 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Opt": [ - "u:five", - "u:six", - "u:seven", - "u:eight" - ], - "/P": "15 0 R", - "/Rect": [ - 158.449, - 156.651, - 221.001, - 232.849 - ], - "/Subtype": "/Widget", - "/T": "u:list1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:12 0 R": { - "value": { - "/AP": { - "/N": "44 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Ff": 131072, - "/Opt": [ - "u:nine", - "u:ten", - "u:elephant", - "u:twelve" - ], - "/P": "15 0 R", - "/Rect": [ - 159.149, - 107.251, - 244.201, - 130.949 - ], - "/Subtype": "/Widget", - "/T": "u:drop1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:13 0 R": { - "value": { - "/AP": { - "/N": "46 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Ff": 393216, - "/Opt": [ - "u:one", - "u:two", - "u:pi", - "u:four" - ], - "/P": "15 0 R", - "/Rect": [ - 403.949, - 159.401, - 459.001, - 232.849 - ], - "/Subtype": "/Widget", - "/T": "u:combolist1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:14 0 R": { - "value": { - "/AP": { - "/N": "48 0 R" - }, - "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", - "/DR": { - "/Font": "18 0 R" - }, - "/DV": "u:", - "/F": 4, - "/FT": "/Ch", - "/Ff": 393216, - "/Opt": [ - "u:alpha", - "u:beta", - "u:gamma", - "u:delta" - ], - "/P": "15 0 R", - "/Rect": [ - 404.599, - 101.451, - 476.701, - 135.349 - ], - "/Subtype": "/Widget", - "/T": "u:combodrop1", - "/Type": "/Annot", - "/V": "u:" - } - }, - "obj:15 0 R": { - "value": { - "/Annots": [ + "objects": { + "obj:1 0 R": { + "value": { + "/AcroForm": { + "/DR": "3 0 R", + "/Fields": [ "4 0 R", - "21 0 R", - "22 0 R", - "23 0 R", + "5 0 R", "6 0 R", "7 0 R", "8 0 R", - "37 0 R", - "38 0 R", - "39 0 R", + "9 0 R", "10 0 R", - "13 0 R", "11 0 R", "12 0 R", + "13 0 R", "14 0 R" ], - "/Contents": "50 0 R", - "/Group": { - "/CS": "/DeviceRGB", - "/I": true, - "/S": "/Transparency" - }, - "/MediaBox": [ + "/NeedAppearances": true + }, + "/Lang": "u:en-US", + "/MarkInfo": { + "/Marked": true + }, + "/OpenAction": [ + "15 0 R", + "/XYZ", + null, + null, + 0 + ], + "/Pages": "16 0 R", + "/StructTreeRoot": "17 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/CreationDate": "u:D:20190103125434-05'00'", + "/Creator": "u:Writer", + "/Producer": "u:LibreOffice 6.1" + } + }, + "obj:3 0 R": { + "value": { + "/Font": "18 0 R", + "/ProcSet": [ + "/PDF", + "/Text" + ] + } + }, + "obj:4 0 R": { + "value": { + "/AP": { + "/N": "19 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Tx", + "/P": "15 0 R", + "/Rect": [ + 123.499, + 689.901, + 260.801, + 704.699 + ], + "/Subtype": "/Widget", + "/T": "u:text", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:5 0 R": { + "value": { + "/DV": "/1", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "21 0 R", + "22 0 R", + "23 0 R" + ], + "/P": "15 0 R", + "/T": "u:r1", + "/V": "/1" + } + }, + "obj:6 0 R": { + "value": { + "/AP": { + "/N": { + "/Off": "24 0 R", + "/Yes": "26 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 554.301, + 130.701, + 566.349 + ], + "/Subtype": "/Widget", + "/T": "u:checkbox1", + "/Type": "/Annot", + "/V": "/Off" + } + }, + "obj:7 0 R": { + "value": { + "/AP": { + "/N": { + "/Off": "29 0 R", + "/Yes": "31 0 R" + } + }, + "/AS": "/Yes", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Yes", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 527.751, + 130.701, + 539.799 + ], + "/Subtype": "/Widget", + "/T": "u:checkbox2", + "/Type": "/Annot", + "/V": "/Yes" + } + }, + "obj:8 0 R": { + "value": { + "/AP": { + "/N": { + "/Off": "33 0 R", + "/Yes": "35 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/DV": "/Off", + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:8" + }, + "/P": "15 0 R", + "/Rect": [ + 118.649, + 500.501, + 130.701, + 512.549 + ], + "/Subtype": "/Widget", + "/T": "u:checkbox3", + "/Type": "/Annot", + "/V": "/Off" + } + }, + "obj:9 0 R": { + "value": { + "/DV": "/2", + "/FT": "/Btn", + "/Ff": 49152, + "/Kids": [ + "37 0 R", + "38 0 R", + "39 0 R" + ], + "/P": "15 0 R", + "/T": "u:r2", + "/V": "/2" + } + }, + "obj:10 0 R": { + "value": { + "/AP": { + "/N": "40 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:salad πʬ", + "/F": 4, + "/FT": "/Tx", + "/P": "15 0 R", + "/Rect": [ + 113.649, + 260.151, + 351.101, + 278.099 + ], + "/Subtype": "/Widget", + "/T": "u:text2", + "/Type": "/Annot", + "/V": "u:salad πʬ" + } + }, + "obj:11 0 R": { + "value": { + "/AP": { + "/N": "42 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Opt": [ + "u:five", + "u:six", + "u:seven", + "u:eight" + ], + "/P": "15 0 R", + "/Rect": [ + 158.449, + 156.651, + 221.001, + 232.849 + ], + "/Subtype": "/Widget", + "/T": "u:list1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:12 0 R": { + "value": { + "/AP": { + "/N": "44 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Ff": 131072, + "/Opt": [ + "u:nine", + "u:ten", + "u:elephant", + "u:twelve" + ], + "/P": "15 0 R", + "/Rect": [ + 159.149, + 107.251, + 244.201, + 130.949 + ], + "/Subtype": "/Widget", + "/T": "u:drop1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:13 0 R": { + "value": { + "/AP": { + "/N": "46 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Ff": 393216, + "/Opt": [ + "u:one", + "u:two", + "u:pi", + "u:four" + ], + "/P": "15 0 R", + "/Rect": [ + 403.949, + 159.401, + 459.001, + 232.849 + ], + "/Subtype": "/Widget", + "/T": "u:combolist1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:14 0 R": { + "value": { + "/AP": { + "/N": "48 0 R" + }, + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DR": { + "/Font": "18 0 R" + }, + "/DV": "u:", + "/F": 4, + "/FT": "/Ch", + "/Ff": 393216, + "/Opt": [ + "u:alpha", + "u:beta", + "u:gamma", + "u:delta" + ], + "/P": "15 0 R", + "/Rect": [ + 404.599, + 101.451, + 476.701, + 135.349 + ], + "/Subtype": "/Widget", + "/T": "u:combodrop1", + "/Type": "/Annot", + "/V": "u:" + } + }, + "obj:15 0 R": { + "value": { + "/Annots": [ + "4 0 R", + "21 0 R", + "22 0 R", + "23 0 R", + "6 0 R", + "7 0 R", + "8 0 R", + "37 0 R", + "38 0 R", + "39 0 R", + "10 0 R", + "13 0 R", + "11 0 R", + "12 0 R", + "14 0 R" + ], + "/Contents": "50 0 R", + "/Group": { + "/CS": "/DeviceRGB", + "/I": true, + "/S": "/Transparency" + }, + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "16 0 R", + "/Resources": "3 0 R", + "/StructParents": 0, + "/Type": "/Page" + } + }, + "obj:16 0 R": { + "value": { + "/Count": 1, + "/Kids": [ + "15 0 R" + ], + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Resources": "3 0 R", + "/Type": "/Pages" + } + }, + "obj:17 0 R": { + "value": { + "/K": [ + "52 0 R" + ], + "/ParentTree": "53 0 R", + "/RoleMap": { + "/Document": "/Document", + "/Standard": "/P" + }, + "/Type": "/StructTreeRoot" + } + }, + "obj:18 0 R": { + "value": { + "/F1": "54 0 R", + "/F2": "55 0 R", + "/F3": "56 0 R", + "/F4": "57 0 R", + "/ZaDi": "28 0 R" + } + }, + "obj:19 0 R": { + "stream": { + "dict": { + "/BBox": [ 0, 0, - 612, - 792 + 137.3, + 14.8 ], - "/Parent": "16 0 R", + "/Length": "20 0 R", "/Resources": "3 0 R", - "/StructParents": 0, - "/Type": "/Page" + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:16 0 R": { - "value": { - "/Count": 1, - "/Kids": [ - "15 0 R" - ], - "/MediaBox": [ + } + }, + "obj:20 0 R": { + "value": 12 + }, + "obj:21 0 R": { + "value": { + "/AP": { + "/N": { + "/1": "58 0 R", + "/Off": "60 0 R" + } + }, + "/AS": "/1", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "5 0 R", + "/Rect": [ + 152.749, + 648.501, + 164.801, + 660.549 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:22 0 R": { + "value": { + "/AP": { + "/N": { + "/2": "62 0 R", + "/Off": "64 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "5 0 R", + "/Rect": [ + 152.749, + 627.301, + 164.801, + 639.349 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:23 0 R": { + "value": { + "/AP": { + "/N": { + "/3": "66 0 R", + "/Off": "68 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "5 0 R", + "/Rect": [ + 151.399, + 606.501, + 163.451, + 618.549 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:24 0 R": { + "stream": { + "dict": { + "/BBox": [ 0, 0, - 612, - 792 + 12.05, + 12.05 ], + "/Length": "25 0 R", "/Resources": "3 0 R", - "/Type": "/Pages" + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:17 0 R": { - "value": { - "/K": [ - "52 0 R" + } + }, + "obj:25 0 R": { + "value": 12 + }, + "obj:26 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/ParentTree": "53 0 R", - "/RoleMap": { - "/Document": "/Document", - "/Standard": "/P" - }, - "/Type": "/StructTreeRoot" + "/Length": "27 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:18 0 R": { - "value": { - "/F1": "54 0 R", - "/F2": "55 0 R", - "/F3": "56 0 R", - "/F4": "57 0 R", - "/ZaDi": "28 0 R" - } - }, - "obj:19 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 137.3, - 14.8 - ], - "/Length": "20 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:20 0 R": { - "value": 12 - }, - "obj:21 0 R": { - "value": { - "/AP": { - "/N": { - "/1": "58 0 R", - "/Off": "60 0 R" - } - }, - "/AS": "/1", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "5 0 R", - "/Rect": [ - 152.749, - 648.501, - 164.801, - 660.549 + } + }, + "obj:27 0 R": { + "value": 82 + }, + "obj:28 0 R": { + "value": { + "/BaseFont": "/ZapfDingbats", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:29 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "30 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:22 0 R": { - "value": { - "/AP": { - "/N": { - "/2": "62 0 R", - "/Off": "64 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "5 0 R", - "/Rect": [ - 152.749, - 627.301, - 164.801, - 639.349 + } + }, + "obj:30 0 R": { + "value": 12 + }, + "obj:31 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "32 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:23 0 R": { - "value": { - "/AP": { - "/N": { - "/3": "66 0 R", - "/Off": "68 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "5 0 R", - "/Rect": [ - 151.399, - 606.501, - 163.451, - 618.549 + } + }, + "obj:32 0 R": { + "value": 82 + }, + "obj:33 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "34 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:24 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "25 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:25 0 R": { - "value": 12 - }, - "obj:26 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "27 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:27 0 R": { - "value": 82 - }, - "obj:28 0 R": { - "value": { - "/BaseFont": "/ZapfDingbats", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:29 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "30 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:30 0 R": { - "value": 12 - }, - "obj:31 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "32 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:32 0 R": { - "value": 82 - }, - "obj:33 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "34 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:34 0 R": { - "value": 12 - }, - "obj:35 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "36 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:36 0 R": { - "value": 82 - }, - "obj:37 0 R": { - "value": { - "/AP": { - "/N": { - "/1": "70 0 R", - "/Off": "72 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "9 0 R", - "/Rect": [ - 118.649, - 388.101, - 130.701, - 400.149 + } + }, + "obj:34 0 R": { + "value": 12 + }, + "obj:35 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "36 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:38 0 R": { - "value": { - "/AP": { - "/N": { - "/2": "74 0 R", - "/Off": "76 0 R" - } - }, - "/AS": "/2", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "9 0 R", - "/Rect": [ - 119.349, - 362.201, - 131.401, - 374.249 + } + }, + "obj:36 0 R": { + "value": 82 + }, + "obj:37 0 R": { + "value": { + "/AP": { + "/N": { + "/1": "70 0 R", + "/Off": "72 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "9 0 R", + "/Rect": [ + 118.649, + 388.101, + 130.701, + 400.149 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:38 0 R": { + "value": { + "/AP": { + "/N": { + "/2": "74 0 R", + "/Off": "76 0 R" + } + }, + "/AS": "/2", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "9 0 R", + "/Rect": [ + 119.349, + 362.201, + 131.401, + 374.249 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:39 0 R": { + "value": { + "/AP": { + "/N": { + "/3": "78 0 R", + "/Off": "80 0 R" + } + }, + "/AS": "/Off", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DR": { + "/Font": { + "/ZaDi": "28 0 R" + } + }, + "/F": 4, + "/FT": "/Btn", + "/MK": { + "/CA": "u:l" + }, + "/P": "15 0 R", + "/Parent": "9 0 R", + "/Rect": [ + 119.349, + 333.551, + 131.401, + 345.599 + ], + "/Subtype": "/Widget", + "/Type": "/Annot" + } + }, + "obj:40 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 237.45, + 17.95 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "41 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:39 0 R": { - "value": { - "/AP": { - "/N": { - "/3": "78 0 R", - "/Off": "80 0 R" - } - }, - "/AS": "/Off", - "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", - "/DR": { - "/Font": { - "/ZaDi": "28 0 R" - } - }, - "/F": 4, - "/FT": "/Btn", - "/MK": { - "/CA": "u:l" - }, - "/P": "15 0 R", - "/Parent": "9 0 R", - "/Rect": [ - 119.349, - 333.551, - 131.401, - 345.599 + } + }, + "obj:41 0 R": { + "value": 12 + }, + "obj:42 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 62.55, + 76.2 ], - "/Subtype": "/Widget", - "/Type": "/Annot" + "/Length": "43 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:40 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 237.45, - 17.95 - ], - "/Length": "41 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:43 0 R": { + "value": 46 + }, + "obj:44 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 85.05, + 23.7 + ], + "/Length": "45 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:41 0 R": { - "value": 12 - }, - "obj:42 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 62.55, - 76.2 - ], - "/Length": "43 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:45 0 R": { + "value": 46 + }, + "obj:46 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 55.05, + 73.45 + ], + "/Length": "47 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:43 0 R": { - "value": 46 - }, - "obj:44 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 85.05, - 23.7 - ], - "/Length": "45 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:47 0 R": { + "value": 47 + }, + "obj:48 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 72.1, + 33.9 + ], + "/Length": "49 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:45 0 R": { - "value": 46 - }, - "obj:46 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 55.05, - 73.45 - ], - "/Length": "47 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } + } + }, + "obj:49 0 R": { + "value": 45 + }, + "obj:50 0 R": { + "stream": { + "dict": { + "/Length": "51 0 R" } - }, - "obj:47 0 R": { - "value": 47 - }, - "obj:48 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 72.1, - 33.9 - ], - "/Length": "49 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:49 0 R": { - "value": 45 - }, - "obj:50 0 R": { - "stream": { - "dict": { - "/Length": "51 0 R" - } - } - }, - "obj:51 0 R": { - "value": 4747 - }, - "obj:52 0 R": { - "value": { - "/K": [ + } + }, + "obj:51 0 R": { + "value": 4747 + }, + "obj:52 0 R": { + "value": { + "/K": [ + "82 0 R", + "83 0 R", + "84 0 R", + "85 0 R", + "86 0 R", + "87 0 R", + "88 0 R", + "89 0 R", + "90 0 R", + "91 0 R", + "92 0 R", + "93 0 R", + "94 0 R", + "95 0 R", + "96 0 R", + "97 0 R", + "98 0 R", + "99 0 R", + "100 0 R", + "101 0 R", + "102 0 R", + "103 0 R", + "104 0 R", + "105 0 R", + "106 0 R", + "107 0 R", + "108 0 R", + "109 0 R", + "110 0 R", + "111 0 R", + "112 0 R", + "113 0 R", + "114 0 R", + "115 0 R", + "116 0 R", + "117 0 R", + "118 0 R", + "119 0 R", + "120 0 R", + "121 0 R", + "122 0 R", + "123 0 R", + "124 0 R", + "125 0 R", + "126 0 R", + "127 0 R", + "128 0 R", + "129 0 R", + "130 0 R", + "131 0 R", + "132 0 R", + "133 0 R", + "134 0 R", + "135 0 R", + "136 0 R", + "137 0 R", + "138 0 R", + "139 0 R", + "140 0 R" + ], + "/P": "17 0 R", + "/Pg": "15 0 R", + "/S": "/Document", + "/Type": "/StructElem" + } + }, + "obj:53 0 R": { + "value": { + "/Nums": [ + 0, + [ "82 0 R", - "83 0 R", "84 0 R", - "85 0 R", "86 0 R", - "87 0 R", - "88 0 R", - "89 0 R", - "90 0 R", - "91 0 R", - "92 0 R", "93 0 R", - "94 0 R", - "95 0 R", - "96 0 R", - "97 0 R", - "98 0 R", - "99 0 R", - "100 0 R", - "101 0 R", - "102 0 R", - "103 0 R", "104 0 R", - "105 0 R", - "106 0 R", - "107 0 R", - "108 0 R", - "109 0 R", - "110 0 R", - "111 0 R", - "112 0 R", - "113 0 R", - "114 0 R", "115 0 R", - "116 0 R", - "117 0 R", - "118 0 R", "119 0 R", - "120 0 R", - "121 0 R", - "122 0 R", - "123 0 R", - "124 0 R", + "119 0 R", + "125 0 R", "125 0 R", "126 0 R", "127 0 R", @@ -1370,1809 +1403,1771 @@ "138 0 R", "139 0 R", "140 0 R" - ], - "/P": "17 0 R", - "/Pg": "15 0 R", - "/S": "/Document", - "/Type": "/StructElem" - } - }, - "obj:53 0 R": { - "value": { - "/Nums": [ - 0, - [ - "82 0 R", - "84 0 R", - "86 0 R", - "93 0 R", - "104 0 R", - "115 0 R", - "119 0 R", - "119 0 R", - "125 0 R", - "125 0 R", - "126 0 R", - "127 0 R", - "128 0 R", - "129 0 R", - "130 0 R", - "131 0 R", - "132 0 R", - "133 0 R", - "134 0 R", - "135 0 R", - "136 0 R", - "137 0 R", - "138 0 R", - "139 0 R", - "140 0 R" - ] ] - } - }, - "obj:54 0 R": { - "value": { - "/BaseFont": "/BAAAAA+LiberationSerif", - "/FirstChar": 0, - "/FontDescriptor": "141 0 R", - "/LastChar": 32, - "/Subtype": "/TrueType", - "/ToUnicode": "142 0 R", - "/Type": "/Font", - "/Widths": [ - 777, - 943, - 500, - 443, - 333, - 333, - 389, - 250, - 777, - 500, - 333, - 500, - 443, - 610, - 500, - 277, - 556, - 277, - 277, - 500, - 443, - 500, - 443, - 500, - 500, - 556, - 610, - 666, - 500, - 722, - 500, - 722, - 500 - ] - } - }, - "obj:55 0 R": { - "value": { - "/BaseFont": "/LiberationSans", - "/Encoding": "/WinAnsiEncoding", - "/FirstChar": 32, - "/FontDescriptor": "144 0 R", - "/LastChar": 255, - "/Subtype": "/TrueType", - "/Type": "/Font", - "/Widths": [ - 277, - 277, - 354, - 556, - 556, - 889, - 666, - 190, - 333, - 333, - 389, - 583, - 277, - 333, - 277, - 277, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 277, - 277, - 583, - 583, - 583, - 556, - 1015, - 666, - 666, - 722, - 722, - 666, - 610, - 777, - 722, - 277, - 500, - 666, - 556, - 833, - 722, - 777, - 666, - 777, - 722, - 666, - 610, - 722, - 666, - 943, - 666, - 666, - 610, - 277, - 277, - 277, - 469, - 556, - 333, - 556, - 556, - 500, - 556, - 556, - 277, - 556, - 556, - 222, - 222, - 500, - 222, - 833, - 556, - 556, - 556, - 556, - 333, - 500, - 277, - 556, - 500, - 722, - 500, - 500, - 500, - 333, - 259, - 333, - 583, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 277, - 333, - 556, - 556, - 556, - 556, - 259, - 556, - 333, - 736, - 370, - 556, - 583, - 333, - 736, - 552, - 399, - 548, - 333, - 333, - 333, - 576, - 537, - 333, - 333, - 333, - 365, - 556, - 833, - 833, - 833, - 610, - 666, - 666, - 666, - 666, - 666, - 666, - 1000, - 722, - 666, - 666, - 666, - 666, - 277, - 277, - 277, - 277, - 722, - 722, - 777, - 777, - 777, - 777, - 777, - 583, - 777, - 722, - 722, - 722, - 722, - 666, - 666, - 610, - 556, - 556, - 556, - 556, - 556, - 556, - 889, - 500, - 556, - 556, - 556, - 556, - 277, - 277, - 277, - 277, - 556, - 556, - 556, - 556, - 556, - 556, - 556, - 548, - 610, - 556, - 556, - 556, - 556, - 500, - 556, - 500 - ] - } - }, - "obj:56 0 R": { - "value": { - "/BaseFont": "/DAAAAA+LiberationSans", - "/FirstChar": 0, - "/FontDescriptor": "145 0 R", - "/LastChar": 22, - "/Subtype": "/TrueType", - "/ToUnicode": "146 0 R", - "/Type": "/Font", - "/Widths": [ - 750, - 333, - 556, - 333, - 556, - 556, - 500, - 722, - 556, - 556, - 500, - 277, - 666, - 556, - 500, - 556, - 556, - 777, - 556, - 277, - 222, - 556, - 556 - ] - } - }, - "obj:57 0 R": { - "value": { - "/BaseFont": "/DejaVuSans", - "/Encoding": "/WinAnsiEncoding", - "/FirstChar": 32, - "/FontDescriptor": "148 0 R", - "/LastChar": 255, - "/Subtype": "/TrueType", - "/Type": "/Font", - "/Widths": [ - 317, - 400, - 459, - 837, - 636, - 950, - 779, - 274, - 390, - 390, - 500, - 837, - 317, - 360, - 317, - 336, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 636, - 336, - 336, - 837, - 837, - 837, - 530, - 1000, - 684, - 686, - 698, - 770, - 631, - 575, - 774, - 751, - 294, - 294, - 655, - 557, - 862, - 748, - 787, - 603, - 787, - 694, - 634, - 610, - 731, - 684, - 988, - 685, - 610, - 685, - 390, - 336, - 390, - 837, - 500, - 500, - 612, - 634, - 549, - 634, - 615, - 352, - 634, - 633, - 277, - 277, - 579, - 277, - 974, - 633, - 611, - 634, - 634, - 411, - 520, - 392, - 633, - 591, - 817, - 591, - 591, - 524, - 636, - 336, - 636, - 837, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 317, - 400, - 636, - 636, - 636, - 636, - 336, - 500, - 500, - 1000, - 471, - 611, - 837, - 360, - 1000, - 500, - 500, - 837, - 400, - 400, - 500, - 636, - 636, - 317, - 500, - 400, - 471, - 611, - 969, - 969, - 969, - 530, - 684, - 684, - 684, - 684, - 684, - 684, - 974, - 698, - 631, - 631, - 631, - 631, - 294, - 294, - 294, - 294, - 774, - 748, - 787, - 787, - 787, - 787, - 787, - 837, - 787, - 731, - 731, - 731, - 731, - 610, - 604, - 629, - 612, - 612, - 612, - 612, - 612, - 612, - 981, - 549, - 615, - 615, - 615, - 615, - 277, - 277, - 277, - 277, - 611, - 633, - 611, - 611, - 611, - 611, - 611, - 837, - 611, - 633, - 633, - 633, - 633, - 591, - 634, - 591 - ] - } - }, - "obj:58 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "59 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:59 0 R": { - "value": 220 - }, - "obj:60 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "61 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:61 0 R": { - "value": 12 - }, - "obj:62 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "63 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:63 0 R": { - "value": 220 - }, - "obj:64 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "65 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:65 0 R": { - "value": 12 - }, - "obj:66 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "67 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:67 0 R": { - "value": 220 - }, - "obj:68 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "69 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:69 0 R": { - "value": 12 - }, - "obj:70 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "71 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:71 0 R": { - "value": 220 - }, - "obj:72 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "73 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:73 0 R": { - "value": 12 - }, - "obj:74 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "75 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:75 0 R": { - "value": 220 - }, - "obj:76 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "77 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:77 0 R": { - "value": 12 - }, - "obj:78 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "79 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:79 0 R": { - "value": 220 - }, - "obj:80 0 R": { - "stream": { - "dict": { - "/BBox": [ - 0, - 0, - 12.05, - 12.05 - ], - "/Length": "81 0 R", - "/Resources": "3 0 R", - "/Subtype": "/Form", - "/Type": "/XObject" - } - } - }, - "obj:81 0 R": { - "value": 12 - }, - "obj:82 0 R": { - "value": { - "/A": "149 0 R", - "/K": [ - 0 + ] + } + }, + "obj:54 0 R": { + "value": { + "/BaseFont": "/BAAAAA+LiberationSerif", + "/FirstChar": 0, + "/FontDescriptor": "141 0 R", + "/LastChar": 32, + "/Subtype": "/TrueType", + "/ToUnicode": "142 0 R", + "/Type": "/Font", + "/Widths": [ + 777, + 943, + 500, + 443, + 333, + 333, + 389, + 250, + 777, + 500, + 333, + 500, + 443, + 610, + 500, + 277, + 556, + 277, + 277, + 500, + 443, + 500, + 443, + 500, + 500, + 556, + 610, + 666, + 500, + 722, + 500, + 722, + 500 + ] + } + }, + "obj:55 0 R": { + "value": { + "/BaseFont": "/LiberationSans", + "/Encoding": "/WinAnsiEncoding", + "/FirstChar": 32, + "/FontDescriptor": "144 0 R", + "/LastChar": 255, + "/Subtype": "/TrueType", + "/Type": "/Font", + "/Widths": [ + 277, + 277, + 354, + 556, + 556, + 889, + 666, + 190, + 333, + 333, + 389, + 583, + 277, + 333, + 277, + 277, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 277, + 277, + 583, + 583, + 583, + 556, + 1015, + 666, + 666, + 722, + 722, + 666, + 610, + 777, + 722, + 277, + 500, + 666, + 556, + 833, + 722, + 777, + 666, + 777, + 722, + 666, + 610, + 722, + 666, + 943, + 666, + 666, + 610, + 277, + 277, + 277, + 469, + 556, + 333, + 556, + 556, + 500, + 556, + 556, + 277, + 556, + 556, + 222, + 222, + 500, + 222, + 833, + 556, + 556, + 556, + 556, + 333, + 500, + 277, + 556, + 500, + 722, + 500, + 500, + 500, + 333, + 259, + 333, + 583, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 277, + 333, + 556, + 556, + 556, + 556, + 259, + 556, + 333, + 736, + 370, + 556, + 583, + 333, + 736, + 552, + 399, + 548, + 333, + 333, + 333, + 576, + 537, + 333, + 333, + 333, + 365, + 556, + 833, + 833, + 833, + 610, + 666, + 666, + 666, + 666, + 666, + 666, + 1000, + 722, + 666, + 666, + 666, + 666, + 277, + 277, + 277, + 277, + 722, + 722, + 777, + 777, + 777, + 777, + 777, + 583, + 777, + 722, + 722, + 722, + 722, + 666, + 666, + 610, + 556, + 556, + 556, + 556, + 556, + 556, + 889, + 500, + 556, + 556, + 556, + 556, + 277, + 277, + 277, + 277, + 556, + 556, + 556, + 556, + 556, + 556, + 556, + 548, + 610, + 556, + 556, + 556, + 556, + 500, + 556, + 500 + ] + } + }, + "obj:56 0 R": { + "value": { + "/BaseFont": "/DAAAAA+LiberationSans", + "/FirstChar": 0, + "/FontDescriptor": "145 0 R", + "/LastChar": 22, + "/Subtype": "/TrueType", + "/ToUnicode": "146 0 R", + "/Type": "/Font", + "/Widths": [ + 750, + 333, + 556, + 333, + 556, + 556, + 500, + 722, + 556, + 556, + 500, + 277, + 666, + 556, + 500, + 556, + 556, + 777, + 556, + 277, + 222, + 556, + 556 + ] + } + }, + "obj:57 0 R": { + "value": { + "/BaseFont": "/DejaVuSans", + "/Encoding": "/WinAnsiEncoding", + "/FirstChar": 32, + "/FontDescriptor": "148 0 R", + "/LastChar": 255, + "/Subtype": "/TrueType", + "/Type": "/Font", + "/Widths": [ + 317, + 400, + 459, + 837, + 636, + 950, + 779, + 274, + 390, + 390, + 500, + 837, + 317, + 360, + 317, + 336, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 636, + 336, + 336, + 837, + 837, + 837, + 530, + 1000, + 684, + 686, + 698, + 770, + 631, + 575, + 774, + 751, + 294, + 294, + 655, + 557, + 862, + 748, + 787, + 603, + 787, + 694, + 634, + 610, + 731, + 684, + 988, + 685, + 610, + 685, + 390, + 336, + 390, + 837, + 500, + 500, + 612, + 634, + 549, + 634, + 615, + 352, + 634, + 633, + 277, + 277, + 579, + 277, + 974, + 633, + 611, + 634, + 634, + 411, + 520, + 392, + 633, + 591, + 817, + 591, + 591, + 524, + 636, + 336, + 636, + 837, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 317, + 400, + 636, + 636, + 636, + 636, + 336, + 500, + 500, + 1000, + 471, + 611, + 837, + 360, + 1000, + 500, + 500, + 837, + 400, + 400, + 500, + 636, + 636, + 317, + 500, + 400, + 471, + 611, + 969, + 969, + 969, + 530, + 684, + 684, + 684, + 684, + 684, + 684, + 974, + 698, + 631, + 631, + 631, + 631, + 294, + 294, + 294, + 294, + 774, + 748, + 787, + 787, + 787, + 787, + 787, + 837, + 787, + 731, + 731, + 731, + 731, + 610, + 604, + 629, + 612, + 612, + 612, + 612, + 612, + 612, + 981, + 549, + 615, + 615, + 615, + 615, + 277, + 277, + 277, + 277, + 611, + 633, + 611, + 611, + 611, + 611, + 611, + 837, + 611, + 633, + 633, + 633, + 633, + 591, + 634, + 591 + ] + } + }, + "obj:58 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "59 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:83 0 R": { - "value": { - "/A": "150 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:84 0 R": { - "value": { - "/A": "151 0 R", - "/K": [ - 1 + } + }, + "obj:59 0 R": { + "value": 220 + }, + "obj:60 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "61 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:85 0 R": { - "value": { - "/A": "152 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:86 0 R": { - "value": { - "/A": "153 0 R", - "/K": [ - 2 + } + }, + "obj:61 0 R": { + "value": 12 + }, + "obj:62 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "63 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:87 0 R": { - "value": { - "/A": "154 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:88 0 R": { - "value": { - "/A": "155 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:89 0 R": { - "value": { - "/A": "156 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:90 0 R": { - "value": { - "/A": "157 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:91 0 R": { - "value": { - "/A": "158 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:92 0 R": { - "value": { - "/A": "159 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:93 0 R": { - "value": { - "/A": "160 0 R", - "/K": [ - 3 + } + }, + "obj:63 0 R": { + "value": 220 + }, + "obj:64 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "65 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:94 0 R": { - "value": { - "/A": "161 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:95 0 R": { - "value": { - "/A": "162 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:96 0 R": { - "value": { - "/A": "163 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:97 0 R": { - "value": { - "/A": "164 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:98 0 R": { - "value": { - "/A": "165 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:99 0 R": { - "value": { - "/A": "166 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:100 0 R": { - "value": { - "/A": "167 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:101 0 R": { - "value": { - "/A": "168 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:102 0 R": { - "value": { - "/A": "169 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:103 0 R": { - "value": { - "/A": "170 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:104 0 R": { - "value": { - "/A": "171 0 R", - "/K": [ - 4 + } + }, + "obj:65 0 R": { + "value": 12 + }, + "obj:66 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "67 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:105 0 R": { - "value": { - "/A": "172 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:106 0 R": { - "value": { - "/A": "173 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:107 0 R": { - "value": { - "/A": "174 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:108 0 R": { - "value": { - "/A": "175 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:109 0 R": { - "value": { - "/A": "176 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:110 0 R": { - "value": { - "/A": "177 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:111 0 R": { - "value": { - "/A": "178 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:112 0 R": { - "value": { - "/A": "179 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:113 0 R": { - "value": { - "/A": "180 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:114 0 R": { - "value": { - "/A": "181 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:115 0 R": { - "value": { - "/A": "182 0 R", - "/K": [ - 5 + } + }, + "obj:67 0 R": { + "value": 220 + }, + "obj:68 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "69 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:116 0 R": { - "value": { - "/A": "183 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:117 0 R": { - "value": { - "/A": "184 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:118 0 R": { - "value": { - "/A": "185 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:119 0 R": { - "value": { - "/A": "186 0 R", - "/K": [ - 6, - 7 + } + }, + "obj:69 0 R": { + "value": 12 + }, + "obj:70 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "71 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:120 0 R": { - "value": { - "/A": "187 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:121 0 R": { - "value": { - "/A": "188 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:122 0 R": { - "value": { - "/A": "189 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:123 0 R": { - "value": { - "/A": "190 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:124 0 R": { - "value": { - "/A": "191 0 R", - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" - } - }, - "obj:125 0 R": { - "value": { - "/A": "192 0 R", - "/K": [ - 8, - 9 + } + }, + "obj:71 0 R": { + "value": 220 + }, + "obj:72 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Standard", - "/Type": "/StructElem" + "/Length": "73 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:126 0 R": { - "value": { - "/K": [ - 10 + } + }, + "obj:73 0 R": { + "value": 12 + }, + "obj:74 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" + "/Length": "75 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:127 0 R": { - "value": { - "/K": [ - 11 + } + }, + "obj:75 0 R": { + "value": 220 + }, + "obj:76 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" + "/Length": "77 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:128 0 R": { - "value": { - "/K": [ - 12 + } + }, + "obj:77 0 R": { + "value": 12 + }, + "obj:78 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" + "/Length": "79 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" } - }, - "obj:129 0 R": { - "value": { - "/K": [ - 13 + } + }, + "obj:79 0 R": { + "value": 220 + }, + "obj:80 0 R": { + "stream": { + "dict": { + "/BBox": [ + 0, + 0, + 12.05, + 12.05 ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:130 0 R": { - "value": { - "/K": [ - 14 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:131 0 R": { - "value": { - "/K": [ - 15 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:132 0 R": { - "value": { - "/K": [ - 16 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:133 0 R": { - "value": { - "/K": [ - 17 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:134 0 R": { - "value": { - "/K": [ - 18 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:135 0 R": { - "value": { - "/K": [ - 19 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:136 0 R": { - "value": { - "/K": [ - 20 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:137 0 R": { - "value": { - "/K": [ - 21 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:138 0 R": { - "value": { - "/K": [ - 22 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:139 0 R": { - "value": { - "/K": [ - 23 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:140 0 R": { - "value": { - "/K": [ - 24 - ], - "/P": "52 0 R", - "/Pg": "15 0 R", - "/S": "/Form", - "/Type": "/StructElem" - } - }, - "obj:141 0 R": { - "value": { - "/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" - } - }, - "obj:142 0 R": { - "stream": { - "dict": { - "/Length": "143 0 R" - } - } - }, - "obj:143 0 R": { - "value": 702 - }, - "obj:144 0 R": { - "value": { - "/Ascent": 905, - "/CapHeight": 979, - "/Descent": -211, - "/Flags": 4, - "/FontBBox": [ - -543, - -303, - 1300, - 979 - ], - "/FontName": "/LiberationSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - } - }, - "obj:145 0 R": { - "value": { - "/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" - } - }, - "obj:146 0 R": { - "stream": { - "dict": { - "/Length": "147 0 R" - } - } - }, - "obj:147 0 R": { - "value": 582 - }, - "obj:148 0 R": { - "value": { - "/Ascent": 928, - "/CapHeight": 1232, - "/Descent": -235, - "/Flags": 4, - "/FontBBox": [ - -1020, - -462, - 1792, - 1232 - ], - "/FontName": "/DejaVuSans", - "/ItalicAngle": 0, - "/StemV": 80, - "/Type": "/FontDescriptor" - } - }, - "obj:149 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:150 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:151 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:152 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:153 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:154 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:155 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:156 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:157 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:158 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:159 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:160 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:161 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:162 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:163 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:164 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:165 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:166 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:167 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:168 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:169 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:170 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:171 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:172 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:173 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:174 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:175 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:176 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:177 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:178 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:179 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:180 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:181 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:182 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:183 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:184 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:185 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:186 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:187 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:188 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:189 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:190 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:191 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:192 0 R": { - "value": { - "/O": "/Layout", - "/Placement": "/Block" - } - }, - "obj:193 0 R": { - "stream": { - "dict": { - "/Length": "194 0 R", - "/Length1": 16184 - } - } - }, - "obj:194 0 R": { - "value": 16184 - }, - "obj:195 0 R": { - "stream": { - "dict": { - "/Length": "196 0 R", - "/Length1": 11088 - } - } - }, - "obj:196 0 R": { - "value": 11088 - }, - "trailer": { - "value": { - "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", - "/ID": [ - "b:f8abc47bb1df544a0df9c15a75ef0046", - "b:ecae7a672bccf334835b54867b208438" - ], - "/Info": "2 0 R", - "/Root": "1 0 R", - "/Size": 197 - } + "/Length": "81 0 R", + "/Resources": "3 0 R", + "/Subtype": "/Form", + "/Type": "/XObject" + } + } + }, + "obj:81 0 R": { + "value": 12 + }, + "obj:82 0 R": { + "value": { + "/A": "149 0 R", + "/K": [ + 0 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:83 0 R": { + "value": { + "/A": "150 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:84 0 R": { + "value": { + "/A": "151 0 R", + "/K": [ + 1 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:85 0 R": { + "value": { + "/A": "152 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:86 0 R": { + "value": { + "/A": "153 0 R", + "/K": [ + 2 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:87 0 R": { + "value": { + "/A": "154 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:88 0 R": { + "value": { + "/A": "155 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:89 0 R": { + "value": { + "/A": "156 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:90 0 R": { + "value": { + "/A": "157 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:91 0 R": { + "value": { + "/A": "158 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:92 0 R": { + "value": { + "/A": "159 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:93 0 R": { + "value": { + "/A": "160 0 R", + "/K": [ + 3 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:94 0 R": { + "value": { + "/A": "161 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:95 0 R": { + "value": { + "/A": "162 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:96 0 R": { + "value": { + "/A": "163 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:97 0 R": { + "value": { + "/A": "164 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:98 0 R": { + "value": { + "/A": "165 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:99 0 R": { + "value": { + "/A": "166 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:100 0 R": { + "value": { + "/A": "167 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:101 0 R": { + "value": { + "/A": "168 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:102 0 R": { + "value": { + "/A": "169 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:103 0 R": { + "value": { + "/A": "170 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:104 0 R": { + "value": { + "/A": "171 0 R", + "/K": [ + 4 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:105 0 R": { + "value": { + "/A": "172 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:106 0 R": { + "value": { + "/A": "173 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:107 0 R": { + "value": { + "/A": "174 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:108 0 R": { + "value": { + "/A": "175 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:109 0 R": { + "value": { + "/A": "176 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:110 0 R": { + "value": { + "/A": "177 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:111 0 R": { + "value": { + "/A": "178 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:112 0 R": { + "value": { + "/A": "179 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:113 0 R": { + "value": { + "/A": "180 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:114 0 R": { + "value": { + "/A": "181 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:115 0 R": { + "value": { + "/A": "182 0 R", + "/K": [ + 5 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:116 0 R": { + "value": { + "/A": "183 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:117 0 R": { + "value": { + "/A": "184 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:118 0 R": { + "value": { + "/A": "185 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:119 0 R": { + "value": { + "/A": "186 0 R", + "/K": [ + 6, + 7 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:120 0 R": { + "value": { + "/A": "187 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:121 0 R": { + "value": { + "/A": "188 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:122 0 R": { + "value": { + "/A": "189 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:123 0 R": { + "value": { + "/A": "190 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:124 0 R": { + "value": { + "/A": "191 0 R", + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:125 0 R": { + "value": { + "/A": "192 0 R", + "/K": [ + 8, + 9 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Standard", + "/Type": "/StructElem" + } + }, + "obj:126 0 R": { + "value": { + "/K": [ + 10 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:127 0 R": { + "value": { + "/K": [ + 11 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:128 0 R": { + "value": { + "/K": [ + 12 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:129 0 R": { + "value": { + "/K": [ + 13 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:130 0 R": { + "value": { + "/K": [ + 14 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:131 0 R": { + "value": { + "/K": [ + 15 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:132 0 R": { + "value": { + "/K": [ + 16 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:133 0 R": { + "value": { + "/K": [ + 17 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:134 0 R": { + "value": { + "/K": [ + 18 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:135 0 R": { + "value": { + "/K": [ + 19 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:136 0 R": { + "value": { + "/K": [ + 20 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:137 0 R": { + "value": { + "/K": [ + 21 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:138 0 R": { + "value": { + "/K": [ + 22 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:139 0 R": { + "value": { + "/K": [ + 23 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:140 0 R": { + "value": { + "/K": [ + 24 + ], + "/P": "52 0 R", + "/Pg": "15 0 R", + "/S": "/Form", + "/Type": "/StructElem" + } + }, + "obj:141 0 R": { + "value": { + "/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" + } + }, + "obj:142 0 R": { + "stream": { + "dict": { + "/Length": "143 0 R" + } + } + }, + "obj:143 0 R": { + "value": 702 + }, + "obj:144 0 R": { + "value": { + "/Ascent": 905, + "/CapHeight": 979, + "/Descent": -211, + "/Flags": 4, + "/FontBBox": [ + -543, + -303, + 1300, + 979 + ], + "/FontName": "/LiberationSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + } + }, + "obj:145 0 R": { + "value": { + "/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" + } + }, + "obj:146 0 R": { + "stream": { + "dict": { + "/Length": "147 0 R" + } + } + }, + "obj:147 0 R": { + "value": 582 + }, + "obj:148 0 R": { + "value": { + "/Ascent": 928, + "/CapHeight": 1232, + "/Descent": -235, + "/Flags": 4, + "/FontBBox": [ + -1020, + -462, + 1792, + 1232 + ], + "/FontName": "/DejaVuSans", + "/ItalicAngle": 0, + "/StemV": 80, + "/Type": "/FontDescriptor" + } + }, + "obj:149 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:150 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:151 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:152 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:153 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:154 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:155 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:156 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:157 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:158 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:159 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:160 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:161 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:162 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:163 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:164 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:165 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:166 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:167 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:168 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:169 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:170 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:171 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:172 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:173 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:174 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:175 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:176 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:177 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:178 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:179 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:180 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:181 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:182 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:183 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:184 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:185 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:186 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:187 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:188 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:189 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:190 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:191 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:192 0 R": { + "value": { + "/O": "/Layout", + "/Placement": "/Block" + } + }, + "obj:193 0 R": { + "stream": { + "dict": { + "/Length": "194 0 R", + "/Length1": 16184 + } + } + }, + "obj:194 0 R": { + "value": 16184 + }, + "obj:195 0 R": { + "stream": { + "dict": { + "/Length": "196 0 R", + "/Length1": 11088 + } + } + }, + "obj:196 0 R": { + "value": 11088 + }, + "trailer": { + "value": { + "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", + "/ID": [ + "b:f8abc47bb1df544a0df9c15a75ef0046", + "b:ecae7a672bccf334835b54867b208438" + ], + "/Info": "2 0 R", + "/Root": "1 0 R", + "/Size": 197 } } } diff --git a/qpdf/qtest/qpdf/json-image-streams-all-file-v2.out b/qpdf/qtest/qpdf/json-image-streams-all-file-v2.out index 728f404b..78c5bef8 100644 --- a/qpdf/qtest/qpdf/json-image-streams-all-file-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-all-file-v2.out @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "all" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 30, "objects": { diff --git a/qpdf/qtest/qpdf/json-image-streams-all-v2.out b/qpdf/qtest/qpdf/json-image-streams-all-v2.out index 423103ae..18e2e7b9 100644 --- a/qpdf/qtest/qpdf/json-image-streams-all-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-all-v2.out @@ -274,473 +274,468 @@ "userpasswordmatched": false }, "outlines": [], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 30, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/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" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "12 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "14 0 R" - } + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/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" + } + }, + "obj:3 0 R": { + "value": { + "/Contents": "12 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "15 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "16 0 R" - } + "/XObject": { + "/Im1": "14 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:4 0 R": { + "value": { + "/Contents": "15 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "17 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "18 0 R" - } + "/XObject": { + "/Im1": "16 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:5 0 R": { + "value": { + "/Contents": "17 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:6 0 R": { - "value": { - "/Contents": "19 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "20 0 R" - } + "/XObject": { + "/Im1": "18 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:6 0 R": { + "value": { + "/Contents": "19 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:7 0 R": { - "value": { - "/Contents": "21 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "22 0 R" - } + "/XObject": { + "/Im1": "20 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:7 0 R": { + "value": { + "/Contents": "21 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:8 0 R": { - "value": { - "/Contents": "23 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "24 0 R" - } + "/XObject": { + "/Im1": "22 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:8 0 R": { + "value": { + "/Contents": "23 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:9 0 R": { - "value": { - "/Contents": "25 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "26 0 R" - } + "/XObject": { + "/Im1": "24 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:9 0 R": { + "value": { + "/Contents": "25 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:10 0 R": { - "value": { - "/Contents": "27 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "28 0 R" - } + "/XObject": { + "/Im1": "26 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:10 0 R": { + "value": { + "/Contents": "27 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "29 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "30 0 R" - } + "/XObject": { + "/Im1": "28 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "29 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "stream": { - "dict": { - "/Length": 95 - } - } - }, - "obj:13 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:14 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Height": 480, - "/Length": 768000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:15 0 R": { - "stream": { - "dict": { - "/Length": 101 - } - } - }, - "obj:16 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 9364, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:17 0 R": { - "stream": { - "dict": { - "/Length": 107 - } - } - }, - "obj:18 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 768998, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:19 0 R": { - "stream": { - "dict": { - "/Length": 94 - } - } - }, - "obj:20 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Height": 480, - "/Length": 576000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:21 0 R": { - "stream": { - "dict": { - "/Length": 100 - } - } - }, - "obj:22 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 3650, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:23 0 R": { - "stream": { - "dict": { - "/Length": 106 - } - } - }, - "obj:24 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 641497, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:25 0 R": { - "stream": { - "dict": { - "/Length": 95 - } - } - }, - "obj:26 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Height": 480, - "/Length": 192000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:27 0 R": { - "stream": { - "dict": { - "/Length": 101 - } - } - }, - "obj:28 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 2587, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:29 0 R": { - "stream": { - "dict": { - "/Length": 107 - } - } - }, - "obj:30 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 3001, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "trailer": { - "value": { - "/ID": [ - "b:53b6958e9beef00ea2ac077d5f2912b6", - "b:272b8d8ba45632ab505020e7606d221d" + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Root": "1 0 R", - "/Size": 31 + "/XObject": { + "/Im1": "30 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "stream": { + "dict": { + "/Length": 95 } } + }, + "obj:13 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:14 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Height": 480, + "/Length": 768000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:15 0 R": { + "stream": { + "dict": { + "/Length": 101 + } + } + }, + "obj:16 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 9364, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:17 0 R": { + "stream": { + "dict": { + "/Length": 107 + } + } + }, + "obj:18 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 768998, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:19 0 R": { + "stream": { + "dict": { + "/Length": 94 + } + } + }, + "obj:20 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Height": 480, + "/Length": 576000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:21 0 R": { + "stream": { + "dict": { + "/Length": 100 + } + } + }, + "obj:22 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 3650, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:23 0 R": { + "stream": { + "dict": { + "/Length": 106 + } + } + }, + "obj:24 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 641497, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:25 0 R": { + "stream": { + "dict": { + "/Length": 95 + } + } + }, + "obj:26 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Height": 480, + "/Length": 192000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:27 0 R": { + "stream": { + "dict": { + "/Length": 101 + } + } + }, + "obj:28 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 2587, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:29 0 R": { + "stream": { + "dict": { + "/Length": 107 + } + } + }, + "obj:30 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 3001, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "trailer": { + "value": { + "/ID": [ + "b:53b6958e9beef00ea2ac077d5f2912b6", + "b:272b8d8ba45632ab505020e7606d221d" + ], + "/Root": "1 0 R", + "/Size": 31 + } } } } diff --git a/qpdf/qtest/qpdf/json-image-streams-generalized-file-v2.out b/qpdf/qtest/qpdf/json-image-streams-generalized-file-v2.out index 51258eca..78bbdbb2 100644 --- a/qpdf/qtest/qpdf/json-image-streams-generalized-file-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-generalized-file-v2.out @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "generalized" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 30, "objects": { diff --git a/qpdf/qtest/qpdf/json-image-streams-generalized-inline-v2.out b/qpdf/qtest/qpdf/json-image-streams-generalized-inline-v2.out index 1f28df1b..2830f033 100644 --- a/qpdf/qtest/qpdf/json-image-streams-generalized-inline-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-generalized-inline-v2.out @@ -1,281 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "generalized" - }, - "pages": [ - { - "contents": [ - "12 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "14 0 R", - "width": 40 - } - ], - "label": null, - "object": "3 0 R", - "outlines": [], - "pageposfrom1": 1 - }, - { - "contents": [ - "15 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "16 0 R", - "width": 40 - } - ], - "label": null, - "object": "4 0 R", - "outlines": [], - "pageposfrom1": 2 - }, - { - "contents": [ - "17 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "18 0 R", - "width": 40 - } - ], - "label": null, - "object": "5 0 R", - "outlines": [], - "pageposfrom1": 3 - }, - { - "contents": [ - "19 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "20 0 R", - "width": 40 - } - ], - "label": null, - "object": "6 0 R", - "outlines": [], - "pageposfrom1": 4 - }, - { - "contents": [ - "21 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "22 0 R", - "width": 40 - } - ], - "label": null, - "object": "7 0 R", - "outlines": [], - "pageposfrom1": 5 - }, - { - "contents": [ - "23 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "24 0 R", - "width": 40 - } - ], - "label": null, - "object": "8 0 R", - "outlines": [], - "pageposfrom1": 6 - }, - { - "contents": [ - "25 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "26 0 R", - "width": 40 - } - ], - "label": null, - "object": "9 0 R", - "outlines": [], - "pageposfrom1": 7 - }, - { - "contents": [ - "27 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "28 0 R", - "width": 40 - } - ], - "label": null, - "object": "10 0 R", - "outlines": [], - "pageposfrom1": 8 - }, - { - "contents": [ - "29 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "30 0 R", - "width": 40 - } - ], - "label": null, - "object": "11 0 R", - "outlines": [], - "pageposfrom1": 9 - } - ], - "pagelabels": [], - "acroform": { - "fields": [], - "hasacroform": false, - "needappearances": false - }, - "attachments": {}, - "encrypt": { - "capabilities": { - "accessibility": true, - "extract": true, - "modify": true, - "modifyannotations": true, - "modifyassembly": true, - "modifyforms": true, - "modifyother": true, - "printhigh": true, - "printlow": true - }, - "encrypted": false, - "ownerpasswordmatched": false, - "parameters": { - "P": 0, - "R": 0, - "V": 0, - "bits": 0, - "filemethod": "none", - "key": null, - "method": "none", - "streammethod": "none", - "stringmethod": "none" - }, - "userpasswordmatched": false - }, - "outlines": [], - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 30, "objects": { diff --git a/qpdf/qtest/qpdf/json-image-streams-none-file-v2.out b/qpdf/qtest/qpdf/json-image-streams-none-file-v2.out index d1b40901..a3f3c3cc 100644 --- a/qpdf/qtest/qpdf/json-image-streams-none-file-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-none-file-v2.out @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 30, "objects": { diff --git a/qpdf/qtest/qpdf/json-image-streams-none-inline-v2.out b/qpdf/qtest/qpdf/json-image-streams-none-inline-v2.out index 7559e5cf..518ae50a 100644 --- a/qpdf/qtest/qpdf/json-image-streams-none-inline-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-none-inline-v2.out @@ -1,281 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "pages": [ - { - "contents": [ - "12 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "14 0 R", - "width": 40 - } - ], - "label": null, - "object": "3 0 R", - "outlines": [], - "pageposfrom1": 1 - }, - { - "contents": [ - "15 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "16 0 R", - "width": 40 - } - ], - "label": null, - "object": "4 0 R", - "outlines": [], - "pageposfrom1": 2 - }, - { - "contents": [ - "17 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "18 0 R", - "width": 40 - } - ], - "label": null, - "object": "5 0 R", - "outlines": [], - "pageposfrom1": 3 - }, - { - "contents": [ - "19 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "20 0 R", - "width": 40 - } - ], - "label": null, - "object": "6 0 R", - "outlines": [], - "pageposfrom1": 4 - }, - { - "contents": [ - "21 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "22 0 R", - "width": 40 - } - ], - "label": null, - "object": "7 0 R", - "outlines": [], - "pageposfrom1": 5 - }, - { - "contents": [ - "23 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "24 0 R", - "width": 40 - } - ], - "label": null, - "object": "8 0 R", - "outlines": [], - "pageposfrom1": 6 - }, - { - "contents": [ - "25 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "26 0 R", - "width": 40 - } - ], - "label": null, - "object": "9 0 R", - "outlines": [], - "pageposfrom1": 7 - }, - { - "contents": [ - "27 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "28 0 R", - "width": 40 - } - ], - "label": null, - "object": "10 0 R", - "outlines": [], - "pageposfrom1": 8 - }, - { - "contents": [ - "29 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "30 0 R", - "width": 40 - } - ], - "label": null, - "object": "11 0 R", - "outlines": [], - "pageposfrom1": 9 - } - ], - "pagelabels": [], - "acroform": { - "fields": [], - "hasacroform": false, - "needappearances": false - }, - "attachments": {}, - "encrypt": { - "capabilities": { - "accessibility": true, - "extract": true, - "modify": true, - "modifyannotations": true, - "modifyassembly": true, - "modifyforms": true, - "modifyother": true, - "printhigh": true, - "printlow": true - }, - "encrypted": false, - "ownerpasswordmatched": false, - "parameters": { - "P": 0, - "R": 0, - "V": 0, - "bits": 0, - "filemethod": "none", - "key": null, - "method": "none", - "streammethod": "none", - "stringmethod": "none" - }, - "userpasswordmatched": false - }, - "outlines": [], - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 30, "objects": { diff --git a/qpdf/qtest/qpdf/json-image-streams-small-v2.out b/qpdf/qtest/qpdf/json-image-streams-small-v2.out index 8b0232a6..515192e1 100644 --- a/qpdf/qtest/qpdf/json-image-streams-small-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-small-v2.out @@ -274,485 +274,480 @@ "userpasswordmatched": false }, "outlines": [], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 30, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/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" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "12 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "14 0 R" - } + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/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" + } + }, + "obj:3 0 R": { + "value": { + "/Contents": "12 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "15 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "16 0 R" - } + "/XObject": { + "/Im1": "14 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:4 0 R": { + "value": { + "/Contents": "15 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "17 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "18 0 R" - } + "/XObject": { + "/Im1": "16 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:5 0 R": { + "value": { + "/Contents": "17 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:6 0 R": { - "value": { - "/Contents": "19 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "20 0 R" - } + "/XObject": { + "/Im1": "18 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:6 0 R": { + "value": { + "/Contents": "19 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:7 0 R": { - "value": { - "/Contents": "21 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "22 0 R" - } + "/XObject": { + "/Im1": "20 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:7 0 R": { + "value": { + "/Contents": "21 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:8 0 R": { - "value": { - "/Contents": "23 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "24 0 R" - } + "/XObject": { + "/Im1": "22 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:8 0 R": { + "value": { + "/Contents": "23 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:9 0 R": { - "value": { - "/Contents": "25 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "26 0 R" - } + "/XObject": { + "/Im1": "24 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:9 0 R": { + "value": { + "/Contents": "25 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:10 0 R": { - "value": { - "/Contents": "27 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "28 0 R" - } + "/XObject": { + "/Im1": "26 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:10 0 R": { + "value": { + "/Contents": "27 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "29 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "30 0 R" - } + "/XObject": { + "/Im1": "28 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "29 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 97 - } - } - }, - "obj:13 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:14 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Length": 51, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:15 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 102 - } - } - }, - "obj:16 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Length": 454, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:17 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 108 - } - } - }, - "obj:18 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Length": 7688, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:19 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 96 - } - } - }, - "obj:20 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Length": 46, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:21 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 99 - } - } - }, - "obj:22 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Length": 849, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:23 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 106 - } - } - }, - "obj:24 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Length": 6411, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:25 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 97 - } - } - }, - "obj:26 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/FlateDecode", - "/Height": 48, - "/Length": 36, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:27 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 101 - } - } - }, - "obj:28 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 48, - "/Length": 359, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "obj:29 0 R": { - "stream": { - "dict": { - "/Filter": "/FlateDecode", - "/Length": 108 - } - } - }, - "obj:30 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 48, - "/Length": 37, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 40 - } - } - }, - "trailer": { - "value": { - "/ID": [ - "b:5aa7af805079bb907e9034361d9a11a2", - "b:5aa7af805079bb907e9034361d9a11a2" + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Root": "1 0 R", - "/Size": 31 + "/XObject": { + "/Im1": "30 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 97 } } + }, + "obj:13 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:14 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/FlateDecode", + "/Height": 48, + "/Length": 51, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:15 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 102 + } + } + }, + "obj:16 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 48, + "/Length": 454, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:17 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 108 + } + } + }, + "obj:18 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 48, + "/Length": 7688, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:19 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 96 + } + } + }, + "obj:20 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/FlateDecode", + "/Height": 48, + "/Length": 46, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:21 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 99 + } + } + }, + "obj:22 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 48, + "/Length": 849, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:23 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 106 + } + } + }, + "obj:24 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 48, + "/Length": 6411, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:25 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 97 + } + } + }, + "obj:26 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/FlateDecode", + "/Height": 48, + "/Length": 36, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:27 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 101 + } + } + }, + "obj:28 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 48, + "/Length": 359, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "obj:29 0 R": { + "stream": { + "dict": { + "/Filter": "/FlateDecode", + "/Length": 108 + } + } + }, + "obj:30 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 48, + "/Length": 37, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 40 + } + } + }, + "trailer": { + "value": { + "/ID": [ + "b:5aa7af805079bb907e9034361d9a11a2", + "b:5aa7af805079bb907e9034361d9a11a2" + ], + "/Root": "1 0 R", + "/Size": 31 + } } } } diff --git a/qpdf/qtest/qpdf/json-image-streams-specialized-file-v2.out b/qpdf/qtest/qpdf/json-image-streams-specialized-file-v2.out index dcf1d47d..e09d040f 100644 --- a/qpdf/qtest/qpdf/json-image-streams-specialized-file-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-specialized-file-v2.out @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "specialized" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 30, "objects": { diff --git a/qpdf/qtest/qpdf/json-image-streams-specialized-inline-v2.out b/qpdf/qtest/qpdf/json-image-streams-specialized-inline-v2.out index 451ca088..5ee93e2d 100644 --- a/qpdf/qtest/qpdf/json-image-streams-specialized-inline-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-specialized-inline-v2.out @@ -1,281 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "specialized" - }, - "pages": [ - { - "contents": [ - "12 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "14 0 R", - "width": 40 - } - ], - "label": null, - "object": "3 0 R", - "outlines": [], - "pageposfrom1": 1 - }, - { - "contents": [ - "15 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "16 0 R", - "width": 40 - } - ], - "label": null, - "object": "4 0 R", - "outlines": [], - "pageposfrom1": 2 - }, - { - "contents": [ - "17 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceCMYK", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "18 0 R", - "width": 40 - } - ], - "label": null, - "object": "5 0 R", - "outlines": [], - "pageposfrom1": 3 - }, - { - "contents": [ - "19 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "20 0 R", - "width": 40 - } - ], - "label": null, - "object": "6 0 R", - "outlines": [], - "pageposfrom1": 4 - }, - { - "contents": [ - "21 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "22 0 R", - "width": 40 - } - ], - "label": null, - "object": "7 0 R", - "outlines": [], - "pageposfrom1": 5 - }, - { - "contents": [ - "23 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceRGB", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "24 0 R", - "width": 40 - } - ], - "label": null, - "object": "8 0 R", - "outlines": [], - "pageposfrom1": 6 - }, - { - "contents": [ - "25 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/FlateDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "26 0 R", - "width": 40 - } - ], - "label": null, - "object": "9 0 R", - "outlines": [], - "pageposfrom1": 7 - }, - { - "contents": [ - "27 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/DCTDecode" - ], - "filterable": false, - "height": 48, - "name": "/Im1", - "object": "28 0 R", - "width": 40 - } - ], - "label": null, - "object": "10 0 R", - "outlines": [], - "pageposfrom1": 8 - }, - { - "contents": [ - "29 0 R" - ], - "images": [ - { - "bitspercomponent": 8, - "colorspace": "/DeviceGray", - "decodeparms": [ - null - ], - "filter": [ - "/RunLengthDecode" - ], - "filterable": true, - "height": 48, - "name": "/Im1", - "object": "30 0 R", - "width": 40 - } - ], - "label": null, - "object": "11 0 R", - "outlines": [], - "pageposfrom1": 9 - } - ], - "pagelabels": [], - "acroform": { - "fields": [], - "hasacroform": false, - "needappearances": false - }, - "attachments": {}, - "encrypt": { - "capabilities": { - "accessibility": true, - "extract": true, - "modify": true, - "modifyannotations": true, - "modifyassembly": true, - "modifyforms": true, - "modifyother": true, - "printhigh": true, - "printlow": true - }, - "encrypted": false, - "ownerpasswordmatched": false, - "parameters": { - "P": 0, - "R": 0, - "V": 0, - "bits": 0, - "filemethod": "none", - "key": null, - "method": "none", - "streammethod": "none", - "stringmethod": "none" - }, - "userpasswordmatched": false - }, - "outlines": [], - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 30, "objects": { diff --git a/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out b/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out index 987d62cb..d5a0eba9 100644 --- a/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out @@ -274,473 +274,468 @@ "userpasswordmatched": false }, "outlines": [], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 30, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/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" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "12 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "14 0 R" - } + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/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" + } + }, + "obj:3 0 R": { + "value": { + "/Contents": "12 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "15 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "16 0 R" - } + "/XObject": { + "/Im1": "14 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:4 0 R": { + "value": { + "/Contents": "15 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "17 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "18 0 R" - } + "/XObject": { + "/Im1": "16 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:5 0 R": { + "value": { + "/Contents": "17 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:6 0 R": { - "value": { - "/Contents": "19 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "20 0 R" - } + "/XObject": { + "/Im1": "18 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:6 0 R": { + "value": { + "/Contents": "19 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:7 0 R": { - "value": { - "/Contents": "21 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "22 0 R" - } + "/XObject": { + "/Im1": "20 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:7 0 R": { + "value": { + "/Contents": "21 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:8 0 R": { - "value": { - "/Contents": "23 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "24 0 R" - } + "/XObject": { + "/Im1": "22 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:8 0 R": { + "value": { + "/Contents": "23 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:9 0 R": { - "value": { - "/Contents": "25 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "26 0 R" - } + "/XObject": { + "/Im1": "24 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:9 0 R": { + "value": { + "/Contents": "25 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:10 0 R": { - "value": { - "/Contents": "27 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "28 0 R" - } + "/XObject": { + "/Im1": "26 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:10 0 R": { + "value": { + "/Contents": "27 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "29 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "30 0 R" - } + "/XObject": { + "/Im1": "28 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "29 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "stream": { - "dict": { - "/Length": 95 - } - } - }, - "obj:13 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:14 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Height": 480, - "/Length": 768000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:15 0 R": { - "stream": { - "dict": { - "/Length": 101 - } - } - }, - "obj:16 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 9364, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:17 0 R": { - "stream": { - "dict": { - "/Length": 107 - } - } - }, - "obj:18 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 768998, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:19 0 R": { - "stream": { - "dict": { - "/Length": 94 - } - } - }, - "obj:20 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Height": 480, - "/Length": 576000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:21 0 R": { - "stream": { - "dict": { - "/Length": 100 - } - } - }, - "obj:22 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 3650, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:23 0 R": { - "stream": { - "dict": { - "/Length": 106 - } - } - }, - "obj:24 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 641497, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:25 0 R": { - "stream": { - "dict": { - "/Length": 95 - } - } - }, - "obj:26 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Height": 480, - "/Length": 192000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:27 0 R": { - "stream": { - "dict": { - "/Length": 101 - } - } - }, - "obj:28 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 2587, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:29 0 R": { - "stream": { - "dict": { - "/Length": 107 - } - } - }, - "obj:30 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 3001, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "trailer": { - "value": { - "/ID": [ - "b:53b6958e9beef00ea2ac077d5f2912b6", - "b:272b8d8ba45632ab505020e7606d221d" + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Root": "1 0 R", - "/Size": 31 + "/XObject": { + "/Im1": "30 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "stream": { + "dict": { + "/Length": 95 } } + }, + "obj:13 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:14 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Height": 480, + "/Length": 768000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:15 0 R": { + "stream": { + "dict": { + "/Length": 101 + } + } + }, + "obj:16 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 9364, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:17 0 R": { + "stream": { + "dict": { + "/Length": 107 + } + } + }, + "obj:18 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 768998, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:19 0 R": { + "stream": { + "dict": { + "/Length": 94 + } + } + }, + "obj:20 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Height": 480, + "/Length": 576000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:21 0 R": { + "stream": { + "dict": { + "/Length": 100 + } + } + }, + "obj:22 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 3650, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:23 0 R": { + "stream": { + "dict": { + "/Length": 106 + } + } + }, + "obj:24 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 641497, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:25 0 R": { + "stream": { + "dict": { + "/Length": 95 + } + } + }, + "obj:26 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Height": 480, + "/Length": 192000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:27 0 R": { + "stream": { + "dict": { + "/Length": 101 + } + } + }, + "obj:28 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 2587, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:29 0 R": { + "stream": { + "dict": { + "/Length": 107 + } + } + }, + "obj:30 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 3001, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "trailer": { + "value": { + "/ID": [ + "b:53b6958e9beef00ea2ac077d5f2912b6", + "b:272b8d8ba45632ab505020e7606d221d" + ], + "/Root": "1 0 R", + "/Size": 31 + } } } } diff --git a/qpdf/qtest/qpdf/json-image-streams-v2.out b/qpdf/qtest/qpdf/json-image-streams-v2.out index 64fc4cb1..6169cb3c 100644 --- a/qpdf/qtest/qpdf/json-image-streams-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-v2.out @@ -274,473 +274,468 @@ "userpasswordmatched": false }, "outlines": [], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 30, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/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" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "12 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "14 0 R" - } + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/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" + } + }, + "obj:3 0 R": { + "value": { + "/Contents": "12 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "15 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "16 0 R" - } + "/XObject": { + "/Im1": "14 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:4 0 R": { + "value": { + "/Contents": "15 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "17 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "18 0 R" - } + "/XObject": { + "/Im1": "16 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:5 0 R": { + "value": { + "/Contents": "17 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:6 0 R": { - "value": { - "/Contents": "19 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "20 0 R" - } + "/XObject": { + "/Im1": "18 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:6 0 R": { + "value": { + "/Contents": "19 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:7 0 R": { - "value": { - "/Contents": "21 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "22 0 R" - } + "/XObject": { + "/Im1": "20 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:7 0 R": { + "value": { + "/Contents": "21 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:8 0 R": { - "value": { - "/Contents": "23 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "24 0 R" - } + "/XObject": { + "/Im1": "22 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:8 0 R": { + "value": { + "/Contents": "23 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:9 0 R": { - "value": { - "/Contents": "25 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "26 0 R" - } + "/XObject": { + "/Im1": "24 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:9 0 R": { + "value": { + "/Contents": "25 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:10 0 R": { - "value": { - "/Contents": "27 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "28 0 R" - } + "/XObject": { + "/Im1": "26 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:10 0 R": { + "value": { + "/Contents": "27 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "29 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 392 + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "13 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text", - "/ImageC" - ], - "/XObject": { - "/Im1": "30 0 R" - } + "/XObject": { + "/Im1": "28 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "29 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 392 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "13 0 R" }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "stream": { - "dict": { - "/Length": 95 - } - } - }, - "obj:13 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:14 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Height": 480, - "/Length": 768000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:15 0 R": { - "stream": { - "dict": { - "/Length": 101 - } - } - }, - "obj:16 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 9364, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:17 0 R": { - "stream": { - "dict": { - "/Length": 107 - } - } - }, - "obj:18 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceCMYK", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 768998, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:19 0 R": { - "stream": { - "dict": { - "/Length": 94 - } - } - }, - "obj:20 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Height": 480, - "/Length": 576000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:21 0 R": { - "stream": { - "dict": { - "/Length": 100 - } - } - }, - "obj:22 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 3650, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:23 0 R": { - "stream": { - "dict": { - "/Length": 106 - } - } - }, - "obj:24 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceRGB", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 641497, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:25 0 R": { - "stream": { - "dict": { - "/Length": 95 - } - } - }, - "obj:26 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Height": 480, - "/Length": 192000, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:27 0 R": { - "stream": { - "dict": { - "/Length": 101 - } - } - }, - "obj:28 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/DCTDecode", - "/Height": 480, - "/Length": 2587, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "obj:29 0 R": { - "stream": { - "dict": { - "/Length": 107 - } - } - }, - "obj:30 0 R": { - "stream": { - "dict": { - "/BitsPerComponent": 8, - "/ColorSpace": "/DeviceGray", - "/Filter": "/RunLengthDecode", - "/Height": 480, - "/Length": 3001, - "/Subtype": "/Image", - "/Type": "/XObject", - "/Width": 400 - } - } - }, - "trailer": { - "value": { - "/ID": [ - "b:53b6958e9beef00ea2ac077d5f2912b6", - "b:272b8d8ba45632ab505020e7606d221d" + "/ProcSet": [ + "/PDF", + "/Text", + "/ImageC" ], - "/Root": "1 0 R", - "/Size": 31 + "/XObject": { + "/Im1": "30 0 R" + } + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "stream": { + "dict": { + "/Length": 95 } } + }, + "obj:13 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:14 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Height": 480, + "/Length": 768000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:15 0 R": { + "stream": { + "dict": { + "/Length": 101 + } + } + }, + "obj:16 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 9364, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:17 0 R": { + "stream": { + "dict": { + "/Length": 107 + } + } + }, + "obj:18 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceCMYK", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 768998, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:19 0 R": { + "stream": { + "dict": { + "/Length": 94 + } + } + }, + "obj:20 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Height": 480, + "/Length": 576000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:21 0 R": { + "stream": { + "dict": { + "/Length": 100 + } + } + }, + "obj:22 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 3650, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:23 0 R": { + "stream": { + "dict": { + "/Length": 106 + } + } + }, + "obj:24 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceRGB", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 641497, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:25 0 R": { + "stream": { + "dict": { + "/Length": 95 + } + } + }, + "obj:26 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Height": 480, + "/Length": 192000, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:27 0 R": { + "stream": { + "dict": { + "/Length": 101 + } + } + }, + "obj:28 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/DCTDecode", + "/Height": 480, + "/Length": 2587, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "obj:29 0 R": { + "stream": { + "dict": { + "/Length": 107 + } + } + }, + "obj:30 0 R": { + "stream": { + "dict": { + "/BitsPerComponent": 8, + "/ColorSpace": "/DeviceGray", + "/Filter": "/RunLengthDecode", + "/Height": 480, + "/Length": 3001, + "/Subtype": "/Image", + "/Type": "/XObject", + "/Width": 400 + } + } + }, + "trailer": { + "value": { + "/ID": [ + "b:53b6958e9beef00ea2ac077d5f2912b6", + "b:272b8d8ba45632ab505020e7606d221d" + ], + "/Root": "1 0 R", + "/Size": 31 + } } } } diff --git a/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out b/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out index 4adc6a31..f235dec4 100644 --- a/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out +++ b/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out @@ -619,1157 +619,1152 @@ "title": "Salad 2 -> 15: /XYZ 66 756 3" } ], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 108, - "objects": { - "obj:1 0 R": { - "value": { - "/Names": { - "/Dests": "107 0 R" - }, - "/Outlines": "2 0 R", - "/PageMode": "/UseOutlines", - "/Pages": "3 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/Count": 6, - "/First": "4 0 R", - "/Last": "5 0 R", - "/Type": "/Outlines" - } - }, - "obj:3 0 R": { - "value": { - "/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" - } - }, - "obj:4 0 R": { - "value": { - "/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": "u:Potato 1 -> 5: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:5 0 R": { - "value": { - "/Dest": [ - "21 0 R", - "/XYZ", - 66, - 756, - 3 - ], - "/Parent": "2 0 R", - "/Prev": "4 0 R", - "/Title": "u:Salad 2 -> 15: /XYZ 66 756 3", - "/Type": "/Outline" - } - }, - "obj:6 0 R": { - "value": { - "/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" - } - }, - "obj:7 0 R": { - "value": { - "/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" - } - }, - "obj:8 0 R": { - "value": { - "/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" - } - }, - "obj:9 0 R": { - "value": { - "/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" - } - }, - "obj:10 0 R": { - "value": { - "/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" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "50 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "value": { - "/Contents": "52 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:13 0 R": { - "value": { - "/Contents": "54 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:14 0 R": { - "value": { - "/Contents": "56 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:15 0 R": { - "value": { - "/Contents": "58 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:16 0 R": { - "value": { - "/Contents": "60 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:17 0 R": { - "value": { - "/Contents": "62 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:18 0 R": { - "value": { - "/Contents": "64 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:19 0 R": { - "value": { - "/Contents": "66 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:20 0 R": { - "value": { - "/Contents": "68 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:21 0 R": { - "value": { - "/Contents": "70 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:22 0 R": { - "value": { - "/Contents": "72 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:23 0 R": { - "value": { - "/Contents": "74 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:24 0 R": { - "value": { - "/Contents": "76 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:25 0 R": { - "value": { - "/Contents": "78 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:26 0 R": { - "value": { - "/Contents": "80 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:27 0 R": { - "value": { - "/Contents": "82 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:28 0 R": { - "value": { - "/Contents": "84 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:29 0 R": { - "value": { - "/Contents": "86 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:30 0 R": { - "value": { - "/Contents": "88 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:31 0 R": { - "value": { - "/Contents": "90 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:32 0 R": { - "value": { - "/Contents": "92 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:33 0 R": { - "value": { - "/Contents": "94 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:34 0 R": { - "value": { - "/Contents": "96 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:35 0 R": { - "value": { - "/Contents": "98 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:36 0 R": { - "value": { - "/Count": -3, - "/Dest": [ - "17 0 R", - "/Fit" - ], - "/First": "100 0 R", - "/Last": "101 0 R", - "/Next": "37 0 R", - "/Parent": "4 0 R", - "/Title": "u:Mern 1.1 -> 11: /Fit", - "/Type": "/Outline" - } - }, - "obj:37 0 R": { - "value": { - "/Count": 2, - "/Dest": [ - "19 0 R", - "/FitH", - 792 - ], - "/First": "102 0 R", - "/Last": "103 0 R", - "/Parent": "4 0 R", - "/Prev": "36 0 R", - "/Title": "u:Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", - "/Type": "/Outline" - } - }, - "obj:38 0 R": { - "stream": { - "dict": { - "/Length": "39 0 R" - } - } - }, - "obj:39 0 R": { - "value": 45 - }, - "obj:40 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:41 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:42 0 R": { - "stream": { - "dict": { - "/Length": "43 0 R" - } - } - }, - "obj:43 0 R": { - "value": 45 - }, - "obj:44 0 R": { - "stream": { - "dict": { - "/Length": "45 0 R" - } - } - }, - "obj:45 0 R": { - "value": 45 - }, - "obj:46 0 R": { - "stream": { - "dict": { - "/Length": "47 0 R" - } - } - }, - "obj:47 0 R": { - "value": 45 - }, - "obj:48 0 R": { - "stream": { - "dict": { - "/Length": "49 0 R" - } - } - }, - "obj:49 0 R": { - "value": 45 - }, - "obj:50 0 R": { - "stream": { - "dict": { - "/Length": "51 0 R" - } - } - }, - "obj:51 0 R": { - "value": 45 - }, - "obj:52 0 R": { - "stream": { - "dict": { - "/Length": "53 0 R" - } - } - }, - "obj:53 0 R": { - "value": 45 - }, - "obj:54 0 R": { - "stream": { - "dict": { - "/Length": "55 0 R" - } - } - }, - "obj:55 0 R": { - "value": 45 - }, - "obj:56 0 R": { - "stream": { - "dict": { - "/Length": "57 0 R" - } - } - }, - "obj:57 0 R": { - "value": 45 - }, - "obj:58 0 R": { - "stream": { - "dict": { - "/Length": "59 0 R" - } - } - }, - "obj:59 0 R": { - "value": 45 - }, - "obj:60 0 R": { - "stream": { - "dict": { - "/Length": "61 0 R" - } - } - }, - "obj:61 0 R": { - "value": 46 - }, - "obj:62 0 R": { - "stream": { - "dict": { - "/Length": "63 0 R" - } - } - }, - "obj:63 0 R": { - "value": 46 - }, - "obj:64 0 R": { - "stream": { - "dict": { - "/Length": "65 0 R" - } - } - }, - "obj:65 0 R": { - "value": 46 - }, - "obj:66 0 R": { - "stream": { - "dict": { - "/Length": "67 0 R" - } - } - }, - "obj:67 0 R": { - "value": 46 - }, - "obj:68 0 R": { - "stream": { - "dict": { - "/Length": "69 0 R" - } - } - }, - "obj:69 0 R": { - "value": 46 - }, - "obj:70 0 R": { - "stream": { - "dict": { - "/Length": "71 0 R" - } - } - }, - "obj:71 0 R": { - "value": 46 - }, - "obj:72 0 R": { - "stream": { - "dict": { - "/Length": "73 0 R" - } - } - }, - "obj:73 0 R": { - "value": 46 - }, - "obj:74 0 R": { - "stream": { - "dict": { - "/Length": "75 0 R" - } - } - }, - "obj:75 0 R": { - "value": 46 - }, - "obj:76 0 R": { - "stream": { - "dict": { - "/Length": "77 0 R" - } - } - }, - "obj:77 0 R": { - "value": 46 - }, - "obj:78 0 R": { - "stream": { - "dict": { - "/Length": "79 0 R" - } - } - }, - "obj:79 0 R": { - "value": 46 - }, - "obj:80 0 R": { - "stream": { - "dict": { - "/Length": "81 0 R" - } - } - }, - "obj:81 0 R": { - "value": 46 - }, - "obj:82 0 R": { - "stream": { - "dict": { - "/Length": "83 0 R" - } - } - }, - "obj:83 0 R": { - "value": 46 - }, - "obj:84 0 R": { - "stream": { - "dict": { - "/Length": "85 0 R" - } - } - }, - "obj:85 0 R": { - "value": 46 - }, - "obj:86 0 R": { - "stream": { - "dict": { - "/Length": "87 0 R" - } - } - }, - "obj:87 0 R": { - "value": 46 - }, - "obj:88 0 R": { - "stream": { - "dict": { - "/Length": "89 0 R" - } - } - }, - "obj:89 0 R": { - "value": 46 - }, - "obj:90 0 R": { - "stream": { - "dict": { - "/Length": "91 0 R" - } - } - }, - "obj:91 0 R": { - "value": 46 - }, - "obj:92 0 R": { - "stream": { - "dict": { - "/Length": "93 0 R" - } - } - }, - "obj:93 0 R": { - "value": 46 - }, - "obj:94 0 R": { - "stream": { - "dict": { - "/Length": "95 0 R" - } - } - }, - "obj:95 0 R": { - "value": 46 - }, - "obj:96 0 R": { - "stream": { - "dict": { - "/Length": "97 0 R" - } - } - }, - "obj:97 0 R": { - "value": 46 - }, - "obj:98 0 R": { - "stream": { - "dict": { - "/Length": "99 0 R" - } - } - }, - "obj:99 0 R": { - "value": 46 - }, - "obj:100 0 R": { - "value": { - "/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": "u:Biherbadem 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" - } - }, - "obj:101 0 R": { - "value": { - "/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": "u:Gawehwehweh 1.1.2 -> 12: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:102 0 R": { - "value": { - "/Dest": "u:gabeebee", - "/Next": "103 0 R", - "/Parent": "37 0 R", - "/Title": "u:Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", - "/Type": "/Outline" - } - }, - "obj:103 0 R": { - "value": { - "/A": { - "/D": [ - "6 0 R", - "/XYZ", - null, - null, - null - ], - "/S": "/GoTo", - "/Type": "/Action" - }, - "/Parent": "37 0 R", - "/Prev": "102 0 R", - "/Title": "u:Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:104 0 R": { - "value": { - "/A": { - "/D": "u:glarp", - "/S": "/GoTo", - "/Type": "/Action" - }, - "/Next": "105 0 R", - "/Parent": "100 0 R", - "/Title": "u:Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:105 0 R": { - "value": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "100 0 R", - "/Prev": "104 0 R", - "/Title": "u:Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:106 0 R": { - "value": { - "/Dest": "108 0 R", - "/Parent": "101 0 R", - "/Title": "u:Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:107 0 R": { - "value": { - "/Names": [ - "u:gabeebee", - [ - "7 0 R", - "/FitR", - 66, - 714, - 180, - 770 - ], - "u:glarp", - [ - "24 0 R", - "/XYZ", - null, - null, - null - ] - ] - } - }, - "obj:108 0 R": { - "value": [ + "objects": { + "obj:1 0 R": { + "value": { + "/Names": { + "/Dests": "107 0 R" + }, + "/Outlines": "2 0 R", + "/PageMode": "/UseOutlines", + "/Pages": "3 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/Count": 6, + "/First": "4 0 R", + "/Last": "5 0 R", + "/Type": "/Outlines" + } + }, + "obj:3 0 R": { + "value": { + "/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" + } + }, + "obj:4 0 R": { + "value": { + "/Count": 4, + "/Dest": [ + "11 0 R", "/XYZ", null, null, null - ] - }, - "trailer": { - "value": { - "/ID": [ - "b:d52b0c17c216506962ae6743afec260f", - "b:d52b0c17c216506962ae6743afec260f" - ], - "/Root": "1 0 R", - "/Size": 109 + ], + "/First": "36 0 R", + "/Last": "37 0 R", + "/Next": "5 0 R", + "/Parent": "2 0 R", + "/Title": "u:Potato 1 -> 5: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:5 0 R": { + "value": { + "/Dest": [ + "21 0 R", + "/XYZ", + 66, + 756, + 3 + ], + "/Parent": "2 0 R", + "/Prev": "4 0 R", + "/Title": "u:Salad 2 -> 15: /XYZ 66 756 3", + "/Type": "/Outline" + } + }, + "obj:6 0 R": { + "value": { + "/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" + } + }, + "obj:7 0 R": { + "value": { + "/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" + } + }, + "obj:8 0 R": { + "value": { + "/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" + } + }, + "obj:9 0 R": { + "value": { + "/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" + } + }, + "obj:10 0 R": { + "value": { + "/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" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "50 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "value": { + "/Contents": "52 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:13 0 R": { + "value": { + "/Contents": "54 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:14 0 R": { + "value": { + "/Contents": "56 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:15 0 R": { + "value": { + "/Contents": "58 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:16 0 R": { + "value": { + "/Contents": "60 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:17 0 R": { + "value": { + "/Contents": "62 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:18 0 R": { + "value": { + "/Contents": "64 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:19 0 R": { + "value": { + "/Contents": "66 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:20 0 R": { + "value": { + "/Contents": "68 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:21 0 R": { + "value": { + "/Contents": "70 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:22 0 R": { + "value": { + "/Contents": "72 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:23 0 R": { + "value": { + "/Contents": "74 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:24 0 R": { + "value": { + "/Contents": "76 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:25 0 R": { + "value": { + "/Contents": "78 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:26 0 R": { + "value": { + "/Contents": "80 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:27 0 R": { + "value": { + "/Contents": "82 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:28 0 R": { + "value": { + "/Contents": "84 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:29 0 R": { + "value": { + "/Contents": "86 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:30 0 R": { + "value": { + "/Contents": "88 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:31 0 R": { + "value": { + "/Contents": "90 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:32 0 R": { + "value": { + "/Contents": "92 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:33 0 R": { + "value": { + "/Contents": "94 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:34 0 R": { + "value": { + "/Contents": "96 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:35 0 R": { + "value": { + "/Contents": "98 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:36 0 R": { + "value": { + "/Count": -3, + "/Dest": [ + "17 0 R", + "/Fit" + ], + "/First": "100 0 R", + "/Last": "101 0 R", + "/Next": "37 0 R", + "/Parent": "4 0 R", + "/Title": "u:Mern 1.1 -> 11: /Fit", + "/Type": "/Outline" + } + }, + "obj:37 0 R": { + "value": { + "/Count": 2, + "/Dest": [ + "19 0 R", + "/FitH", + 792 + ], + "/First": "102 0 R", + "/Last": "103 0 R", + "/Parent": "4 0 R", + "/Prev": "36 0 R", + "/Title": "u:Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", + "/Type": "/Outline" + } + }, + "obj:38 0 R": { + "stream": { + "dict": { + "/Length": "39 0 R" } } + }, + "obj:39 0 R": { + "value": 45 + }, + "obj:40 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:41 0 R": { + "value": [ + "/PDF", + "/Text" + ] + }, + "obj:42 0 R": { + "stream": { + "dict": { + "/Length": "43 0 R" + } + } + }, + "obj:43 0 R": { + "value": 45 + }, + "obj:44 0 R": { + "stream": { + "dict": { + "/Length": "45 0 R" + } + } + }, + "obj:45 0 R": { + "value": 45 + }, + "obj:46 0 R": { + "stream": { + "dict": { + "/Length": "47 0 R" + } + } + }, + "obj:47 0 R": { + "value": 45 + }, + "obj:48 0 R": { + "stream": { + "dict": { + "/Length": "49 0 R" + } + } + }, + "obj:49 0 R": { + "value": 45 + }, + "obj:50 0 R": { + "stream": { + "dict": { + "/Length": "51 0 R" + } + } + }, + "obj:51 0 R": { + "value": 45 + }, + "obj:52 0 R": { + "stream": { + "dict": { + "/Length": "53 0 R" + } + } + }, + "obj:53 0 R": { + "value": 45 + }, + "obj:54 0 R": { + "stream": { + "dict": { + "/Length": "55 0 R" + } + } + }, + "obj:55 0 R": { + "value": 45 + }, + "obj:56 0 R": { + "stream": { + "dict": { + "/Length": "57 0 R" + } + } + }, + "obj:57 0 R": { + "value": 45 + }, + "obj:58 0 R": { + "stream": { + "dict": { + "/Length": "59 0 R" + } + } + }, + "obj:59 0 R": { + "value": 45 + }, + "obj:60 0 R": { + "stream": { + "dict": { + "/Length": "61 0 R" + } + } + }, + "obj:61 0 R": { + "value": 46 + }, + "obj:62 0 R": { + "stream": { + "dict": { + "/Length": "63 0 R" + } + } + }, + "obj:63 0 R": { + "value": 46 + }, + "obj:64 0 R": { + "stream": { + "dict": { + "/Length": "65 0 R" + } + } + }, + "obj:65 0 R": { + "value": 46 + }, + "obj:66 0 R": { + "stream": { + "dict": { + "/Length": "67 0 R" + } + } + }, + "obj:67 0 R": { + "value": 46 + }, + "obj:68 0 R": { + "stream": { + "dict": { + "/Length": "69 0 R" + } + } + }, + "obj:69 0 R": { + "value": 46 + }, + "obj:70 0 R": { + "stream": { + "dict": { + "/Length": "71 0 R" + } + } + }, + "obj:71 0 R": { + "value": 46 + }, + "obj:72 0 R": { + "stream": { + "dict": { + "/Length": "73 0 R" + } + } + }, + "obj:73 0 R": { + "value": 46 + }, + "obj:74 0 R": { + "stream": { + "dict": { + "/Length": "75 0 R" + } + } + }, + "obj:75 0 R": { + "value": 46 + }, + "obj:76 0 R": { + "stream": { + "dict": { + "/Length": "77 0 R" + } + } + }, + "obj:77 0 R": { + "value": 46 + }, + "obj:78 0 R": { + "stream": { + "dict": { + "/Length": "79 0 R" + } + } + }, + "obj:79 0 R": { + "value": 46 + }, + "obj:80 0 R": { + "stream": { + "dict": { + "/Length": "81 0 R" + } + } + }, + "obj:81 0 R": { + "value": 46 + }, + "obj:82 0 R": { + "stream": { + "dict": { + "/Length": "83 0 R" + } + } + }, + "obj:83 0 R": { + "value": 46 + }, + "obj:84 0 R": { + "stream": { + "dict": { + "/Length": "85 0 R" + } + } + }, + "obj:85 0 R": { + "value": 46 + }, + "obj:86 0 R": { + "stream": { + "dict": { + "/Length": "87 0 R" + } + } + }, + "obj:87 0 R": { + "value": 46 + }, + "obj:88 0 R": { + "stream": { + "dict": { + "/Length": "89 0 R" + } + } + }, + "obj:89 0 R": { + "value": 46 + }, + "obj:90 0 R": { + "stream": { + "dict": { + "/Length": "91 0 R" + } + } + }, + "obj:91 0 R": { + "value": 46 + }, + "obj:92 0 R": { + "stream": { + "dict": { + "/Length": "93 0 R" + } + } + }, + "obj:93 0 R": { + "value": 46 + }, + "obj:94 0 R": { + "stream": { + "dict": { + "/Length": "95 0 R" + } + } + }, + "obj:95 0 R": { + "value": 46 + }, + "obj:96 0 R": { + "stream": { + "dict": { + "/Length": "97 0 R" + } + } + }, + "obj:97 0 R": { + "value": 46 + }, + "obj:98 0 R": { + "stream": { + "dict": { + "/Length": "99 0 R" + } + } + }, + "obj:99 0 R": { + "value": 46 + }, + "obj:100 0 R": { + "value": { + "/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": "u:Biherbadem 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + } + }, + "obj:101 0 R": { + "value": { + "/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": "u:Gawehwehweh 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:102 0 R": { + "value": { + "/Dest": "u:gabeebee", + "/Next": "103 0 R", + "/Parent": "37 0 R", + "/Title": "u:Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + } + }, + "obj:103 0 R": { + "value": { + "/A": { + "/D": [ + "6 0 R", + "/XYZ", + null, + null, + null + ], + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Parent": "37 0 R", + "/Prev": "102 0 R", + "/Title": "u:Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:104 0 R": { + "value": { + "/A": { + "/D": "u:glarp", + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Next": "105 0 R", + "/Parent": "100 0 R", + "/Title": "u:Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:105 0 R": { + "value": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "104 0 R", + "/Title": "u:Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:106 0 R": { + "value": { + "/Dest": "108 0 R", + "/Parent": "101 0 R", + "/Title": "u:Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:107 0 R": { + "value": { + "/Names": [ + "u:gabeebee", + [ + "7 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "u:glarp", + [ + "24 0 R", + "/XYZ", + null, + null, + null + ] + ] + } + }, + "obj:108 0 R": { + "value": [ + "28 0 R", + "/XYZ", + null, + null, + null + ] + }, + "trailer": { + "value": { + "/ID": [ + "b:d52b0c17c216506962ae6743afec260f", + "b:d52b0c17c216506962ae6743afec260f" + ], + "/Root": "1 0 R", + "/Size": 109 + } } } } diff --git a/qpdf/qtest/qpdf/json-outlines-with-old-root-dests-v2.out b/qpdf/qtest/qpdf/json-outlines-with-old-root-dests-v2.out index 8e97c099..357e99d2 100644 --- a/qpdf/qtest/qpdf/json-outlines-with-old-root-dests-v2.out +++ b/qpdf/qtest/qpdf/json-outlines-with-old-root-dests-v2.out @@ -724,1159 +724,1154 @@ "title": "•Salad 2 -> 15: /XYZ 66 756 3" } ], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 107, - "objects": { - "obj:1 0 R": { - "value": { - "/Dests": "107 0 R", - "/Outlines": "2 0 R", - "/PageLabels": { - "/Nums": [ - 0, - { - "/P": "u:0" - }, - 1, - { - "/S": "/R" - } - ] - }, - "/PageMode": "/UseOutlines", - "/Pages": "3 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/Count": 6, - "/First": "4 0 R", - "/Last": "5 0 R", - "/Type": "/Outlines" - } - }, - "obj:3 0 R": { - "value": { - "/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" - } - }, - "obj:4 0 R": { - "value": { - "/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": "u:•Potato 1 -> 5: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:5 0 R": { - "value": { - "/Dest": [ - "21 0 R", - "/XYZ", - 66, - 756, - 3 - ], - "/Parent": "2 0 R", - "/Prev": "4 0 R", - "/Title": "u:•Salad 2 -> 15: /XYZ 66 756 3", - "/Type": "/Outline" - } - }, - "obj:6 0 R": { - "value": { - "/Contents": "38 0 R", - "/MediaBox": [ + "objects": { + "obj:1 0 R": { + "value": { + "/Dests": "107 0 R", + "/Outlines": "2 0 R", + "/PageLabels": { + "/Nums": [ 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" + { + "/P": "u:0" }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:7 0 R": { - "value": { - "/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" - } - }, - "obj:8 0 R": { - "value": { - "/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" - } - }, - "obj:9 0 R": { - "value": { - "/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" - } - }, - "obj:10 0 R": { - "value": { - "/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" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "50 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "value": { - "/Contents": "52 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:13 0 R": { - "value": { - "/Contents": "54 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:14 0 R": { - "value": { - "/Contents": "56 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:15 0 R": { - "value": { - "/Contents": "58 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:16 0 R": { - "value": { - "/Contents": "60 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:17 0 R": { - "value": { - "/Contents": "62 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:18 0 R": { - "value": { - "/Contents": "64 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:19 0 R": { - "value": { - "/Contents": "66 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:20 0 R": { - "value": { - "/Contents": "68 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:21 0 R": { - "value": { - "/Contents": "70 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:22 0 R": { - "value": { - "/Contents": "72 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:23 0 R": { - "value": { - "/Contents": "74 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:24 0 R": { - "value": { - "/Contents": "76 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:25 0 R": { - "value": { - "/Contents": "78 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:26 0 R": { - "value": { - "/Contents": "80 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:27 0 R": { - "value": { - "/Contents": "82 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:28 0 R": { - "value": { - "/Contents": "84 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:29 0 R": { - "value": { - "/Contents": "86 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:30 0 R": { - "value": { - "/Contents": "88 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:31 0 R": { - "value": { - "/Contents": "90 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:32 0 R": { - "value": { - "/Contents": "92 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:33 0 R": { - "value": { - "/Contents": "94 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:34 0 R": { - "value": { - "/Contents": "96 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:35 0 R": { - "value": { - "/Contents": "98 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:36 0 R": { - "value": { - "/Count": 3, - "/Dest": [ - "17 0 R", - "/Fit" - ], - "/First": "100 0 R", - "/Last": "101 0 R", - "/Next": "37 0 R", - "/Parent": "4 0 R", - "/Title": "u:•Mern 1.1 -> 11: /Fit", - "/Type": "/Outline" - } - }, - "obj:37 0 R": { - "value": { - "/Count": 2, - "/Dest": [ - "19 0 R", - "/FitH", - 792 - ], - "/First": "102 0 R", - "/Last": "103 0 R", - "/Parent": "4 0 R", - "/Prev": "36 0 R", - "/Title": "u:•Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", - "/Type": "/Outline" - } - }, - "obj:38 0 R": { - "stream": { - "dict": { - "/Length": "39 0 R" - } - } - }, - "obj:39 0 R": { - "value": 44 - }, - "obj:40 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:41 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:42 0 R": { - "stream": { - "dict": { - "/Length": "43 0 R" - } - } - }, - "obj:43 0 R": { - "value": 44 - }, - "obj:44 0 R": { - "stream": { - "dict": { - "/Length": "45 0 R" - } - } - }, - "obj:45 0 R": { - "value": 44 - }, - "obj:46 0 R": { - "stream": { - "dict": { - "/Length": "47 0 R" - } - } - }, - "obj:47 0 R": { - "value": 44 - }, - "obj:48 0 R": { - "stream": { - "dict": { - "/Length": "49 0 R" - } - } - }, - "obj:49 0 R": { - "value": 44 - }, - "obj:50 0 R": { - "stream": { - "dict": { - "/Length": "51 0 R" - } - } - }, - "obj:51 0 R": { - "value": 44 - }, - "obj:52 0 R": { - "stream": { - "dict": { - "/Length": "53 0 R" - } - } - }, - "obj:53 0 R": { - "value": 44 - }, - "obj:54 0 R": { - "stream": { - "dict": { - "/Length": "55 0 R" - } - } - }, - "obj:55 0 R": { - "value": 44 - }, - "obj:56 0 R": { - "stream": { - "dict": { - "/Length": "57 0 R" - } - } - }, - "obj:57 0 R": { - "value": 44 - }, - "obj:58 0 R": { - "stream": { - "dict": { - "/Length": "59 0 R" - } - } - }, - "obj:59 0 R": { - "value": 44 - }, - "obj:60 0 R": { - "stream": { - "dict": { - "/Length": "61 0 R" - } - } - }, - "obj:61 0 R": { - "value": 45 - }, - "obj:62 0 R": { - "stream": { - "dict": { - "/Length": "63 0 R" - } - } - }, - "obj:63 0 R": { - "value": 45 - }, - "obj:64 0 R": { - "stream": { - "dict": { - "/Length": "65 0 R" - } - } - }, - "obj:65 0 R": { - "value": 45 - }, - "obj:66 0 R": { - "stream": { - "dict": { - "/Length": "67 0 R" - } - } - }, - "obj:67 0 R": { - "value": 45 - }, - "obj:68 0 R": { - "stream": { - "dict": { - "/Length": "69 0 R" - } - } - }, - "obj:69 0 R": { - "value": 45 - }, - "obj:70 0 R": { - "stream": { - "dict": { - "/Length": "71 0 R" - } - } - }, - "obj:71 0 R": { - "value": 45 - }, - "obj:72 0 R": { - "stream": { - "dict": { - "/Length": "73 0 R" - } - } - }, - "obj:73 0 R": { - "value": 45 - }, - "obj:74 0 R": { - "stream": { - "dict": { - "/Length": "75 0 R" - } - } - }, - "obj:75 0 R": { - "value": 45 - }, - "obj:76 0 R": { - "stream": { - "dict": { - "/Length": "77 0 R" - } - } - }, - "obj:77 0 R": { - "value": 45 - }, - "obj:78 0 R": { - "stream": { - "dict": { - "/Length": "79 0 R" - } - } - }, - "obj:79 0 R": { - "value": 45 - }, - "obj:80 0 R": { - "stream": { - "dict": { - "/Length": "81 0 R" - } - } - }, - "obj:81 0 R": { - "value": 45 - }, - "obj:82 0 R": { - "stream": { - "dict": { - "/Length": "83 0 R" - } - } - }, - "obj:83 0 R": { - "value": 45 - }, - "obj:84 0 R": { - "stream": { - "dict": { - "/Length": "85 0 R" - } - } - }, - "obj:85 0 R": { - "value": 45 - }, - "obj:86 0 R": { - "stream": { - "dict": { - "/Length": "87 0 R" - } - } - }, - "obj:87 0 R": { - "value": 45 - }, - "obj:88 0 R": { - "stream": { - "dict": { - "/Length": "89 0 R" - } - } - }, - "obj:89 0 R": { - "value": 45 - }, - "obj:90 0 R": { - "stream": { - "dict": { - "/Length": "91 0 R" - } - } - }, - "obj:91 0 R": { - "value": 45 - }, - "obj:92 0 R": { - "stream": { - "dict": { - "/Length": "93 0 R" - } - } - }, - "obj:93 0 R": { - "value": 45 - }, - "obj:94 0 R": { - "stream": { - "dict": { - "/Length": "95 0 R" - } - } - }, - "obj:95 0 R": { - "value": 45 - }, - "obj:96 0 R": { - "stream": { - "dict": { - "/Length": "97 0 R" - } - } - }, - "obj:97 0 R": { - "value": 45 - }, - "obj:98 0 R": { - "stream": { - "dict": { - "/Length": "99 0 R" - } - } - }, - "obj:99 0 R": { - "value": 45 - }, - "obj:100 0 R": { - "value": { - "/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": "u:•Biherbadem 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" - } - }, - "obj:101 0 R": { - "value": { - "/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": "u:•Gawehwehweh 1.1.2 -> 12: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:102 0 R": { - "value": { - "/Dest": "/gabeebee", - "/Next": "103 0 R", - "/Parent": "37 0 R", - "/Title": "u:•Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", - "/Type": "/Outline" - } - }, - "obj:103 0 R": { - "value": { - "/A": { - "/D": [ - "6 0 R", - "/XYZ", - null, - null, - null - ], - "/S": "/GoTo", - "/Type": "/Action" - }, - "/Parent": "37 0 R", - "/Prev": "102 0 R", - "/Title": "u:•Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:104 0 R": { - "value": { - "/A": { - "/D": "/glarp", - "/S": "/GoTo", - "/Type": "/Action" - }, - "/Next": "105 0 R", - "/Parent": "100 0 R", - "/Title": "u:•Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:105 0 R": { - "value": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "100 0 R", - "/Prev": "104 0 R", - "/Title": "u:•Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:106 0 R": { - "value": { - "/Dest": [ - "28 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "101 0 R", - "/Title": "u:•Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:107 0 R": { - "value": { - "/gabeebee": [ - "7 0 R", - "/FitR", - 66, - 714, - 180, - 770 - ], - "/glarp": [ - "24 0 R", - "/XYZ", - null, - null, - null + 1, + { + "/S": "/R" + } ] + }, + "/PageMode": "/UseOutlines", + "/Pages": "3 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/Count": 6, + "/First": "4 0 R", + "/Last": "5 0 R", + "/Type": "/Outlines" + } + }, + "obj:3 0 R": { + "value": { + "/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" + } + }, + "obj:4 0 R": { + "value": { + "/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": "u:•Potato 1 -> 5: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:5 0 R": { + "value": { + "/Dest": [ + "21 0 R", + "/XYZ", + 66, + 756, + 3 + ], + "/Parent": "2 0 R", + "/Prev": "4 0 R", + "/Title": "u:•Salad 2 -> 15: /XYZ 66 756 3", + "/Type": "/Outline" + } + }, + "obj:6 0 R": { + "value": { + "/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" + } + }, + "obj:7 0 R": { + "value": { + "/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" + } + }, + "obj:8 0 R": { + "value": { + "/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" + } + }, + "obj:9 0 R": { + "value": { + "/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" + } + }, + "obj:10 0 R": { + "value": { + "/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" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "50 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "value": { + "/Contents": "52 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:13 0 R": { + "value": { + "/Contents": "54 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:14 0 R": { + "value": { + "/Contents": "56 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:15 0 R": { + "value": { + "/Contents": "58 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:16 0 R": { + "value": { + "/Contents": "60 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:17 0 R": { + "value": { + "/Contents": "62 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:18 0 R": { + "value": { + "/Contents": "64 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:19 0 R": { + "value": { + "/Contents": "66 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:20 0 R": { + "value": { + "/Contents": "68 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:21 0 R": { + "value": { + "/Contents": "70 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:22 0 R": { + "value": { + "/Contents": "72 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:23 0 R": { + "value": { + "/Contents": "74 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:24 0 R": { + "value": { + "/Contents": "76 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:25 0 R": { + "value": { + "/Contents": "78 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:26 0 R": { + "value": { + "/Contents": "80 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:27 0 R": { + "value": { + "/Contents": "82 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:28 0 R": { + "value": { + "/Contents": "84 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:29 0 R": { + "value": { + "/Contents": "86 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:30 0 R": { + "value": { + "/Contents": "88 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:31 0 R": { + "value": { + "/Contents": "90 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:32 0 R": { + "value": { + "/Contents": "92 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:33 0 R": { + "value": { + "/Contents": "94 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:34 0 R": { + "value": { + "/Contents": "96 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:35 0 R": { + "value": { + "/Contents": "98 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:36 0 R": { + "value": { + "/Count": 3, + "/Dest": [ + "17 0 R", + "/Fit" + ], + "/First": "100 0 R", + "/Last": "101 0 R", + "/Next": "37 0 R", + "/Parent": "4 0 R", + "/Title": "u:•Mern 1.1 -> 11: /Fit", + "/Type": "/Outline" + } + }, + "obj:37 0 R": { + "value": { + "/Count": 2, + "/Dest": [ + "19 0 R", + "/FitH", + 792 + ], + "/First": "102 0 R", + "/Last": "103 0 R", + "/Parent": "4 0 R", + "/Prev": "36 0 R", + "/Title": "u:•Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", + "/Type": "/Outline" + } + }, + "obj:38 0 R": { + "stream": { + "dict": { + "/Length": "39 0 R" } - }, - "trailer": { - "value": { - "/ID": [ - "b:d52b0c17c216506962ae6743afec260f", - "b:d52b0c17c216506962ae6743afec260f" + } + }, + "obj:39 0 R": { + "value": 44 + }, + "obj:40 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:41 0 R": { + "value": [ + "/PDF", + "/Text" + ] + }, + "obj:42 0 R": { + "stream": { + "dict": { + "/Length": "43 0 R" + } + } + }, + "obj:43 0 R": { + "value": 44 + }, + "obj:44 0 R": { + "stream": { + "dict": { + "/Length": "45 0 R" + } + } + }, + "obj:45 0 R": { + "value": 44 + }, + "obj:46 0 R": { + "stream": { + "dict": { + "/Length": "47 0 R" + } + } + }, + "obj:47 0 R": { + "value": 44 + }, + "obj:48 0 R": { + "stream": { + "dict": { + "/Length": "49 0 R" + } + } + }, + "obj:49 0 R": { + "value": 44 + }, + "obj:50 0 R": { + "stream": { + "dict": { + "/Length": "51 0 R" + } + } + }, + "obj:51 0 R": { + "value": 44 + }, + "obj:52 0 R": { + "stream": { + "dict": { + "/Length": "53 0 R" + } + } + }, + "obj:53 0 R": { + "value": 44 + }, + "obj:54 0 R": { + "stream": { + "dict": { + "/Length": "55 0 R" + } + } + }, + "obj:55 0 R": { + "value": 44 + }, + "obj:56 0 R": { + "stream": { + "dict": { + "/Length": "57 0 R" + } + } + }, + "obj:57 0 R": { + "value": 44 + }, + "obj:58 0 R": { + "stream": { + "dict": { + "/Length": "59 0 R" + } + } + }, + "obj:59 0 R": { + "value": 44 + }, + "obj:60 0 R": { + "stream": { + "dict": { + "/Length": "61 0 R" + } + } + }, + "obj:61 0 R": { + "value": 45 + }, + "obj:62 0 R": { + "stream": { + "dict": { + "/Length": "63 0 R" + } + } + }, + "obj:63 0 R": { + "value": 45 + }, + "obj:64 0 R": { + "stream": { + "dict": { + "/Length": "65 0 R" + } + } + }, + "obj:65 0 R": { + "value": 45 + }, + "obj:66 0 R": { + "stream": { + "dict": { + "/Length": "67 0 R" + } + } + }, + "obj:67 0 R": { + "value": 45 + }, + "obj:68 0 R": { + "stream": { + "dict": { + "/Length": "69 0 R" + } + } + }, + "obj:69 0 R": { + "value": 45 + }, + "obj:70 0 R": { + "stream": { + "dict": { + "/Length": "71 0 R" + } + } + }, + "obj:71 0 R": { + "value": 45 + }, + "obj:72 0 R": { + "stream": { + "dict": { + "/Length": "73 0 R" + } + } + }, + "obj:73 0 R": { + "value": 45 + }, + "obj:74 0 R": { + "stream": { + "dict": { + "/Length": "75 0 R" + } + } + }, + "obj:75 0 R": { + "value": 45 + }, + "obj:76 0 R": { + "stream": { + "dict": { + "/Length": "77 0 R" + } + } + }, + "obj:77 0 R": { + "value": 45 + }, + "obj:78 0 R": { + "stream": { + "dict": { + "/Length": "79 0 R" + } + } + }, + "obj:79 0 R": { + "value": 45 + }, + "obj:80 0 R": { + "stream": { + "dict": { + "/Length": "81 0 R" + } + } + }, + "obj:81 0 R": { + "value": 45 + }, + "obj:82 0 R": { + "stream": { + "dict": { + "/Length": "83 0 R" + } + } + }, + "obj:83 0 R": { + "value": 45 + }, + "obj:84 0 R": { + "stream": { + "dict": { + "/Length": "85 0 R" + } + } + }, + "obj:85 0 R": { + "value": 45 + }, + "obj:86 0 R": { + "stream": { + "dict": { + "/Length": "87 0 R" + } + } + }, + "obj:87 0 R": { + "value": 45 + }, + "obj:88 0 R": { + "stream": { + "dict": { + "/Length": "89 0 R" + } + } + }, + "obj:89 0 R": { + "value": 45 + }, + "obj:90 0 R": { + "stream": { + "dict": { + "/Length": "91 0 R" + } + } + }, + "obj:91 0 R": { + "value": 45 + }, + "obj:92 0 R": { + "stream": { + "dict": { + "/Length": "93 0 R" + } + } + }, + "obj:93 0 R": { + "value": 45 + }, + "obj:94 0 R": { + "stream": { + "dict": { + "/Length": "95 0 R" + } + } + }, + "obj:95 0 R": { + "value": 45 + }, + "obj:96 0 R": { + "stream": { + "dict": { + "/Length": "97 0 R" + } + } + }, + "obj:97 0 R": { + "value": 45 + }, + "obj:98 0 R": { + "stream": { + "dict": { + "/Length": "99 0 R" + } + } + }, + "obj:99 0 R": { + "value": 45 + }, + "obj:100 0 R": { + "value": { + "/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": "u:•Biherbadem 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + } + }, + "obj:101 0 R": { + "value": { + "/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": "u:•Gawehwehweh 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:102 0 R": { + "value": { + "/Dest": "/gabeebee", + "/Next": "103 0 R", + "/Parent": "37 0 R", + "/Title": "u:•Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + } + }, + "obj:103 0 R": { + "value": { + "/A": { + "/D": [ + "6 0 R", + "/XYZ", + null, + null, + null ], - "/Root": "1 0 R", - "/Size": 108 - } + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Parent": "37 0 R", + "/Prev": "102 0 R", + "/Title": "u:•Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:104 0 R": { + "value": { + "/A": { + "/D": "/glarp", + "/S": "/GoTo", + "/Type": "/Action" + }, + "/Next": "105 0 R", + "/Parent": "100 0 R", + "/Title": "u:•Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:105 0 R": { + "value": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "104 0 R", + "/Title": "u:•Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:106 0 R": { + "value": { + "/Dest": [ + "28 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "101 0 R", + "/Title": "u:•Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:107 0 R": { + "value": { + "/gabeebee": [ + "7 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "/glarp": [ + "24 0 R", + "/XYZ", + null, + null, + null + ] + } + }, + "trailer": { + "value": { + "/ID": [ + "b:d52b0c17c216506962ae6743afec260f", + "b:d52b0c17c216506962ae6743afec260f" + ], + "/Root": "1 0 R", + "/Size": 108 } } } diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v1.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-2-v1.out similarity index 100% rename from qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v1.out rename to qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-2-v1.out diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-2-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-2-v2.out new file mode 100644 index 00000000..2e3d90c2 --- /dev/null +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-2-v2.out @@ -0,0 +1,52 @@ +{ + "version": 2, + "parameters": { + "decodelevel": "generalized" + }, + "objects": { + "obj:2 0 R": { + "value": { + "/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" + } + }, + "trailer": { + "value": { + "/Root": "1 0 R", + "/Size": 107 + } + } + } +} diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v1.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-v1.out similarity index 100% rename from qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v1.out rename to qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-v1.out diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-v2.out new file mode 100644 index 00000000..e0adca90 --- /dev/null +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-trailer-v2.out @@ -0,0 +1,14 @@ +{ + "version": 2, + "parameters": { + "decodelevel": "generalized" + }, + "objects": { + "trailer": { + "value": { + "/Root": "1 0 R", + "/Size": 107 + } + } + } +} diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v1.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-v1.out similarity index 100% rename from qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v1.out rename to qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-v1.out diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-v2.out new file mode 100644 index 00000000..39bb0141 --- /dev/null +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-objects-v2.out @@ -0,0 +1,1186 @@ +{ + "version": 2, + "parameters": { + "decodelevel": "generalized" + }, + "objects": { + "obj:1 0 R": { + "value": { + "/Outlines": "95 0 R", + "/PageLabels": { + "/Nums": [ + 0, + { + "/P": "u:" + }, + 2, + { + "/S": "/r", + "/St": 1 + }, + 7, + { + "/P": "u:" + }, + 9, + { + "/S": "/r", + "/St": 6 + }, + 11, + { + "/P": "u:" + }, + 12, + { + "/S": "/D", + "/St": 2 + }, + 15, + { + "/S": "/D", + "/St": 6 + }, + 19, + { + "/P": "u:" + }, + 20, + { + "/S": "/D", + "/St": 12 + }, + 22, + { + "/S": "/D", + "/St": 16059 + }, + 23, + { + "/S": "/r", + "/St": 50 + }, + 29, + { + "/S": "/r", + "/St": 54 + } + ] + }, + "/PageMode": "/UseOutlines", + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/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" + } + }, + "obj:3 0 R": { + "value": { + "/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" + } + }, + "obj:4 0 R": { + "value": { + "/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" + } + }, + "obj:5 0 R": { + "value": { + "/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" + } + }, + "obj:6 0 R": { + "value": { + "/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" + } + }, + "obj:7 0 R": { + "value": { + "/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" + } + }, + "obj:8 0 R": { + "value": { + "/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" + } + }, + "obj:9 0 R": { + "value": { + "/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" + } + }, + "obj:10 0 R": { + "value": { + "/Contents": "49 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "51 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "value": { + "/Contents": "53 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:13 0 R": { + "value": { + "/Contents": "55 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:14 0 R": { + "value": { + "/Contents": "57 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:15 0 R": { + "value": { + "/Contents": "59 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:16 0 R": { + "value": { + "/Contents": "61 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:17 0 R": { + "value": { + "/Contents": "63 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:18 0 R": { + "value": { + "/Contents": "65 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:19 0 R": { + "value": { + "/Contents": "67 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:20 0 R": { + "value": { + "/Contents": "69 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:21 0 R": { + "value": { + "/Contents": "71 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:22 0 R": { + "value": { + "/Contents": "73 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:23 0 R": { + "value": { + "/Contents": "75 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:24 0 R": { + "value": { + "/Contents": "77 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:25 0 R": { + "value": { + "/Contents": "79 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:26 0 R": { + "value": { + "/Contents": "81 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:27 0 R": { + "value": { + "/Contents": "83 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:28 0 R": { + "value": { + "/Contents": "85 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:29 0 R": { + "value": { + "/Contents": "87 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:30 0 R": { + "value": { + "/Contents": "89 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:31 0 R": { + "value": { + "/Contents": "91 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:32 0 R": { + "value": { + "/Contents": "93 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:33 0 R": { + "stream": { + "dict": { + "/Length": "34 0 R" + } + } + }, + "obj:34 0 R": { + "value": 46 + }, + "obj:35 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:36 0 R": { + "value": [ + "/PDF", + "/Text" + ] + }, + "obj:37 0 R": { + "stream": { + "dict": { + "/Length": "38 0 R" + } + } + }, + "obj:38 0 R": { + "value": 46 + }, + "obj:39 0 R": { + "stream": { + "dict": { + "/Length": "40 0 R" + } + } + }, + "obj:40 0 R": { + "value": 46 + }, + "obj:41 0 R": { + "stream": { + "dict": { + "/Length": "42 0 R" + } + } + }, + "obj:42 0 R": { + "value": 46 + }, + "obj:43 0 R": { + "stream": { + "dict": { + "/Length": "44 0 R" + } + } + }, + "obj:44 0 R": { + "value": 46 + }, + "obj:45 0 R": { + "stream": { + "dict": { + "/Length": "46 0 R" + } + } + }, + "obj:46 0 R": { + "value": 46 + }, + "obj:47 0 R": { + "stream": { + "dict": { + "/Length": "48 0 R" + } + } + }, + "obj:48 0 R": { + "value": 46 + }, + "obj:49 0 R": { + "stream": { + "dict": { + "/Length": "50 0 R" + } + } + }, + "obj:50 0 R": { + "value": 46 + }, + "obj:51 0 R": { + "stream": { + "dict": { + "/Length": "52 0 R" + } + } + }, + "obj:52 0 R": { + "value": 46 + }, + "obj:53 0 R": { + "stream": { + "dict": { + "/Length": "54 0 R" + } + } + }, + "obj:54 0 R": { + "value": 46 + }, + "obj:55 0 R": { + "stream": { + "dict": { + "/Length": "56 0 R" + } + } + }, + "obj:56 0 R": { + "value": 47 + }, + "obj:57 0 R": { + "stream": { + "dict": { + "/Length": "58 0 R" + } + } + }, + "obj:58 0 R": { + "value": 47 + }, + "obj:59 0 R": { + "stream": { + "dict": { + "/Length": "60 0 R" + } + } + }, + "obj:60 0 R": { + "value": 47 + }, + "obj:61 0 R": { + "stream": { + "dict": { + "/Length": "62 0 R" + } + } + }, + "obj:62 0 R": { + "value": 47 + }, + "obj:63 0 R": { + "stream": { + "dict": { + "/Length": "64 0 R" + } + } + }, + "obj:64 0 R": { + "value": 47 + }, + "obj:65 0 R": { + "stream": { + "dict": { + "/Length": "66 0 R" + } + } + }, + "obj:66 0 R": { + "value": 47 + }, + "obj:67 0 R": { + "stream": { + "dict": { + "/Length": "68 0 R" + } + } + }, + "obj:68 0 R": { + "value": 47 + }, + "obj:69 0 R": { + "stream": { + "dict": { + "/Length": "70 0 R" + } + } + }, + "obj:70 0 R": { + "value": 47 + }, + "obj:71 0 R": { + "stream": { + "dict": { + "/Length": "72 0 R" + } + } + }, + "obj:72 0 R": { + "value": 47 + }, + "obj:73 0 R": { + "stream": { + "dict": { + "/Length": "74 0 R" + } + } + }, + "obj:74 0 R": { + "value": 47 + }, + "obj:75 0 R": { + "stream": { + "dict": { + "/Length": "76 0 R" + } + } + }, + "obj:76 0 R": { + "value": 47 + }, + "obj:77 0 R": { + "stream": { + "dict": { + "/Length": "78 0 R" + } + } + }, + "obj:78 0 R": { + "value": 47 + }, + "obj:79 0 R": { + "stream": { + "dict": { + "/Length": "80 0 R" + } + } + }, + "obj:80 0 R": { + "value": 47 + }, + "obj:81 0 R": { + "stream": { + "dict": { + "/Length": "82 0 R" + } + } + }, + "obj:82 0 R": { + "value": 47 + }, + "obj:83 0 R": { + "stream": { + "dict": { + "/Length": "84 0 R" + } + } + }, + "obj:84 0 R": { + "value": 47 + }, + "obj:85 0 R": { + "stream": { + "dict": { + "/Length": "86 0 R" + } + } + }, + "obj:86 0 R": { + "value": 47 + }, + "obj:87 0 R": { + "stream": { + "dict": { + "/Length": "88 0 R" + } + } + }, + "obj:88 0 R": { + "value": 47 + }, + "obj:89 0 R": { + "stream": { + "dict": { + "/Length": "90 0 R" + } + } + }, + "obj:90 0 R": { + "value": 47 + }, + "obj:91 0 R": { + "stream": { + "dict": { + "/Length": "92 0 R" + } + } + }, + "obj:92 0 R": { + "value": 47 + }, + "obj:93 0 R": { + "stream": { + "dict": { + "/Length": "94 0 R" + } + } + }, + "obj:94 0 R": { + "value": 47 + }, + "obj:95 0 R": { + "value": { + "/Count": 6, + "/First": "96 0 R", + "/Last": "97 0 R", + "/Type": "/Outlines" + } + }, + "obj:96 0 R": { + "value": { + "/Count": 4, + "/Dest": [ + "8 0 R", + "/XYZ", + null, + null, + null + ], + "/First": "98 0 R", + "/Last": "99 0 R", + "/Next": "97 0 R", + "/Parent": "95 0 R", + "/Title": "u:Isís 1 -> 5: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:97 0 R": { + "value": { + "/Dest": [ + "18 0 R", + "/XYZ", + 66, + 756, + 3 + ], + "/Parent": "95 0 R", + "/Prev": "96 0 R", + "/Title": "u:Trepak 2 -> 15: /XYZ 66 756 3", + "/Type": "/Outline" + } + }, + "obj:98 0 R": { + "value": { + "/Count": -3, + "/Dest": [ + "14 0 R", + "/Fit" + ], + "/First": "100 0 R", + "/Last": "101 0 R", + "/Next": "99 0 R", + "/Parent": "96 0 R", + "/Title": "u:Amanda 1.1 -> 11: /Fit", + "/Type": "/Outline" + } + }, + "obj:99 0 R": { + "value": { + "/Count": 2, + "/Dest": [ + "16 0 R", + "/FitH", + 792 + ], + "/First": "105 0 R", + "/Last": "106 0 R", + "/Parent": "96 0 R", + "/Prev": "98 0 R", + "/Title": "u:Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", + "/Type": "/Outline" + } + }, + "obj:100 0 R": { + "value": { + "/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": "u:Isosicle 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + } + }, + "obj:101 0 R": { + "value": { + "/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": "u:Isosicle 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:102 0 R": { + "value": { + "/Dest": [ + "21 0 R", + "/XYZ", + null, + null, + null + ], + "/Next": "103 0 R", + "/Parent": "100 0 R", + "/Title": "u:Isosicle 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:103 0 R": { + "value": { + "/Dest": [ + "22 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "102 0 R", + "/Title": "u:Isosicle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:104 0 R": { + "value": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "101 0 R", + "/Title": "u:Isosicle 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:105 0 R": { + "value": { + "/Dest": [ + "4 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "/Next": "106 0 R", + "/Parent": "99 0 R", + "/Title": "u:Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + } + }, + "obj:106 0 R": { + "value": { + "/Dest": [ + "3 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "99 0 R", + "/Prev": "105 0 R", + "/Title": "u:Trepsicle 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + } + }, + "trailer": { + "value": { + "/Root": "1 0 R", + "/Size": 107 + } + } + } +} diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v2.out deleted file mode 100644 index 867f5b93..00000000 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v2.out +++ /dev/null @@ -1,57 +0,0 @@ -{ - "version": 2, - "parameters": { - "decodelevel": "generalized" - }, - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 106, - "objects": { - "obj:2 0 R": { - "value": { - "/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" - } - }, - "trailer": { - "value": { - "/Root": "1 0 R", - "/Size": 107 - } - } - } - } -} diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v2.out deleted file mode 100644 index 6a4969d4..00000000 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v2.out +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "parameters": { - "decodelevel": "generalized" - }, - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 106, - "objects": { - "trailer": { - "value": { - "/Root": "1 0 R", - "/Size": 107 - } - } - } - } -} diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out deleted file mode 100644 index 9c8e5b57..00000000 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out +++ /dev/null @@ -1,1191 +0,0 @@ -{ - "version": 2, - "parameters": { - "decodelevel": "generalized" - }, - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 106, - "objects": { - "obj:1 0 R": { - "value": { - "/Outlines": "95 0 R", - "/PageLabels": { - "/Nums": [ - 0, - { - "/P": "u:" - }, - 2, - { - "/S": "/r", - "/St": 1 - }, - 7, - { - "/P": "u:" - }, - 9, - { - "/S": "/r", - "/St": 6 - }, - 11, - { - "/P": "u:" - }, - 12, - { - "/S": "/D", - "/St": 2 - }, - 15, - { - "/S": "/D", - "/St": 6 - }, - 19, - { - "/P": "u:" - }, - 20, - { - "/S": "/D", - "/St": 12 - }, - 22, - { - "/S": "/D", - "/St": 16059 - }, - 23, - { - "/S": "/r", - "/St": 50 - }, - 29, - { - "/S": "/r", - "/St": 54 - } - ] - }, - "/PageMode": "/UseOutlines", - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/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" - } - }, - "obj:3 0 R": { - "value": { - "/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" - } - }, - "obj:4 0 R": { - "value": { - "/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" - } - }, - "obj:5 0 R": { - "value": { - "/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" - } - }, - "obj:6 0 R": { - "value": { - "/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" - } - }, - "obj:7 0 R": { - "value": { - "/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" - } - }, - "obj:8 0 R": { - "value": { - "/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" - } - }, - "obj:9 0 R": { - "value": { - "/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" - } - }, - "obj:10 0 R": { - "value": { - "/Contents": "49 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "51 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "value": { - "/Contents": "53 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:13 0 R": { - "value": { - "/Contents": "55 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:14 0 R": { - "value": { - "/Contents": "57 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:15 0 R": { - "value": { - "/Contents": "59 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:16 0 R": { - "value": { - "/Contents": "61 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:17 0 R": { - "value": { - "/Contents": "63 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:18 0 R": { - "value": { - "/Contents": "65 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:19 0 R": { - "value": { - "/Contents": "67 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:20 0 R": { - "value": { - "/Contents": "69 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:21 0 R": { - "value": { - "/Contents": "71 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:22 0 R": { - "value": { - "/Contents": "73 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:23 0 R": { - "value": { - "/Contents": "75 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:24 0 R": { - "value": { - "/Contents": "77 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:25 0 R": { - "value": { - "/Contents": "79 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:26 0 R": { - "value": { - "/Contents": "81 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:27 0 R": { - "value": { - "/Contents": "83 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:28 0 R": { - "value": { - "/Contents": "85 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:29 0 R": { - "value": { - "/Contents": "87 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:30 0 R": { - "value": { - "/Contents": "89 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:31 0 R": { - "value": { - "/Contents": "91 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:32 0 R": { - "value": { - "/Contents": "93 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:33 0 R": { - "stream": { - "dict": { - "/Length": "34 0 R" - } - } - }, - "obj:34 0 R": { - "value": 46 - }, - "obj:35 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:36 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:37 0 R": { - "stream": { - "dict": { - "/Length": "38 0 R" - } - } - }, - "obj:38 0 R": { - "value": 46 - }, - "obj:39 0 R": { - "stream": { - "dict": { - "/Length": "40 0 R" - } - } - }, - "obj:40 0 R": { - "value": 46 - }, - "obj:41 0 R": { - "stream": { - "dict": { - "/Length": "42 0 R" - } - } - }, - "obj:42 0 R": { - "value": 46 - }, - "obj:43 0 R": { - "stream": { - "dict": { - "/Length": "44 0 R" - } - } - }, - "obj:44 0 R": { - "value": 46 - }, - "obj:45 0 R": { - "stream": { - "dict": { - "/Length": "46 0 R" - } - } - }, - "obj:46 0 R": { - "value": 46 - }, - "obj:47 0 R": { - "stream": { - "dict": { - "/Length": "48 0 R" - } - } - }, - "obj:48 0 R": { - "value": 46 - }, - "obj:49 0 R": { - "stream": { - "dict": { - "/Length": "50 0 R" - } - } - }, - "obj:50 0 R": { - "value": 46 - }, - "obj:51 0 R": { - "stream": { - "dict": { - "/Length": "52 0 R" - } - } - }, - "obj:52 0 R": { - "value": 46 - }, - "obj:53 0 R": { - "stream": { - "dict": { - "/Length": "54 0 R" - } - } - }, - "obj:54 0 R": { - "value": 46 - }, - "obj:55 0 R": { - "stream": { - "dict": { - "/Length": "56 0 R" - } - } - }, - "obj:56 0 R": { - "value": 47 - }, - "obj:57 0 R": { - "stream": { - "dict": { - "/Length": "58 0 R" - } - } - }, - "obj:58 0 R": { - "value": 47 - }, - "obj:59 0 R": { - "stream": { - "dict": { - "/Length": "60 0 R" - } - } - }, - "obj:60 0 R": { - "value": 47 - }, - "obj:61 0 R": { - "stream": { - "dict": { - "/Length": "62 0 R" - } - } - }, - "obj:62 0 R": { - "value": 47 - }, - "obj:63 0 R": { - "stream": { - "dict": { - "/Length": "64 0 R" - } - } - }, - "obj:64 0 R": { - "value": 47 - }, - "obj:65 0 R": { - "stream": { - "dict": { - "/Length": "66 0 R" - } - } - }, - "obj:66 0 R": { - "value": 47 - }, - "obj:67 0 R": { - "stream": { - "dict": { - "/Length": "68 0 R" - } - } - }, - "obj:68 0 R": { - "value": 47 - }, - "obj:69 0 R": { - "stream": { - "dict": { - "/Length": "70 0 R" - } - } - }, - "obj:70 0 R": { - "value": 47 - }, - "obj:71 0 R": { - "stream": { - "dict": { - "/Length": "72 0 R" - } - } - }, - "obj:72 0 R": { - "value": 47 - }, - "obj:73 0 R": { - "stream": { - "dict": { - "/Length": "74 0 R" - } - } - }, - "obj:74 0 R": { - "value": 47 - }, - "obj:75 0 R": { - "stream": { - "dict": { - "/Length": "76 0 R" - } - } - }, - "obj:76 0 R": { - "value": 47 - }, - "obj:77 0 R": { - "stream": { - "dict": { - "/Length": "78 0 R" - } - } - }, - "obj:78 0 R": { - "value": 47 - }, - "obj:79 0 R": { - "stream": { - "dict": { - "/Length": "80 0 R" - } - } - }, - "obj:80 0 R": { - "value": 47 - }, - "obj:81 0 R": { - "stream": { - "dict": { - "/Length": "82 0 R" - } - } - }, - "obj:82 0 R": { - "value": 47 - }, - "obj:83 0 R": { - "stream": { - "dict": { - "/Length": "84 0 R" - } - } - }, - "obj:84 0 R": { - "value": 47 - }, - "obj:85 0 R": { - "stream": { - "dict": { - "/Length": "86 0 R" - } - } - }, - "obj:86 0 R": { - "value": 47 - }, - "obj:87 0 R": { - "stream": { - "dict": { - "/Length": "88 0 R" - } - } - }, - "obj:88 0 R": { - "value": 47 - }, - "obj:89 0 R": { - "stream": { - "dict": { - "/Length": "90 0 R" - } - } - }, - "obj:90 0 R": { - "value": 47 - }, - "obj:91 0 R": { - "stream": { - "dict": { - "/Length": "92 0 R" - } - } - }, - "obj:92 0 R": { - "value": 47 - }, - "obj:93 0 R": { - "stream": { - "dict": { - "/Length": "94 0 R" - } - } - }, - "obj:94 0 R": { - "value": 47 - }, - "obj:95 0 R": { - "value": { - "/Count": 6, - "/First": "96 0 R", - "/Last": "97 0 R", - "/Type": "/Outlines" - } - }, - "obj:96 0 R": { - "value": { - "/Count": 4, - "/Dest": [ - "8 0 R", - "/XYZ", - null, - null, - null - ], - "/First": "98 0 R", - "/Last": "99 0 R", - "/Next": "97 0 R", - "/Parent": "95 0 R", - "/Title": "u:Isís 1 -> 5: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:97 0 R": { - "value": { - "/Dest": [ - "18 0 R", - "/XYZ", - 66, - 756, - 3 - ], - "/Parent": "95 0 R", - "/Prev": "96 0 R", - "/Title": "u:Trepak 2 -> 15: /XYZ 66 756 3", - "/Type": "/Outline" - } - }, - "obj:98 0 R": { - "value": { - "/Count": -3, - "/Dest": [ - "14 0 R", - "/Fit" - ], - "/First": "100 0 R", - "/Last": "101 0 R", - "/Next": "99 0 R", - "/Parent": "96 0 R", - "/Title": "u:Amanda 1.1 -> 11: /Fit", - "/Type": "/Outline" - } - }, - "obj:99 0 R": { - "value": { - "/Count": 2, - "/Dest": [ - "16 0 R", - "/FitH", - 792 - ], - "/First": "105 0 R", - "/Last": "106 0 R", - "/Parent": "96 0 R", - "/Prev": "98 0 R", - "/Title": "u:Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", - "/Type": "/Outline" - } - }, - "obj:100 0 R": { - "value": { - "/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": "u:Isosicle 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" - } - }, - "obj:101 0 R": { - "value": { - "/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": "u:Isosicle 1.1.2 -> 12: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:102 0 R": { - "value": { - "/Dest": [ - "21 0 R", - "/XYZ", - null, - null, - null - ], - "/Next": "103 0 R", - "/Parent": "100 0 R", - "/Title": "u:Isosicle 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:103 0 R": { - "value": { - "/Dest": [ - "22 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "100 0 R", - "/Prev": "102 0 R", - "/Title": "u:Isosicle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:104 0 R": { - "value": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "101 0 R", - "/Title": "u:Isosicle 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:105 0 R": { - "value": { - "/Dest": [ - "4 0 R", - "/FitR", - 66, - 714, - 180, - 770 - ], - "/Next": "106 0 R", - "/Parent": "99 0 R", - "/Title": "u:Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", - "/Type": "/Outline" - } - }, - "obj:106 0 R": { - "value": { - "/Dest": [ - "3 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "99 0 R", - "/Prev": "105 0 R", - "/Title": "u:Trepsicle 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" - } - }, - "trailer": { - "value": { - "/Root": "1 0 R", - "/Size": 107 - } - } - } - } -} diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out index 81f7441b..14775582 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out @@ -794,1189 +794,1184 @@ "title": "Trepak 2 -> 15: /XYZ 66 756 3" } ], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 106, - "objects": { - "obj:1 0 R": { - "value": { - "/Outlines": "95 0 R", - "/PageLabels": { - "/Nums": [ - 0, - { - "/P": "u:" - }, - 2, - { - "/S": "/r", - "/St": 1 - }, - 7, - { - "/P": "u:" - }, - 9, - { - "/S": "/r", - "/St": 6 - }, - 11, - { - "/P": "u:" - }, - 12, - { - "/S": "/D", - "/St": 2 - }, - 15, - { - "/S": "/D", - "/St": 6 - }, - 19, - { - "/P": "u:" - }, - 20, - { - "/S": "/D", - "/St": 12 - }, - 22, - { - "/S": "/D", - "/St": 16059 - }, - 23, - { - "/S": "/r", - "/St": 50 - }, - 29, - { - "/S": "/r", - "/St": 54 - } - ] - }, - "/PageMode": "/UseOutlines", - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/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" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "33 0 R", - "/MediaBox": [ + "objects": { + "obj:1 0 R": { + "value": { + "/Outlines": "95 0 R", + "/PageLabels": { + "/Nums": [ 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + { + "/P": "u:" }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "37 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 2, + { + "/S": "/r", + "/St": 1 }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "39 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 7, + { + "/P": "u:" }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:6 0 R": { - "value": { - "/Contents": "41 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 9, + { + "/S": "/r", + "/St": 6 }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:7 0 R": { - "value": { - "/Contents": "43 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 11, + { + "/P": "u:" }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:8 0 R": { - "value": { - "/Contents": "45 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 12, + { + "/S": "/D", + "/St": 2 }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:9 0 R": { - "value": { - "/Contents": "47 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 15, + { + "/S": "/D", + "/St": 6 }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:10 0 R": { - "value": { - "/Contents": "49 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 19, + { + "/P": "u:" }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "51 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 20, + { + "/S": "/D", + "/St": 12 }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "value": { - "/Contents": "53 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 22, + { + "/S": "/D", + "/St": 16059 }, - "/ProcSet": "36 0 R" - }, - "/Type": "/Page" - } - }, - "obj:13 0 R": { - "value": { - "/Contents": "55 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" + 23, + { + "/S": "/r", + "/St": 50 }, - "/ProcSet": "36 0 R" + 29, + { + "/S": "/r", + "/St": 54 + } + ] + }, + "/PageMode": "/UseOutlines", + "/Pages": "2 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/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" + } + }, + "obj:3 0 R": { + "value": { + "/Contents": "33 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:14 0 R": { - "value": { - "/Contents": "57 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:4 0 R": { + "value": { + "/Contents": "37 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:15 0 R": { - "value": { - "/Contents": "59 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:5 0 R": { + "value": { + "/Contents": "39 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:16 0 R": { - "value": { - "/Contents": "61 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:6 0 R": { + "value": { + "/Contents": "41 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:17 0 R": { - "value": { - "/Contents": "63 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:7 0 R": { + "value": { + "/Contents": "43 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:18 0 R": { - "value": { - "/Contents": "65 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:8 0 R": { + "value": { + "/Contents": "45 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:19 0 R": { - "value": { - "/Contents": "67 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:9 0 R": { + "value": { + "/Contents": "47 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:20 0 R": { - "value": { - "/Contents": "69 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:10 0 R": { + "value": { + "/Contents": "49 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:21 0 R": { - "value": { - "/Contents": "71 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "51 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:22 0 R": { - "value": { - "/Contents": "73 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "value": { + "/Contents": "53 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:23 0 R": { - "value": { - "/Contents": "75 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:13 0 R": { + "value": { + "/Contents": "55 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:24 0 R": { - "value": { - "/Contents": "77 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:14 0 R": { + "value": { + "/Contents": "57 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:25 0 R": { - "value": { - "/Contents": "79 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:15 0 R": { + "value": { + "/Contents": "59 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:26 0 R": { - "value": { - "/Contents": "81 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:16 0 R": { + "value": { + "/Contents": "61 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:27 0 R": { - "value": { - "/Contents": "83 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:17 0 R": { + "value": { + "/Contents": "63 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:28 0 R": { - "value": { - "/Contents": "85 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:18 0 R": { + "value": { + "/Contents": "65 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:29 0 R": { - "value": { - "/Contents": "87 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:19 0 R": { + "value": { + "/Contents": "67 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:30 0 R": { - "value": { - "/Contents": "89 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:20 0 R": { + "value": { + "/Contents": "69 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:31 0 R": { - "value": { - "/Contents": "91 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:21 0 R": { + "value": { + "/Contents": "71 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" - } - }, - "obj:32 0 R": { - "value": { - "/Contents": "93 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "35 0 R" - }, - "/ProcSet": "36 0 R" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:22 0 R": { + "value": { + "/Contents": "73 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" }, - "/Type": "/Page" + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:23 0 R": { + "value": { + "/Contents": "75 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:24 0 R": { + "value": { + "/Contents": "77 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:25 0 R": { + "value": { + "/Contents": "79 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:26 0 R": { + "value": { + "/Contents": "81 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:27 0 R": { + "value": { + "/Contents": "83 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:28 0 R": { + "value": { + "/Contents": "85 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:29 0 R": { + "value": { + "/Contents": "87 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:30 0 R": { + "value": { + "/Contents": "89 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:31 0 R": { + "value": { + "/Contents": "91 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:32 0 R": { + "value": { + "/Contents": "93 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "2 0 R", + "/Resources": { + "/Font": { + "/F1": "35 0 R" + }, + "/ProcSet": "36 0 R" + }, + "/Type": "/Page" + } + }, + "obj:33 0 R": { + "stream": { + "dict": { + "/Length": "34 0 R" } - }, - "obj:33 0 R": { - "stream": { - "dict": { - "/Length": "34 0 R" - } + } + }, + "obj:34 0 R": { + "value": 46 + }, + "obj:35 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:36 0 R": { + "value": [ + "/PDF", + "/Text" + ] + }, + "obj:37 0 R": { + "stream": { + "dict": { + "/Length": "38 0 R" } - }, - "obj:34 0 R": { - "value": 46 - }, - "obj:35 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" + } + }, + "obj:38 0 R": { + "value": 46 + }, + "obj:39 0 R": { + "stream": { + "dict": { + "/Length": "40 0 R" } - }, - "obj:36 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:37 0 R": { - "stream": { - "dict": { - "/Length": "38 0 R" - } + } + }, + "obj:40 0 R": { + "value": 46 + }, + "obj:41 0 R": { + "stream": { + "dict": { + "/Length": "42 0 R" } - }, - "obj:38 0 R": { - "value": 46 - }, - "obj:39 0 R": { - "stream": { - "dict": { - "/Length": "40 0 R" - } + } + }, + "obj:42 0 R": { + "value": 46 + }, + "obj:43 0 R": { + "stream": { + "dict": { + "/Length": "44 0 R" } - }, - "obj:40 0 R": { - "value": 46 - }, - "obj:41 0 R": { - "stream": { - "dict": { - "/Length": "42 0 R" - } + } + }, + "obj:44 0 R": { + "value": 46 + }, + "obj:45 0 R": { + "stream": { + "dict": { + "/Length": "46 0 R" } - }, - "obj:42 0 R": { - "value": 46 - }, - "obj:43 0 R": { - "stream": { - "dict": { - "/Length": "44 0 R" - } + } + }, + "obj:46 0 R": { + "value": 46 + }, + "obj:47 0 R": { + "stream": { + "dict": { + "/Length": "48 0 R" } - }, - "obj:44 0 R": { - "value": 46 - }, - "obj:45 0 R": { - "stream": { - "dict": { - "/Length": "46 0 R" - } + } + }, + "obj:48 0 R": { + "value": 46 + }, + "obj:49 0 R": { + "stream": { + "dict": { + "/Length": "50 0 R" } - }, - "obj:46 0 R": { - "value": 46 - }, - "obj:47 0 R": { - "stream": { - "dict": { - "/Length": "48 0 R" - } + } + }, + "obj:50 0 R": { + "value": 46 + }, + "obj:51 0 R": { + "stream": { + "dict": { + "/Length": "52 0 R" } - }, - "obj:48 0 R": { - "value": 46 - }, - "obj:49 0 R": { - "stream": { - "dict": { - "/Length": "50 0 R" - } + } + }, + "obj:52 0 R": { + "value": 46 + }, + "obj:53 0 R": { + "stream": { + "dict": { + "/Length": "54 0 R" } - }, - "obj:50 0 R": { - "value": 46 - }, - "obj:51 0 R": { - "stream": { - "dict": { - "/Length": "52 0 R" - } + } + }, + "obj:54 0 R": { + "value": 46 + }, + "obj:55 0 R": { + "stream": { + "dict": { + "/Length": "56 0 R" } - }, - "obj:52 0 R": { - "value": 46 - }, - "obj:53 0 R": { - "stream": { - "dict": { - "/Length": "54 0 R" - } + } + }, + "obj:56 0 R": { + "value": 47 + }, + "obj:57 0 R": { + "stream": { + "dict": { + "/Length": "58 0 R" } - }, - "obj:54 0 R": { - "value": 46 - }, - "obj:55 0 R": { - "stream": { - "dict": { - "/Length": "56 0 R" - } + } + }, + "obj:58 0 R": { + "value": 47 + }, + "obj:59 0 R": { + "stream": { + "dict": { + "/Length": "60 0 R" } - }, - "obj:56 0 R": { - "value": 47 - }, - "obj:57 0 R": { - "stream": { - "dict": { - "/Length": "58 0 R" - } + } + }, + "obj:60 0 R": { + "value": 47 + }, + "obj:61 0 R": { + "stream": { + "dict": { + "/Length": "62 0 R" } - }, - "obj:58 0 R": { - "value": 47 - }, - "obj:59 0 R": { - "stream": { - "dict": { - "/Length": "60 0 R" - } + } + }, + "obj:62 0 R": { + "value": 47 + }, + "obj:63 0 R": { + "stream": { + "dict": { + "/Length": "64 0 R" } - }, - "obj:60 0 R": { - "value": 47 - }, - "obj:61 0 R": { - "stream": { - "dict": { - "/Length": "62 0 R" - } + } + }, + "obj:64 0 R": { + "value": 47 + }, + "obj:65 0 R": { + "stream": { + "dict": { + "/Length": "66 0 R" } - }, - "obj:62 0 R": { - "value": 47 - }, - "obj:63 0 R": { - "stream": { - "dict": { - "/Length": "64 0 R" - } + } + }, + "obj:66 0 R": { + "value": 47 + }, + "obj:67 0 R": { + "stream": { + "dict": { + "/Length": "68 0 R" } - }, - "obj:64 0 R": { - "value": 47 - }, - "obj:65 0 R": { - "stream": { - "dict": { - "/Length": "66 0 R" - } + } + }, + "obj:68 0 R": { + "value": 47 + }, + "obj:69 0 R": { + "stream": { + "dict": { + "/Length": "70 0 R" } - }, - "obj:66 0 R": { - "value": 47 - }, - "obj:67 0 R": { - "stream": { - "dict": { - "/Length": "68 0 R" - } + } + }, + "obj:70 0 R": { + "value": 47 + }, + "obj:71 0 R": { + "stream": { + "dict": { + "/Length": "72 0 R" } - }, - "obj:68 0 R": { - "value": 47 - }, - "obj:69 0 R": { - "stream": { - "dict": { - "/Length": "70 0 R" - } + } + }, + "obj:72 0 R": { + "value": 47 + }, + "obj:73 0 R": { + "stream": { + "dict": { + "/Length": "74 0 R" } - }, - "obj:70 0 R": { - "value": 47 - }, - "obj:71 0 R": { - "stream": { - "dict": { - "/Length": "72 0 R" - } + } + }, + "obj:74 0 R": { + "value": 47 + }, + "obj:75 0 R": { + "stream": { + "dict": { + "/Length": "76 0 R" } - }, - "obj:72 0 R": { - "value": 47 - }, - "obj:73 0 R": { - "stream": { - "dict": { - "/Length": "74 0 R" - } + } + }, + "obj:76 0 R": { + "value": 47 + }, + "obj:77 0 R": { + "stream": { + "dict": { + "/Length": "78 0 R" } - }, - "obj:74 0 R": { - "value": 47 - }, - "obj:75 0 R": { - "stream": { - "dict": { - "/Length": "76 0 R" - } + } + }, + "obj:78 0 R": { + "value": 47 + }, + "obj:79 0 R": { + "stream": { + "dict": { + "/Length": "80 0 R" } - }, - "obj:76 0 R": { - "value": 47 - }, - "obj:77 0 R": { - "stream": { - "dict": { - "/Length": "78 0 R" - } + } + }, + "obj:80 0 R": { + "value": 47 + }, + "obj:81 0 R": { + "stream": { + "dict": { + "/Length": "82 0 R" } - }, - "obj:78 0 R": { - "value": 47 - }, - "obj:79 0 R": { - "stream": { - "dict": { - "/Length": "80 0 R" - } + } + }, + "obj:82 0 R": { + "value": 47 + }, + "obj:83 0 R": { + "stream": { + "dict": { + "/Length": "84 0 R" } - }, - "obj:80 0 R": { - "value": 47 - }, - "obj:81 0 R": { - "stream": { - "dict": { - "/Length": "82 0 R" - } + } + }, + "obj:84 0 R": { + "value": 47 + }, + "obj:85 0 R": { + "stream": { + "dict": { + "/Length": "86 0 R" } - }, - "obj:82 0 R": { - "value": 47 - }, - "obj:83 0 R": { - "stream": { - "dict": { - "/Length": "84 0 R" - } + } + }, + "obj:86 0 R": { + "value": 47 + }, + "obj:87 0 R": { + "stream": { + "dict": { + "/Length": "88 0 R" } - }, - "obj:84 0 R": { - "value": 47 - }, - "obj:85 0 R": { - "stream": { - "dict": { - "/Length": "86 0 R" - } + } + }, + "obj:88 0 R": { + "value": 47 + }, + "obj:89 0 R": { + "stream": { + "dict": { + "/Length": "90 0 R" } - }, - "obj:86 0 R": { - "value": 47 - }, - "obj:87 0 R": { - "stream": { - "dict": { - "/Length": "88 0 R" - } + } + }, + "obj:90 0 R": { + "value": 47 + }, + "obj:91 0 R": { + "stream": { + "dict": { + "/Length": "92 0 R" } - }, - "obj:88 0 R": { - "value": 47 - }, - "obj:89 0 R": { - "stream": { - "dict": { - "/Length": "90 0 R" - } - } - }, - "obj:90 0 R": { - "value": 47 - }, - "obj:91 0 R": { - "stream": { - "dict": { - "/Length": "92 0 R" - } - } - }, - "obj:92 0 R": { - "value": 47 - }, - "obj:93 0 R": { - "stream": { - "dict": { - "/Length": "94 0 R" - } - } - }, - "obj:94 0 R": { - "value": 47 - }, - "obj:95 0 R": { - "value": { - "/Count": 6, - "/First": "96 0 R", - "/Last": "97 0 R", - "/Type": "/Outlines" - } - }, - "obj:96 0 R": { - "value": { - "/Count": 4, - "/Dest": [ - "8 0 R", - "/XYZ", - null, - null, - null - ], - "/First": "98 0 R", - "/Last": "99 0 R", - "/Next": "97 0 R", - "/Parent": "95 0 R", - "/Title": "u:Isís 1 -> 5: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:97 0 R": { - "value": { - "/Dest": [ - "18 0 R", - "/XYZ", - 66, - 756, - 3 - ], - "/Parent": "95 0 R", - "/Prev": "96 0 R", - "/Title": "u:Trepak 2 -> 15: /XYZ 66 756 3", - "/Type": "/Outline" - } - }, - "obj:98 0 R": { - "value": { - "/Count": -3, - "/Dest": [ - "14 0 R", - "/Fit" - ], - "/First": "100 0 R", - "/Last": "101 0 R", - "/Next": "99 0 R", - "/Parent": "96 0 R", - "/Title": "u:Amanda 1.1 -> 11: /Fit", - "/Type": "/Outline" - } - }, - "obj:99 0 R": { - "value": { - "/Count": 2, - "/Dest": [ - "16 0 R", - "/FitH", - 792 - ], - "/First": "105 0 R", - "/Last": "106 0 R", - "/Parent": "96 0 R", - "/Prev": "98 0 R", - "/Title": "u:Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", - "/Type": "/Outline" - } - }, - "obj:100 0 R": { - "value": { - "/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": "u:Isosicle 1.1.1 -> 12: /FitV 100", - "/Type": "/Outline" - } - }, - "obj:101 0 R": { - "value": { - "/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": "u:Isosicle 1.1.2 -> 12: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:102 0 R": { - "value": { - "/Dest": [ - "21 0 R", - "/XYZ", - null, - null, - null - ], - "/Next": "103 0 R", - "/Parent": "100 0 R", - "/Title": "u:Isosicle 1.1.1.1 -> 18: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:103 0 R": { - "value": { - "/Dest": [ - "22 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "100 0 R", - "/Prev": "102 0 R", - "/Title": "u:Isosicle 1.1.1.2 -> 19: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:104 0 R": { - "value": { - "/Dest": [ - "25 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "101 0 R", - "/Title": "u:Isosicle 1.1.2.1 -> 22: /XYZ null null null", - "/Type": "/Outline" - } - }, - "obj:105 0 R": { - "value": { - "/Dest": [ - "4 0 R", - "/FitR", - 66, - 714, - 180, - 770 - ], - "/Next": "106 0 R", - "/Parent": "99 0 R", - "/Title": "u:Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", - "/Type": "/Outline" - } - }, - "obj:106 0 R": { - "value": { - "/Dest": [ - "3 0 R", - "/XYZ", - null, - null, - null - ], - "/Parent": "99 0 R", - "/Prev": "105 0 R", - "/Title": "u:Trepsicle 1.2.2 -> 0: /XYZ null null null", - "/Type": "/Outline" - } - }, - "trailer": { - "value": { - "/Root": "1 0 R", - "/Size": 107 + } + }, + "obj:92 0 R": { + "value": 47 + }, + "obj:93 0 R": { + "stream": { + "dict": { + "/Length": "94 0 R" } } + }, + "obj:94 0 R": { + "value": 47 + }, + "obj:95 0 R": { + "value": { + "/Count": 6, + "/First": "96 0 R", + "/Last": "97 0 R", + "/Type": "/Outlines" + } + }, + "obj:96 0 R": { + "value": { + "/Count": 4, + "/Dest": [ + "8 0 R", + "/XYZ", + null, + null, + null + ], + "/First": "98 0 R", + "/Last": "99 0 R", + "/Next": "97 0 R", + "/Parent": "95 0 R", + "/Title": "u:Isís 1 -> 5: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:97 0 R": { + "value": { + "/Dest": [ + "18 0 R", + "/XYZ", + 66, + 756, + 3 + ], + "/Parent": "95 0 R", + "/Prev": "96 0 R", + "/Title": "u:Trepak 2 -> 15: /XYZ 66 756 3", + "/Type": "/Outline" + } + }, + "obj:98 0 R": { + "value": { + "/Count": -3, + "/Dest": [ + "14 0 R", + "/Fit" + ], + "/First": "100 0 R", + "/Last": "101 0 R", + "/Next": "99 0 R", + "/Parent": "96 0 R", + "/Title": "u:Amanda 1.1 -> 11: /Fit", + "/Type": "/Outline" + } + }, + "obj:99 0 R": { + "value": { + "/Count": 2, + "/Dest": [ + "16 0 R", + "/FitH", + 792 + ], + "/First": "105 0 R", + "/Last": "106 0 R", + "/Parent": "96 0 R", + "/Prev": "98 0 R", + "/Title": "u:Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", + "/Type": "/Outline" + } + }, + "obj:100 0 R": { + "value": { + "/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": "u:Isosicle 1.1.1 -> 12: /FitV 100", + "/Type": "/Outline" + } + }, + "obj:101 0 R": { + "value": { + "/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": "u:Isosicle 1.1.2 -> 12: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:102 0 R": { + "value": { + "/Dest": [ + "21 0 R", + "/XYZ", + null, + null, + null + ], + "/Next": "103 0 R", + "/Parent": "100 0 R", + "/Title": "u:Isosicle 1.1.1.1 -> 18: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:103 0 R": { + "value": { + "/Dest": [ + "22 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "100 0 R", + "/Prev": "102 0 R", + "/Title": "u:Isosicle 1.1.1.2 -> 19: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:104 0 R": { + "value": { + "/Dest": [ + "25 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "101 0 R", + "/Title": "u:Isosicle 1.1.2.1 -> 22: /XYZ null null null", + "/Type": "/Outline" + } + }, + "obj:105 0 R": { + "value": { + "/Dest": [ + "4 0 R", + "/FitR", + 66, + 714, + 180, + 770 + ], + "/Next": "106 0 R", + "/Parent": "99 0 R", + "/Title": "u:Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", + "/Type": "/Outline" + } + }, + "obj:106 0 R": { + "value": { + "/Dest": [ + "3 0 R", + "/XYZ", + null, + null, + null + ], + "/Parent": "99 0 R", + "/Prev": "105 0 R", + "/Title": "u:Trepsicle 1.2.2 -> 0: /XYZ null null null", + "/Type": "/Outline" + } + }, + "trailer": { + "value": { + "/Root": "1 0 R", + "/Size": 107 + } } } } diff --git a/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out b/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out index e7ea1ede..1bfa1ad3 100644 --- a/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out @@ -537,1067 +537,1062 @@ "userpasswordmatched": false }, "outlines": [], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 99, - "objects": { - "obj:1 0 R": { - "value": { - "/PageLabels": "2 0 R", - "/Pages": "3 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/Kids": [ - "4 0 R", - "5 0 R" - ] - } - }, - "obj:3 0 R": { - "value": { - "/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" - } - }, - "obj:4 0 R": { - "value": { - "/Kids": [ - "36 0 R", - "37 0 R" - ], - "/Limits": [ - 0, - 19 - ] - } - }, - "obj:5 0 R": { - "value": { - "/Limits": [ - 20, - 29 - ], - "/Nums": [ - 20, - { - "/S": "/D", - "/St": 12 - }, - 22, - { - "/S": "/D", - "/St": 16059 - }, - 23, - { - "/S": "/R", - "/St": 50 - }, - 29, - { - "/S": "/r", - "/St": 54 - } - ] - } - }, - "obj:6 0 R": { - "value": { - "/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" - } - }, - "obj:7 0 R": { - "value": { - "/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" - } - }, - "obj:8 0 R": { - "value": { - "/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" - } - }, - "obj:9 0 R": { - "value": { - "/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" - } - }, - "obj:10 0 R": { - "value": { - "/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" - } - }, - "obj:11 0 R": { - "value": { - "/Contents": "50 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:12 0 R": { - "value": { - "/Contents": "52 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:13 0 R": { - "value": { - "/Contents": "54 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:14 0 R": { - "value": { - "/Contents": "56 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:15 0 R": { - "value": { - "/Contents": "58 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:16 0 R": { - "value": { - "/Contents": "60 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:17 0 R": { - "value": { - "/Contents": "62 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:18 0 R": { - "value": { - "/Contents": "64 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:19 0 R": { - "value": { - "/Contents": "66 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:20 0 R": { - "value": { - "/Contents": "68 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:21 0 R": { - "value": { - "/Contents": "70 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:22 0 R": { - "value": { - "/Contents": "72 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:23 0 R": { - "value": { - "/Contents": "74 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:24 0 R": { - "value": { - "/Contents": "76 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:25 0 R": { - "value": { - "/Contents": "78 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:26 0 R": { - "value": { - "/Contents": "80 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:27 0 R": { - "value": { - "/Contents": "82 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:28 0 R": { - "value": { - "/Contents": "84 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:29 0 R": { - "value": { - "/Contents": "86 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:30 0 R": { - "value": { - "/Contents": "88 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:31 0 R": { - "value": { - "/Contents": "90 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:32 0 R": { - "value": { - "/Contents": "92 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:33 0 R": { - "value": { - "/Contents": "94 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:34 0 R": { - "value": { - "/Contents": "96 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:35 0 R": { - "value": { - "/Contents": "98 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "40 0 R" - }, - "/ProcSet": "41 0 R" - }, - "/Type": "/Page" - } - }, - "obj:36 0 R": { - "value": { - "/Limits": [ - 0, - 9 - ], - "/Nums": [ - 0, - { - "/S": "/r" - }, - 2, - { - "/P": "u:blank" - }, - 3, - { - "/P": "u:X-", - "/S": "/A", - "/St": 17 - }, - 5, - { - "/P": "u:" - }, - 6, - { - "/S": "/R", - "/St": 3 - }, - 9, - { - "/S": "/D" - } - ] - } - }, - "obj:37 0 R": { - "value": { - "/Limits": [ - 11, - 19 - ], - "/Nums": [ - 11, - { - "/S": "/a" - }, - 12, - { - "/S": "/a", - "/St": 3 - }, - 15, - { - "/P": "u:q.", - "/S": "/D", - "/St": 6 - }, - 19, - { - "/P": "u:www" - } - ] - } - }, - "obj:38 0 R": { - "stream": { - "dict": { - "/Length": "39 0 R" - } - } - }, - "obj:39 0 R": { - "value": 46 - }, - "obj:40 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:41 0 R": { - "value": [ - "/PDF", - "/Text" + "objects": { + "obj:1 0 R": { + "value": { + "/PageLabels": "2 0 R", + "/Pages": "3 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/Kids": [ + "4 0 R", + "5 0 R" ] - }, - "obj:42 0 R": { - "stream": { - "dict": { - "/Length": "43 0 R" + } + }, + "obj:3 0 R": { + "value": { + "/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" + } + }, + "obj:4 0 R": { + "value": { + "/Kids": [ + "36 0 R", + "37 0 R" + ], + "/Limits": [ + 0, + 19 + ] + } + }, + "obj:5 0 R": { + "value": { + "/Limits": [ + 20, + 29 + ], + "/Nums": [ + 20, + { + "/S": "/D", + "/St": 12 + }, + 22, + { + "/S": "/D", + "/St": 16059 + }, + 23, + { + "/S": "/R", + "/St": 50 + }, + 29, + { + "/S": "/r", + "/St": 54 } - } - }, - "obj:43 0 R": { - "value": 46 - }, - "obj:44 0 R": { - "stream": { - "dict": { - "/Length": "45 0 R" + ] + } + }, + "obj:6 0 R": { + "value": { + "/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" + } + }, + "obj:7 0 R": { + "value": { + "/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" + } + }, + "obj:8 0 R": { + "value": { + "/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" + } + }, + "obj:9 0 R": { + "value": { + "/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" + } + }, + "obj:10 0 R": { + "value": { + "/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" + } + }, + "obj:11 0 R": { + "value": { + "/Contents": "50 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:12 0 R": { + "value": { + "/Contents": "52 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:13 0 R": { + "value": { + "/Contents": "54 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:14 0 R": { + "value": { + "/Contents": "56 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:15 0 R": { + "value": { + "/Contents": "58 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:16 0 R": { + "value": { + "/Contents": "60 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:17 0 R": { + "value": { + "/Contents": "62 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:18 0 R": { + "value": { + "/Contents": "64 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:19 0 R": { + "value": { + "/Contents": "66 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:20 0 R": { + "value": { + "/Contents": "68 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:21 0 R": { + "value": { + "/Contents": "70 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:22 0 R": { + "value": { + "/Contents": "72 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:23 0 R": { + "value": { + "/Contents": "74 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:24 0 R": { + "value": { + "/Contents": "76 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:25 0 R": { + "value": { + "/Contents": "78 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:26 0 R": { + "value": { + "/Contents": "80 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:27 0 R": { + "value": { + "/Contents": "82 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:28 0 R": { + "value": { + "/Contents": "84 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:29 0 R": { + "value": { + "/Contents": "86 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:30 0 R": { + "value": { + "/Contents": "88 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:31 0 R": { + "value": { + "/Contents": "90 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:32 0 R": { + "value": { + "/Contents": "92 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:33 0 R": { + "value": { + "/Contents": "94 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:34 0 R": { + "value": { + "/Contents": "96 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:35 0 R": { + "value": { + "/Contents": "98 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "40 0 R" + }, + "/ProcSet": "41 0 R" + }, + "/Type": "/Page" + } + }, + "obj:36 0 R": { + "value": { + "/Limits": [ + 0, + 9 + ], + "/Nums": [ + 0, + { + "/S": "/r" + }, + 2, + { + "/P": "u:blank" + }, + 3, + { + "/P": "u:X-", + "/S": "/A", + "/St": 17 + }, + 5, + { + "/P": "u:" + }, + 6, + { + "/S": "/R", + "/St": 3 + }, + 9, + { + "/S": "/D" } - } - }, - "obj:45 0 R": { - "value": 46 - }, - "obj:46 0 R": { - "stream": { - "dict": { - "/Length": "47 0 R" + ] + } + }, + "obj:37 0 R": { + "value": { + "/Limits": [ + 11, + 19 + ], + "/Nums": [ + 11, + { + "/S": "/a" + }, + 12, + { + "/S": "/a", + "/St": 3 + }, + 15, + { + "/P": "u:q.", + "/S": "/D", + "/St": 6 + }, + 19, + { + "/P": "u:www" } + ] + } + }, + "obj:38 0 R": { + "stream": { + "dict": { + "/Length": "39 0 R" } - }, - "obj:47 0 R": { - "value": 46 - }, - "obj:48 0 R": { - "stream": { - "dict": { - "/Length": "49 0 R" - } + } + }, + "obj:39 0 R": { + "value": 46 + }, + "obj:40 0 R": { + "value": { + "/BaseFont": "/Helvetica", + "/Encoding": "/WinAnsiEncoding", + "/Name": "/F1", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:41 0 R": { + "value": [ + "/PDF", + "/Text" + ] + }, + "obj:42 0 R": { + "stream": { + "dict": { + "/Length": "43 0 R" } - }, - "obj:49 0 R": { - "value": 46 - }, - "obj:50 0 R": { - "stream": { - "dict": { - "/Length": "51 0 R" - } + } + }, + "obj:43 0 R": { + "value": 46 + }, + "obj:44 0 R": { + "stream": { + "dict": { + "/Length": "45 0 R" } - }, - "obj:51 0 R": { - "value": 46 - }, - "obj:52 0 R": { - "stream": { - "dict": { - "/Length": "53 0 R" - } + } + }, + "obj:45 0 R": { + "value": 46 + }, + "obj:46 0 R": { + "stream": { + "dict": { + "/Length": "47 0 R" } - }, - "obj:53 0 R": { - "value": 46 - }, - "obj:54 0 R": { - "stream": { - "dict": { - "/Length": "55 0 R" - } + } + }, + "obj:47 0 R": { + "value": 46 + }, + "obj:48 0 R": { + "stream": { + "dict": { + "/Length": "49 0 R" } - }, - "obj:55 0 R": { - "value": 46 - }, - "obj:56 0 R": { - "stream": { - "dict": { - "/Length": "57 0 R" - } + } + }, + "obj:49 0 R": { + "value": 46 + }, + "obj:50 0 R": { + "stream": { + "dict": { + "/Length": "51 0 R" } - }, - "obj:57 0 R": { - "value": 46 - }, - "obj:58 0 R": { - "stream": { - "dict": { - "/Length": "59 0 R" - } + } + }, + "obj:51 0 R": { + "value": 46 + }, + "obj:52 0 R": { + "stream": { + "dict": { + "/Length": "53 0 R" } - }, - "obj:59 0 R": { - "value": 46 - }, - "obj:60 0 R": { - "stream": { - "dict": { - "/Length": "61 0 R" - } + } + }, + "obj:53 0 R": { + "value": 46 + }, + "obj:54 0 R": { + "stream": { + "dict": { + "/Length": "55 0 R" } - }, - "obj:61 0 R": { - "value": 47 - }, - "obj:62 0 R": { - "stream": { - "dict": { - "/Length": "63 0 R" - } + } + }, + "obj:55 0 R": { + "value": 46 + }, + "obj:56 0 R": { + "stream": { + "dict": { + "/Length": "57 0 R" } - }, - "obj:63 0 R": { - "value": 47 - }, - "obj:64 0 R": { - "stream": { - "dict": { - "/Length": "65 0 R" - } + } + }, + "obj:57 0 R": { + "value": 46 + }, + "obj:58 0 R": { + "stream": { + "dict": { + "/Length": "59 0 R" } - }, - "obj:65 0 R": { - "value": 47 - }, - "obj:66 0 R": { - "stream": { - "dict": { - "/Length": "67 0 R" - } + } + }, + "obj:59 0 R": { + "value": 46 + }, + "obj:60 0 R": { + "stream": { + "dict": { + "/Length": "61 0 R" } - }, - "obj:67 0 R": { - "value": 47 - }, - "obj:68 0 R": { - "stream": { - "dict": { - "/Length": "69 0 R" - } + } + }, + "obj:61 0 R": { + "value": 47 + }, + "obj:62 0 R": { + "stream": { + "dict": { + "/Length": "63 0 R" } - }, - "obj:69 0 R": { - "value": 47 - }, - "obj:70 0 R": { - "stream": { - "dict": { - "/Length": "71 0 R" - } + } + }, + "obj:63 0 R": { + "value": 47 + }, + "obj:64 0 R": { + "stream": { + "dict": { + "/Length": "65 0 R" } - }, - "obj:71 0 R": { - "value": 47 - }, - "obj:72 0 R": { - "stream": { - "dict": { - "/Length": "73 0 R" - } + } + }, + "obj:65 0 R": { + "value": 47 + }, + "obj:66 0 R": { + "stream": { + "dict": { + "/Length": "67 0 R" } - }, - "obj:73 0 R": { - "value": 47 - }, - "obj:74 0 R": { - "stream": { - "dict": { - "/Length": "75 0 R" - } + } + }, + "obj:67 0 R": { + "value": 47 + }, + "obj:68 0 R": { + "stream": { + "dict": { + "/Length": "69 0 R" } - }, - "obj:75 0 R": { - "value": 47 - }, - "obj:76 0 R": { - "stream": { - "dict": { - "/Length": "77 0 R" - } + } + }, + "obj:69 0 R": { + "value": 47 + }, + "obj:70 0 R": { + "stream": { + "dict": { + "/Length": "71 0 R" } - }, - "obj:77 0 R": { - "value": 47 - }, - "obj:78 0 R": { - "stream": { - "dict": { - "/Length": "79 0 R" - } + } + }, + "obj:71 0 R": { + "value": 47 + }, + "obj:72 0 R": { + "stream": { + "dict": { + "/Length": "73 0 R" } - }, - "obj:79 0 R": { - "value": 47 - }, - "obj:80 0 R": { - "stream": { - "dict": { - "/Length": "81 0 R" - } + } + }, + "obj:73 0 R": { + "value": 47 + }, + "obj:74 0 R": { + "stream": { + "dict": { + "/Length": "75 0 R" } - }, - "obj:81 0 R": { - "value": 47 - }, - "obj:82 0 R": { - "stream": { - "dict": { - "/Length": "83 0 R" - } + } + }, + "obj:75 0 R": { + "value": 47 + }, + "obj:76 0 R": { + "stream": { + "dict": { + "/Length": "77 0 R" } - }, - "obj:83 0 R": { - "value": 47 - }, - "obj:84 0 R": { - "stream": { - "dict": { - "/Length": "85 0 R" - } + } + }, + "obj:77 0 R": { + "value": 47 + }, + "obj:78 0 R": { + "stream": { + "dict": { + "/Length": "79 0 R" } - }, - "obj:85 0 R": { - "value": 47 - }, - "obj:86 0 R": { - "stream": { - "dict": { - "/Length": "87 0 R" - } + } + }, + "obj:79 0 R": { + "value": 47 + }, + "obj:80 0 R": { + "stream": { + "dict": { + "/Length": "81 0 R" } - }, - "obj:87 0 R": { - "value": 47 - }, - "obj:88 0 R": { - "stream": { - "dict": { - "/Length": "89 0 R" - } + } + }, + "obj:81 0 R": { + "value": 47 + }, + "obj:82 0 R": { + "stream": { + "dict": { + "/Length": "83 0 R" } - }, - "obj:89 0 R": { - "value": 47 - }, - "obj:90 0 R": { - "stream": { - "dict": { - "/Length": "91 0 R" - } + } + }, + "obj:83 0 R": { + "value": 47 + }, + "obj:84 0 R": { + "stream": { + "dict": { + "/Length": "85 0 R" } - }, - "obj:91 0 R": { - "value": 47 - }, - "obj:92 0 R": { - "stream": { - "dict": { - "/Length": "93 0 R" - } + } + }, + "obj:85 0 R": { + "value": 47 + }, + "obj:86 0 R": { + "stream": { + "dict": { + "/Length": "87 0 R" } - }, - "obj:93 0 R": { - "value": 47 - }, - "obj:94 0 R": { - "stream": { - "dict": { - "/Length": "95 0 R" - } + } + }, + "obj:87 0 R": { + "value": 47 + }, + "obj:88 0 R": { + "stream": { + "dict": { + "/Length": "89 0 R" } - }, - "obj:95 0 R": { - "value": 47 - }, - "obj:96 0 R": { - "stream": { - "dict": { - "/Length": "97 0 R" - } + } + }, + "obj:89 0 R": { + "value": 47 + }, + "obj:90 0 R": { + "stream": { + "dict": { + "/Length": "91 0 R" } - }, - "obj:97 0 R": { - "value": 47 - }, - "obj:98 0 R": { - "stream": { - "dict": { - "/Length": "99 0 R" - } + } + }, + "obj:91 0 R": { + "value": 47 + }, + "obj:92 0 R": { + "stream": { + "dict": { + "/Length": "93 0 R" } - }, - "obj:99 0 R": { - "value": 47 - }, - "trailer": { - "value": { - "/ID": [ - "b:90f919de7874f3bc5cb7afbd1e9537bb", - "b:0dfe18a94cde0f4bfdc86c03af19010e" - ], - "/Root": "1 0 R", - "/Size": 100 + } + }, + "obj:93 0 R": { + "value": 47 + }, + "obj:94 0 R": { + "stream": { + "dict": { + "/Length": "95 0 R" } } + }, + "obj:95 0 R": { + "value": 47 + }, + "obj:96 0 R": { + "stream": { + "dict": { + "/Length": "97 0 R" + } + } + }, + "obj:97 0 R": { + "value": 47 + }, + "obj:98 0 R": { + "stream": { + "dict": { + "/Length": "99 0 R" + } + } + }, + "obj:99 0 R": { + "value": 47 + }, + "trailer": { + "value": { + "/ID": [ + "b:90f919de7874f3bc5cb7afbd1e9537bb", + "b:0dfe18a94cde0f4bfdc86c03af19010e" + ], + "/Root": "1 0 R", + "/Size": 100 + } } } } diff --git a/qpdf/qtest/qpdf/page_api_2-json-objects.out b/qpdf/qtest/qpdf/page_api_2-json-objects.out index 42d47124..75cc76aa 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-objects.out +++ b/qpdf/qtest/qpdf/page_api_2-json-objects.out @@ -3,117 +3,112 @@ "parameters": { "decodelevel": "generalized" }, - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 10, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "3 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/CreationDate": "u:D:20120621124041", - "/Producer": "u:Apex PDFWriter" - } - }, - "obj:3 0 R": { - "value": { - "/Count": 3, - "/Kids": [ - "4 0 R", - "4 0 R", - "5 0 R" - ], - "/Type": "/Pages" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "6 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "3 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/CreationDate": "u:D:20120621124041", + "/Producer": "u:Apex PDFWriter" + } + }, + "obj:3 0 R": { + "value": { + "/Count": 3, + "/Kids": [ + "4 0 R", + "4 0 R", + "5 0 R" + ], + "/Type": "/Pages" + } + }, + "obj:4 0 R": { + "value": { + "/Contents": "6 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "8 0 R" }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "9 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "/Type": "/Page" + } + }, + "obj:5 0 R": { + "value": { + "/Contents": "9 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "8 0 R" }, - "/Type": "/Page" + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "/Type": "/Page" + } + }, + "obj:6 0 R": { + "stream": { + "dict": { + "/Length": "7 0 R" } - }, - "obj:6 0 R": { - "stream": { - "dict": { - "/Length": "7 0 R" - } - } - }, - "obj:7 0 R": { - "value": 47 - }, - "obj:8 0 R": { - "value": { - "/BaseFont": "/Times-Roman", - "/Encoding": "/WinAnsiEncoding", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:9 0 R": { - "stream": { - "dict": { - "/Length": "10 0 R" - } - } - }, - "obj:10 0 R": { - "value": 47 - }, - "trailer": { - "value": { - "/ID": [ - "b:fb18b786ff7b358705da8a532aba8f6f", - "b:f7179eb35159bfd4c00f128abcfd1f02" - ], - "/Info": "2 0 R", - "/Root": "1 0 R", - "/Size": 11 + } + }, + "obj:7 0 R": { + "value": 47 + }, + "obj:8 0 R": { + "value": { + "/BaseFont": "/Times-Roman", + "/Encoding": "/WinAnsiEncoding", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:9 0 R": { + "stream": { + "dict": { + "/Length": "10 0 R" } } + }, + "obj:10 0 R": { + "value": 47 + }, + "trailer": { + "value": { + "/ID": [ + "b:fb18b786ff7b358705da8a532aba8f6f", + "b:f7179eb35159bfd4c00f128abcfd1f02" + ], + "/Info": "2 0 R", + "/Root": "1 0 R", + "/Size": 11 + } } } } diff --git a/qpdf/qtest/qpdf/page_api_2-json-pages.out b/qpdf/qtest/qpdf/page_api_2-json-pages.out index 372a14f7..d45406d5 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-pages.out +++ b/qpdf/qtest/qpdf/page_api_2-json-pages.out @@ -35,138 +35,133 @@ "pageposfrom1": 3 } ], - "qpdf": { - "jsonversion": 2, - "pdfversion": "1.3", - "maxobjectid": 11, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "3 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/CreationDate": "u:D:20120621124041", - "/Producer": "u:Apex PDFWriter" - } - }, - "obj:3 0 R": { - "value": { - "/Count": 3, - "/Kids": [ - "4 0 R", - "11 0 R", - "5 0 R" - ], - "/Type": "/Pages" - } - }, - "obj:4 0 R": { - "value": { - "/Contents": "6 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "3 0 R", + "/Type": "/Catalog" + } + }, + "obj:2 0 R": { + "value": { + "/CreationDate": "u:D:20120621124041", + "/Producer": "u:Apex PDFWriter" + } + }, + "obj:3 0 R": { + "value": { + "/Count": 3, + "/Kids": [ + "4 0 R", + "11 0 R", + "5 0 R" + ], + "/Type": "/Pages" + } + }, + "obj:4 0 R": { + "value": { + "/Contents": "6 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "8 0 R" }, - "/Type": "/Page" - } - }, - "obj:5 0 R": { - "value": { - "/Contents": "9 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "/Type": "/Page" + } + }, + "obj:5 0 R": { + "value": { + "/Contents": "9 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "8 0 R" }, - "/Type": "/Page" + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "/Type": "/Page" + } + }, + "obj:6 0 R": { + "stream": { + "dict": { + "/Length": "7 0 R" } - }, - "obj:6 0 R": { - "stream": { - "dict": { - "/Length": "7 0 R" - } + } + }, + "obj:7 0 R": { + "value": 47 + }, + "obj:8 0 R": { + "value": { + "/BaseFont": "/Times-Roman", + "/Encoding": "/WinAnsiEncoding", + "/Subtype": "/Type1", + "/Type": "/Font" + } + }, + "obj:9 0 R": { + "stream": { + "dict": { + "/Length": "10 0 R" } - }, - "obj:7 0 R": { - "value": 47 - }, - "obj:8 0 R": { - "value": { - "/BaseFont": "/Times-Roman", - "/Encoding": "/WinAnsiEncoding", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "obj:9 0 R": { - "stream": { - "dict": { - "/Length": "10 0 R" - } - } - }, - "obj:10 0 R": { - "value": 47 - }, - "obj:11 0 R": { - "value": { - "/Contents": "6 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + } + }, + "obj:10 0 R": { + "value": 47 + }, + "obj:11 0 R": { + "value": { + "/Contents": "6 0 R", + "/MediaBox": [ + 0, + 0, + 612, + 792 + ], + "/Parent": "3 0 R", + "/Resources": { + "/Font": { + "/F1": "8 0 R" }, - "/Type": "/Page" - } - }, - "trailer": { - "value": { - "/ID": [ - "b:fb18b786ff7b358705da8a532aba8f6f", - "b:f7179eb35159bfd4c00f128abcfd1f02" - ], - "/Info": "2 0 R", - "/Root": "1 0 R", - "/Size": 11 - } + "/ProcSet": [ + "/PDF", + "/Text" + ] + }, + "/Type": "/Page" + } + }, + "trailer": { + "value": { + "/ID": [ + "b:fb18b786ff7b358705da8a532aba8f6f", + "b:f7179eb35159bfd4c00f128abcfd1f02" + ], + "/Info": "2 0 R", + "/Root": "1 0 R", + "/Size": 11 } } } diff --git a/qpdf/qtest/qpdf/qjson-bad-json-version1.json b/qpdf/qtest/qpdf/qjson-bad-json-version1.json deleted file mode 100644 index 78591a42..00000000 --- a/qpdf/qtest/qpdf/qjson-bad-json-version1.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 16059, - "pdfversion": "1.3", - "maxobjectid": 6, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/Count": 1, - "/Kids": [ - "3 0 R" - ], - "/Type": "/Pages" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "4 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "6 0 R" - }, - "/ProcSet": "5 0 R" - }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "stream": { - "data": "QlQKICAvRjEgMjQgVGYKICA3MiA3MjAgVGQKICAoUG90YXRvKSBUagpFVAo=", - "dict": {} - } - }, - "obj:5 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:6 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "trailer": { - "value": { - "/Root": "1 0 R", - "/Size": 7 - } - } - } - } -} diff --git a/qpdf/qtest/qpdf/qjson-bad-json-version1.out b/qpdf/qtest/qpdf/qjson-bad-json-version1.out deleted file mode 100644 index fff93d8a..00000000 --- a/qpdf/qtest/qpdf/qjson-bad-json-version1.out +++ /dev/null @@ -1,2 +0,0 @@ -WARNING: qjson-bad-json-version1.json (offset 98): only JSON version 2 is supported -qpdf: qjson-bad-json-version1.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-bad-json-version2.json b/qpdf/qtest/qpdf/qjson-bad-json-version2.json deleted file mode 100644 index 20843caf..00000000 --- a/qpdf/qtest/qpdf/qjson-bad-json-version2.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": "potato", - "pdfversion": "1.3", - "maxobjectid": 6, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/Count": 1, - "/Kids": [ - "3 0 R" - ], - "/Type": "/Pages" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "4 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "6 0 R" - }, - "/ProcSet": "5 0 R" - }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "stream": { - "data": "QlQKICAvRjEgMjQgVGYKICA3MiA3MjAgVGQKICAoUG90YXRvKSBUagpFVAo=", - "dict": {} - } - }, - "obj:5 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:6 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "trailer": { - "value": { - "/Root": "1 0 R", - "/Size": 7 - } - } - } - } -} diff --git a/qpdf/qtest/qpdf/qjson-bad-json-version2.out b/qpdf/qtest/qpdf/qjson-bad-json-version2.out deleted file mode 100644 index 351fbb5a..00000000 --- a/qpdf/qtest/qpdf/qjson-bad-json-version2.out +++ /dev/null @@ -1,2 +0,0 @@ -WARNING: qjson-bad-json-version2.json (offset 98): only JSON version 2 is supported -qpdf: qjson-bad-json-version2.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-bad-object-key.json b/qpdf/qtest/qpdf/qjson-bad-object-key.json index 77441846..e8637891 100644 --- a/qpdf/qtest/qpdf/qjson-bad-object-key.json +++ b/qpdf/qtest/qpdf/qjson-bad-object-key.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-bad-object-key.out b/qpdf/qtest/qpdf/qjson-bad-object-key.out index 915b5261..dee225f7 100644 --- a/qpdf/qtest/qpdf/qjson-bad-object-key.out +++ b/qpdf/qtest/qpdf/qjson-bad-object-key.out @@ -1,2 +1,2 @@ -WARNING: qjson-bad-object-key.json (offset 181): object key should be "trailer" or "obj:n n R" +WARNING: qjson-bad-object-key.json (offset 97): object key should be "trailer" or "obj:n n R" qpdf: qjson-bad-object-key.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-bad-pdf-version1.json b/qpdf/qtest/qpdf/qjson-bad-pdf-version1.json index eccaeeca..e99c26ef 100644 --- a/qpdf/qtest/qpdf/qjson-bad-pdf-version1.json +++ b/qpdf/qtest/qpdf/qjson-bad-pdf-version1.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "potato", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-bad-pdf-version1.out b/qpdf/qtest/qpdf/qjson-bad-pdf-version1.out index 2e9f4328..2f18da41 100644 --- a/qpdf/qtest/qpdf/qjson-bad-pdf-version1.out +++ b/qpdf/qtest/qpdf/qjson-bad-pdf-version1.out @@ -1,2 +1,2 @@ -WARNING: qjson-bad-pdf-version1.json (offset 119): invalid PDF version (must be x.y) +WARNING: qjson-bad-pdf-version1.json (offset 35): invalid PDF version (must be x.y) qpdf: qjson-bad-pdf-version1.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-bad-pdf-version2.json b/qpdf/qtest/qpdf/qjson-bad-pdf-version2.json index 04443eea..acc1642a 100644 --- a/qpdf/qtest/qpdf/qjson-bad-pdf-version2.json +++ b/qpdf/qtest/qpdf/qjson-bad-pdf-version2.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": [], "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-bad-pdf-version2.out b/qpdf/qtest/qpdf/qjson-bad-pdf-version2.out index 39ad8446..3a5086ba 100644 --- a/qpdf/qtest/qpdf/qjson-bad-pdf-version2.out +++ b/qpdf/qtest/qpdf/qjson-bad-pdf-version2.out @@ -1,2 +1,2 @@ -WARNING: qjson-bad-pdf-version2.json (offset 119): invalid PDF version (must be x.y) +WARNING: qjson-bad-pdf-version2.json (offset 35): invalid PDF version (must be x.y) qpdf: qjson-bad-pdf-version2.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-missing-objects.json b/qpdf/qtest/qpdf/qjson-missing-objects.json index a2b4930b..ae287217 100644 --- a/qpdf/qtest/qpdf/qjson-missing-objects.json +++ b/qpdf/qtest/qpdf/qjson-missing-objects.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6 } diff --git a/qpdf/qtest/qpdf/qjson-missing-objects.out b/qpdf/qtest/qpdf/qjson-missing-objects.out index 6b0a6715..2692a97b 100644 --- a/qpdf/qtest/qpdf/qjson-missing-objects.out +++ b/qpdf/qtest/qpdf/qjson-missing-objects.out @@ -1,2 +1,2 @@ -WARNING: qjson-missing-objects.json: "qpdf.objects" was not seen +WARNING: qjson-missing-objects.json: "qpdf-v2.objects" was not seen qpdf: qjson-missing-objects.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-missing-trailer.json b/qpdf/qtest/qpdf/qjson-missing-trailer.json index 4fcf82aa..21050e05 100644 --- a/qpdf/qtest/qpdf/qjson-missing-trailer.json +++ b/qpdf/qtest/qpdf/qjson-missing-trailer.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-missing-trailer.out b/qpdf/qtest/qpdf/qjson-missing-trailer.out index 817a8c05..3a4b7910 100644 --- a/qpdf/qtest/qpdf/qjson-missing-trailer.out +++ b/qpdf/qtest/qpdf/qjson-missing-trailer.out @@ -1,2 +1,2 @@ -WARNING: qjson-missing-trailer.json: "qpdf.objects.trailer" was not seen +WARNING: qjson-missing-trailer.json: "qpdf-v2.objects.trailer" was not seen qpdf: qjson-missing-trailer.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-no-json-version.json b/qpdf/qtest/qpdf/qjson-no-json-version.json deleted file mode 100644 index 72f223ad..00000000 --- a/qpdf/qtest/qpdf/qjson-no-json-version.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "pdfversion": "1.3", - "maxobjectid": 6, - "objects": { - "obj:1 0 R": { - "value": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - } - }, - "obj:2 0 R": { - "value": { - "/Count": 1, - "/Kids": [ - "3 0 R" - ], - "/Type": "/Pages" - } - }, - "obj:3 0 R": { - "value": { - "/Contents": "4 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "6 0 R" - }, - "/ProcSet": "5 0 R" - }, - "/Type": "/Page" - } - }, - "obj:4 0 R": { - "stream": { - "data": "QlQKICAvRjEgMjQgVGYKICA3MiA3MjAgVGQKICAoUG90YXRvKSBUagpFVAo=", - "dict": {} - } - }, - "obj:5 0 R": { - "value": [ - "/PDF", - "/Text" - ] - }, - "obj:6 0 R": { - "value": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Subtype": "/Type1", - "/Type": "/Font" - } - }, - "trailer": { - "value": { - "/Root": "1 0 R", - "/Size": 7 - } - } - } - } -} diff --git a/qpdf/qtest/qpdf/qjson-no-json-version.out b/qpdf/qtest/qpdf/qjson-no-json-version.out deleted file mode 100644 index 13b76d41..00000000 --- a/qpdf/qtest/qpdf/qjson-no-json-version.out +++ /dev/null @@ -1,2 +0,0 @@ -WARNING: qjson-no-json-version.json: "qpdf.jsonversion" was not seen -qpdf: qjson-no-json-version.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-no-pdf-version.json b/qpdf/qtest/qpdf/qjson-no-pdf-version.json index 39f21be2..77bfe1ca 100644 --- a/qpdf/qtest/qpdf/qjson-no-pdf-version.json +++ b/qpdf/qtest/qpdf/qjson-no-pdf-version.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "maxobjectid": 6, "objects": { "obj:1 0 R": { diff --git a/qpdf/qtest/qpdf/qjson-no-pdf-version.out b/qpdf/qtest/qpdf/qjson-no-pdf-version.out index dc7df6d5..6a00d76c 100644 --- a/qpdf/qtest/qpdf/qjson-no-pdf-version.out +++ b/qpdf/qtest/qpdf/qjson-no-pdf-version.out @@ -1,2 +1,2 @@ -WARNING: qjson-no-pdf-version.json: "qpdf.pdfversion" was not seen +WARNING: qjson-no-pdf-version.json: "qpdf-v2.pdfversion" was not seen qpdf: qjson-no-pdf-version.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-obj-key-errors.json b/qpdf/qtest/qpdf/qjson-obj-key-errors.json index 4b9beeb7..2adc33d4 100644 --- a/qpdf/qtest/qpdf/qjson-obj-key-errors.json +++ b/qpdf/qtest/qpdf/qjson-obj-key-errors.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-obj-key-errors.out b/qpdf/qtest/qpdf/qjson-obj-key-errors.out index 0098bcee..752c5321 100644 --- a/qpdf/qtest/qpdf/qjson-obj-key-errors.out +++ b/qpdf/qtest/qpdf/qjson-obj-key-errors.out @@ -1,7 +1,7 @@ -WARNING: qjson-obj-key-errors.json (obj:2 0 R, offset 302): object must have exactly one of "value" or "stream" -WARNING: qjson-obj-key-errors.json (obj:3 0 R, offset 600): object must have exactly one of "value" or "stream" -WARNING: qjson-obj-key-errors.json (obj:4 0 R, offset 768): "stream" is missing "dict" -WARNING: qjson-obj-key-errors.json (obj:4 0 R, offset 768): "stream" must have exactly one of "data" or "datafile" -WARNING: qjson-obj-key-errors.json (obj:5 0 R, offset 858): "stream" must have exactly one of "data" or "datafile" -WARNING: qjson-obj-key-errors.json (trailer, offset 1236): "trailer" is missing "value" +WARNING: qjson-obj-key-errors.json (obj:2 0 R, offset 218): object must have exactly one of "value" or "stream" +WARNING: qjson-obj-key-errors.json (obj:3 0 R, offset 516): object must have exactly one of "value" or "stream" +WARNING: qjson-obj-key-errors.json (obj:4 0 R, offset 684): "stream" is missing "dict" +WARNING: qjson-obj-key-errors.json (obj:4 0 R, offset 684): "stream" must have exactly one of "data" or "datafile" +WARNING: qjson-obj-key-errors.json (obj:5 0 R, offset 774): "stream" must have exactly one of "data" or "datafile" +WARNING: qjson-obj-key-errors.json (trailer, offset 1152): "trailer" is missing "value" qpdf: qjson-obj-key-errors.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-object-not-dict.json b/qpdf/qtest/qpdf/qjson-object-not-dict.json index c0831c74..93357afd 100644 --- a/qpdf/qtest/qpdf/qjson-object-not-dict.json +++ b/qpdf/qtest/qpdf/qjson-object-not-dict.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-object-not-dict.out b/qpdf/qtest/qpdf/qjson-object-not-dict.out index daa99065..cfb44457 100644 --- a/qpdf/qtest/qpdf/qjson-object-not-dict.out +++ b/qpdf/qtest/qpdf/qjson-object-not-dict.out @@ -1,2 +1,2 @@ -WARNING: qjson-object-not-dict.json (offset 184): "obj:1 0 R" must be a dictionary +WARNING: qjson-object-not-dict.json (offset 100): "obj:1 0 R" must be a dictionary qpdf: qjson-object-not-dict.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-objects-not-dict.json b/qpdf/qtest/qpdf/qjson-objects-not-dict.json index 0e16294a..12870f81 100644 --- a/qpdf/qtest/qpdf/qjson-objects-not-dict.json +++ b/qpdf/qtest/qpdf/qjson-objects-not-dict.json @@ -1,6 +1,5 @@ { - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.7", "objects": false } diff --git a/qpdf/qtest/qpdf/qjson-objects-not-dict.out b/qpdf/qtest/qpdf/qjson-objects-not-dict.out index 16e19695..b009ef63 100644 --- a/qpdf/qtest/qpdf/qjson-objects-not-dict.out +++ b/qpdf/qtest/qpdf/qjson-objects-not-dict.out @@ -1,3 +1,3 @@ -WARNING: qjson-objects-not-dict.json (offset 77): "objects" must be a dictionary -WARNING: qjson-objects-not-dict.json: "qpdf.objects.trailer" was not seen +WARNING: qjson-objects-not-dict.json (offset 58): "objects" must be a dictionary +WARNING: qjson-objects-not-dict.json: "qpdf-v2.objects.trailer" was not seen qpdf: qjson-objects-not-dict.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.json b/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.json index 19bd08b1..a34e1a7e 100644 --- a/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.json +++ b/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.json @@ -1,6 +1,5 @@ { - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.7", "objects": { "obj:1 0 R": { diff --git a/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.out b/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.out index 37a125ec..2a2c8de9 100644 --- a/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.out +++ b/qpdf/qtest/qpdf/qjson-stream-dict-not-dict.out @@ -1,5 +1,5 @@ -WARNING: qjson-stream-dict-not-dict.json (obj:1 0 R, offset 137): "stream.dict" must be a dictionary -WARNING: qjson-stream-dict-not-dict.json (obj:1 0 R, offset 137): unrecognized string value -WARNING: qjson-stream-dict-not-dict.json (obj:1 0 R, offset 117): "stream" must have exactly one of "data" or "datafile" -WARNING: qjson-stream-dict-not-dict.json: "qpdf.objects.trailer" was not seen +WARNING: qjson-stream-dict-not-dict.json (obj:1 0 R, offset 118): "stream.dict" must be a dictionary +WARNING: qjson-stream-dict-not-dict.json (obj:1 0 R, offset 118): unrecognized string value +WARNING: qjson-stream-dict-not-dict.json (obj:1 0 R, offset 98): "stream" must have exactly one of "data" or "datafile" +WARNING: qjson-stream-dict-not-dict.json: "qpdf-v2.objects.trailer" was not seen qpdf: qjson-stream-dict-not-dict.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-stream-not-dict.json b/qpdf/qtest/qpdf/qjson-stream-not-dict.json index cef86c95..fedf657f 100644 --- a/qpdf/qtest/qpdf/qjson-stream-not-dict.json +++ b/qpdf/qtest/qpdf/qjson-stream-not-dict.json @@ -1,6 +1,5 @@ { - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.7", "objects": { "obj:1 0 R": { diff --git a/qpdf/qtest/qpdf/qjson-stream-not-dict.out b/qpdf/qtest/qpdf/qjson-stream-not-dict.out index f6213ea4..4d492bcf 100644 --- a/qpdf/qtest/qpdf/qjson-stream-not-dict.out +++ b/qpdf/qtest/qpdf/qjson-stream-not-dict.out @@ -1,3 +1,3 @@ -WARNING: qjson-stream-not-dict.json (obj:1 0 R, offset 118): "stream" must be a dictionary -WARNING: qjson-stream-not-dict.json: "qpdf.objects.trailer" was not seen +WARNING: qjson-stream-not-dict.json (obj:1 0 R, offset 99): "stream" must be a dictionary +WARNING: qjson-stream-not-dict.json: "qpdf-v2.objects.trailer" was not seen qpdf: qjson-stream-not-dict.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-trailer-not-dict.json b/qpdf/qtest/qpdf/qjson-trailer-not-dict.json index 32a5efab..0617095e 100644 --- a/qpdf/qtest/qpdf/qjson-trailer-not-dict.json +++ b/qpdf/qtest/qpdf/qjson-trailer-not-dict.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-trailer-not-dict.out b/qpdf/qtest/qpdf/qjson-trailer-not-dict.out index fcdf1e9b..5a7ce0e8 100644 --- a/qpdf/qtest/qpdf/qjson-trailer-not-dict.out +++ b/qpdf/qtest/qpdf/qjson-trailer-not-dict.out @@ -1,2 +1,2 @@ -WARNING: qjson-trailer-not-dict.json (trailer, offset 1327): "trailer.value" must be a dictionary +WARNING: qjson-trailer-not-dict.json (trailer, offset 1243): "trailer.value" must be a dictionary qpdf: qjson-trailer-not-dict.json: errors found in JSON diff --git a/qpdf/qtest/qpdf/qjson-trailer-stream.json b/qpdf/qtest/qpdf/qjson-trailer-stream.json index 0ec21248..2b991a74 100644 --- a/qpdf/qtest/qpdf/qjson-trailer-stream.json +++ b/qpdf/qtest/qpdf/qjson-trailer-stream.json @@ -1,10 +1,5 @@ { - "version": 2, - "parameters": { - "decodelevel": "none" - }, - "qpdf": { - "jsonversion": 2, + "qpdf-v2": { "pdfversion": "1.3", "maxobjectid": 6, "objects": { diff --git a/qpdf/qtest/qpdf/qjson-trailer-stream.out b/qpdf/qtest/qpdf/qjson-trailer-stream.out index 8ab18888..94a60873 100644 --- a/qpdf/qtest/qpdf/qjson-trailer-stream.out +++ b/qpdf/qtest/qpdf/qjson-trailer-stream.out @@ -1,2 +1,2 @@ -WARNING: qjson-trailer-stream.json (trailer, offset 1327): the trailer may not be a stream +WARNING: qjson-trailer-stream.json (trailer, offset 1243): the trailer may not be a stream qpdf: qjson-trailer-stream.json: errors found in JSON diff --git a/qpdf/qtest/qpdf-json.test b/qpdf/qtest/qpdf_json.test similarity index 86% rename from qpdf/qtest/qpdf-json.test rename to qpdf/qtest/qpdf_json.test index 89d5cd4e..dbb0c70d 100644 --- a/qpdf/qtest/qpdf-json.test +++ b/qpdf/qtest/qpdf_json.test @@ -18,11 +18,8 @@ my $n_tests = 0; my @badfiles = ( 'no-qpdf-object', - 'no-json-version', 'no-pdf-version', 'top-level-scalar', - 'bad-json-version1', - 'bad-json-version2', 'bad-pdf-version1', 'bad-pdf-version2', 'top-level-array', @@ -44,7 +41,7 @@ foreach my $f (@badfiles) { $td->runtest("bad: $f", {$td->COMMAND => - "qpdf --create-from-json=qjson-$f.json a.pdf"}, + "qpdf --json-input qjson-$f.json a.pdf"}, {$td->FILE => "qjson-$f.out", $td->EXIT_STATUS => 2}, $td->NORMALIZE_NEWLINES); }