Give some .in test files better formatting.

Then regenerate the .pdf files.

Change-Id: I15ea18f5485e9381de8b9a93110bacadcbd15448
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65871
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/testing/resources/bug_821454.in b/testing/resources/bug_821454.in
index 168c983..ee7f20c 100644
--- a/testing/resources/bug_821454.in
+++ b/testing/resources/bug_821454.in
@@ -1,71 +1,63 @@
 {{header}}
-{{object 1 0}}
-<<
+{{object 1 0}} <<
   /Type /Catalog
   /Pages 2 0 R
-  /Names 14 0 R
-  /AcroForm << /Fields [ 8 0 R 9 0 R ] >>
+  /Names 7 0 R
+  /AcroForm <<
+    /Fields [ 5 0 R 6 0 R ]
+  >>
 >>
 endobj
-{{object 2 0}}
-<<
+{{object 2 0}} <<
   /Type /Pages
   /Count 1
   /Kids [ 3 0 R ]
 >>
 endobj
-{{object 3 0}}
-<<
+{{object 3 0}} <<
   /Type /Page
   /Parent 2 0 R
-  /Contents 6 0 R
+  /Contents 4 0 R
   /MediaBox [ 0 0 300 600 ]
-  /Annots [ 8 0 R 9 0 R ]
+  /Annots [ 5 0 R 6 0 R ]
 >>
 endobj
-{{object 6 0}}
-<<
-{{streamlen}}
+{{object 4 0}} <<
+  {{streamlen}}
 >>
 stream
 endstream
 endobj
-{{object 8 0}}
-<<
+{{object 5 0}} <<
   /Type /Annot
   /Subtype /Link
   /Rect [ 100 350 200 380 ]
   /Dest (target10)
 >>
 endobj
-{{object 9 0}}
-<<
+{{object 6 0}} <<
   /Type /Annot
   /Subtype /Link
   /Rect [ 100 400 200 430 ]
   /Dest (target100)
 >>
 endobj
-{{object 14 0}}
-<<
-  /Dests 15 0 R
+{{object 7 0}} <<
+  /Dests 8 0 R
 >>
 endobj
-{{object 15 0}}
-<<
+{{object 8 0}} <<
   /Names [
-    (target10) 16 0 R
-    (target100) 17 0 R
+    (target10) 9 0 R
+    (target100) 10 0 R
   ]
 >>
 endobj
-{{object 16 0}}
-<<
+{{object 9 0}} <<
   /D [3 0 R /XYZ 100 200 0]
 >>
 endobj
-{{object 17 0}}
-<<
+{{object 10 0}} <<
   /D [3 0 R /XYZ 150 250 0]
 >>
 endobj
diff --git a/testing/resources/bug_821454.pdf b/testing/resources/bug_821454.pdf
index d6229a5..1e11c13 100644
--- a/testing/resources/bug_821454.pdf
+++ b/testing/resources/bug_821454.pdf
@@ -1,96 +1,84 @@
 %PDF-1.7
 % ò¤ô
-1 0 obj
-<<
+1 0 obj <<
   /Type /Catalog
   /Pages 2 0 R
-  /Names 14 0 R
-  /AcroForm << /Fields [ 8 0 R 9 0 R ] >>
+  /Names 7 0 R
+  /AcroForm <<
+    /Fields [ 5 0 R 6 0 R ]
+  >>
 >>
 endobj
-2 0 obj
-<<
+2 0 obj <<
   /Type /Pages
   /Count 1
   /Kids [ 3 0 R ]
 >>
 endobj
-3 0 obj
-<<
+3 0 obj <<
   /Type /Page
   /Parent 2 0 R
-  /Contents 6 0 R
+  /Contents 4 0 R
   /MediaBox [ 0 0 300 600 ]
-  /Annots [ 8 0 R 9 0 R ]
+  /Annots [ 5 0 R 6 0 R ]
 >>
 endobj
-6 0 obj
-<<
-/Length 0
+4 0 obj <<
+  /Length 0
 >>
 stream
 endstream
 endobj
-8 0 obj
-<<
+5 0 obj <<
   /Type /Annot
   /Subtype /Link
   /Rect [ 100 350 200 380 ]
   /Dest (target10)
 >>
 endobj
-9 0 obj
-<<
+6 0 obj <<
   /Type /Annot
   /Subtype /Link
   /Rect [ 100 400 200 430 ]
   /Dest (target100)
 >>
 endobj
-14 0 obj
-<<
-  /Dests 15 0 R
+7 0 obj <<
+  /Dests 8 0 R
 >>
 endobj
-15 0 obj
-<<
+8 0 obj <<
   /Names [
-    (target10) 16 0 R
-    (target100) 17 0 R
+    (target10) 9 0 R
+    (target100) 10 0 R
   ]
 >>
 endobj
-16 0 obj
-<<
+9 0 obj <<
   /D [3 0 R /XYZ 100 200 0]
 >>
 endobj
-17 0 obj
-<<
+10 0 obj <<
   /D [3 0 R /XYZ 150 250 0]
 >>
 endobj
 xref
-0 18
+0 11
 0000000000 65535 f 
 0000000015 00000 n 
-0000000126 00000 n 
-0000000191 00000 n 
-0000000000 65535 f 
-0000000000 65535 f 
-0000000314 00000 n 
-0000000000 65535 f 
-0000000362 00000 n 
-0000000462 00000 n 
-0000000000 65535 f 
-0000000000 65535 f 
-0000000000 65535 f 
-0000000000 65535 f 
-0000000563 00000 n 
-0000000601 00000 n 
-0000000683 00000 n 
-0000000733 00000 n 
-trailer<< /Root 1 0 R /Size 18 >>
+0000000131 00000 n 
+0000000196 00000 n 
+0000000319 00000 n 
+0000000369 00000 n 
+0000000469 00000 n 
+0000000570 00000 n 
+0000000606 00000 n 
+0000000686 00000 n 
+0000000735 00000 n 
+trailer <<
+  /Root 1 0 R
+  /Size 11
+>>
 startxref
-783
+785
 %%EOF
diff --git a/testing/resources/bug_921.in b/testing/resources/bug_921.in
index a0c2e73..ccd44fb 100644
--- a/testing/resources/bug_921.in
+++ b/testing/resources/bug_921.in
@@ -43,7 +43,7 @@
 >>
 endobj
 {{object 6 0}} <<
-{{streamlen}}
+  {{streamlen}}
 >>
 stream
 BT
diff --git a/testing/resources/bug_921.pdf b/testing/resources/bug_921.pdf
index fb3950e..84e0755 100644
--- a/testing/resources/bug_921.pdf
+++ b/testing/resources/bug_921.pdf
@@ -44,7 +44,7 @@
 >>
 endobj
 6 0 obj <<
-/Length 2784
+  /Length 2784
 >>
 stream
 BT
@@ -68,7 +68,10 @@
 0000000287 00000 n 
 0000000412 00000 n 
 0000000593 00000 n 
-trailer<< /Root 1 0 R /Size 7 >>
+trailer <<
+  /Root 1 0 R
+  /Size 7
+>>
 startxref
-3428
+3430
 %%EOF
diff --git a/testing/resources/bug_925981.in b/testing/resources/bug_925981.in
index 3d6e37a..f5f8ebe 100644
--- a/testing/resources/bug_925981.in
+++ b/testing/resources/bug_925981.in
@@ -36,7 +36,7 @@
 >>
 endobj
 {{object 6 0}} <<
-{{streamlen}}
+  {{streamlen}}
 >>
 stream
 BT
diff --git a/testing/resources/bug_925981.pdf b/testing/resources/bug_925981.pdf
index 8d856e1..5c35e38 100644
--- a/testing/resources/bug_925981.pdf
+++ b/testing/resources/bug_925981.pdf
@@ -37,7 +37,7 @@
 >>
 endobj
 6 0 obj <<
-/Length 83
+  /Length 83
 >>
 stream
 BT
@@ -64,11 +64,11 @@
 0000000309 00000 n 
 0000000387 00000 n 
 0000000463 00000 n 
-0000000595 00000 n 
+0000000597 00000 n 
 trailer <<
   /Root 1 0 R
   /Size 8
 >>
 startxref
-646
+648
 %%EOF
diff --git a/testing/resources/find_text_consecutive.in b/testing/resources/find_text_consecutive.in
index 9e35e1d..d484584 100644
--- a/testing/resources/find_text_consecutive.in
+++ b/testing/resources/find_text_consecutive.in
@@ -29,7 +29,7 @@
 >>
 endobj
 {{object 5 0}} <<
-{{streamlen}}
+  {{streamlen}}
 >>
 stream
 BT
diff --git a/testing/resources/find_text_consecutive.pdf b/testing/resources/find_text_consecutive.pdf
index 5083d75..bd78380 100644
--- a/testing/resources/find_text_consecutive.pdf
+++ b/testing/resources/find_text_consecutive.pdf
@@ -30,7 +30,7 @@
 >>
 endobj
 5 0 obj <<
-/Length 51
+  /Length 51
 >>
 stream
 BT
@@ -53,5 +53,5 @@
   /Size 6
 >>
 startxref
-465
+467
 %%EOF
diff --git a/testing/resources/pixel/bug_1012369.in b/testing/resources/pixel/bug_1012369.in
index 7f56d35..db1fc5a 100644
--- a/testing/resources/pixel/bug_1012369.in
+++ b/testing/resources/pixel/bug_1012369.in
@@ -46,7 +46,7 @@
   /Filter [/ASCIIHexDecode /JPXDecode]
   /Height 64
   /Width 64
-{{streamlen}}
+  {{streamlen}}
 >>
 stream
 0000000c6a5020200d0a870a00000014667479706a703220000000006a7032200000004f6a7032
@@ -67,7 +67,7 @@
   /Filter [/ASCIIHexDecode /JPXDecode]
   /Height 64
   /Width 64
-{{streamlen}}
+  {{streamlen}}
 >>
 stream
 0000000c6a5020200d0a870a00000014667479706a703220000000006a7032200000004f6a7032
diff --git a/testing/resources/pixel/bug_1161.in b/testing/resources/pixel/bug_1161.in
index 1f02ab5..f3317e1 100644
--- a/testing/resources/pixel/bug_1161.in
+++ b/testing/resources/pixel/bug_1161.in
@@ -21,7 +21,7 @@
 >>
 endobj
 {{object 5 0}} <<
-{{streamlen}}
+  {{streamlen}}
 >>
 stream
 q 1 0 0 1 50 50 cm /X0 Do Q
@@ -48,20 +48,20 @@
 endstream
 endobj
 {{object 7 0}} <<
-/Type /ExtGState
-/ca 0.2
-/CA 1
+  /Type /ExtGState
+  /ca 0.2
+  /CA 1
 >>
 endobj
 {{object 8 0}} <<
-/Type /Pattern
-/TilingType 1
-/PatternType 1
-/BBox [0 0 18 18]
-/PaintType 1
-/YStep 18
-/XStep 18
-{{streamlen}}
+  /Type /Pattern
+  /TilingType 1
+  /PatternType 1
+  /BBox [0 0 18 18]
+  /PaintType 1
+  /YStep 18
+  /XStep 18
+  {{streamlen}}
 >>
 stream
 0 0 0 rg
diff --git a/testing/resources/pixel/bug_842.in b/testing/resources/pixel/bug_842.in
index 255a902..71f0104 100644
--- a/testing/resources/pixel/bug_842.in
+++ b/testing/resources/pixel/bug_842.in
@@ -24,7 +24,7 @@
 >>
 endobj
 {{object 4 0}} <<
-{{streamlen}}
+  {{streamlen}}
 >>
 stream
 q