Reformat listbox_form.in to be more consistent with other .in files.
Also reformat combobox_form.in.
Change-Id: Iefb2c6e689c5b6f0afb45dbcc9aba9a4588512da
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/59939
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/testing/resources/combobox_form.in b/testing/resources/combobox_form.in
index 4d243b0..3f1004d 100644
--- a/testing/resources/combobox_form.in
+++ b/testing/resources/combobox_form.in
@@ -1,16 +1,20 @@
{{header}}
-{{object 1 0}}
-<<
+{{object 1 0}} <<
/Type /Catalog
/Pages 2 0 R
- /AcroForm << /Fields [ 8 0 R 9 0 R 10 0 R ] /DR 4 0 R >>
+ /AcroForm <<
+ /Fields [ 8 0 R 9 0 R 10 0 R ]
+ /DR 4 0 R
+ >>
>>
endobj
-{{object 2 0}}
-<< /Count 1 /Kids [ 3 0 R ] /Type /Pages >>
+{{object 2 0}} <<
+ /Type /Pages
+ /Count 1
+ /Kids [ 3 0 R ]
+>>
endobj
-{{object 3 0}}
-<<
+{{object 3 0}} <<
/Type /Page
/Parent 2 0 R
/Resources 4 0 R
@@ -19,21 +23,23 @@
/Annots [ 8 0 R 9 0 R 10 0 R ]
>>
endobj
-{{object 4 0}}
-<< /Font 5 0 R >>
+{{object 4 0}} <<
+ /Font 5 0 R
+>>
endobj
-{{object 5 0}}
-<< /F1 6 0 R >>
+{{object 5 0}} <<
+ /F1 6 0 R
+>>
endobj
-{{object 6 0}}
-<<
+{{object 6 0}} <<
/Type /Font
/Subtype /Type1
/BaseFont /Helvetica
>>
endobj
-{{object 7 0}}
-<< {{streamlen}} >>
+{{object 7 0}} <<
+ {{streamlen}}
+>>
stream
BT
0 0 0 rg
@@ -43,27 +49,25 @@
ET
endstream
endobj
-{{object 8 0}}
-<<
+{{object 8 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 393216
/T (Combo_Editable)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 350 200 380 ]
- /Subtype /Widget
/Opt [[(foo) (Foo)] [(bar) (Bar)] [(qux) (Qux)]]
>>
endobj
-{{object 9 0}}
-<<
+{{object 9 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 131072
/T (Combo1)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 400 200 430 ]
- /Subtype /Widget
/Opt [(Apple) (Banana) (Cherry) (Date) (Elderberry) (Fig) (Guava) (Honeydew)
(Indian Fig) (Jackfruit) (Kiwi) (Lemon) (Mango) (Nectarine) (Orange)
(Persimmon) (Quince) (Raspberry) (Strawberry) (Tamarind) (Ugli Fruit)
@@ -71,15 +75,14 @@
/V (Banana)
>>
endobj
-{{object 10 0}}
-<<
+{{object 10 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 131073
/T (Combo_ReadOnly)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 500 200 530 ]
- /Subtype /Widget
/Opt [(Dog) (Elephant) (Frog)]
>>
endobj
diff --git a/testing/resources/combobox_form.pdf b/testing/resources/combobox_form.pdf
index 1f0e895..5b61db5 100644
--- a/testing/resources/combobox_form.pdf
+++ b/testing/resources/combobox_form.pdf
@@ -1,17 +1,21 @@
%PDF-1.7
% ò¤ô
-1 0 obj
-<<
+1 0 obj <<
/Type /Catalog
/Pages 2 0 R
- /AcroForm << /Fields [ 8 0 R 9 0 R 10 0 R ] /DR 4 0 R >>
+ /AcroForm <<
+ /Fields [ 8 0 R 9 0 R 10 0 R ]
+ /DR 4 0 R
+ >>
>>
endobj
-2 0 obj
-<< /Count 1 /Kids [ 3 0 R ] /Type /Pages >>
+2 0 obj <<
+ /Type /Pages
+ /Count 1
+ /Kids [ 3 0 R ]
+>>
endobj
-3 0 obj
-<<
+3 0 obj <<
/Type /Page
/Parent 2 0 R
/Resources 4 0 R
@@ -20,21 +24,23 @@
/Annots [ 8 0 R 9 0 R 10 0 R ]
>>
endobj
-4 0 obj
-<< /Font 5 0 R >>
+4 0 obj <<
+ /Font 5 0 R
+>>
endobj
-5 0 obj
-<< /F1 6 0 R >>
+5 0 obj <<
+ /F1 6 0 R
+>>
endobj
-6 0 obj
-<<
+6 0 obj <<
/Type /Font
/Subtype /Type1
/BaseFont /Helvetica
>>
endobj
-7 0 obj
-<< /Length 51 >>
+7 0 obj <<
+ /Length 51
+>>
stream
BT
0 0 0 rg
@@ -44,27 +50,25 @@
ET
endstream
endobj
-8 0 obj
-<<
+8 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 393216
/T (Combo_Editable)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 350 200 380 ]
- /Subtype /Widget
/Opt [[(foo) (Foo)] [(bar) (Bar)] [(qux) (Qux)]]
>>
endobj
-9 0 obj
-<<
+9 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 131072
/T (Combo1)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 400 200 430 ]
- /Subtype /Widget
/Opt [(Apple) (Banana) (Cherry) (Date) (Elderberry) (Fig) (Guava) (Honeydew)
(Indian Fig) (Jackfruit) (Kiwi) (Lemon) (Mango) (Nectarine) (Orange)
(Persimmon) (Quince) (Raspberry) (Strawberry) (Tamarind) (Ugli Fruit)
@@ -72,15 +76,14 @@
/V (Banana)
>>
endobj
-10 0 obj
-<<
+10 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 131073
/T (Combo_ReadOnly)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 500 200 530 ]
- /Subtype /Widget
/Opt [(Dog) (Elephant) (Frog)]
>>
endobj
@@ -88,16 +91,19 @@
0 11
0000000000 65535 f
0000000015 00000 n
-0000000127 00000 n
-0000000186 00000 n
-0000000335 00000 n
-0000000368 00000 n
-0000000399 00000 n
-0000000475 00000 n
-0000000575 00000 n
-0000000781 00000 n
-0000001237 00000 n
-trailer<< /Root 1 0 R /Size 11 >>
+0000000137 00000 n
+0000000202 00000 n
+0000000351 00000 n
+0000000386 00000 n
+0000000419 00000 n
+0000000495 00000 n
+0000000597 00000 n
+0000000803 00000 n
+0000001259 00000 n
+trailer <<
+ /Root 1 0 R
+ /Size 11
+>>
startxref
-1426
+1448
%%EOF
diff --git a/testing/resources/listbox_form.in b/testing/resources/listbox_form.in
index 334d068..354d841 100644
--- a/testing/resources/listbox_form.in
+++ b/testing/resources/listbox_form.in
@@ -1,16 +1,20 @@
{{header}}
-{{object 1 0}}
-<<
+{{object 1 0}} <<
/Type /Catalog
/Pages 2 0 R
- /AcroForm << /Fields [ 8 0 R 9 0 R 10 0 R 11 0 R 12 0 R ] /DR 4 0 R >>
+ /AcroForm <<
+ /Fields [ 8 0 R 9 0 R 10 0 R 11 0 R 12 0 R ]
+ /DR 4 0 R
+ >>
>>
endobj
-{{object 2 0}}
-<< /Count 1 /Kids [ 3 0 R ] /Type /Pages >>
+{{object 2 0}} <<
+ /Type /Pages
+ /Count 1
+ /Kids [ 3 0 R ]
+>>
endobj
-{{object 3 0}}
-<<
+{{object 3 0}} <<
/Type /Page
/Parent 2 0 R
/Resources 4 0 R
@@ -19,21 +23,23 @@
/Annots [ 8 0 R 9 0 R 10 0 R 11 0 R 12 0 R ]
>>
endobj
-{{object 4 0}}
-<< /Font 5 0 R >>
+{{object 4 0}} <<
+ /Font 5 0 R
+>>
endobj
-{{object 5 0}}
-<< /F1 6 0 R >>
+{{object 5 0}} <<
+ /F1 6 0 R
+>>
endobj
-{{object 6 0}}
-<<
+{{object 6 0}} <<
/Type /Font
/Subtype /Type1
/BaseFont /Helvetica
>>
endobj
-{{object 7 0}}
-<< {{streamlen}} >>
+{{object 7 0}} <<
+ {{streamlen}}
+>>
stream
BT
0 0 0 rg
@@ -43,27 +49,25 @@
ET
endstream
endobj
-{{object 8 0}}
-<<
+{{object 8 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 0
/T (Listbox_SingleSelect)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 350 200 380 ]
- /Subtype /Widget
/Opt [[(foo) (Foo)] [(bar) (Bar)] [(qux) (Qux)]]
>>
endobj
-{{object 9 0}}
-<<
+{{object 9 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 2097152
/T (Listbox_MultiSelect)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 400 200 430 ]
- /Subtype /Widget
/Opt [(Apple) (Banana) (Cherry) (Date) (Elderberry) (Fig) (Guava) (Honeydew)
(Indian Fig) (Jackfruit) (Kiwi) (Lemon) (Mango) (Nectarine) (Orange)
(Persimmon) (Quince) (Raspberry) (Strawberry) (Tamarind) (Ugli Fruit)
@@ -71,40 +75,37 @@
/V (Banana)
>>
endobj
-{{object 10 0}}
-<<
+{{object 10 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 1
/T (Listbox_ReadOnly)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 500 200 530 ]
- /Subtype /Widget
/Opt [(Dog) (Elephant) (Frog)]
>>
endobj
-{{object 11 0}}
-<<
+{{object 11 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 2097152
/T (Listbox_MultiSelectMultipleSelected)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 200 200 230 ]
- /Subtype /Widget
/Opt [(Alpha) (Beta) (Gamma) (Delta) (Epsilon)]
/V [(Epsilon) (Gamma)]
>>
endobj
-{{object 12 0}}
-<<
+{{object 12 0}} <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 0
/T (Listbox_SingleSelectLastSelected)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 100 200 130 ]
- /Subtype /Widget
/Opt [(Alberta) (British Columbia) (Manitoba) (New Brunswick)
(Newfoundland and Labrador) (Nova Scotia) (Ontario)
(Prince Edward Island) (Quebec) (Saskatchewan) ]
diff --git a/testing/resources/listbox_form.pdf b/testing/resources/listbox_form.pdf
index 51a7fb7..9e1393e 100644
--- a/testing/resources/listbox_form.pdf
+++ b/testing/resources/listbox_form.pdf
@@ -1,17 +1,21 @@
%PDF-1.7
% ò¤ô
-1 0 obj
-<<
+1 0 obj <<
/Type /Catalog
/Pages 2 0 R
- /AcroForm << /Fields [ 8 0 R 9 0 R 10 0 R 11 0 R 12 0 R ] /DR 4 0 R >>
+ /AcroForm <<
+ /Fields [ 8 0 R 9 0 R 10 0 R 11 0 R 12 0 R ]
+ /DR 4 0 R
+ >>
>>
endobj
-2 0 obj
-<< /Count 1 /Kids [ 3 0 R ] /Type /Pages >>
+2 0 obj <<
+ /Type /Pages
+ /Count 1
+ /Kids [ 3 0 R ]
+>>
endobj
-3 0 obj
-<<
+3 0 obj <<
/Type /Page
/Parent 2 0 R
/Resources 4 0 R
@@ -20,21 +24,23 @@
/Annots [ 8 0 R 9 0 R 10 0 R 11 0 R 12 0 R ]
>>
endobj
-4 0 obj
-<< /Font 5 0 R >>
+4 0 obj <<
+ /Font 5 0 R
+>>
endobj
-5 0 obj
-<< /F1 6 0 R >>
+5 0 obj <<
+ /F1 6 0 R
+>>
endobj
-6 0 obj
-<<
+6 0 obj <<
/Type /Font
/Subtype /Type1
/BaseFont /Helvetica
>>
endobj
-7 0 obj
-<< /Length 51 >>
+7 0 obj <<
+ /Length 51
+>>
stream
BT
0 0 0 rg
@@ -44,27 +50,25 @@
ET
endstream
endobj
-8 0 obj
-<<
+8 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 0
/T (Listbox_SingleSelect)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 350 200 380 ]
- /Subtype /Widget
/Opt [[(foo) (Foo)] [(bar) (Bar)] [(qux) (Qux)]]
>>
endobj
-9 0 obj
-<<
+9 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 2097152
/T (Listbox_MultiSelect)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 400 200 430 ]
- /Subtype /Widget
/Opt [(Apple) (Banana) (Cherry) (Date) (Elderberry) (Fig) (Guava) (Honeydew)
(Indian Fig) (Jackfruit) (Kiwi) (Lemon) (Mango) (Nectarine) (Orange)
(Persimmon) (Quince) (Raspberry) (Strawberry) (Tamarind) (Ugli Fruit)
@@ -72,40 +76,37 @@
/V (Banana)
>>
endobj
-10 0 obj
-<<
+10 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 1
/T (Listbox_ReadOnly)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 500 200 530 ]
- /Subtype /Widget
/Opt [(Dog) (Elephant) (Frog)]
>>
endobj
-11 0 obj
-<<
+11 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 2097152
/T (Listbox_MultiSelectMultipleSelected)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 200 200 230 ]
- /Subtype /Widget
/Opt [(Alpha) (Beta) (Gamma) (Delta) (Epsilon)]
/V [(Epsilon) (Gamma)]
>>
endobj
-12 0 obj
-<<
+12 0 obj <<
/Type /Annot
+ /Subtype /Widget
/FT /Ch
/Ff 0
/T (Listbox_SingleSelectLastSelected)
/DA (0 0 0 rg /F1 12 Tf)
/Rect [ 100 100 200 130 ]
- /Subtype /Widget
/Opt [(Alberta) (British Columbia) (Manitoba) (New Brunswick)
(Newfoundland and Labrador) (Nova Scotia) (Ontario)
(Prince Edward Island) (Quebec) (Saskatchewan) ]
@@ -117,21 +118,21 @@
0 13
0000000000 65535 f
0000000015 00000 n
-0000000141 00000 n
-0000000200 00000 n
-0000000363 00000 n
-0000000396 00000 n
-0000000427 00000 n
-0000000503 00000 n
-0000000603 00000 n
-0000000810 00000 n
-0000001280 00000 n
-0000001466 00000 n
-0000001719 00000 n
+0000000151 00000 n
+0000000216 00000 n
+0000000379 00000 n
+0000000414 00000 n
+0000000447 00000 n
+0000000523 00000 n
+0000000625 00000 n
+0000000832 00000 n
+0000001302 00000 n
+0000001488 00000 n
+0000001741 00000 n
trailer <<
/Root 1 0 R
/Size 13
>>
startxref
-2097
+2119
%%EOF
