update testfiles to pdfmanagement changes.

latex3 · Dec 20, 2024 · 24eceee · 24eceee
1 parent 66c778e
commit 24eceee
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 46 deletions.
diff --git a/required/latex-lab/testfiles-bib/bib-002.luatex.tlg b/required/latex-lab/testfiles-bib/bib-002.luatex.tlg
@@ -48,14 +48,14 @@ Completed box being shipped out [1]
 .....\hbox(0.0+0.0)x15.0, direction TLT
 .....\OT1/cmr/m/n/10 [
 .....\hbox(6.44444+0.0)x5.00002, direction TLT
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> } action goto name{cite.citeA}
 ......\OT1/cmr/m/n/10 1
 ......\pdfendlink
 .....\OT1/cmr/m/n/10 ]
 .....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
 .....\OT1/cmr/m/n/10 [
 .....\hbox(6.94444+0.0)x20.83339, direction TLT
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeB}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650042> } action goto name{cite.citeB}
 ......\OT1/cmr/m/n/10 l
 ......\OT1/cmr/m/n/10 a
 ......\discretionary (penalty 50)
@@ -81,14 +81,14 @@ Completed box being shipped out [1]
 .....\hbox(0.0+0.0)x15.0, direction TLT
 .....\OT1/cmr/m/n/10 [
 .....\hbox(6.44444+0.0)x5.00002, direction TLT
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> } action goto name{cite.citeA}
 ......\OT1/cmr/m/n/10 1
 ......\pdfendlink
 .....\OT1/cmr/m/n/10 ,
 .....\penalty 1000
 .....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
 .....\hbox(6.44444+0.0)x5.00002, direction TLT
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeC}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650043> } action goto name{cite.citeC}
 ......\OT1/cmr/m/n/10 2
 ......\pdfendlink
 .....\OT1/cmr/m/n/10 ]

diff --git a/required/latex-lab/testfiles-bib/bib-002.tlg b/required/latex-lab/testfiles-bib/bib-002.tlg
@@ -41,7 +41,7 @@ Completed box being shipped out [1]
 .....\T1/cmr/m/n/10 [
 .....\hbox(6.4151+0.0)x4.99878
 ......\special{}
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> } action goto name{cite.citeA}
 ......\T1/cmr/m/n/10 1
 ......\pdfendlink
 ......\special{}
@@ -50,7 +50,7 @@ Completed box being shipped out [1]
 .....\T1/cmr/m/n/10 [
 .....\hbox(6.8872+0.0)x20.82825
 ......\special{}
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeB}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650042> } action goto name{cite.citeB}
 ......\T1/cmr/m/n/10 l
 ......\T1/cmr/m/n/10 a
 ......\T1/cmr/m/n/10 b
@@ -71,7 +71,7 @@ Completed box being shipped out [1]
 .....\T1/cmr/m/n/10 [
 .....\hbox(6.4151+0.0)x4.99878
 ......\special{}
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> } action goto name{cite.citeA}
 ......\T1/cmr/m/n/10 1
 ......\pdfendlink
 ......\special{}
@@ -80,7 +80,7 @@ Completed box being shipped out [1]
 .....\glue 3.33252 plus 1.66626 minus 1.11084
 .....\hbox(6.4151+0.0)x4.99878
 ......\special{}
-......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] } action goto name{cite.citeC}
+......\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650043> } action goto name{cite.citeC}
 ......\T1/cmr/m/n/10 2
 ......\pdfendlink
 ......\special{}

diff --git a/required/latex-lab/testfiles-bib/bib-004.luatex.tlg b/required/latex-lab/testfiles-bib/bib-004.luatex.tlg
@@ -57,7 +57,7 @@ Completed box being shipped out [1]
 .....\hbox(6.44444+0.0)x5.00002, direction TLT
 ......\pdfliteral page <lua data reference ...>
 ......\pdfliteral page <lua data reference ...>
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 1 } action struct name{cite.citeA} goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 1 } action struct name{cite.citeA} goto name{cite.citeA}
 ......\OT1/cmr/m/n/10 1
 ......\pdfendlink
 ......\write1{\new@label@record{@tag@objr@page@1}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -70,7 +70,7 @@ Completed box being shipped out [1]
 .....\hbox(6.94444+0.0)x20.83339, direction TLT
 ......\pdfliteral page <lua data reference ...>
 ......\pdfliteral page <lua data reference ...>
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action struct name{cite.citeB} goto name{cite.citeB}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650042> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action struct name{cite.citeB} goto name{cite.citeB}
 ......\OT1/cmr/m/n/10 l
 ......\OT1/cmr/m/n/10 a
 ......\discretionary (penalty 50)
@@ -103,7 +103,7 @@ Completed box being shipped out [1]
 .....\hbox(6.44444+0.0)x5.00002, direction TLT
 ......\pdfliteral page <lua data reference ...>
 ......\pdfliteral page <lua data reference ...>
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action struct name{cite.citeA} goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action struct name{cite.citeA} goto name{cite.citeA}
 ......\OT1/cmr/m/n/10 1
 ......\pdfendlink
 ......\write1{\new@label@record{@tag@objr@page@3}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -116,7 +116,7 @@ Completed box being shipped out [1]
 .....\hbox(6.44444+0.0)x5.00002, direction TLT
 ......\pdfliteral page <lua data reference ...>
 ......\pdfliteral page <lua data reference ...>
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action struct name{cite.citeC} goto name{cite.citeC}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650043> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action struct name{cite.citeC} goto name{cite.citeC}
 ......\OT1/cmr/m/n/10 2
 ......\pdfendlink
 ......\write1{\new@label@record{@tag@objr@page@4}{{tagabspage}{\__property_code_tagabspage: }}}

diff --git a/required/latex-lab/testfiles-bib/bib-004.tlg b/required/latex-lab/testfiles-bib/bib-004.tlg
@@ -68,7 +68,7 @@ Completed box being shipped out [1]
 ......\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 ......\marks4{b-,3,8,Link,,,}
 ......\marks4{b+,3,8,Link,,,}
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 1 } action goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 1 } action goto name{cite.citeA}
 ......\T1/cmr/m/n/10 1
 ......\pdfendlink
 ......\write1{\new@label@record{@tag@objr@page@1}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -104,7 +104,7 @@ Completed box being shipped out [1]
 ......\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 ......\marks4{b-,7,10,Link,,,}
 ......\marks4{b+,7,10,Link,,,}
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action goto name{cite.citeB}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650042> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action goto name{cite.citeB}
 ......\T1/cmr/m/n/10 l
 ......\T1/cmr/m/n/10 a
 ......\T1/cmr/m/n/10 b
@@ -159,7 +159,7 @@ Completed box being shipped out [1]
 ......\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 ......\marks4{b-,12,14,Link,,,}
 ......\marks4{b+,12,14,Link,,,}
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action goto name{cite.citeA}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650041> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action goto name{cite.citeA}
 ......\T1/cmr/m/n/10 1
 ......\pdfendlink
 ......\write1{\new@label@record{@tag@objr@page@3}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -195,7 +195,7 @@ Completed box being shipped out [1]
 ......\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 ......\marks4{b-,16,16,Link,,,}
 ......\marks4{b+,16,16,Link,,,}
-......\pdfstartlink(*+*)x* attr{/Contents (ref) /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action goto name{cite.citeC}
+......\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200063006900740065002E00630069007400650043> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action goto name{cite.citeC}
 ......\T1/cmr/m/n/10 2
 ......\pdfendlink
 ......\write1{\new@label@record{@tag@objr@page@4}{{tagabspage}{\__property_code_tagabspage: }}}

diff --git a/required/latex-lab/testfiles-table-pdftex/table-000.tlg b/required/latex-lab/testfiles-table-pdftex/table-000.tlg
@@ -10,6 +10,8 @@ Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versio
 File: pdfmanagement-testphase.ltx ....-..-.. v... PDF management code (testphase)
 \g__pdfmanagement_EmbeddedFiles_int=\count...
 \l__pdfmeta_xmp_indent_int=\count...
+\g_pdffile_embed_pdfa_int=\count...
+\g_pdffile_embed_nonpdfa_int=\count...
 ))) (../l3backend-pdftex.def
 File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
 \l__color_backend_stack_int=\count...

diff --git a/required/latex-lab/testfiles/documentmetadata-support-000.luatex.tlg b/required/latex-lab/testfiles/documentmetadata-support-000.luatex.tlg
@@ -11,6 +11,8 @@ Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versio
 File: pdfmanagement-testphase.ltx ....-..-.. v... PDF management code (testphase)
 \g__pdfmanagement_EmbeddedFiles_int=\count...
 \l__pdfmeta_xmp_indent_int=\count...
+\g_pdffile_embed_pdfa_int=\count...
+\g_pdffile_embed_nonpdfa_int=\count...
 ))) (../l3backend-luatex.def
 File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
 \l__color_backend_stack_int=\count...

diff --git a/required/latex-lab/testfiles/documentmetadata-support-000.tlg b/required/latex-lab/testfiles/documentmetadata-support-000.tlg
@@ -11,6 +11,8 @@ Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versio
 File: pdfmanagement-testphase.ltx ....-..-.. v... PDF management code (testphase)
 \g__pdfmanagement_EmbeddedFiles_int=\count...
 \l__pdfmeta_xmp_indent_int=\count...
+\g_pdffile_embed_pdfa_int=\count...
+\g_pdffile_embed_nonpdfa_int=\count...
 ))) (../l3backend-pdftex.def
 File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
 \l__color_backend_stack_int=\count...

diff --git a/required/latex-lab/testfiles/documentmetadata-support-001.luatex.tlg b/required/latex-lab/testfiles/documentmetadata-support-001.luatex.tlg
@@ -11,6 +11,8 @@ Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versio
 File: pdfmanagement-testphase.ltx ....-..-.. v... PDF management code (testphase)
 \g__pdfmanagement_EmbeddedFiles_int=\count...
 \l__pdfmeta_xmp_indent_int=\count...
+\g_pdffile_embed_pdfa_int=\count...
+\g_pdffile_embed_nonpdfa_int=\count...
 ))) (../l3backend-luatex.def
 File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
 \l__color_backend_stack_int=\count...

diff --git a/required/latex-lab/testfiles/documentmetadata-support-001.tlg b/required/latex-lab/testfiles/documentmetadata-support-001.tlg
@@ -11,6 +11,8 @@ Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versio
 File: pdfmanagement-testphase.ltx ....-..-.. v... PDF management code (testphase)
 \g__pdfmanagement_EmbeddedFiles_int=\count...
 \l__pdfmeta_xmp_indent_int=\count...
+\g_pdffile_embed_pdfa_int=\count...
+\g_pdffile_embed_nonpdfa_int=\count...
 ))) (../l3backend-pdftex.def
 File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
 \l__color_backend_stack_int=\count...

diff --git a/required/latex-lab/testfiles/documentmetadata-support-002.luatex.tlg b/required/latex-lab/testfiles/documentmetadata-support-002.luatex.tlg
@@ -11,6 +11,8 @@ Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versio
 File: pdfmanagement-testphase.ltx ....-..-.. v... PDF management code (testphase)
 \g__pdfmanagement_EmbeddedFiles_int=\count...
 \l__pdfmeta_xmp_indent_int=\count...
+\g_pdffile_embed_pdfa_int=\count...
+\g_pdffile_embed_nonpdfa_int=\count...
 ))) (../l3backend-luatex.def
 File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
 \l__color_backend_stack_int=\count...

diff --git a/required/latex-lab/testfiles/documentmetadata-support-002.tlg b/required/latex-lab/testfiles/documentmetadata-support-002.tlg
@@ -11,6 +11,8 @@ Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versio
 File: pdfmanagement-testphase.ltx ....-..-.. v... PDF management code (testphase)
 \g__pdfmanagement_EmbeddedFiles_int=\count...
 \l__pdfmeta_xmp_indent_int=\count...
+\g_pdffile_embed_pdfa_int=\count...
+\g_pdffile_embed_nonpdfa_int=\count...
 ))) (../l3backend-pdftex.def
 File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
 \l__color_backend_stack_int=\count...

diff --git a/required/latex-lab/testfiles/standard-a4f.luatex.tpf b/required/latex-lab/testfiles/standard-a4f.luatex.tpf
@@ -268,16 +268,16 @@ endobj
 [ 6 0 R ]
 endobj
 14 0 obj
-<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20160520) >> /Length 33 >>         
+<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20160520) >> /Length 115 >>        
 stream
-PDF standard A-4F requires a file
+The document was declared to be of type PDF/A-4f but hasn't any attachments. LaTeX therefore added this dummy file.
 endstream
 endobj
 15 0 obj
-<< /Type /Filespec /AFRelationship /Unspecified /Desc (note about PDF/A-4F) /F (readme.txt) /UF <FEFF0072006500610064006D0065002E007400780074> /EF<</F 14 0 R/UF 14 0 R>> >>
+<< /Type /Filespec /AFRelationship /Unspecified /Desc (note about PDF/A-4F) /F (pdf-A4f.txt) /UF <FEFF007000640066002D004100340066002E007400780074> /EF<</F 14 0 R/UF 14 0 R>> >>
 endobj
 16 0 obj
-<< /Names[(readme) 15 0 R] >>
+<< /Names[(pdf-A4f) 15 0 R] >>
 endobj
 17 0 obj
 [500 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 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 0 0 0 0 527.8 ]
@@ -314,19 +314,19 @@ xref
 0000015752 00000 n 
 0000015644 00000 n 
 0000015477 00000 n 
-0000024448 00000 n 
-0000024588 00000 n 
+0000024536 00000 n 
+0000024676 00000 n 
 0000015861 00000 n 
 0000015887 00000 n 
-0000016056 00000 n 
-0000016245 00000 n 
-0000016291 00000 n 
-0000024243 00000 n 
-0000016460 00000 n 
-0000024649 00000 n 
-0000024693 00000 n 
+0000016138 00000 n 
+0000016332 00000 n 
+0000016379 00000 n 
+0000024331 00000 n 
+0000016548 00000 n 
+0000024737 00000 n 
+0000024781 00000 n 
 trailer
 << /Size 22 /Root 21 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-24805
+24893
 %%EOF
diff --git a/required/latex-lab/testfiles/standard-a4f.tpf b/required/latex-lab/testfiles/standard-a4f.tpf
@@ -285,17 +285,17 @@ endobj
 14 0 obj
 <<
 /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20160520) >>
-/Length 33        
+/Length 115       
 >>
 stream
-PDF standard A-4F requires a file
+The document was declared to be of type PDF/A-4f but hasn't any attachments. LaTeX therefore added this dummy file.
 endstream
 endobj
 15 0 obj
-<< /Type /Filespec /AFRelationship /Unspecified /Desc (note about PDF/A-4F) /F (readme.txt) /UF <FEFF0072006500610064006D0065002E007400780074> /EF<</F 14 0 R/UF 14 0 R>> >>
+<< /Type /Filespec /AFRelationship /Unspecified /Desc (note about PDF/A-4F) /F (pdf-A4f.txt) /UF <FEFF007000640066002D004100340066002E007400780074> /EF<</F 14 0 R/UF 14 0 R>> >>
 endobj
 16 0 obj
-<< /Names[(readme) 15 0 R] >>
+<< /Names[(pdf-A4f) 15 0 R] >>
 endobj
 18 0 obj
 [499.9 499.9 499.9 499.9 499.9 499.9 499.9 499.9 499.9 277.7 277.7 777.6 777.6 777.6 472.1 777.6 749.8 708.2 722 763.7 680.4 652.6 784.5 749.8 361 513.8 777.6 624.8 916.4 749.8 777.6 680.4 777.6 735.9 555.4 722 749.8 749.8 1027.5 749.8 749.8 611 277.7 499.9 277.7 611 777.6 277.7 499.9 555.4 444.3 555.4 444.3 305.5 499.9 555.4 277.7 305.5 527.7 277.7 833.1 555.4 499.9 555.4 527.7 391.6 394.3 388.8 555.4 527.7 722 527.7]
@@ -520,23 +520,23 @@ xref
 0000015724 00000 n 
 0000015618 00000 n 
 0000015468 00000 n 
-0000021110 00000 n 
-0000021288 00000 n 
+0000021198 00000 n 
+0000021376 00000 n 
 0000015834 00000 n 
 0000015860 00000 n 
-0000016028 00000 n 
-0000016217 00000 n 
-0000018955 00000 n 
-0000016263 00000 n 
-0000016702 00000 n 
-0000018748 00000 n 
-0000019021 00000 n 
-0000021346 00000 n 
-0000021390 00000 n 
+0000016110 00000 n 
+0000016304 00000 n 
+0000019043 00000 n 
+0000016351 00000 n 
+0000016790 00000 n 
+0000018836 00000 n 
+0000019109 00000 n 
+0000021434 00000 n 
+0000021478 00000 n 
 trailer
 << /Size 24
 /Root 23 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-21502
+21590
 %%EOF