diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-05-07 19:33:45 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-05-08 19:45:20 +0200 |
| commit | c76536dd9a150adb71fdcda11ee1a93f25128cc7 (patch) | |
| tree | 03f68965ad1646f643d184b0435bd6706b42fcdc /qpdf/qtest | |
| parent | bdfc4da5105c86f0dc63ed390da240306e6b4466 (diff) | |
| download | qpdf-c76536dd9a150adb71fdcda11ee1a93f25128cc7.tar.zst | |
Implement JSON v2 output
Diffstat (limited to 'qpdf/qtest')
23 files changed, 850 insertions, 950 deletions
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test index 734485e3..23dce379 100644 --- a/qpdf/qtest/qpdf.test +++ b/qpdf/qtest/qpdf.test @@ -1139,9 +1139,9 @@ foreach my $d (@json_files) $td->NORMALIZE_NEWLINES); $td->runtest("json v2 $out", {$td->COMMAND => - ['qpdf', '--json=2', '--test-json-schema', @v1_xargs, $in]}, + ['qpdf', '--json=2', '--test-json-schema', @$xargs, $in]}, {$td->FILE => "$out-v2.out", $td->EXIT_STATUS => 0}, - $td->NORMALIZE_NEWLINES | $td->EXPECT_FAILURE); + $td->NORMALIZE_NEWLINES); } show_ntests(); @@ -2886,14 +2886,13 @@ 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=objects --json-key=objectinfo"}, + " --json-key=qpdf"}, {$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=objects --json-key=objectinfo" . - " --json-key=pages"}, + " --json-key=qpdf --json-key=pages"}, {$td->FILE => "$f-json-pages.out", $td->EXIT_STATUS => 0}, $td->NORMALIZE_NEWLINES); } diff --git a/qpdf/qtest/qpdf/direct-pages-json-objects.out b/qpdf/qtest/qpdf/direct-pages-json-objects.out index a7cf4e96..773a0a4c 100644 --- a/qpdf/qtest/qpdf/direct-pages-json-objects.out +++ b/qpdf/qtest/qpdf/direct-pages-json-objects.out @@ -3,118 +3,92 @@ "parameters": { "decodelevel": "generalized" }, - "objects": { - "1 0 R": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - }, - "2 0 R": { - "/Count": 2, - "/Kids": [ - { - "/Contents": "3 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "5 0 R" + "qpdf": { + "jsonversion": 2, + "pdfversion": "1.3", + "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" + }, + "/Type": "/Page" }, - "/ProcSet": "6 0 R" - }, - "/Type": "/Page" - }, - { - "/Contents": "3 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 + { + "/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" + } ], - "/Parent": "2 0 R", - "/Resources": { - "/Font": { - "/F1": "5 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 } - ], - "/Type": "/Pages" - }, - "3 0 R": { - "dict": { - "/Length": "4 0 R" - } - }, - "4 0 R": 44, - "5 0 R": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "6 0 R": [ - "/PDF", - "/Text" - ], - "trailer": { - "/ID": [ - "b:1323a5937c577a66735583a93698ce3c", - "b:372cbf44f6db88ab60d9263c0f0bd26a" - ], - "/Root": "1 0 R", - "/Size": 7 - } - }, - "objectinfo": { - "1 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "3 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 44 - } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null } } } diff --git a/qpdf/qtest/qpdf/direct-pages-json-pages.out b/qpdf/qtest/qpdf/direct-pages-json-pages.out index 4ebc4d29..5cd2b2c0 100644 --- a/qpdf/qtest/qpdf/direct-pages-json-pages.out +++ b/qpdf/qtest/qpdf/direct-pages-json-pages.out @@ -25,134 +25,98 @@ "pageposfrom1": 2 } ], - "objects": { - "1 0 R": { - "/Pages": "2 0 R", - "/Type": "/Catalog" - }, - "2 0 R": { - "/Count": 2, - "/Kids": [ - "7 0 R", - "8 0 R" - ], - "/Type": "/Pages" - }, - "3 0 R": { - "dict": { - "/Length": "4 0 R" - } - }, - "4 0 R": 44, - "5 0 R": { - "/BaseFont": "/Helvetica", - "/Encoding": "/WinAnsiEncoding", - "/Name": "/F1", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "6 0 R": [ - "/PDF", - "/Text" - ], - "7 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" + "qpdf": { + "jsonversion": 2, + "pdfversion": "1.3", + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "2 0 R", + "/Type": "/Catalog" + } }, - "/Type": "/Page" - }, - "8 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" + "obj:2 0 R": { + "value": { + "/Count": 2, + "/Kids": [ + "7 0 R", + "8 0 R" + ], + "/Type": "/Pages" + } }, - "/Type": "/Page" - }, - "trailer": { - "/ID": [ - "b:1323a5937c577a66735583a93698ce3c", - "b:372cbf44f6db88ab60d9263c0f0bd26a" - ], - "/Root": "1 0 R", - "/Size": 7 - } - }, - "objectinfo": { - "1 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "3 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 44 - } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null + "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" + }, + "/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" + }, + "/Type": "/Page" + } + }, + "trailer": { + "value": { + "/ID": [ + "b:1323a5937c577a66735583a93698ce3c", + "b:372cbf44f6db88ab60d9263c0f0bd26a" + ], + "/Root": "1 0 R", + "/Size": 7 + } } } } diff --git a/qpdf/qtest/qpdf/json-V4-aes-encrypt---show-encryption-key-v2.out b/qpdf/qtest/qpdf/json-V4-aes-encrypt---show-encryption-key-v2.out index bef0e522..5f32eb44 100644 --- a/qpdf/qtest/qpdf/json-V4-aes-encrypt---show-encryption-key-v2.out +++ b/qpdf/qtest/qpdf/json-V4-aes-encrypt---show-encryption-key-v2.out @@ -7,8 +7,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, diff --git a/qpdf/qtest/qpdf/json-V4-aes-encrypt-v2.out b/qpdf/qtest/qpdf/json-V4-aes-encrypt-v2.out index 93de404b..959f0103 100644 --- a/qpdf/qtest/qpdf/json-V4-aes-encrypt-v2.out +++ b/qpdf/qtest/qpdf/json-V4-aes-encrypt-v2.out @@ -7,8 +7,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, 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 b52cc9db..c3158fae 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 @@ -26,7 +26,7 @@ "object": "4 0 R" }, "choices": [], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text", @@ -40,7 +40,7 @@ "parent": null, "partialname": "text", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "r1", @@ -266,7 +266,7 @@ "object": "10 0 R" }, "choices": [], - "defaultvalue": "salad πʬ", + "defaultvalue": "u:salad πʬ", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text2", @@ -280,7 +280,7 @@ "parent": null, "partialname": "text2", "quadding": 0, - "value": "salad πʬ" + "value": "u:salad πʬ" }, { "alternativename": "combolist1", @@ -295,7 +295,7 @@ "pi", "four" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combolist1", @@ -309,7 +309,7 @@ "parent": null, "partialname": "combolist1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "list1", @@ -324,7 +324,7 @@ "seven", "eight" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Ch", "fullname": "list1", @@ -338,7 +338,7 @@ "parent": null, "partialname": "list1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "drop1", @@ -353,7 +353,7 @@ "elephant", "twelve" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 131072, "fieldtype": "/Ch", "fullname": "drop1", @@ -367,7 +367,7 @@ "parent": null, "partialname": "drop1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "combodrop1", @@ -382,7 +382,7 @@ "gamma", "delta" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combodrop1", @@ -396,7 +396,7 @@ "parent": null, "partialname": "combodrop1", "quadding": 0, - "value": "" + "value": "u:" } ], "hasacroform": true, @@ -407,8 +407,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -433,7 +433,7 @@ "outlines": [], "qpdf": { "jsonversion": 2, - "pdfversion": "1.3", + "pdfversion": "1.5", "objects": { "obj:1 0 R": { "value": { @@ -454,7 +454,7 @@ ], "/NeedAppearances": true }, - "/Lang": "en-US", + "/Lang": "u:en-US", "/MarkInfo": { "/Marked": true }, @@ -472,9 +472,9 @@ }, "obj:2 0 R": { "value": { - "/CreationDate": "D:20190103125434-05'00'", - "/Creator": "Writer", - "/Producer": "LibreOffice 6.1" + "/CreationDate": "u:D:20190103125434-05'00'", + "/Creator": "u:Writer", + "/Producer": "u:LibreOffice 6.1" } }, "obj:3 0 R": { @@ -491,11 +491,11 @@ "/AP": { "/N": "19 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Tx", "/P": "15 0 R", @@ -506,9 +506,9 @@ 704.699 ], "/Subtype": "/Widget", - "/T": "text", + "/T": "u:text", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:5 0 R": { @@ -522,7 +522,7 @@ "23 0 R" ], "/P": "15 0 R", - "/T": "r1", + "/T": "u:r1", "/V": "/1" } }, @@ -535,7 +535,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -545,7 +545,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "8" + "/CA": "u:8" }, "/P": "15 0 R", "/Rect": [ @@ -555,7 +555,7 @@ 566.349 ], "/Subtype": "/Widget", - "/T": "checkbox1", + "/T": "u:checkbox1", "/Type": "/Annot", "/V": "/Off" } @@ -569,7 +569,7 @@ } }, "/AS": "/Yes", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -579,7 +579,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "8" + "/CA": "u:8" }, "/P": "15 0 R", "/Rect": [ @@ -589,7 +589,7 @@ 539.799 ], "/Subtype": "/Widget", - "/T": "checkbox2", + "/T": "u:checkbox2", "/Type": "/Annot", "/V": "/Yes" } @@ -603,7 +603,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -613,7 +613,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "8" + "/CA": "u:8" }, "/P": "15 0 R", "/Rect": [ @@ -623,7 +623,7 @@ 512.549 ], "/Subtype": "/Widget", - "/T": "checkbox3", + "/T": "u:checkbox3", "/Type": "/Annot", "/V": "/Off" } @@ -639,7 +639,7 @@ "39 0 R" ], "/P": "15 0 R", - "/T": "r2", + "/T": "u:r2", "/V": "/2" } }, @@ -648,11 +648,11 @@ "/AP": { "/N": "40 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "salad πʬ", + "/DV": "u:salad πʬ", "/F": 4, "/FT": "/Tx", "/P": "15 0 R", @@ -663,9 +663,9 @@ 278.099 ], "/Subtype": "/Widget", - "/T": "text2", + "/T": "u:text2", "/Type": "/Annot", - "/V": "salad πʬ" + "/V": "u:salad πʬ" } }, "obj:11 0 R": { @@ -673,18 +673,18 @@ "/AP": { "/N": "42 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Opt": [ - "five", - "six", - "seven", - "eight" + "u:five", + "u:six", + "u:seven", + "u:eight" ], "/P": "15 0 R", "/Rect": [ @@ -694,9 +694,9 @@ 232.849 ], "/Subtype": "/Widget", - "/T": "list1", + "/T": "u:list1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:12 0 R": { @@ -704,19 +704,19 @@ "/AP": { "/N": "44 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Ff": 131072, "/Opt": [ - "nine", - "ten", - "elephant", - "twelve" + "u:nine", + "u:ten", + "u:elephant", + "u:twelve" ], "/P": "15 0 R", "/Rect": [ @@ -726,9 +726,9 @@ 130.949 ], "/Subtype": "/Widget", - "/T": "drop1", + "/T": "u:drop1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:13 0 R": { @@ -736,19 +736,19 @@ "/AP": { "/N": "46 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Ff": 393216, "/Opt": [ - "one", - "two", - "pi", - "four" + "u:one", + "u:two", + "u:pi", + "u:four" ], "/P": "15 0 R", "/Rect": [ @@ -758,9 +758,9 @@ 232.849 ], "/Subtype": "/Widget", - "/T": "combolist1", + "/T": "u:combolist1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:14 0 R": { @@ -768,19 +768,19 @@ "/AP": { "/N": "48 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Ff": 393216, "/Opt": [ - "alpha", - "beta", - "gamma", - "delta" + "u:alpha", + "u:beta", + "u:gamma", + "u:delta" ], "/P": "15 0 R", "/Rect": [ @@ -790,9 +790,9 @@ 135.349 ], "/Subtype": "/Widget", - "/T": "combodrop1", + "/T": "u:combodrop1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:15 0 R": { @@ -898,7 +898,7 @@ } }, "/AS": "/1", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -907,7 +907,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "5 0 R", @@ -930,7 +930,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -939,7 +939,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "5 0 R", @@ -962,7 +962,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -971,7 +971,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "5 0 R", @@ -1115,7 +1115,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -1124,7 +1124,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "9 0 R", @@ -1147,7 +1147,7 @@ } }, "/AS": "/2", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -1156,7 +1156,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "9 0 R", @@ -1179,7 +1179,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -1188,7 +1188,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "9 0 R", @@ -3165,8 +3165,8 @@ "value": { "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", "/ID": [ - "ø«Ä{±ßTJ\rùÁZuï\u0000F", - "ì®zg+Ìó4…[Tƒ{ —8" + "b:f8abc47bb1df544a0df9c15a75ef0046", + "b:ecae7a672bccf334835b54867b208438" ], "/Info": "2 0 R", "/Root": "1 0 R", diff --git a/qpdf/qtest/qpdf/json-field-types-acroform-v2.out b/qpdf/qtest/qpdf/json-field-types-acroform-v2.out index c5854d12..79abecf6 100644 --- a/qpdf/qtest/qpdf/json-field-types-acroform-v2.out +++ b/qpdf/qtest/qpdf/json-field-types-acroform-v2.out @@ -13,7 +13,7 @@ "object": "4 0 R" }, "choices": [], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text", @@ -27,7 +27,7 @@ "parent": null, "partialname": "text", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "r1", @@ -253,7 +253,7 @@ "object": "10 0 R" }, "choices": [], - "defaultvalue": "salad πʬ", + "defaultvalue": "u:salad πʬ", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text2", @@ -267,7 +267,7 @@ "parent": null, "partialname": "text2", "quadding": 0, - "value": "salad πʬ" + "value": "u:salad πʬ" }, { "alternativename": "combolist1", @@ -282,7 +282,7 @@ "pi", "four" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combolist1", @@ -296,7 +296,7 @@ "parent": null, "partialname": "combolist1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "list1", @@ -311,7 +311,7 @@ "seven", "eight" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Ch", "fullname": "list1", @@ -325,7 +325,7 @@ "parent": null, "partialname": "list1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "drop1", @@ -340,7 +340,7 @@ "elephant", "twelve" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 131072, "fieldtype": "/Ch", "fullname": "drop1", @@ -354,7 +354,7 @@ "parent": null, "partialname": "drop1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "combodrop1", @@ -369,7 +369,7 @@ "gamma", "delta" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combodrop1", @@ -383,7 +383,7 @@ "parent": null, "partialname": "combodrop1", "quadding": 0, - "value": "" + "value": "u:" } ], "hasacroform": true, diff --git a/qpdf/qtest/qpdf/json-field-types-v2.out b/qpdf/qtest/qpdf/json-field-types-v2.out index b52cc9db..c3158fae 100644 --- a/qpdf/qtest/qpdf/json-field-types-v2.out +++ b/qpdf/qtest/qpdf/json-field-types-v2.out @@ -26,7 +26,7 @@ "object": "4 0 R" }, "choices": [], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text", @@ -40,7 +40,7 @@ "parent": null, "partialname": "text", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "r1", @@ -266,7 +266,7 @@ "object": "10 0 R" }, "choices": [], - "defaultvalue": "salad πʬ", + "defaultvalue": "u:salad πʬ", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text2", @@ -280,7 +280,7 @@ "parent": null, "partialname": "text2", "quadding": 0, - "value": "salad πʬ" + "value": "u:salad πʬ" }, { "alternativename": "combolist1", @@ -295,7 +295,7 @@ "pi", "four" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combolist1", @@ -309,7 +309,7 @@ "parent": null, "partialname": "combolist1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "list1", @@ -324,7 +324,7 @@ "seven", "eight" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Ch", "fullname": "list1", @@ -338,7 +338,7 @@ "parent": null, "partialname": "list1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "drop1", @@ -353,7 +353,7 @@ "elephant", "twelve" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 131072, "fieldtype": "/Ch", "fullname": "drop1", @@ -367,7 +367,7 @@ "parent": null, "partialname": "drop1", "quadding": 0, - "value": "" + "value": "u:" }, { "alternativename": "combodrop1", @@ -382,7 +382,7 @@ "gamma", "delta" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combodrop1", @@ -396,7 +396,7 @@ "parent": null, "partialname": "combodrop1", "quadding": 0, - "value": "" + "value": "u:" } ], "hasacroform": true, @@ -407,8 +407,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -433,7 +433,7 @@ "outlines": [], "qpdf": { "jsonversion": 2, - "pdfversion": "1.3", + "pdfversion": "1.5", "objects": { "obj:1 0 R": { "value": { @@ -454,7 +454,7 @@ ], "/NeedAppearances": true }, - "/Lang": "en-US", + "/Lang": "u:en-US", "/MarkInfo": { "/Marked": true }, @@ -472,9 +472,9 @@ }, "obj:2 0 R": { "value": { - "/CreationDate": "D:20190103125434-05'00'", - "/Creator": "Writer", - "/Producer": "LibreOffice 6.1" + "/CreationDate": "u:D:20190103125434-05'00'", + "/Creator": "u:Writer", + "/Producer": "u:LibreOffice 6.1" } }, "obj:3 0 R": { @@ -491,11 +491,11 @@ "/AP": { "/N": "19 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Tx", "/P": "15 0 R", @@ -506,9 +506,9 @@ 704.699 ], "/Subtype": "/Widget", - "/T": "text", + "/T": "u:text", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:5 0 R": { @@ -522,7 +522,7 @@ "23 0 R" ], "/P": "15 0 R", - "/T": "r1", + "/T": "u:r1", "/V": "/1" } }, @@ -535,7 +535,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -545,7 +545,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "8" + "/CA": "u:8" }, "/P": "15 0 R", "/Rect": [ @@ -555,7 +555,7 @@ 566.349 ], "/Subtype": "/Widget", - "/T": "checkbox1", + "/T": "u:checkbox1", "/Type": "/Annot", "/V": "/Off" } @@ -569,7 +569,7 @@ } }, "/AS": "/Yes", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -579,7 +579,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "8" + "/CA": "u:8" }, "/P": "15 0 R", "/Rect": [ @@ -589,7 +589,7 @@ 539.799 ], "/Subtype": "/Widget", - "/T": "checkbox2", + "/T": "u:checkbox2", "/Type": "/Annot", "/V": "/Yes" } @@ -603,7 +603,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -613,7 +613,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "8" + "/CA": "u:8" }, "/P": "15 0 R", "/Rect": [ @@ -623,7 +623,7 @@ 512.549 ], "/Subtype": "/Widget", - "/T": "checkbox3", + "/T": "u:checkbox3", "/Type": "/Annot", "/V": "/Off" } @@ -639,7 +639,7 @@ "39 0 R" ], "/P": "15 0 R", - "/T": "r2", + "/T": "u:r2", "/V": "/2" } }, @@ -648,11 +648,11 @@ "/AP": { "/N": "40 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F2 12 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F2 12 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "salad πʬ", + "/DV": "u:salad πʬ", "/F": 4, "/FT": "/Tx", "/P": "15 0 R", @@ -663,9 +663,9 @@ 278.099 ], "/Subtype": "/Widget", - "/T": "text2", + "/T": "u:text2", "/Type": "/Annot", - "/V": "salad πʬ" + "/V": "u:salad πʬ" } }, "obj:11 0 R": { @@ -673,18 +673,18 @@ "/AP": { "/N": "42 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Opt": [ - "five", - "six", - "seven", - "eight" + "u:five", + "u:six", + "u:seven", + "u:eight" ], "/P": "15 0 R", "/Rect": [ @@ -694,9 +694,9 @@ 232.849 ], "/Subtype": "/Widget", - "/T": "list1", + "/T": "u:list1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:12 0 R": { @@ -704,19 +704,19 @@ "/AP": { "/N": "44 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Ff": 131072, "/Opt": [ - "nine", - "ten", - "elephant", - "twelve" + "u:nine", + "u:ten", + "u:elephant", + "u:twelve" ], "/P": "15 0 R", "/Rect": [ @@ -726,9 +726,9 @@ 130.949 ], "/Subtype": "/Widget", - "/T": "drop1", + "/T": "u:drop1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:13 0 R": { @@ -736,19 +736,19 @@ "/AP": { "/N": "46 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Ff": 393216, "/Opt": [ - "one", - "two", - "pi", - "four" + "u:one", + "u:two", + "u:pi", + "u:four" ], "/P": "15 0 R", "/Rect": [ @@ -758,9 +758,9 @@ 232.849 ], "/Subtype": "/Widget", - "/T": "combolist1", + "/T": "u:combolist1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:14 0 R": { @@ -768,19 +768,19 @@ "/AP": { "/N": "48 0 R" }, - "/DA": "0.18039 0.20392 0.21176 rg /F4 10 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /F4 10 Tf", "/DR": { "/Font": "18 0 R" }, - "/DV": "", + "/DV": "u:", "/F": 4, "/FT": "/Ch", "/Ff": 393216, "/Opt": [ - "alpha", - "beta", - "gamma", - "delta" + "u:alpha", + "u:beta", + "u:gamma", + "u:delta" ], "/P": "15 0 R", "/Rect": [ @@ -790,9 +790,9 @@ 135.349 ], "/Subtype": "/Widget", - "/T": "combodrop1", + "/T": "u:combodrop1", "/Type": "/Annot", - "/V": "" + "/V": "u:" } }, "obj:15 0 R": { @@ -898,7 +898,7 @@ } }, "/AS": "/1", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -907,7 +907,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "5 0 R", @@ -930,7 +930,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -939,7 +939,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "5 0 R", @@ -962,7 +962,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -971,7 +971,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "5 0 R", @@ -1115,7 +1115,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -1124,7 +1124,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "9 0 R", @@ -1147,7 +1147,7 @@ } }, "/AS": "/2", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -1156,7 +1156,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "9 0 R", @@ -1179,7 +1179,7 @@ } }, "/AS": "/Off", - "/DA": "0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", + "/DA": "u:0.18039 0.20392 0.21176 rg /ZaDi 0 Tf", "/DR": { "/Font": { "/ZaDi": "28 0 R" @@ -1188,7 +1188,7 @@ "/F": 4, "/FT": "/Btn", "/MK": { - "/CA": "l" + "/CA": "u:l" }, "/P": "15 0 R", "/Parent": "9 0 R", @@ -3165,8 +3165,8 @@ "value": { "/DocChecksum": "/CC322E136FE95DECF8BC297B1A9B2C2E", "/ID": [ - "ø«Ä{±ßTJ\rùÁZuï\u0000F", - "ì®zg+Ìó4…[Tƒ{ —8" + "b:f8abc47bb1df544a0df9c15a75ef0046", + "b:ecae7a672bccf334835b54867b208438" ], "/Info": "2 0 R", "/Root": "1 0 R", diff --git a/qpdf/qtest/qpdf/json-image-streams-all-v2.out b/qpdf/qtest/qpdf/json-image-streams-all-v2.out index 3b09fe94..6ba15415 100644 --- a/qpdf/qtest/qpdf/json-image-streams-all-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-all-v2.out @@ -250,8 +250,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -733,8 +733,8 @@ "trailer": { "value": { "/ID": [ - "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", - "'+“‰¤V2«PP ç`m\"˛" + "b:53b6958e9beef00ea2ac077d5f2912b6", + "b:272b8d8ba45632ab505020e7606d221d" ], "/Root": "1 0 R", "/Size": 31 diff --git a/qpdf/qtest/qpdf/json-image-streams-small-v2.out b/qpdf/qtest/qpdf/json-image-streams-small-v2.out index f9daea32..f7556d31 100644 --- a/qpdf/qtest/qpdf/json-image-streams-small-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-small-v2.out @@ -250,8 +250,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -745,8 +745,8 @@ "trailer": { "value": { "/ID": [ - "Z§¯•Py»’~’46˛ı\u0011¢", - "Z§¯•Py»’~’46˛ı\u0011¢" + "b:5aa7af805079bb907e9034361d9a11a2", + "b:5aa7af805079bb907e9034361d9a11a2" ], "/Root": "1 0 R", "/Size": 31 diff --git a/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out b/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out index 42382857..3e3f699c 100644 --- a/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out @@ -250,8 +250,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -733,8 +733,8 @@ "trailer": { "value": { "/ID": [ - "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", - "'+“‰¤V2«PP ç`m\"˛" + "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 d757bb57..6a49225b 100644 --- a/qpdf/qtest/qpdf/json-image-streams-v2.out +++ b/qpdf/qtest/qpdf/json-image-streams-v2.out @@ -250,8 +250,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -733,8 +733,8 @@ "trailer": { "value": { "/ID": [ - "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", - "'+“‰¤V2«PP ç`m\"˛" + "b:53b6958e9beef00ea2ac077d5f2912b6", + "b:272b8d8ba45632ab505020e7606d221d" ], "/Root": "1 0 R", "/Size": 31 diff --git a/qpdf/qtest/qpdf/json-need-appearances-acroform-v2.out b/qpdf/qtest/qpdf/json-need-appearances-acroform-v2.out index ae3dcec3..b5f00110 100644 --- a/qpdf/qtest/qpdf/json-need-appearances-acroform-v2.out +++ b/qpdf/qtest/qpdf/json-need-appearances-acroform-v2.out @@ -13,7 +13,7 @@ "object": "4 0 R" }, "choices": [], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text", @@ -27,7 +27,7 @@ "parent": null, "partialname": "text", "quadding": 0, - "value": "abc" + "value": "u:abc" }, { "alternativename": "r1", @@ -253,7 +253,7 @@ "object": "10 0 R" }, "choices": [], - "defaultvalue": "salad πʬ", + "defaultvalue": "u:salad πʬ", "fieldflags": 0, "fieldtype": "/Tx", "fullname": "text2", @@ -267,7 +267,7 @@ "parent": null, "partialname": "text2", "quadding": 0, - "value": "salad ÷πʬ" + "value": "u:salad ÷πʬ" }, { "alternativename": "combolist1", @@ -282,7 +282,7 @@ "pi", "four" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combolist1", @@ -296,7 +296,7 @@ "parent": null, "partialname": "combolist1", "quadding": 0, - "value": "pi" + "value": "u:pi" }, { "alternativename": "list1", @@ -311,7 +311,7 @@ "seven", "eight" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 0, "fieldtype": "/Ch", "fullname": "list1", @@ -325,7 +325,7 @@ "parent": null, "partialname": "list1", "quadding": 0, - "value": "six" + "value": "u:six" }, { "alternativename": "drop1", @@ -340,7 +340,7 @@ "elephant", "twelve" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 131072, "fieldtype": "/Ch", "fullname": "drop1", @@ -354,7 +354,7 @@ "parent": null, "partialname": "drop1", "quadding": 0, - "value": "elephant" + "value": "u:elephant" }, { "alternativename": "combodrop1", @@ -369,7 +369,7 @@ "gamma", "delta" ], - "defaultvalue": "", + "defaultvalue": "u:", "fieldflags": 393216, "fieldtype": "/Ch", "fullname": "combodrop1", @@ -383,7 +383,7 @@ "parent": null, "partialname": "combodrop1", "quadding": 0, - "value": "delta" + "value": "u:delta" } ], "hasacroform": true, diff --git a/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out b/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out index 4182f6d3..feffede7 100644 --- a/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out +++ b/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out @@ -441,8 +441,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -694,7 +694,7 @@ "/Last": "37 0 R", "/Next": "5 0 R", "/Parent": "2 0 R", - "/Title": "Potato 1 -> 5: /XYZ null null null", + "/Title": "u:Potato 1 -> 5: /XYZ null null null", "/Type": "/Outline" } }, @@ -709,7 +709,7 @@ ], "/Parent": "2 0 R", "/Prev": "4 0 R", - "/Title": "Salad 2 -> 15: /XYZ 66 756 3", + "/Title": "u:Salad 2 -> 15: /XYZ 66 756 3", "/Type": "/Outline" } }, @@ -1294,7 +1294,7 @@ "/Last": "101 0 R", "/Next": "37 0 R", "/Parent": "4 0 R", - "/Title": "Mern 1.1 -> 11: /Fit", + "/Title": "u:Mern 1.1 -> 11: /Fit", "/Type": "/Outline" } }, @@ -1310,7 +1310,7 @@ "/Last": "103 0 R", "/Parent": "4 0 R", "/Prev": "36 0 R", - "/Title": "Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", + "/Title": "u:Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", "/Type": "/Outline" } }, @@ -1641,7 +1641,7 @@ "/Last": "105 0 R", "/Next": "101 0 R", "/Parent": "36 0 R", - "/Title": "Biherbadem 1.1.1 -> 12: /FitV 100", + "/Title": "u:Biherbadem 1.1.1 -> 12: /FitV 100", "/Type": "/Outline" } }, @@ -1659,16 +1659,16 @@ "/Last": "106 0 R", "/Parent": "36 0 R", "/Prev": "100 0 R", - "/Title": "Gawehwehweh 1.1.2 -> 12: /XYZ null null null", + "/Title": "u:Gawehwehweh 1.1.2 -> 12: /XYZ null null null", "/Type": "/Outline" } }, "obj:102 0 R": { "value": { - "/Dest": "gabeebee", + "/Dest": "u:gabeebee", "/Next": "103 0 R", "/Parent": "37 0 R", - "/Title": "Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", + "/Title": "u:Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", "/Type": "/Outline" } }, @@ -1687,20 +1687,20 @@ }, "/Parent": "37 0 R", "/Prev": "102 0 R", - "/Title": "Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", + "/Title": "u:Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", "/Type": "/Outline" } }, "obj:104 0 R": { "value": { "/A": { - "/D": "glarp", + "/D": "u:glarp", "/S": "/GoTo", "/Type": "/Action" }, "/Next": "105 0 R", "/Parent": "100 0 R", - "/Title": "Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", + "/Title": "u:Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", "/Type": "/Outline" } }, @@ -1715,7 +1715,7 @@ ], "/Parent": "100 0 R", "/Prev": "104 0 R", - "/Title": "Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", + "/Title": "u:Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", "/Type": "/Outline" } }, @@ -1723,14 +1723,14 @@ "value": { "/Dest": "108 0 R", "/Parent": "101 0 R", - "/Title": "Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", + "/Title": "u:Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", "/Type": "/Outline" } }, "obj:107 0 R": { "value": { "/Names": [ - "gabeebee", + "u:gabeebee", [ "7 0 R", "/FitR", @@ -1739,7 +1739,7 @@ 180, 770 ], - "glarp", + "u:glarp", [ "24 0 R", "/XYZ", @@ -1762,8 +1762,8 @@ "trailer": { "value": { "/ID": [ - "Õ+\f\u0017Â\u0016Pib®gC¯ì&\u000f", - "Õ+\f\u0017Â\u0016Pib®gC¯ì&\u000f" + "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 4bd39d7c..6ce3b54d 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 @@ -10,7 +10,7 @@ ], "images": [], "label": { - "/P": "0", + "/P": "u:0", "/St": 1 }, "object": "6 0 R", @@ -524,7 +524,7 @@ { "index": 0, "label": { - "/P": "0", + "/P": "u:0", "/St": 1 } }, @@ -546,8 +546,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -736,7 +736,7 @@ "/Nums": [ 0, { - "/P": "0" + "/P": "u:0" }, 1, { @@ -809,7 +809,7 @@ "/Last": "37 0 R", "/Next": "5 0 R", "/Parent": "2 0 R", - "/Title": "•Potato 1 -> 5: /XYZ null null null", + "/Title": "u:•Potato 1 -> 5: /XYZ null null null", "/Type": "/Outline" } }, @@ -824,7 +824,7 @@ ], "/Parent": "2 0 R", "/Prev": "4 0 R", - "/Title": "•Salad 2 -> 15: /XYZ 66 756 3", + "/Title": "u:•Salad 2 -> 15: /XYZ 66 756 3", "/Type": "/Outline" } }, @@ -1409,7 +1409,7 @@ "/Last": "101 0 R", "/Next": "37 0 R", "/Parent": "4 0 R", - "/Title": "•Mern 1.1 -> 11: /Fit", + "/Title": "u:•Mern 1.1 -> 11: /Fit", "/Type": "/Outline" } }, @@ -1425,7 +1425,7 @@ "/Last": "103 0 R", "/Parent": "4 0 R", "/Prev": "36 0 R", - "/Title": "•Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", + "/Title": "u:•Squash ÷πʬ÷ 1.2 -> 13: /FitH 792", "/Type": "/Outline" } }, @@ -1756,7 +1756,7 @@ "/Last": "105 0 R", "/Next": "101 0 R", "/Parent": "36 0 R", - "/Title": "•Biherbadem 1.1.1 -> 12: /FitV 100", + "/Title": "u:•Biherbadem 1.1.1 -> 12: /FitV 100", "/Type": "/Outline" } }, @@ -1774,7 +1774,7 @@ "/Last": "106 0 R", "/Parent": "36 0 R", "/Prev": "100 0 R", - "/Title": "•Gawehwehweh 1.1.2 -> 12: /XYZ null null null", + "/Title": "u:•Gawehwehweh 1.1.2 -> 12: /XYZ null null null", "/Type": "/Outline" } }, @@ -1783,7 +1783,7 @@ "/Dest": "/gabeebee", "/Next": "103 0 R", "/Parent": "37 0 R", - "/Title": "•Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", + "/Title": "u:•Gabeebeebee (name) 1.2.1 -> 1: /FitR 66 714 180 770", "/Type": "/Outline" } }, @@ -1802,7 +1802,7 @@ }, "/Parent": "37 0 R", "/Prev": "102 0 R", - "/Title": "•Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", + "/Title": "u:•Merschqaberschq (A) 1.2.2 -> 0: /XYZ null null null", "/Type": "/Outline" } }, @@ -1815,7 +1815,7 @@ }, "/Next": "105 0 R", "/Parent": "100 0 R", - "/Title": "•Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", + "/Title": "u:•Glarpenspliel (A, name) 1.1.1.1 -> 18: /XYZ null null null", "/Type": "/Outline" } }, @@ -1830,7 +1830,7 @@ ], "/Parent": "100 0 R", "/Prev": "104 0 R", - "/Title": "•Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", + "/Title": "u:•Hagoogamagoogle 1.1.1.2 -> 19: /XYZ null null null", "/Type": "/Outline" } }, @@ -1844,7 +1844,7 @@ null ], "/Parent": "101 0 R", - "/Title": "•Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", + "/Title": "u:•Jawarnianbvarwash 1.1.2.1 -> 22: /XYZ null null null", "/Type": "/Outline" } }, @@ -1870,8 +1870,8 @@ "trailer": { "value": { "/ID": [ - "Õ+\f\u0017Â\u0016Pib®gC¯ì&\u000f", - "Õ+\f\u0017Â\u0016Pib®gC¯ì&\u000f" + "b:d52b0c17c216506962ae6743afec260f", + "b:d52b0c17c216506962ae6743afec260f" ], "/Root": "1 0 R", "/Size": 108 diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-outlines-pages-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-outlines-pages-v2.out index 05c245ef..acbf7e08 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-outlines-pages-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-outlines-pages-v2.out @@ -10,7 +10,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "3 0 R", @@ -35,7 +35,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 2 }, "object": "4 0 R", @@ -138,7 +138,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "10 0 R", @@ -151,7 +151,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 2 }, "object": "11 0 R", @@ -190,7 +190,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "14 0 R", @@ -358,7 +358,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "22 0 R", diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-pagelabels-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-pagelabels-v2.out index 8f2d7578..50611b13 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-pagelabels-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-pagelabels-v2.out @@ -7,7 +7,7 @@ { "index": 0, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -21,7 +21,7 @@ { "index": 7, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -35,7 +35,7 @@ { "index": 11, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -56,7 +56,7 @@ { "index": 19, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines-pages-v2.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines-pages-v2.out index 9d11e8f1..746d0bee 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-pages-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-pages-v2.out @@ -10,7 +10,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "3 0 R", @@ -35,7 +35,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 2 }, "object": "4 0 R", @@ -138,7 +138,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "10 0 R", @@ -151,7 +151,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 2 }, "object": "11 0 R", @@ -190,7 +190,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "14 0 R", @@ -358,7 +358,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "22 0 R", 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 index 8a64c16f..3d8a2d67 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out @@ -14,7 +14,7 @@ "/Nums": [ 0, { - "/P": "" + "/P": "u:" }, 2, { @@ -23,7 +23,7 @@ }, 7, { - "/P": "" + "/P": "u:" }, 9, { @@ -32,7 +32,7 @@ }, 11, { - "/P": "" + "/P": "u:" }, 12, { @@ -46,7 +46,7 @@ }, 19, { - "/P": "" + "/P": "u:" }, 20, { @@ -684,8 +684,10 @@ } }, "obj:33 0 R": { - "value": { - "/Length": "34 0 R" + "stream": { + "dict": { + "/Length": "34 0 R" + } } }, "obj:34 0 R": { @@ -707,232 +709,290 @@ ] }, "obj:37 0 R": { - "value": { - "/Length": "38 0 R" + "stream": { + "dict": { + "/Length": "38 0 R" + } } }, "obj:38 0 R": { "value": 46 }, "obj:39 0 R": { - "value": { - "/Length": "40 0 R" + "stream": { + "dict": { + "/Length": "40 0 R" + } } }, "obj:40 0 R": { "value": 46 }, "obj:41 0 R": { - "value": { - "/Length": "42 0 R" + "stream": { + "dict": { + "/Length": "42 0 R" + } } }, "obj:42 0 R": { "value": 46 }, "obj:43 0 R": { - "value": { - "/Length": "44 0 R" + "stream": { + "dict": { + "/Length": "44 0 R" + } } }, "obj:44 0 R": { "value": 46 }, "obj:45 0 R": { - "value": { - "/Length": "46 0 R" + "stream": { + "dict": { + "/Length": "46 0 R" + } } }, "obj:46 0 R": { "value": 46 }, "obj:47 0 R": { - "value": { - "/Length": "48 0 R" + "stream": { + "dict": { + "/Length": "48 0 R" + } } }, "obj:48 0 R": { "value": 46 }, "obj:49 0 R": { - "value": { - "/Length": "50 0 R" + "stream": { + "dict": { + "/Length": "50 0 R" + } } }, "obj:50 0 R": { "value": 46 }, "obj:51 0 R": { - "value": { - "/Length": "52 0 R" + "stream": { + "dict": { + "/Length": "52 0 R" + } } }, "obj:52 0 R": { "value": 46 }, "obj:53 0 R": { - "value": { - "/Length": "54 0 R" + "stream": { + "dict": { + "/Length": "54 0 R" + } } }, "obj:54 0 R": { "value": 46 }, "obj:55 0 R": { - "value": { - "/Length": "56 0 R" + "stream": { + "dict": { + "/Length": "56 0 R" + } } }, "obj:56 0 R": { "value": 47 }, "obj:57 0 R": { - "value": { - "/Length": "58 0 R" + "stream": { + "dict": { + "/Length": "58 0 R" + } } }, "obj:58 0 R": { "value": 47 }, "obj:59 0 R": { - "value": { - "/Length": "60 0 R" + "stream": { + "dict": { + "/Length": "60 0 R" + } } }, "obj:60 0 R": { "value": 47 }, "obj:61 0 R": { - "value": { - "/Length": "62 0 R" + "stream": { + "dict": { + "/Length": "62 0 R" + } } }, "obj:62 0 R": { "value": 47 }, "obj:63 0 R": { - "value": { - "/Length": "64 0 R" + "stream": { + "dict": { + "/Length": "64 0 R" + } } }, "obj:64 0 R": { "value": 47 }, "obj:65 0 R": { - "value": { - "/Length": "66 0 R" + "stream": { + "dict": { + "/Length": "66 0 R" + } } }, "obj:66 0 R": { "value": 47 }, "obj:67 0 R": { - "value": { - "/Length": "68 0 R" + "stream": { + "dict": { + "/Length": "68 0 R" + } } }, "obj:68 0 R": { "value": 47 }, "obj:69 0 R": { - "value": { - "/Length": "70 0 R" + "stream": { + "dict": { + "/Length": "70 0 R" + } } }, "obj:70 0 R": { "value": 47 }, "obj:71 0 R": { - "value": { - "/Length": "72 0 R" + "stream": { + "dict": { + "/Length": "72 0 R" + } } }, "obj:72 0 R": { "value": 47 }, "obj:73 0 R": { - "value": { - "/Length": "74 0 R" + "stream": { + "dict": { + "/Length": "74 0 R" + } } }, "obj:74 0 R": { "value": 47 }, "obj:75 0 R": { - "value": { - "/Length": "76 0 R" + "stream": { + "dict": { + "/Length": "76 0 R" + } } }, "obj:76 0 R": { "value": 47 }, "obj:77 0 R": { - "value": { - "/Length": "78 0 R" + "stream": { + "dict": { + "/Length": "78 0 R" + } } }, "obj:78 0 R": { "value": 47 }, "obj:79 0 R": { - "value": { - "/Length": "80 0 R" + "stream": { + "dict": { + "/Length": "80 0 R" + } } }, "obj:80 0 R": { "value": 47 }, "obj:81 0 R": { - "value": { - "/Length": "82 0 R" + "stream": { + "dict": { + "/Length": "82 0 R" + } } }, "obj:82 0 R": { "value": 47 }, "obj:83 0 R": { - "value": { - "/Length": "84 0 R" + "stream": { + "dict": { + "/Length": "84 0 R" + } } }, "obj:84 0 R": { "value": 47 }, "obj:85 0 R": { - "value": { - "/Length": "86 0 R" + "stream": { + "dict": { + "/Length": "86 0 R" + } } }, "obj:86 0 R": { "value": 47 }, "obj:87 0 R": { - "value": { - "/Length": "88 0 R" + "stream": { + "dict": { + "/Length": "88 0 R" + } } }, "obj:88 0 R": { "value": 47 }, "obj:89 0 R": { - "value": { - "/Length": "90 0 R" + "stream": { + "dict": { + "/Length": "90 0 R" + } } }, "obj:90 0 R": { "value": 47 }, "obj:91 0 R": { - "value": { - "/Length": "92 0 R" + "stream": { + "dict": { + "/Length": "92 0 R" + } } }, "obj:92 0 R": { "value": 47 }, "obj:93 0 R": { - "value": { - "/Length": "94 0 R" + "stream": { + "dict": { + "/Length": "94 0 R" + } } }, "obj:94 0 R": { @@ -960,7 +1020,7 @@ "/Last": "99 0 R", "/Next": "97 0 R", "/Parent": "95 0 R", - "/Title": "Isís 1 -> 5: /XYZ null null null", + "/Title": "u:Isís 1 -> 5: /XYZ null null null", "/Type": "/Outline" } }, @@ -975,7 +1035,7 @@ ], "/Parent": "95 0 R", "/Prev": "96 0 R", - "/Title": "Trepak 2 -> 15: /XYZ 66 756 3", + "/Title": "u:Trepak 2 -> 15: /XYZ 66 756 3", "/Type": "/Outline" } }, @@ -990,7 +1050,7 @@ "/Last": "101 0 R", "/Next": "99 0 R", "/Parent": "96 0 R", - "/Title": "Amanda 1.1 -> 11: /Fit", + "/Title": "u:Amanda 1.1 -> 11: /Fit", "/Type": "/Outline" } }, @@ -1006,7 +1066,7 @@ "/Last": "106 0 R", "/Parent": "96 0 R", "/Prev": "98 0 R", - "/Title": "Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", + "/Title": "u:Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", "/Type": "/Outline" } }, @@ -1022,7 +1082,7 @@ "/Last": "103 0 R", "/Next": "101 0 R", "/Parent": "98 0 R", - "/Title": "Isosicle 1.1.1 -> 12: /FitV 100", + "/Title": "u:Isosicle 1.1.1 -> 12: /FitV 100", "/Type": "/Outline" } }, @@ -1040,7 +1100,7 @@ "/Last": "104 0 R", "/Parent": "98 0 R", "/Prev": "100 0 R", - "/Title": "Isosicle 1.1.2 -> 12: /XYZ null null null", + "/Title": "u:Isosicle 1.1.2 -> 12: /XYZ null null null", "/Type": "/Outline" } }, @@ -1055,7 +1115,7 @@ ], "/Next": "103 0 R", "/Parent": "100 0 R", - "/Title": "Isosicle 1.1.1.1 -> 18: /XYZ null null null", + "/Title": "u:Isosicle 1.1.1.1 -> 18: /XYZ null null null", "/Type": "/Outline" } }, @@ -1070,7 +1130,7 @@ ], "/Parent": "100 0 R", "/Prev": "102 0 R", - "/Title": "Isosicle 1.1.1.2 -> 19: /XYZ null null null", + "/Title": "u:Isosicle 1.1.1.2 -> 19: /XYZ null null null", "/Type": "/Outline" } }, @@ -1084,7 +1144,7 @@ null ], "/Parent": "101 0 R", - "/Title": "Isosicle 1.1.2.1 -> 22: /XYZ null null null", + "/Title": "u:Isosicle 1.1.2.1 -> 22: /XYZ null null null", "/Type": "/Outline" } }, @@ -1100,7 +1160,7 @@ ], "/Next": "106 0 R", "/Parent": "99 0 R", - "/Title": "Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", + "/Title": "u:Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", "/Type": "/Outline" } }, @@ -1115,7 +1175,7 @@ ], "/Parent": "99 0 R", "/Prev": "105 0 R", - "/Title": "Trepsicle 1.2.2 -> 0: /XYZ null null null", + "/Title": "u:Trepsicle 1.2.2 -> 0: /XYZ null null null", "/Type": "/Outline" } }, 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 43becdf5..349b8b68 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out @@ -10,7 +10,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "3 0 R", @@ -35,7 +35,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 2 }, "object": "4 0 R", @@ -138,7 +138,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "10 0 R", @@ -151,7 +151,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 2 }, "object": "11 0 R", @@ -190,7 +190,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "14 0 R", @@ -358,7 +358,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "22 0 R", @@ -524,7 +524,7 @@ { "index": 0, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -538,7 +538,7 @@ { "index": 7, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -552,7 +552,7 @@ { "index": 11, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -573,7 +573,7 @@ { "index": 19, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -616,8 +616,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -805,7 +805,7 @@ "/Nums": [ 0, { - "/P": "" + "/P": "u:" }, 2, { @@ -814,7 +814,7 @@ }, 7, { - "/P": "" + "/P": "u:" }, 9, { @@ -823,7 +823,7 @@ }, 11, { - "/P": "" + "/P": "u:" }, 12, { @@ -837,7 +837,7 @@ }, 19, { - "/P": "" + "/P": "u:" }, 20, { @@ -1811,7 +1811,7 @@ "/Last": "99 0 R", "/Next": "97 0 R", "/Parent": "95 0 R", - "/Title": "Isís 1 -> 5: /XYZ null null null", + "/Title": "u:Isís 1 -> 5: /XYZ null null null", "/Type": "/Outline" } }, @@ -1826,7 +1826,7 @@ ], "/Parent": "95 0 R", "/Prev": "96 0 R", - "/Title": "Trepak 2 -> 15: /XYZ 66 756 3", + "/Title": "u:Trepak 2 -> 15: /XYZ 66 756 3", "/Type": "/Outline" } }, @@ -1841,7 +1841,7 @@ "/Last": "101 0 R", "/Next": "99 0 R", "/Parent": "96 0 R", - "/Title": "Amanda 1.1 -> 11: /Fit", + "/Title": "u:Amanda 1.1 -> 11: /Fit", "/Type": "/Outline" } }, @@ -1857,7 +1857,7 @@ "/Last": "106 0 R", "/Parent": "96 0 R", "/Prev": "98 0 R", - "/Title": "Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", + "/Title": "u:Sandy ÷Σανδι÷ 1.2 -> 13: /FitH 792", "/Type": "/Outline" } }, @@ -1873,7 +1873,7 @@ "/Last": "103 0 R", "/Next": "101 0 R", "/Parent": "98 0 R", - "/Title": "Isosicle 1.1.1 -> 12: /FitV 100", + "/Title": "u:Isosicle 1.1.1 -> 12: /FitV 100", "/Type": "/Outline" } }, @@ -1891,7 +1891,7 @@ "/Last": "104 0 R", "/Parent": "98 0 R", "/Prev": "100 0 R", - "/Title": "Isosicle 1.1.2 -> 12: /XYZ null null null", + "/Title": "u:Isosicle 1.1.2 -> 12: /XYZ null null null", "/Type": "/Outline" } }, @@ -1906,7 +1906,7 @@ ], "/Next": "103 0 R", "/Parent": "100 0 R", - "/Title": "Isosicle 1.1.1.1 -> 18: /XYZ null null null", + "/Title": "u:Isosicle 1.1.1.1 -> 18: /XYZ null null null", "/Type": "/Outline" } }, @@ -1921,7 +1921,7 @@ ], "/Parent": "100 0 R", "/Prev": "102 0 R", - "/Title": "Isosicle 1.1.1.2 -> 19: /XYZ null null null", + "/Title": "u:Isosicle 1.1.1.2 -> 19: /XYZ null null null", "/Type": "/Outline" } }, @@ -1935,7 +1935,7 @@ null ], "/Parent": "101 0 R", - "/Title": "Isosicle 1.1.2.1 -> 22: /XYZ null null null", + "/Title": "u:Isosicle 1.1.2.1 -> 22: /XYZ null null null", "/Type": "/Outline" } }, @@ -1951,7 +1951,7 @@ ], "/Next": "106 0 R", "/Parent": "99 0 R", - "/Title": "Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", + "/Title": "u:Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770", "/Type": "/Outline" } }, @@ -1966,7 +1966,7 @@ ], "/Parent": "99 0 R", "/Prev": "105 0 R", - "/Title": "Trepsicle 1.2.2 -> 0: /XYZ null null null", + "/Title": "u:Trepsicle 1.2.2 -> 0: /XYZ null null null", "/Type": "/Outline" } }, 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 5fe008d6..acff306a 100644 --- a/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out +++ b/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out @@ -36,7 +36,7 @@ ], "images": [], "label": { - "/P": "blank", + "/P": "u:blank", "/St": 1 }, "object": "8 0 R", @@ -49,7 +49,7 @@ ], "images": [], "label": { - "/P": "X-", + "/P": "u:X-", "/S": "/A", "/St": 17 }, @@ -63,7 +63,7 @@ ], "images": [], "label": { - "/P": "X-", + "/P": "u:X-", "/S": "/A", "/St": 18 }, @@ -77,7 +77,7 @@ ], "images": [], "label": { - "/P": "", + "/P": "u:", "/St": 1 }, "object": "11 0 R", @@ -207,7 +207,7 @@ ], "images": [], "label": { - "/P": "q.", + "/P": "u:q.", "/S": "/D", "/St": 6 }, @@ -221,7 +221,7 @@ ], "images": [], "label": { - "/P": "q.", + "/P": "u:q.", "/S": "/D", "/St": 7 }, @@ -235,7 +235,7 @@ ], "images": [], "label": { - "/P": "q.", + "/P": "u:q.", "/S": "/D", "/St": 8 }, @@ -249,7 +249,7 @@ ], "images": [], "label": { - "/P": "q.", + "/P": "u:q.", "/S": "/D", "/St": 9 }, @@ -263,7 +263,7 @@ ], "images": [], "label": { - "/P": "www", + "/P": "u:www", "/St": 1 }, "object": "25 0 R", @@ -412,14 +412,14 @@ { "index": 2, "label": { - "/P": "blank", + "/P": "u:blank", "/St": 1 } }, { "index": 3, "label": { - "/P": "X-", + "/P": "u:X-", "/S": "/A", "/St": 17 } @@ -427,7 +427,7 @@ { "index": 5, "label": { - "/P": "", + "/P": "u:", "/St": 1 } }, @@ -462,7 +462,7 @@ { "index": 15, "label": { - "/P": "q.", + "/P": "u:q.", "/S": "/D", "/St": 6 } @@ -470,7 +470,7 @@ { "index": 19, "label": { - "/P": "www", + "/P": "u:www", "/St": 1 } }, @@ -513,8 +513,8 @@ "capabilities": { "accessibility": true, "extract": true, - "moddifyannotations": true, "modify": true, + "modifyannotations": true, "modifyassembly": true, "modifyforms": true, "modifyother": true, @@ -1219,17 +1219,17 @@ }, 2, { - "/P": "blank" + "/P": "u:blank" }, 3, { - "/P": "X-", + "/P": "u:X-", "/S": "/A", "/St": 17 }, 5, { - "/P": "" + "/P": "u:" }, 6, { @@ -1261,13 +1261,13 @@ }, 15, { - "/P": "q.", + "/P": "u:q.", "/S": "/D", "/St": 6 }, 19, { - "/P": "www" + "/P": "u:www" } ] } @@ -1590,8 +1590,8 @@ "trailer": { "value": { "/ID": [ - "’ùˇÞxtó¼\\·¯½˚Ł7»", - "\rþ˘©LÞ\u000fKýÈl\u0003¯ˇ\u0001\u000e" + "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 3fc137ac..b686d143 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-objects.out +++ b/qpdf/qtest/qpdf/page_api_2-json-objects.out @@ -3,161 +3,115 @@ "parameters": { "decodelevel": "generalized" }, - "objects": { - "1 0 R": { - "/Pages": "3 0 R", - "/Type": "/Catalog" - }, - "2 0 R": { - "/CreationDate": "u:D:20120621124041", - "/Producer": "u:Apex PDFWriter" - }, - "3 0 R": { - "/Count": 3, - "/Kids": [ - "4 0 R", - "4 0 R", - "5 0 R" - ], - "/Type": "/Pages" - }, - "4 0 R": { - "/Contents": "6 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "qpdf": { + "jsonversion": 2, + "pdfversion": "1.3", + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "3 0 R", + "/Type": "/Catalog" + } }, - "/Type": "/Page" - }, - "5 0 R": { - "/Contents": "9 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "obj:2 0 R": { + "value": { + "/CreationDate": "u:D:20120621124041", + "/Producer": "u:Apex PDFWriter" + } }, - "/Type": "/Page" - }, - "6 0 R": { - "dict": { - "/Length": "7 0 R" - } - }, - "7 0 R": 47, - "8 0 R": { - "/BaseFont": "/Times-Roman", - "/Encoding": "/WinAnsiEncoding", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "9 0 R": { - "dict": { - "/Length": "10 0 R" - } - }, - "10 0 R": 47, - "trailer": { - "/ID": [ - "b:fb18b786ff7b358705da8a532aba8f6f", - "b:f7179eb35159bfd4c00f128abcfd1f02" - ], - "/Info": "2 0 R", - "/Root": "1 0 R", - "/Size": 11 - } - }, - "objectinfo": { - "1 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 47 - } - }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "9 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 47 - } - }, - "10 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null + "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" + ] + }, + "/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" + ] + }, + "/Type": "/Page" + } + }, + "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 + } } } } diff --git a/qpdf/qtest/qpdf/page_api_2-json-pages.out b/qpdf/qtest/qpdf/page_api_2-json-pages.out index c4b7632c..8e6f94b0 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-pages.out +++ b/qpdf/qtest/qpdf/page_api_2-json-pages.out @@ -35,188 +35,137 @@ "pageposfrom1": 3 } ], - "objects": { - "1 0 R": { - "/Pages": "3 0 R", - "/Type": "/Catalog" - }, - "2 0 R": { - "/CreationDate": "u:D:20120621124041", - "/Producer": "u:Apex PDFWriter" - }, - "3 0 R": { - "/Count": 3, - "/Kids": [ - "4 0 R", - "11 0 R", - "5 0 R" - ], - "/Type": "/Pages" - }, - "4 0 R": { - "/Contents": "6 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "qpdf": { + "jsonversion": 2, + "pdfversion": "1.3", + "objects": { + "obj:1 0 R": { + "value": { + "/Pages": "3 0 R", + "/Type": "/Catalog" + } }, - "/Type": "/Page" - }, - "5 0 R": { - "/Contents": "9 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "obj:2 0 R": { + "value": { + "/CreationDate": "u:D:20120621124041", + "/Producer": "u:Apex PDFWriter" + } }, - "/Type": "/Page" - }, - "6 0 R": { - "dict": { - "/Length": "7 0 R" - } - }, - "7 0 R": 47, - "8 0 R": { - "/BaseFont": "/Times-Roman", - "/Encoding": "/WinAnsiEncoding", - "/Subtype": "/Type1", - "/Type": "/Font" - }, - "9 0 R": { - "dict": { - "/Length": "10 0 R" - } - }, - "10 0 R": 47, - "11 0 R": { - "/Contents": "6 0 R", - "/MediaBox": [ - 0, - 0, - 612, - 792 - ], - "/Parent": "3 0 R", - "/Resources": { - "/Font": { - "/F1": "8 0 R" - }, - "/ProcSet": [ - "/PDF", - "/Text" - ] + "obj:3 0 R": { + "value": { + "/Count": 3, + "/Kids": [ + "4 0 R", + "11 0 R", + "5 0 R" + ], + "/Type": "/Pages" + } }, - "/Type": "/Page" - }, - "trailer": { - "/ID": [ - "b:fb18b786ff7b358705da8a532aba8f6f", - "b:f7179eb35159bfd4c00f128abcfd1f02" - ], - "/Info": "2 0 R", - "/Root": "1 0 R", - "/Size": 11 - } - }, - "objectinfo": { - "1 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 47 - } - }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "9 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 47 - } - }, - "10 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "11 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null + "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" + ] + }, + "/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" + ] + }, + "/Type": "/Page" + } + }, + "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 + }, + "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" + ] + }, + "/Type": "/Page" + } + }, + "trailer": { + "value": { + "/ID": [ + "b:fb18b786ff7b358705da8a532aba8f6f", + "b:f7179eb35159bfd4c00f128abcfd1f02" + ], + "/Info": "2 0 R", + "/Root": "1 0 R", + "/Size": 11 + } } } } |