summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-03-08 03:00:59 +0000
committerNorbert Preining <norbert@preining.info>2021-03-08 03:00:59 +0000
commitd9784b9287b55be1161c5d383c2a7ebde45671ee (patch)
treebf57d07f605b6c53c124ce1f918014bb8dae108f /macros
parent6c0a4c9f40ab21e9b7d888d6a13b76b9af2f6c5b (diff)
CTAN sync 202103080300
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/newpax/README.md (renamed from macros/luatex/latex/newpax/README.md)2
-rw-r--r--macros/latex/contrib/newpax/doc-extract-newpax.tex (renamed from macros/luatex/latex/newpax/doc-extract-newpax.tex)0
-rw-r--r--macros/latex/contrib/newpax/doc-extract-pax.tex (renamed from macros/luatex/latex/newpax/doc-extract-pax.tex)0
-rw-r--r--macros/latex/contrib/newpax/doc-input1.pdf (renamed from macros/luatex/latex/newpax/doc-input1.pdf)220
-rw-r--r--macros/latex/contrib/newpax/doc-input1.tex (renamed from macros/luatex/latex/newpax/doc-input1.tex)0
-rw-r--r--macros/latex/contrib/newpax/doc-input2.pdf (renamed from macros/luatex/latex/newpax/doc-input2.pdf)220
-rw-r--r--macros/latex/contrib/newpax/doc-input2.tex (renamed from macros/luatex/latex/newpax/doc-input2.tex)0
-rw-r--r--macros/latex/contrib/newpax/doc-use-newpax.pdf (renamed from macros/luatex/latex/newpax/doc-use-newpax.pdf)398
-rw-r--r--macros/latex/contrib/newpax/doc-use-newpax.tex (renamed from macros/luatex/latex/newpax/doc-use-newpax.tex)0
-rw-r--r--macros/latex/contrib/newpax/doc-use-pax.pdf (renamed from macros/luatex/latex/newpax/doc-use-pax.pdf)bin44937 -> 44937 bytes
-rw-r--r--macros/latex/contrib/newpax/doc-use-pax.tex (renamed from macros/luatex/latex/newpax/doc-use-pax.tex)0
-rw-r--r--macros/latex/contrib/newpax/newpax.dtx (renamed from macros/luatex/latex/newpax/newpax.dtx)50
-rw-r--r--macros/latex/contrib/newpax/newpax.ins (renamed from macros/luatex/latex/newpax/newpax.ins)0
-rw-r--r--macros/latex/contrib/newpax/newpax.pdf (renamed from macros/luatex/latex/newpax/newpax.pdf)1596
-rw-r--r--macros/latex/contrib/newpax/newpax.tex (renamed from macros/luatex/latex/newpax/newpax.tex)10
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md31
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/README.md2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx38
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdfbin843358 -> 873009 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx14
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdfbin545241 -> 565792 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx159
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdfbin532029 -> 565696 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdfbin496017 -> 523596 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx961
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdfbin0 -> 556128 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx64
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdfbin519787 -> 547500 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdfbin619976 -> 649554 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdfbin625958 -> 656456 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdfbin487709 -> 514001 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdfbin410316 -> 435022 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx10
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdfbin521875 -> 550289 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx15
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdfbin395182 -> 419964 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx10
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins8
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdfbin419957 -> 444916 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.dtx42
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.pdfbin297774 -> 298716 bytes
-rw-r--r--macros/latex/contrib/ut-thesis/ut-thesis.dtx8
-rw-r--r--macros/latex/contrib/ut-thesis/ut-thesis.ins2
-rw-r--r--macros/latex/contrib/ut-thesis/ut-thesis.pdfbin116662 -> 116658 bytes
54 files changed, 2513 insertions, 1381 deletions
diff --git a/macros/luatex/latex/newpax/README.md b/macros/latex/contrib/newpax/README.md
index 5bd4b273c0..7b7ecc8248 100644
--- a/macros/luatex/latex/newpax/README.md
+++ b/macros/latex/contrib/newpax/README.md
@@ -7,7 +7,7 @@ a lua script first.
The package is based on and uses code from [pax](https://ctan.org/pkg/pax) by Heiko Oberdiek.
-Packageversion: 0.5
+Packageversion: 0.51
Packagedate: 2021-02-26
Author: Ulrike Fischer
diff --git a/macros/luatex/latex/newpax/doc-extract-newpax.tex b/macros/latex/contrib/newpax/doc-extract-newpax.tex
index 052dd474ad..052dd474ad 100644
--- a/macros/luatex/latex/newpax/doc-extract-newpax.tex
+++ b/macros/latex/contrib/newpax/doc-extract-newpax.tex
diff --git a/macros/luatex/latex/newpax/doc-extract-pax.tex b/macros/latex/contrib/newpax/doc-extract-pax.tex
index aa23b0e8fc..aa23b0e8fc 100644
--- a/macros/luatex/latex/newpax/doc-extract-pax.tex
+++ b/macros/latex/contrib/newpax/doc-extract-pax.tex
diff --git a/macros/luatex/latex/newpax/doc-input1.pdf b/macros/latex/contrib/newpax/doc-input1.pdf
index 8e63bd474f..76e98f14e0 100644
--- a/macros/luatex/latex/newpax/doc-input1.pdf
+++ b/macros/latex/contrib/newpax/doc-input1.pdf
@@ -47,73 +47,73 @@ endobj
<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 691.892 154.69 703.08 ]/A << /S /GoTo /D (section.1) >> >>
endobj
8 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 156.015 691.892 310.187 703.08 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 156.015 691.892 310.187 703.08 ]
+
>>
endobj
9 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 147.716 680.176 478.476 691.344 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 147.716 680.176 478.476 691.344 ]
+
>>
endobj
18 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 668.211 478.476 679.28 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 668.211 478.476 679.28 ]
+
>>
endobj
19 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 656.256 478.476 667.324 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 656.256 478.476 667.324 ]
+
>>
endobj
20 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 644.301 478.476 655.369 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 644.301 478.476 655.369 ]
+
>>
endobj
21 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 632.356 478.476 643.524 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 632.356 478.476 643.524 ]
+
>>
endobj
22 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 620.4 478.476 631.459 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 620.4 478.476 631.459 ]
+
>>
endobj
23 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 608.445 478.476 619.504 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 608.445 478.476 619.504 ]
+
>>
endobj
24 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 596.48 478.476 607.549 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 596.48 478.476 607.549 ]
+
>>
endobj
25 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 584.644 478.476 595.593 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 584.644 478.476 595.593 ]
+
>>
endobj
26 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 572.58 478.476 583.638 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 572.58 478.476 583.638 ]
+
>>
endobj
27 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 560.615 396.035 571.683 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 560.615 396.035 571.683 ]
+
>>
endobj
10 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /Rect [ 147.716 548.779 164.115 559.728 ]
- /Subtype/Link/A<</Type /Action /S /GoToR /F (/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf) /D (chapter.1) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf) /D (chapter.1) >> /Rect [ 147.716 548.779 164.115 559.728 ]
+
>>
endobj
11 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /Rect [ 132.772 440.192 147.497 449.318 ]
- /Subtype/Link/A<</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >> /Rect [ 132.772 440.192 147.497 449.318 ]
+
>>
endobj
14 0 obj
@@ -155,8 +155,8 @@ endobj
[ 34 0 R 35 0 R 36 0 R 37 0 R ]
endobj
34 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 147.716 703.847 301.888 715.035 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 147.716 703.847 301.888 715.035 ]
+
>>
endobj
35 0 obj
@@ -193,8 +193,8 @@ endobj
[ 43 0 R ]
endobj
43 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /Rect [ 147.716 704.077 218.491 715.145 ]
- /Subtype/Link/A<</Type /Action /S /Named /N /FirstPage >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /A <</Type /Action /S /Named /N /FirstPage >> /Rect [ 147.716 704.077 218.491 715.145 ]
+
>>
endobj
47 0 obj
@@ -532,12 +532,12 @@ endobj
<< /Type /Catalog /Pages 32 0 R /Outlines 80 0 R /Names 82 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
84 0 obj
-<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200420+01'00') /ModDate (D:20210228200420+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
endobj
xref
0 85
0000000002 65535 f
-0000011648 00000 n
+0000011696 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
@@ -545,84 +545,84 @@ xref
0000005196 00000 n
0000005387 00000 n
0000005576 00000 n
-0000005799 00000 n
-0000008400 00000 n
-0000008665 00000 n
-0000009198 00000 n
+0000005802 00000 n
+0000008436 00000 n
+0000008704 00000 n
+0000009240 00000 n
0000000020 00000 n
-0000008894 00000 n
-0000008954 00000 n
-0000026887 00000 n
-0000019284 00000 n
-0000006035 00000 n
-0000006271 00000 n
-0000006508 00000 n
-0000006745 00000 n
-0000006982 00000 n
-0000007217 00000 n
-0000007454 00000 n
-0000007690 00000 n
-0000007927 00000 n
-0000008163 00000 n
-0000009015 00000 n
-0000014928 00000 n
-0000009076 00000 n
-0000009137 00000 n
-0000027241 00000 n
+0000008936 00000 n
+0000008996 00000 n
+0000026935 00000 n
+0000019332 00000 n
+0000006041 00000 n
+0000006280 00000 n
+0000006520 00000 n
+0000006760 00000 n
+0000007000 00000 n
+0000007238 00000 n
+0000007478 00000 n
+0000007717 00000 n
+0000007957 00000 n
+0000008196 00000 n
+0000009057 00000 n
+0000014976 00000 n
+0000009118 00000 n
+0000009179 00000 n
+0000027289 00000 n
0000005068 00000 n
-0000009898 00000 n
-0000010123 00000 n
-0000010314 00000 n
-0000010506 00000 n
-0000010759 00000 n
-0000009672 00000 n
-0000009309 00000 n
-0000010698 00000 n
-0000009850 00000 n
-0000011296 00000 n
-0000011561 00000 n
-0000011091 00000 n
-0000010858 00000 n
-0000011500 00000 n
-0000011269 00000 n
-0000012102 00000 n
-0000011878 00000 n
-0000011695 00000 n
-0000012041 00000 n
-0000012189 00000 n
-0000027558 00000 n
-0000012235 00000 n
-0000012278 00000 n
-0000027471 00000 n
-0000012324 00000 n
-0000012367 00000 n
-0000027397 00000 n
-0000012413 00000 n
-0000012456 00000 n
-0000013887 00000 n
-0000012536 00000 n
-0000012610 00000 n
-0000014121 00000 n
-0000015079 00000 n
-0000015276 00000 n
-0000018063 00000 n
-0000015484 00000 n
-0000015559 00000 n
-0000018298 00000 n
-0000019437 00000 n
-0000019636 00000 n
-0000025362 00000 n
-0000019994 00000 n
-0000020070 00000 n
-0000025598 00000 n
-0000027041 00000 n
-0000027323 00000 n
-0000027632 00000 n
-0000027841 00000 n
-0000027877 00000 n
-0000028051 00000 n
+0000009940 00000 n
+0000010168 00000 n
+0000010359 00000 n
+0000010551 00000 n
+0000010804 00000 n
+0000009714 00000 n
+0000009351 00000 n
+0000010743 00000 n
+0000009892 00000 n
+0000011341 00000 n
+0000011609 00000 n
+0000011136 00000 n
+0000010903 00000 n
+0000011548 00000 n
+0000011314 00000 n
+0000012150 00000 n
+0000011926 00000 n
+0000011743 00000 n
+0000012089 00000 n
+0000012237 00000 n
+0000027606 00000 n
+0000012283 00000 n
+0000012326 00000 n
+0000027519 00000 n
+0000012372 00000 n
+0000012415 00000 n
+0000027445 00000 n
+0000012461 00000 n
+0000012504 00000 n
+0000013935 00000 n
+0000012584 00000 n
+0000012658 00000 n
+0000014169 00000 n
+0000015127 00000 n
+0000015324 00000 n
+0000018111 00000 n
+0000015532 00000 n
+0000015607 00000 n
+0000018346 00000 n
+0000019485 00000 n
+0000019684 00000 n
+0000025410 00000 n
+0000020042 00000 n
+0000020118 00000 n
+0000025646 00000 n
+0000027089 00000 n
+0000027371 00000 n
+0000027680 00000 n
+0000027889 00000 n
+0000027925 00000 n
+0000028099 00000 n
trailer
-<< /Size 85 /Root 83 0 R /Info 84 0 R /ID [ <EC032ED2AA88455BA76B6BF174C71EA6> <EC032ED2AA88455BA76B6BF174C71EA6> ] >>
+<< /Size 85 /Root 83 0 R /Info 84 0 R /ID [ <8611558406E76F2AB0E7D61D137DC36E> <8611558406E76F2AB0E7D61D137DC36E> ] >>
startxref
-28380
+28428
%%EOF
diff --git a/macros/luatex/latex/newpax/doc-input1.tex b/macros/latex/contrib/newpax/doc-input1.tex
index b6da05beae..b6da05beae 100644
--- a/macros/luatex/latex/newpax/doc-input1.tex
+++ b/macros/latex/contrib/newpax/doc-input1.tex
diff --git a/macros/luatex/latex/newpax/doc-input2.pdf b/macros/latex/contrib/newpax/doc-input2.pdf
index 870855aec4..76ac16e226 100644
--- a/macros/luatex/latex/newpax/doc-input2.pdf
+++ b/macros/latex/contrib/newpax/doc-input2.pdf
@@ -43,73 +43,73 @@ endobj
<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 703.847 154.69 715.035 ]/A << /S /GoTo /D (section.1) >> >>
endobj
7 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 156.015 703.847 310.187 715.035 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 156.015 703.847 310.187 715.035 ]
+
>>
endobj
8 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 147.716 692.131 478.476 703.299 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 147.716 692.131 478.476 703.299 ]
+
>>
endobj
17 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 680.166 478.476 691.235 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 680.166 478.476 691.235 ]
+
>>
endobj
18 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 668.211 478.476 679.28 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 668.211 478.476 679.28 ]
+
>>
endobj
19 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 656.256 478.476 667.324 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 656.256 478.476 667.324 ]
+
>>
endobj
20 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 644.311 478.476 655.479 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 644.311 478.476 655.479 ]
+
>>
endobj
21 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 632.356 478.476 643.414 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 632.356 478.476 643.414 ]
+
>>
endobj
22 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 620.4 478.476 631.459 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 620.4 478.476 631.459 ]
+
>>
endobj
23 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 608.435 478.476 619.504 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 608.435 478.476 619.504 ]
+
>>
endobj
24 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 596.6 478.476 607.549 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 596.6 478.476 607.549 ]
+
>>
endobj
25 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 584.535 478.476 595.593 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 584.535 478.476 595.593 ]
+
>>
endobj
26 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 132.772 572.57 396.035 583.638 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 572.57 396.035 583.638 ]
+
>>
endobj
9 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /Rect [ 147.716 560.734 164.115 571.683 ]
- /Subtype/Link/A<</Type /Action /S /GoToR /F (/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf) /D (chapter.1) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf) /D (chapter.1) >> /Rect [ 147.716 560.734 164.115 571.683 ]
+
>>
endobj
10 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /Rect [ 132.772 452.147 147.497 461.273 ]
- /Subtype/Link/A<</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >> /Rect [ 132.772 452.147 147.497 461.273 ]
+
>>
endobj
13 0 obj
@@ -151,8 +151,8 @@ endobj
[ 33 0 R 34 0 R 35 0 R 36 0 R ]
endobj
33 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /Rect [ 147.716 703.847 301.888 715.035 ]
- /Subtype/Link/A<</Type /Action /S /URI /URI (https://www.latex-project.org) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 147.716 703.847 301.888 715.035 ]
+
>>
endobj
34 0 obj
@@ -189,8 +189,8 @@ endobj
[ 42 0 R ]
endobj
42 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /Rect [ 147.716 704.077 218.491 715.145 ]
- /Subtype/Link/A<</Type /Action /S /Named /N /FirstPage >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /A <</Type /Action /S /Named /N /FirstPage >> /Rect [ 147.716 704.077 218.491 715.145 ]
+
>>
endobj
46 0 obj
@@ -528,96 +528,96 @@ endobj
<< /Type /Catalog /Pages 31 0 R /Outlines 79 0 R /Names 81 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
83 0 obj
-<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200447+01'00') /ModDate (D:20210228200447+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
endobj
xref
0 84
0000000002 65535 f
-0000011380 00000 n
+0000011428 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
0000004822 00000 n
0000005120 00000 n
0000005310 00000 n
-0000005534 00000 n
-0000008134 00000 n
-0000008398 00000 n
-0000008930 00000 n
+0000005537 00000 n
+0000008170 00000 n
+0000008437 00000 n
+0000008972 00000 n
0000000020 00000 n
-0000008627 00000 n
-0000008687 00000 n
-0000026619 00000 n
-0000019016 00000 n
-0000005770 00000 n
-0000006007 00000 n
-0000006243 00000 n
-0000006480 00000 n
-0000006717 00000 n
-0000006954 00000 n
-0000007189 00000 n
-0000007426 00000 n
-0000007661 00000 n
-0000007898 00000 n
-0000008748 00000 n
-0000014660 00000 n
-0000008809 00000 n
-0000008869 00000 n
-0000026973 00000 n
+0000008669 00000 n
+0000008729 00000 n
+0000026667 00000 n
+0000019064 00000 n
+0000005776 00000 n
+0000006016 00000 n
+0000006255 00000 n
+0000006495 00000 n
+0000006735 00000 n
+0000006975 00000 n
+0000007213 00000 n
+0000007453 00000 n
+0000007691 00000 n
+0000007931 00000 n
+0000008790 00000 n
+0000014708 00000 n
+0000008851 00000 n
+0000008911 00000 n
+0000027021 00000 n
0000004999 00000 n
-0000009630 00000 n
-0000009855 00000 n
-0000010046 00000 n
-0000010238 00000 n
-0000010491 00000 n
-0000009404 00000 n
-0000009041 00000 n
-0000010430 00000 n
-0000009582 00000 n
-0000011028 00000 n
-0000011293 00000 n
-0000010823 00000 n
-0000010590 00000 n
-0000011232 00000 n
-0000011001 00000 n
-0000011834 00000 n
-0000011610 00000 n
-0000011427 00000 n
-0000011773 00000 n
-0000011921 00000 n
-0000027290 00000 n
-0000011967 00000 n
-0000012010 00000 n
-0000027203 00000 n
-0000012056 00000 n
-0000012099 00000 n
-0000027129 00000 n
-0000012145 00000 n
-0000012188 00000 n
-0000013619 00000 n
-0000012268 00000 n
-0000012342 00000 n
-0000013853 00000 n
-0000014811 00000 n
-0000015008 00000 n
-0000017795 00000 n
-0000015216 00000 n
-0000015291 00000 n
-0000018030 00000 n
-0000019169 00000 n
-0000019368 00000 n
-0000025094 00000 n
-0000019726 00000 n
-0000019802 00000 n
-0000025330 00000 n
-0000026773 00000 n
-0000027055 00000 n
-0000027364 00000 n
-0000027573 00000 n
-0000027609 00000 n
-0000027783 00000 n
+0000009672 00000 n
+0000009900 00000 n
+0000010091 00000 n
+0000010283 00000 n
+0000010536 00000 n
+0000009446 00000 n
+0000009083 00000 n
+0000010475 00000 n
+0000009624 00000 n
+0000011073 00000 n
+0000011341 00000 n
+0000010868 00000 n
+0000010635 00000 n
+0000011280 00000 n
+0000011046 00000 n
+0000011882 00000 n
+0000011658 00000 n
+0000011475 00000 n
+0000011821 00000 n
+0000011969 00000 n
+0000027338 00000 n
+0000012015 00000 n
+0000012058 00000 n
+0000027251 00000 n
+0000012104 00000 n
+0000012147 00000 n
+0000027177 00000 n
+0000012193 00000 n
+0000012236 00000 n
+0000013667 00000 n
+0000012316 00000 n
+0000012390 00000 n
+0000013901 00000 n
+0000014859 00000 n
+0000015056 00000 n
+0000017843 00000 n
+0000015264 00000 n
+0000015339 00000 n
+0000018078 00000 n
+0000019217 00000 n
+0000019416 00000 n
+0000025142 00000 n
+0000019774 00000 n
+0000019850 00000 n
+0000025378 00000 n
+0000026821 00000 n
+0000027103 00000 n
+0000027412 00000 n
+0000027621 00000 n
+0000027657 00000 n
+0000027831 00000 n
trailer
-<< /Size 84 /Root 82 0 R /Info 83 0 R /ID [ <0F0A1D2CCCA7B6565CF78EF12D38C90F> <0F0A1D2CCCA7B6565CF78EF12D38C90F> ] >>
+<< /Size 84 /Root 82 0 R /Info 83 0 R /ID [ <A5EE8B29894F85D1657AE472529BBF66> <A5EE8B29894F85D1657AE472529BBF66> ] >>
startxref
-28112
+28160
%%EOF
diff --git a/macros/luatex/latex/newpax/doc-input2.tex b/macros/latex/contrib/newpax/doc-input2.tex
index e0d96d307f..e0d96d307f 100644
--- a/macros/luatex/latex/newpax/doc-input2.tex
+++ b/macros/latex/contrib/newpax/doc-input2.tex
diff --git a/macros/luatex/latex/newpax/doc-use-newpax.pdf b/macros/latex/contrib/newpax/doc-use-newpax.pdf
index d0eff42d16..0dc805a5f3 100644
--- a/macros/luatex/latex/newpax/doc-use-newpax.pdf
+++ b/macros/latex/contrib/newpax/doc-use-newpax.pdf
@@ -84,7 +84,7 @@ Q
endstream
endobj
6 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200420+01'00') /ModDate (D:20210228200420+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 75 0 R /Font << /F23 76 0 R /F24 77 0 R /F36 78 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4811 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 75 0 R /Font << /F23 76 0 R /F24 77 0 R /F36 78 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4811 >>
stream
/opacity1 gs
BT
@@ -393,7 +393,7 @@ Q
endstream
endobj
24 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200420+01'00') /ModDate (D:20210228200420+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 75 0 R /Font << /F24 77 0 R /F23 76 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 75 0 R /Font << /F24 77 0 R /F23 76 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
stream
/opacity1 gs
BT
@@ -449,124 +449,124 @@ endobj
<< /XObject << /Im1 6 0 R >> /ProcSet [ /PDF ] >>
endobj
10 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 170.028 634.719 247.116 640.313 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 170.028 634.719 247.116 640.313 ] >>
endobj
11 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 165.878 628.861 276.275 634.445 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 165.878 628.861 276.275 634.445 ] >>
endobj
12 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 622.879 276.275 628.413 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 622.879 276.275 628.413 ] >>
endobj
13 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 616.901 276.275 622.435 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 616.901 276.275 622.435 ] >>
endobj
14 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 610.924 276.275 616.458 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 610.924 276.275 616.458 ] >>
endobj
15 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 604.951 276.275 610.535 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 604.951 276.275 610.535 ] >>
endobj
16 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 598.973 276.275 604.503 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 598.973 276.275 604.503 ] >>
endobj
17 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 592.996 276.275 598.525 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 592.996 276.275 598.525 ] >>
endobj
18 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 587.013 276.275 592.548 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 587.013 276.275 592.548 ] >>
endobj
19 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 581.095 276.275 586.57 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 581.095 276.275 586.57 ] >>
endobj
20 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 575.063 276.275 580.592 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 575.063 276.275 580.592 ] >>
endobj
21 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 569.081 276.275 574.615 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 569.081 276.275 574.615 ] >>
endobj
22 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /Rect [ 165.878 563.163 174.078 568.637 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 165.878 563.163 174.078 568.637 ] >>
endobj
23 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /Rect [ 158.406 508.869 165.768 513.432 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /BS <</S/U/W 1>> /Rect [ 158.406 508.869 165.768 513.432 ] >>
endobj
26 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 282.581 640.697 359.667 646.291 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 282.581 640.697 359.667 646.291 ] >>
endobj
33 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 170.028 467.896 247.116 473.49 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 170.028 467.896 247.116 473.49 ] >>
endobj
34 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 165.878 462.038 276.275 467.622 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 165.878 462.038 276.275 467.622 ] >>
endobj
35 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 456.056 276.275 461.59 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 456.056 276.275 461.59 ] >>
endobj
36 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 450.078 276.275 455.612 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 450.078 276.275 455.612 ] >>
endobj
37 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 444.101 276.275 449.635 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 444.101 276.275 449.635 ] >>
endobj
38 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 438.128 276.275 443.712 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 438.128 276.275 443.712 ] >>
endobj
39 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 432.15 276.275 437.68 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 432.15 276.275 437.68 ] >>
endobj
40 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 426.173 276.275 431.702 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 426.173 276.275 431.702 ] >>
endobj
41 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 420.19 276.275 425.725 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 420.19 276.275 425.725 ] >>
endobj
42 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 414.272 276.275 419.747 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 414.272 276.275 419.747 ] >>
endobj
43 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 408.24 276.275 413.769 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 408.24 276.275 413.769 ] >>
endobj
44 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 158.406 402.258 276.275 407.792 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 402.258 276.275 407.792 ] >>
endobj
45 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /Rect [ 165.878 396.34 174.078 401.814 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 165.878 396.34 174.078 401.814 ] >>
endobj
46 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /Rect [ 158.406 342.046 165.768 346.609 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /BS <</S/U/W 1>> /Rect [ 158.406 342.046 165.768 346.609 ] >>
endobj
48 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 282.581 473.874 359.667 479.468 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 282.581 473.874 359.667 479.468 ] >>
endobj
8 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 167.512 640.786 187.388 647.287 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 167.512 640.786 187.388 647.287 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
endobj
9 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 164.882 633.723 170.361 641.309 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 164.882 633.723 170.361 641.309 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
endobj
27 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 281.584 634.754 287.064 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 281.584 634.754 287.064 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
endobj
28 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 290.715 634.754 296.194 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 290.715 634.754 296.194 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
endobj
29 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 299.846 634.754 305.325 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 299.846 634.754 305.325 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
endobj
31 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 167.512 473.964 187.388 480.464 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 167.512 473.964 187.388 480.464 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@B) >> >>
endobj
32 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 164.882 466.9 170.361 474.487 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 164.882 466.9 170.361 474.487 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@B) >> >>
endobj
49 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 281.584 467.932 287.064 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 281.584 467.932 287.064 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@B) >> >>
endobj
50 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 290.715 467.932 296.194 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 290.715 467.932 296.194 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@B) >> >>
endobj
51 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 299.846 467.932 305.325 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 299.846 467.932 305.325 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@B) >> >>
endobj
59 0 obj
<< /D [ 5 0 R /XYZ 132.768 705.06 null ] >>
@@ -635,7 +635,7 @@ endobj
[ 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 101 0 R ]
endobj
56 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200447+01'00') /ModDate (D:20210228200447+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R /F24 127 0 R /F36 128 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4742 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R /F24 127 0 R /F36 128 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4742 >>
stream
/opacity1 gs
BT
@@ -930,46 +930,46 @@ stream
endstream
endobj
102 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 172.765 662.182 317.807 672.708 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 172.765 662.182 317.807 672.708 ] >>
endobj
103 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 164.957 651.159 476.13 661.666 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 164.957 651.159 476.13 661.666 ] >>
endobj
104 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 639.902 476.13 650.316 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 639.902 476.13 650.316 ] >>
endobj
105 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 628.655 476.13 639.069 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 628.655 476.13 639.069 ] >>
endobj
106 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 617.407 476.13 627.82 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 617.407 476.13 627.82 ] >>
endobj
107 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 606.169 476.13 616.676 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 606.169 476.13 616.676 ] >>
endobj
108 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 594.921 476.13 605.325 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 594.921 476.13 605.325 ] >>
endobj
109 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 583.673 476.13 594.077 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 583.673 476.13 594.077 ] >>
endobj
110 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 572.416 476.13 582.83 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 572.416 476.13 582.83 ] >>
endobj
111 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 561.281 476.13 571.582 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 561.281 476.13 571.582 ] >>
endobj
112 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 549.93 476.13 560.334 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 549.93 476.13 560.334 ] >>
endobj
113 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 538.673 398.571 549.086 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 538.673 398.571 549.086 ] >>
endobj
114 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /Subtype/Link/A<</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /Rect [ 164.957 527.537 180.385 537.838 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /Rect [ 164.957 527.537 180.385 537.838 ] >>
endobj
115 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /Subtype/Link/A<</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /Rect [ 150.898 425.376 164.751 433.962 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /Rect [ 150.898 425.376 164.751 433.962 ] >>
endobj
101 0 obj
<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 163.961 661.186 172.514 673.704 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@1@B) >> >>
@@ -1020,7 +1020,7 @@ endobj
[ 148 0 R 149 0 R 150 0 R 151 0 R ]
endobj
147 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200447+01'00') /ModDate (D:20210228200447+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F24 127 0 R /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F24 127 0 R /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
stream
/opacity1 gs
BT
@@ -1034,7 +1034,7 @@ ET
endstream
endobj
148 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 164.957 662.182 309.999 672.708 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 164.957 662.182 309.999 672.708 ] >>
endobj
149 0 obj
<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 163.961 651.879 172.514 662.194 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@2@B) >> >>
@@ -1079,7 +1079,7 @@ endobj
[ 158 0 R ]
endobj
157 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 3 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200447+01'00') /ModDate (D:20210228200447+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 173 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 3 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 173 >>
stream
/opacity1 gs
BT
@@ -1091,7 +1091,7 @@ ET
endstream
endobj
158 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /Subtype/Link/A<</Type/Action/S/Named/N/FirstPage>> /Rect [ 164.957 662.398 231.541 672.811 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type/Action/S/Named/N/FirstPage>> /Rect [ 164.957 662.398 231.541 672.811 ] >>
endobj
162 0 obj
<< /D [ 160 0 R /XYZ 132.768 705.06 null ] >>
@@ -1127,7 +1127,7 @@ endobj
<< /Type /Page /Contents 167 0 R /Resources 165 0 R /MediaBox [ 0 0 612 792 ] /Parent 72 0 R >>
endobj
164 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 4 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200447+01'00') /ModDate (D:20210228200447+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 123 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 4 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 123 >>
stream
/opacity1 gs
BT
@@ -1219,83 +1219,83 @@ endobj
<< /Type /Catalog /Pages 72 0 R /Names 176 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
178 0 obj
-<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200610+01'00') /ModDate (D:20210228200610+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307001040+01'00') /ModDate (D:20210307001040+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
endobj
xref
0 179
0000000002 65535 f
-0000060830 00000 n
+0000060968 00000 n
0000000003 00000 f
0000000004 00000 f
0000000053 00000 f
0000000668 00000 n
0000001304 00000 n
0000001090 00000 n
-0000030181 00000 n
-0000030392 00000 n
+0000030271 00000 n
+0000030482 00000 n
0000023537 00000 n
-0000023756 00000 n
-0000023975 00000 n
-0000024194 00000 n
-0000024413 00000 n
-0000024632 00000 n
-0000024851 00000 n
-0000025070 00000 n
-0000025289 00000 n
-0000025508 00000 n
-0000025726 00000 n
-0000025945 00000 n
-0000026164 00000 n
-0000026421 00000 n
+0000023759 00000 n
+0000023981 00000 n
+0000024203 00000 n
+0000024425 00000 n
+0000024647 00000 n
+0000024869 00000 n
+0000025091 00000 n
+0000025313 00000 n
+0000025535 00000 n
+0000025756 00000 n
+0000025978 00000 n
+0000026200 00000 n
+0000026460 00000 n
0000021746 00000 n
0000021531 00000 n
-0000026643 00000 n
-0000030603 00000 n
-0000030814 00000 n
-0000031025 00000 n
+0000026685 00000 n
+0000030693 00000 n
+0000030904 00000 n
+0000031115 00000 n
0000022691 00000 n
-0000031236 00000 n
-0000031449 00000 n
-0000026862 00000 n
-0000027080 00000 n
-0000027299 00000 n
-0000027517 00000 n
-0000027736 00000 n
-0000027955 00000 n
-0000028174 00000 n
-0000028391 00000 n
-0000028610 00000 n
-0000028828 00000 n
-0000029047 00000 n
-0000029265 00000 n
-0000029484 00000 n
-0000029740 00000 n
+0000031326 00000 n
+0000031539 00000 n
+0000026907 00000 n
+0000027128 00000 n
+0000027350 00000 n
+0000027571 00000 n
+0000027793 00000 n
+0000028015 00000 n
+0000028237 00000 n
+0000028457 00000 n
+0000028679 00000 n
+0000028900 00000 n
+0000029122 00000 n
+0000029343 00000 n
+0000029565 00000 n
+0000029824 00000 n
0000022972 00000 n
-0000029962 00000 n
-0000031660 00000 n
-0000031873 00000 n
-0000032086 00000 n
+0000030049 00000 n
+0000031750 00000 n
+0000031963 00000 n
+0000032176 00000 n
0000023254 00000 n
0000000054 00000 f
0000000055 00000 f
0000000000 00000 f
-0000033662 00000 n
-0000033028 00000 n
+0000033752 00000 n
+0000033118 00000 n
0000000020 00000 n
-0000032299 00000 n
-0000032359 00000 n
-0000032420 00000 n
-0000032481 00000 n
-0000032541 00000 n
-0000032602 00000 n
-0000032663 00000 n
-0000032724 00000 n
-0000032785 00000 n
-0000032845 00000 n
-0000032906 00000 n
-0000032967 00000 n
-0000063786 00000 n
-0000064145 00000 n
+0000032389 00000 n
+0000032449 00000 n
+0000032510 00000 n
+0000032571 00000 n
+0000032631 00000 n
+0000032692 00000 n
+0000032753 00000 n
+0000032814 00000 n
+0000032875 00000 n
+0000032935 00000 n
+0000032996 00000 n
+0000033057 00000 n
+0000063924 00000 n
+0000064283 00000 n
0000000792 00000 n
0000021465 00000 n
0000006701 00000 n
@@ -1324,86 +1324,86 @@ xref
0000022906 00000 n
0000023187 00000 n
0000023470 00000 n
-0000056641 00000 n
-0000053799 00000 n
-0000054000 00000 n
-0000054200 00000 n
-0000054400 00000 n
-0000054600 00000 n
-0000054799 00000 n
-0000054999 00000 n
-0000055199 00000 n
-0000055399 00000 n
-0000055598 00000 n
-0000055798 00000 n
-0000055997 00000 n
-0000056198 00000 n
-0000056437 00000 n
-0000057144 00000 n
-0000033392 00000 n
-0000033189 00000 n
-0000056826 00000 n
-0000056890 00000 n
-0000056954 00000 n
-0000057017 00000 n
-0000057081 00000 n
-0000033521 00000 n
-0000038995 00000 n
-0000039046 00000 n
-0000039203 00000 n
-0000039359 00000 n
-0000039513 00000 n
-0000039716 00000 n
-0000040999 00000 n
-0000041201 00000 n
-0000042180 00000 n
-0000042380 00000 n
-0000043180 00000 n
-0000043419 00000 n
-0000043778 00000 n
-0000044016 00000 n
-0000044225 00000 n
-0000044462 00000 n
-0000044543 00000 n
-0000049829 00000 n
-0000049897 00000 n
-0000052395 00000 n
-0000052462 00000 n
-0000053733 00000 n
-0000057614 00000 n
-0000058496 00000 n
-0000058697 00000 n
-0000058882 00000 n
-0000059067 00000 n
-0000059315 00000 n
-0000057432 00000 n
-0000057229 00000 n
-0000059252 00000 n
-0000057561 00000 n
-0000059762 00000 n
-0000060501 00000 n
-0000060744 00000 n
-0000059604 00000 n
-0000059401 00000 n
-0000060681 00000 n
-0000059733 00000 n
-0000061193 00000 n
-0000061945 00000 n
-0000061080 00000 n
-0000060877 00000 n
-0000061882 00000 n
-0000062031 00000 n
-0000062794 00000 n
-0000062063 00000 n
-0000062135 00000 n
-0000063033 00000 n
-0000063942 00000 n
-0000064238 00000 n
-0000064939 00000 n
-0000064977 00000 n
-0000065136 00000 n
+0000056773 00000 n
+0000053889 00000 n
+0000054093 00000 n
+0000054296 00000 n
+0000054499 00000 n
+0000054702 00000 n
+0000054904 00000 n
+0000055107 00000 n
+0000055310 00000 n
+0000055513 00000 n
+0000055715 00000 n
+0000055918 00000 n
+0000056120 00000 n
+0000056324 00000 n
+0000056566 00000 n
+0000057276 00000 n
+0000033482 00000 n
+0000033279 00000 n
+0000056958 00000 n
+0000057022 00000 n
+0000057086 00000 n
+0000057149 00000 n
+0000057213 00000 n
+0000033611 00000 n
+0000039085 00000 n
+0000039136 00000 n
+0000039293 00000 n
+0000039449 00000 n
+0000039603 00000 n
+0000039806 00000 n
+0000041089 00000 n
+0000041291 00000 n
+0000042270 00000 n
+0000042470 00000 n
+0000043270 00000 n
+0000043509 00000 n
+0000043868 00000 n
+0000044106 00000 n
+0000044315 00000 n
+0000044552 00000 n
+0000044633 00000 n
+0000049919 00000 n
+0000049987 00000 n
+0000052485 00000 n
+0000052552 00000 n
+0000053823 00000 n
+0000057746 00000 n
+0000058628 00000 n
+0000058832 00000 n
+0000059017 00000 n
+0000059202 00000 n
+0000059450 00000 n
+0000057564 00000 n
+0000057361 00000 n
+0000059387 00000 n
+0000057693 00000 n
+0000059897 00000 n
+0000060636 00000 n
+0000060882 00000 n
+0000059739 00000 n
+0000059536 00000 n
+0000060819 00000 n
+0000059868 00000 n
+0000061331 00000 n
+0000062083 00000 n
+0000061218 00000 n
+0000061015 00000 n
+0000062020 00000 n
+0000062169 00000 n
+0000062932 00000 n
+0000062201 00000 n
+0000062273 00000 n
+0000063171 00000 n
+0000064080 00000 n
+0000064376 00000 n
+0000065077 00000 n
+0000065115 00000 n
+0000065274 00000 n
trailer
-<< /Size 179 /Root 177 0 R /Info 178 0 R /ID [ <85BB5DA5CDD34E17F4E5301517C4A4D0> <85BB5DA5CDD34E17F4E5301517C4A4D0> ] >>
+<< /Size 179 /Root 177 0 R /Info 178 0 R /ID [ <A68583ADE9E8F964D75771AE3B6D3F9F> <A68583ADE9E8F964D75771AE3B6D3F9F> ] >>
startxref
-65443
+65581
%%EOF
diff --git a/macros/luatex/latex/newpax/doc-use-newpax.tex b/macros/latex/contrib/newpax/doc-use-newpax.tex
index dc23bcd842..dc23bcd842 100644
--- a/macros/luatex/latex/newpax/doc-use-newpax.tex
+++ b/macros/latex/contrib/newpax/doc-use-newpax.tex
diff --git a/macros/luatex/latex/newpax/doc-use-pax.pdf b/macros/latex/contrib/newpax/doc-use-pax.pdf
index 644eba050b..b498d12e6b 100644
--- a/macros/luatex/latex/newpax/doc-use-pax.pdf
+++ b/macros/latex/contrib/newpax/doc-use-pax.pdf
Binary files differ
diff --git a/macros/luatex/latex/newpax/doc-use-pax.tex b/macros/latex/contrib/newpax/doc-use-pax.tex
index f5b6e695a6..f5b6e695a6 100644
--- a/macros/luatex/latex/newpax/doc-use-pax.tex
+++ b/macros/latex/contrib/newpax/doc-use-pax.tex
diff --git a/macros/luatex/latex/newpax/newpax.dtx b/macros/latex/contrib/newpax/newpax.dtx
index 15958c0416..44c6dbe16a 100644
--- a/macros/luatex/latex/newpax/newpax.dtx
+++ b/macros/latex/contrib/newpax/newpax.dtx
@@ -29,7 +29,7 @@
%<@@=newpax>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{newpax}%
- [2021-02-26 v0.5 Annotation support for PDF graphics based on pax.sty adapted by (UF)]%
+ [2021-03-07 v0.51 Annotation support for PDF graphics based on pax.sty adapted by (UF)]%
\ExplSyntaxOn
\bool_if:nF
{
@@ -67,7 +67,7 @@
\tl_new:N \l_@@_destsuffix_tl
\tl_new:N \NEWPAX@fileextension
-\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nnx}
+\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nnx,xnx,xnn}
\NewDocumentCommand\newpaxsetup { m }
{
\keys_set:nn {newpax}{ #1}
@@ -134,7 +134,7 @@
}
-\cs_set_eq:NN \@NEWPAX@annotation@nnnn \pdfannot_box:nnnn
+
\cs_new_protected:Npn \@NEWPAX@linkgoto@xnn #1 #2 #3 %#1 dest #2 width #3 height
{
@@ -143,18 +143,27 @@
\leavevmode
\exp_args:Nx\pdfannot_link_goto_begin:nw
{ #1 }
- \hbox_to_wd:nn {#2}{\@NEWPAX@ensurelinkbox@n { \rule{0pt}{#3} }\hfill}
+ \@NEWPAX@ensurelinkbox@n{\hbox_to_wd:nn {#2}{ { \rule{0pt}{#3} }\hfill}}
\pdfannot_link_goto_end:
\group_end:
}
-\cs_generate_variant:Nn \pdfannot_box:nnnnn {xnnnx}
+\cs_new_protected:Npn \@NEWPAX@link@setaction@nn #1 #2
+ {
+ \pdfannot_dict_put:nnn{link/#1}{Subtype}{/Link}
+ \pdfannot_dict_put:nnx{link/#1}{A}
+ {<</Type/Action/S/#1 #2>>}
+ }
+
+
-\cs_new_protected:Npn \@NEWPAX@annotboxlink@xnnx #1 #2 #3 #4 %#1 type, #2 width #3 height #4 spec
+\cs_new_protected:Npn \@NEWPAX@annotboxlink@nnn #1 #2 #3 %#1 type, #2 width #3 height
{
\group_begin:
\exp_args:Nx\@NEWPAX@setattributes@n {#1}
- \leavevmode\pdfannot_box:xnnnx {link/#1}{#2}{#3}{0pt}{#4}
+ \leavevmode
+ \pdfannot_box:nnnx {#2}{#3}{0pt}
+ {\pdfannot_dict_use:n{link/#1}}
\group_end:
}
@@ -163,7 +172,6 @@
\exp_args:Nxx \pdf_destination:nn {#1}{#2}
}
-
% only defined if hyperref is loaded ...
\sys_if_engine_xetex:TF
{
@@ -309,10 +317,9 @@
\def\<{<}%
\def\>{>}%
\endlinechar=-1 %
- \InputIfFileExists\NEWPAX@file{%
- }{%
- \typeout{* Missing: \NEWPAX@file}%
- }%
+ \begingroup
+ \catcode`\#=12 \catcode`\%=12
+ \InputIfFileExists\NEWPAX@file{}{\typeout{* Missing: \NEWPAX@file}}\endgroup
}
\def\NEWPAX@parser#1{\NEWPAX@call{cmd}{#1}{}}%
\def\NEWPAX@call#1#2#3{%
@@ -469,15 +476,10 @@
}%
\else
\hbox{%
- \@NEWPAX@annotboxlink@xnnx {\NEWPAX@link@type}{\NEWPAX@width}{\NEWPAX@height}
- {
- /Subtype/Link%
- /A<<%
- /Type/Action%
- /S/\NEWPAX@link@type
- #1%
- >>%
- }}%
+ \expandafter\@NEWPAX@link@setaction@nn\expandafter{\NEWPAX@link@type}{#1}%
+ \expandafter
+ \@NEWPAX@annotboxlink@nnn
+ \expandafter {\NEWPAX@link@type}{\NEWPAX@width}{\NEWPAX@height}{}}%
\fi
\hss
}%
@@ -699,8 +701,8 @@
%<*lua>
local ProvidesLuaModule = {
name = "newpax",
- version = "0.5", --TAGVERSION
- date = "2021-02-26", --TAGDATE
+ version = "0.51", --TAGVERSION
+ date = "2021-03-07", --TAGDATE
description = "newpax lua code",
license = "The LATEX Project Public License 1.3c"
}
@@ -1119,7 +1121,7 @@ end
-- the main function
local function __writepax (ext,file)
- local fileVAR = assert(kpse.find_file(file ..".pdf"),"file not found")
+ local fileVAR = assert(kpse.find_file(file ..".pdf"),"file `"..file..".pdf` not found")
local filebaseVAR = FILENAMEONLY(fileVAR)
-- getting the data for the concrete document:
local writeVAR = io.open (filebaseVAR .."."..ext,"w") -- always in current directory
diff --git a/macros/luatex/latex/newpax/newpax.ins b/macros/latex/contrib/newpax/newpax.ins
index 62ec48b0c9..62ec48b0c9 100644
--- a/macros/luatex/latex/newpax/newpax.ins
+++ b/macros/latex/contrib/newpax/newpax.ins
diff --git a/macros/luatex/latex/newpax/newpax.pdf b/macros/latex/contrib/newpax/newpax.pdf
index 87ad6c60c2..d5a4ce65c0 100644
--- a/macros/luatex/latex/newpax/newpax.pdf
+++ b/macros/latex/contrib/newpax/newpax.pdf
@@ -1,7 +1,7 @@
%PDF-1.7
%ÌÕÁÔÅØÐÄÆ
7 0 obj
-<< /Length 12176 >>
+<< /Length 12182 >>
stream
/opacity1 gs
0 g 0 G
@@ -18,13 +18,13 @@ stream
0 g 0 G
BT
/F54 20.66252 Tf
-1 0 0 1 174.076 714.049 Tm [<0068003F0032>]TJ
+1 0 0 1 168.673 714.049 Tm [<0068003F0032>]TJ
/F55 20.66252 Tf
-1 0 0 1 218.955 714.049 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 213.552 714.049 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
/F54 20.66252 Tf
-1 0 0 1 291.625 714.049 Tm [<0054001C002B0046001C003B0032002D>-367<0070007900580038>]TJ
+1 0 0 1 286.222 714.049 Tm [<0054001C002B0046001C003B0032002D>-367<00700079005800380052>]TJ
0 g 0 G
0 g 0 G
/F54 11.95517 Tf
@@ -35,7 +35,7 @@ BT
/F57 12.95146 Tf
1 0 0 1 342.914 666.569 Tm [<000B>]TJ
/F57 14.3462 Tf
-1 0 0 1 261.6 636.963 Tm [<0013001100130012000E00110013000E00130017>]TJ
+1 0 0 1 261.794 636.963 Tm [<0013001100130012000E00110014000E00110018>]TJ
0 g 0 G
/F54 14.3462 Tf
1 0 0 1 74.008 559.773 Tm [<0052>-500<0041004D006900600051>-31<002F006D002B006900420051004D>]TJ
@@ -169,7 +169,7 @@ endobj
<< /ExtGState 1 0 R /Font << /F54 10 0 R /F55 11 0 R /F57 12 0 R /F36 14 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
18 0 obj
-<< /Length 11479 >>
+<< /Length 13328 >>
stream
/opacity1 gs
0 g 0 G
@@ -301,92 +301,91 @@ BT
0 g 0 G
/F57 10.90909 Tf
1 0 0 1 505.94 471.469 Tm [<000F>]TJ
+0.993 0 0 1 74.071 451.146 Tm [<0035>102<0050>-225<056D004F0045>-226<005500490046>-226<00480053>9<004200510049004A00440054>]TJ
+/F36 10.90909 Tf
+1 0 0 1 173.206 451.146 Tm [<00460054001C0069003F00620032001C>]TJ
+/F57 10.90909 Tf
+0.993 0 0 1 221.473 451.146 Tm [<004A0054>-226<0056005400460045000F>-302<00350049004A0054>-226<004E00460042004F0054>-226<0055004900420055>-226<00480053>10<004200510049004A00440054>-226<004A004F>-226<005500460059004E0047>-226<00550053>20<004600460054>-225<0058004A004D004D>-226<005800500053>5<004C>-225<0042004F0045>]TJ
+0.98 0 0 1 74.409 437.596 Tm [<005A>6<00500056>-224<00440042004F>-225<0042004D00540050>-225<005600540046>-225<00510042005500490054>-225<00550050>-225<0045004A0053>20<00460044005500500053>-7<004A00460054>9<000D>-225<004300560055>-225<0054004600550055004A004F00480054>-225<004A004F>]TJ
+/F36 10.90909 Tf
+1 0 0 1 324.833 437.596 Tm [<0024003B0060001C0054003F0042002B00620054001C0069003F>]TJ
+/F57 10.90909 Tf
+0.98 0 0 1 401.692 437.596 Tm [<00420053>20<0046>-224<004A0048004F00500053>20<00460045000F>-303<003500490046>-225<004F00460058005100420059>]TJ
+1 0 0 1 74.409 424.047 Tm [<056D004D0046>-225<004A0054>-225<0044005600530053>20<0046004F0055004D005A>-224<00580053>-9<004A005500550046004F>-225<004A004F00550050>-225<005500490046>-225<0044005600530053>20<0046004F0055>-224<0045004A0053>19<00460044005500500053>-17<005A>86<000D>-225<00580049004A00440049>-225<004E00460042004F0054>-225<0055004900420055>-225<00480053>9<004200510049004A00440054>-224<0058004A00550049>-225<005500490046>-225<00540042004E0046>]TJ
+0.993 0 0 1 74.409 410.498 Tm [<004F0042004E0046>-226<004A004F>-226<0045004A056C00460053>19<0046004F0055>-226<004D0050004400420055004A0050004F0054>-226<00580050004F>81<0445>77<0055>-225<005800500053>5<004C>-226<004600420054004A004D005A>-226<00090058004A00550049>-226<004D00560042004D0042005500460059>-227<005A>5<00500056>-225<004400500056004D0045>-227<00440053>20<0046004200550046>-225<005500490046>-227<004F00460058005100420059>-226<056D004D0046>]TJ
+1.02 0 0 1 74.409 396.949 Tm [<004A004F>-233<005500490046>-234<0045005000440056004E0046004F0055>-233<004B005600540055>-234<00430046004700500053>19<0046>-233<004A0055>-233<004A0054>-234<004F00460046004500460045000A000F>-333<002D0042005500460053>-234<0057>4<004600530054004A0050004F0054>-232<00500047>-234<005500490046>-234<005100420044004C004200480046>-233<0058004A004D004D>-234<00510053>5<0050004300420043004D005A>-232<004200450045>]TJ
+1 0 0 1 74.409 383.4 Tm [<00540050004E0046>-225<005000510055004A0050004F0054>-225<004700500053>-225<00550049004A0054>-225<0044004200540046>20<000D>-225<004300560055>-225<004700500053>-225<004F0050>30<0058>-225<005600540046>-225<00420055>-225<0043004600540055>-225<0045004A00540055004A004F00440055>-225<056D004D0046>-225<004F0042004E00460054>20<000F>]TJ
0 g 0 G
/F54 11.95517 Tf
-1 0 0 1 74.409 433.374 Tm [<006B0058006B>-500<0061006900320054>-367<006B002C>-489<006C00620042004D003B>-367<0069003F0032>]TJ
+1 0 0 1 74.409 345.305 Tm [<006B0058006B>-500<0061006900320054>-367<006B002C>-489<006C00620042004D003B>-367<0069003F0032>]TJ
/F55 11.95517 Tf
-1 0 0 1 199.56 433.374 Tm [<0058004D003200720054001C0074>]TJ
+1 0 0 1 199.56 345.305 Tm [<0058004D003200720054001C0074>]TJ
/F54 11.95517 Tf
-1 0 0 1 243.495 433.374 Tm [<0040007D00480032>-367<007200420069003F>]TJ
+1 0 0 1 243.495 345.305 Tm [<0040007D00480032>-367<007200420069003F>]TJ
/F55 11.95517 Tf
-1 0 0 1 296.325 433.374 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 296.325 345.305 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 74.071 405.032 Tm [<003500490046>-230<005100420044004C004200480046>]TJ
+1.02 0 0 1 74.071 316.963 Tm [<003500490046>-230<005100420044004C004200480046>]TJ
/F36 10.90909 Tf
-1 0 0 1 139.842 405.032 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 139.842 316.963 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 176.769 405.032 Tm [<004A0054>-230<00430042005400460045>-230<0050004F>-231<005500490046>-230<005100420044004C004200480046>]TJ
+1.02 0 0 1 176.769 316.963 Tm [<004A0054>-230<00430042005400460045>-230<0050004F>-231<005500490046>-230<005100420044004C004200480046>]TJ
/F36 10.90909 Tf
-1 0 0 1 298.244 405.032 Tm [<0054001C0074>]TJ
+1 0 0 1 298.244 316.963 Tm [<0054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 317.99 405.032 Tm [<004300560055>-230<0046005900550046004F00450054>-230<004A0055>-231<004A004F>-230<0057>5<00420053>-7<004A005000560054>-230<00580042005A>94<000F>-323<002A>23<0055>-229<004A0054>-231<00540055004A004D004D>-230<0042004F>]TJ
-0.98 0 0 1 74.409 391.483 Tm [<00460059005100460053>-8<004A004E0046004F00550042004D>-165<005100420044004C004200480046>20<000D>-177<0042004F0045>-165<004A0055>-165<0053>20<004600520056004A0053>21<00460054>-164<005500490046>-165<004F00460058>-165<002D>]TJ
+1.02 0 0 1 317.99 316.963 Tm [<004300560055>-230<0046005900550046004F00450054>-230<004A0055>-231<004A004F>-230<0057>5<00420053>-7<004A005000560054>-230<00580042005A>94<000F>-323<002A>23<0055>-229<004A0054>-231<00540055004A004D004D>-230<0042004F>]TJ
+0.98 0 0 1 74.409 303.413 Tm [<00460059005100460053>-8<004A004E0046004F00550042004D>-165<005100420044004C004200480046>20<000D>-177<0042004F0045>-165<004A0055>-165<0053>20<004600520056004A0053>21<00460054>-164<005500490046>-165<004F00460058>-165<002D>]TJ
/F57 7.63636 Tf
-1 0 0 1 296.373 393.748 Tm [<0022>]TJ
+1 0 0 1 296.373 305.678 Tm [<0022>]TJ
/F57 10.90909 Tf
-0.98 0 0 1 299.586 391.483 Tm [<0035>]TJ
-1 0 0 1 304.406 388.811 Tm [<0026>]TJ
-0.98 0 0 1 309.654 391.483 Tm [<0039>-164<003100250027>-165<004E0042004F004200480046004E0046004F0055>-165<0044005000450046>-165<004A004F>]TJ
+0.98 0 0 1 299.586 303.413 Tm [<0035>]TJ
+1 0 0 1 304.406 300.741 Tm [<0026>]TJ
+0.98 0 0 1 309.654 303.413 Tm [<0039>-164<003100250027>-165<004E0042004F004200480046004E0046004F0055>-165<0044005000450046>-165<004A004F>]TJ
/F36 10.90909 Tf
-1 0 0 1 443.553 391.483 Tm [<0054002F0037004B001C004D001C003B0032004B0032004D00690040>]TJ
-1 0 0 1 74.409 377.934 Tm [<00690032006200690054003F001C00620032>]TJ
+1 0 0 1 443.553 303.413 Tm [<0054002F0037004B001C004D001C003B0032004B0032004D00690040>]TJ
+1 0 0 1 74.409 289.864 Tm [<00690032006200690054003F001C00620032>]TJ
0 g 0 G
/F57 10.90909 Tf
-0.994 0 0 1 128.409 377.934 Tm [<005100420044004C004200480046>20<000F>-301<00350049004A0054>-226<004F00460058>-226<0044005000450046>-227<004A0054044300420054>-226<005500490046>-226<004F0042004E0046>-226<004A004E0051004D004A0046005404430044005600530053>19<0046004F0055004D005A>-225<004A004F>-226<005500490046>-227<005500460054005500510049004200540046>-226<0042004F0045>]TJ
+0.994 0 0 1 128.409 289.864 Tm [<005100420044004C004200480046>20<000F>-301<00350049004A0054>-226<004F00460058>-226<0044005000450046>-227<004A0054044300420054>-226<005500490046>-226<004F0042004E0046>-226<004A004E0051004D004A0046005404430044005600530053>19<0046004F0055004D005A>-225<004A004F>-226<005500490046>-227<005500460054005500510049004200540046>-226<0042004F0045>]TJ
/F89 10.90909 Tf
-1 0 0 1 74.409 364.385 Tm [<004F00500055>]TJ
+1 0 0 1 74.409 276.315 Tm [<004F00500055>]TJ
/F57 10.90909 Tf
-1 0 0 1 94.471 364.385 Tm [<00440050004E005100420055004A0043004D0046>-225<0058004A00550049>-225<00460057>5<00460053>-18<005A>-225<005100420044004C0042004800460002>]TJ
-1 0 0 1 74.071 344.061 Tm [<003500490046>-225<00470050004D004D0050>30<0058004A004F0048>-225<004D004A00540055004A004F0048>-225<005400490050>30<00580054>-225<00490050>30<0058>-225<00550050>-225<005600540046>]TJ
+1 0 0 1 94.471 276.315 Tm [<00440050004E005100420055004A0043004D0046>-225<0058004A00550049>-225<00460057>5<00460053>-18<005A>-225<005100420044004C0042004800460002>]TJ
+1 0 0 1 74.071 255.991 Tm [<003500490046>-225<00470050004D004D0050>30<0058004A004F0048>-225<004D004A00540055004A004F0048>-225<005400490050>30<00580054>-225<00490050>30<0058>-225<00550050>-225<005600540046>]TJ
/F36 10.90909 Tf
-1 0 0 1 264.86 344.061 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 264.86 255.991 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1 0 0 1 299.224 344.061 Tm [<000F>]TJ
-0 g 0 G
-1 0 0 1 91.766 320.748 Tm [<044C>]TJ
+1 0 0 1 299.224 255.991 Tm [<000F>]TJ
0 g 0 G
-1.02 0 0 1 101.682 320.748 Tm [<002A>24<0055>-243<0054004900500056004D0045>-244<005800500053>6<004C>-243<0058004A00550049>-244<00510045056E0042005500460059000D>-249<004D00560042004D0042005500460059>-243<0042004F0045>-244<00590046004D0042005500460059000F>-363<003500490046>-243<004D0042005500460059001000450057004A00510054>-244<0053>5<0050005600550046>-242<00470042004A004D0054>-244<00420054>-243<00550049004A0054>]TJ
-1 0 0 1 101.682 307.199 Tm [<00440042004F>80<0445>75<0055>-225<004A004F0044004D005600450046>-225<003100250027>-225<0042004F005A00580042005A>95<000F>]TJ
+1 0 0 1 91.766 232.679 Tm [<044C>]TJ
0 g 0 G
-1 0 0 1 91.766 286.875 Tm [<044C>]TJ
+1.02 0 0 1 101.682 232.679 Tm [<002A>24<0055>-243<0054004900500056004D0045>-244<005800500053>6<004C>-243<0058004A00550049>-244<00510045056E0042005500460059000D>-249<004D00560042004D0042005500460059>-243<0042004F0045>-244<00590046004D0042005500460059000F>-363<003500490046>-243<004D0042005500460059001000450057004A00510054>-244<0053>5<0050005600550046>-242<00470042004A004D0054>-244<00420054>-243<00550049004A0054>]TJ
+1 0 0 1 101.682 219.129 Tm [<00440042004F>80<0445>75<0055>-225<004A004F0044004D005600450046>-225<003100250027>-225<0042004F005A00580042005A>95<000F>]TJ
0 g 0 G
-1.02 0 0 1 101.682 286.875 Tm [<0034>12<0050004E0046>-237<00510053>5<0050>30<0057004A0054004A0050004F>-236<004900420057>4<0046>-236<004300460046004F>-237<00420045004500460045>-238<00550050>-237<0042004D004D0050>29<0058>-236<004E0056004D0055004A0051004D0046>-237<004A004F0044004D00560054004A0050004F>-237<00500047>-237<005500490046>-237<00540042004E0046>-237<003100250027>179<000D>-236<004300560055>-237<004A0047>]TJ
-0.988 0 0 1 101.682 273.326 Tm [<005A>6<00500056>-228<004A004F005400460053>-8<0055>-228<0045004A056C00460053>19<0046004F0055>-227<0054004600550054>-229<00500047>-228<00510042004800460054>-229<00470053>6<0050004E>-228<0042>-228<003100250027>-228<00540050004E0046>-229<0045004600540055004A004F00420055004A0050004F0054>-228<00440042004F>-229<00540055004A004D004D>-228<00430046>-228<004E004A00540054004A004F0048000F>-306<0034>12<0050>]TJ
-1 0 0 1 101.682 259.777 Tm [<004300460055005500460053>-225<00420057>5<0050004A0045>-225<004A0055000F>]TJ
+1 0 0 1 91.766 198.806 Tm [<044C>]TJ
0 g 0 G
-1 0 0 1 91.766 239.453 Tm [<044C>]TJ
+1.02 0 0 1 101.682 198.806 Tm [<0034>12<0050004E0046>-237<00510053>5<0050>30<0057004A0054004A0050004F>-236<004900420057>4<0046>-236<004300460046004F>-237<00420045004500460045>-238<00550050>-237<0042004D004D0050>29<0058>-236<004E0056004D0055004A0051004D0046>-237<004A004F0044004D00560054004A0050004F>-237<00500047>-237<005500490046>-237<00540042004E0046>-237<003100250027>179<000D>-236<004300560055>-237<004A0047>]TJ
+0.988 0 0 1 101.682 185.256 Tm [<005A>6<00500056>-228<004A004F005400460053>-8<0055>-228<0045004A056C00460053>19<0046004F0055>-227<0054004600550054>-229<00500047>-228<00510042004800460054>-229<00470053>6<0050004E>-228<0042>-228<003100250027>-228<00540050004E0046>-229<0045004600540055004A004F00420055004A0050004F0054>-228<00440042004F>-229<00540055004A004D004D>-228<00430046>-228<004E004A00540054004A004F0048000F>-306<0034>12<0050>]TJ
+1 0 0 1 101.682 171.707 Tm [<004300460055005500460053>-225<00420057>5<0050004A0045>-225<004A0055000F>]TJ
0 g 0 G
-0.98 0 0 1 101.682 239.453 Tm [<003A>93<00500056>-216<00440042004F>-217<004400490050005000540046>-218<004700500053>-217<00460057>4<00460053>-17<005A>-218<056D004D0046>-217<004A0047>-217<004300500053>19<004500460053>-216<00440050004D00500053>-217<0042004F0045>-217<00540055005A004D00460054>-218<00500047>-217<004D004A004F004C0054>-217<00420053>20<0046>-216<00550042004C0046004F>-218<00470053>6<0050004E>-217<005500490046>-217<0054005000560053>20<00440046>]TJ
-1 0 0 1 101.682 225.904 Tm [<003100250027>-225<00500053>-225<00470053>6<0050004E>-225<005500490046>-225<0049005A0051004600530053>20<00460047>-225<0054004600550055004A004F00480054>20<000F>-300<0023>12<00560055>-225<005A>6<00500056>-225<00440042004F>80<0445>75<0055>-225<00420045004B005600540055>-225<00500053>-225<004400490042004F00480046>-225<00440050004D00500053>20<00460045>-225<004D004A004F004C0054>20<000F>]TJ
+1 0 0 1 91.766 151.383 Tm [<044C>]TJ
0 g 0 G
-1 0 0 1 91.766 205.58 Tm [<044C>]TJ
-0 g 0 G
-1 0 0 1 101.682 205.58 Tm [<003A>90<00500056>-225<00440042004F>-225<004200450045>-225<004200450045004A0055004A0050004F0042004D>-225<0054004600550055004A004F00480054>-225<00550050>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>10<000D>-225<004700500053>-225<004600590042004E0051004D0046>-225<0042004F>]TJ
-/F36 10.90909 Tf
-1 0 0 1 429.467 205.58 Tm [<00660036>]TJ
-/F57 10.90909 Tf
-1 0 0 1 443.377 205.58 Tm [<056E00420048000D>-225<0058004A00550049>]TJ
-/F36 10.90909 Tf
-1 0 0 1 101.682 186.053 Tm [<0024003100740054004800610076004D0069001C00740050004D>]TJ
-1 0 0 1 101.682 172.504 Tm [<00240054002F0037001C004D004D00510069006E002F0042002B0069006E0054006D0069002C004D004D004D>-525<002600480042004D00460066006C005F00410027002600360027002600390027>]TJ
-1 0 0 1 101.682 158.955 Tm [<0024003100740054004800610076004D0069001C0074005000370037>]TJ
+0.98 0 0 1 101.682 151.383 Tm [<003A>93<00500056>-216<00440042004F>-217<004400490050005000540046>-218<004700500053>-217<00460057>4<00460053>-17<005A>-218<056D004D0046>-217<004A0047>-217<004300500053>19<004500460053>-216<00440050004D00500053>-217<0042004F0045>-217<00540055005A004D00460054>-218<00500047>-217<004D004A004F004C0054>-217<00420053>20<0046>-216<00550042004C0046004F>-218<00470053>6<0050004E>-217<005500490046>-217<0054005000560053>20<00440046>]TJ
+1 0 0 1 101.682 137.834 Tm [<003100250027>-225<00500053>-225<00470053>6<0050004E>-225<005500490046>-225<0049005A0051004600530053>20<00460047>-225<0054004600550055004A004F00480054>20<000F>-300<0023>12<00560055>-225<005A>6<00500056>-225<00440042004F>80<0445>75<0055>-225<00420045004B005600540055>-225<00500053>-225<004400490042004F00480046>-225<00440050004D00500053>20<00460045>-225<004D004A004F004C0054>20<000F>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
-0 g 0 G
-0 g 0 G
-/F57 10.90909 Tf
1 0 0 1 294.747 93.476 Tm [<0013>]TJ
0 g 0 G
0 g 0 G
@@ -447,25 +446,13 @@ endobj
<< /D [ 17 0 R /XYZ 74.409 511.32 null ] >>
endobj
34 0 obj
-<< /D [ 17 0 R /XYZ 74.409 451.457 null ] >>
-endobj
-36 0 obj
-<< /D [ 17 0 R /XYZ 74.409 196.963 null ] >>
-endobj
-37 0 obj
-<< /D [ 17 0 R /XYZ 101.682 199.603 null ] >>
-endobj
-38 0 obj
-<< /D [ 17 0 R /XYZ 101.682 186.053 null ] >>
-endobj
-39 0 obj
-<< /D [ 17 0 R /XYZ 101.682 172.504 null ] >>
+<< /D [ 17 0 R /XYZ 74.409 363.518 null ] >>
endobj
16 0 obj
<< /ExtGState 1 0 R /Font << /F54 10 0 R /F57 12 0 R /F36 14 0 R /F55 11 0 R /F89 35 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-42 0 obj
-<< /Length 10248 >>
+38 0 obj
+<< /Length 11037 >>
stream
/opacity1 gs
0 g 0 G
@@ -477,280 +464,290 @@ stream
0 g 0 G
0 g 0 G
0 g 0 G
-0 g 0 G
BT
/F57 10.90909 Tf
-1 0 0 1 224.263 760.773 Tm [<002D004A00540055004A004F0048>-225<0013001B>]TJ
+1 0 0 1 91.766 760.773 Tm [<044C>]TJ
+0 g 0 G
+1 0 0 1 101.682 760.773 Tm [<003A>90<00500056>-225<00440042004F>-225<004200450045>-225<004200450045004A0055004A0050004F0042004D>-225<0054004600550055004A004F00480054>-225<00550050>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>10<000D>-225<004700500053>-225<004600590042004E0051004D0046>-225<0042004F>]TJ
+/F36 10.90909 Tf
+1 0 0 1 429.467 760.773 Tm [<00660036>]TJ
+/F57 10.90909 Tf
+1 0 0 1 443.377 760.773 Tm [<056E00420048000D>-225<0058004A00550049>]TJ
+/F36 10.90909 Tf
+1 0 0 1 101.682 741.987 Tm [<0024003100740054004800610076004D0069001C00740050004D>]TJ
+1 0 0 1 101.682 728.438 Tm [<00240054002F0037001C004D004D00510069006E002F0042002B0069006E0054006D0069002C004D004D004D>-525<002600480042004D00460066006C005F00410027002600360027002600390027>]TJ
+1 0 0 1 101.682 714.889 Tm [<0024003100740054004800610076004D0069001C0074005000370037>]TJ
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+/F57 10.90909 Tf
+1 0 0 1 224.263 685.628 Tm [<002D004A00540055004A004F0048>-225<0013001B>]TJ
0 g 0 G
-1 0 0 1 271.325 760.773 Tm [<004500500044000E005600540046000E004F00460058005100420059000F005500460059>]TJ
+1 0 0 1 271.325 685.628 Tm [<004500500044000E005600540046000E004F00460058005100420059000F005500460059>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 730.686 Tm [<0024005F0032005B006D0042006000320053001C002B0046001C003B003200260054002F0037004B001C004D001C003B0032004B0032004D0069004000690032006200690054003F001C006200320027>]TJ
-1 0 0 1 74.409 717.137 Tm [<0024002E0032002B0048001C00600032002E0051002B006D004B0032004D0069004A00320069001C002F001C0069001C0026006D004D002B0051004B005400600032006200620027>]TJ
-1 0 0 1 74.409 703.588 Tm [<0024>]TJ
+1 0 0 1 74.409 655.911 Tm [<0024005F0032005B006D0042006000320053001C002B0046001C003B003200260054002F0037004B001C004D001C003B0032004B0032004D0069004000690032006200690054003F001C006200320027>]TJ
+1 0 0 1 74.409 642.362 Tm [<0024002E0032002B0048001C00600032002E0051002B006D004B0032004D0069004A00320069001C002F001C0069001C0026006D004D002B0051004B005400600032006200620027>]TJ
+1 0 0 1 74.409 628.812 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 703.588 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
+1 0 0 1 80.137 628.812 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
/F36 10.90909 Tf
-1 0 0 1 154.591 703.588 Tm [<0026001C006000690042002B004800320027>]TJ
-1 0 0 1 74.409 676.489 Tm [<0024>]TJ
+1 0 0 1 154.591 628.812 Tm [<0026001C006000690042002B004800320027>]TJ
+1 0 0 1 74.409 601.714 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 676.489 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+1 0 0 1 80.137 601.714 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
/F36 10.90909 Tf
-1 0 0 1 137.409 676.489 Tm [<00260054002F00370054001C003B00320062002D0074002B00510048005100600027>]TJ
-1 0 0 1 74.409 649.391 Tm [<0024>]TJ
+1 0 0 1 137.409 601.714 Tm [<00260054002F00370054001C003B00320062002D0074002B00510048005100600027>]TJ
+1 0 0 1 74.409 574.616 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 649.391 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+1 0 0 1 80.137 574.616 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
/F36 10.90909 Tf
-1 0 0 1 137.409 649.391 Tm [<0026003F00760054003200600060003200370027>]TJ
-1 0 0 1 74.409 635.842 Tm [<0024003F0076005400320060006200320069006D0054002600480042004D0046002300510060002F00320060002B0051004800510060003400230048006D00320027>]TJ
-1 0 0 1 74.409 608.744 Tm [<0024>]TJ
+1 0 0 1 137.409 574.616 Tm [<0026003F00760054003200600060003200370027>]TJ
+1 0 0 1 74.409 561.066 Tm [<0024003F0076005400320060006200320069006D0054002600480042004D0046002300510060002F00320060002B0051004800510060003400230048006D00320027>]TJ
+1 0 0 1 74.409 533.968 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 608.744 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+1 0 0 1 80.137 533.968 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
/F36 10.90909 Tf
-1 0 0 1 137.409 608.744 Tm [<0026004D003200720054001C00740027>]TJ
+1 0 0 1 137.409 533.968 Tm [<0026004D003200720054001C00740027>]TJ
0 0.5 0 rg 0 0.5 0 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 581.645 Tm [<0057>]TJ
+1 0 0 1 74.409 506.87 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 80.137 581.645 Tm [<006D00620032>]TJ
+1 0 0 1 80.137 506.87 Tm [<006D00620032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 103.046 581.645 Tm [<0069003F0032>]TJ
+1 0 0 1 103.046 506.87 Tm [<0069003F0032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 125.955 581.645 Tm [<00480042004D0046>]TJ
+1 0 0 1 125.955 506.87 Tm [<00480042004D0046>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 154.591 581.645 Tm [<002300510060002F00320060>]TJ
+1 0 0 1 154.591 506.87 Tm [<002300510060002F00320060>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 194.682 581.645 Tm [<002B0051004800510060>]TJ
+1 0 0 1 194.682 506.87 Tm [<002B0051004800510060>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 229.046 581.645 Tm [<001C004D002F>]TJ
+1 0 0 1 229.046 506.87 Tm [<001C004D002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 251.955 581.645 Tm [<00620069007600480032>]TJ
+1 0 0 1 251.955 506.87 Tm [<00620069007600480032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 286.319 581.645 Tm [<00510037>]TJ
+1 0 0 1 286.319 506.87 Tm [<00510037>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 303.5 581.645 Tm [<0069003F0032>]TJ
+1 0 0 1 303.5 506.87 Tm [<0069003F0032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 326.409 581.645 Tm [<0042004B00540051006000690032002F>]TJ
+1 0 0 1 326.409 506.87 Tm [<0042004B00540051006000690032002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 377.955 581.645 Tm [<0054002F0037>]TJ
+1 0 0 1 377.955 506.87 Tm [<0054002F0037>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 74.409 568.096 Tm [<0057>]TJ
+1 0 0 1 74.409 493.32 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 80.137 568.096 Tm [<001C004D002F>]TJ
+1 0 0 1 80.137 493.32 Tm [<001C004D002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 103.046 568.096 Tm [<004D00510069>]TJ
+1 0 0 1 103.046 493.32 Tm [<004D00510069>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 125.955 568.096 Tm [<003F0076005400320060006000320037>]TJ
+1 0 0 1 125.955 493.32 Tm [<003F0076005400320060006000320037>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 177.5 568.096 Tm [<002B00510048005100600062>]TJ
+1 0 0 1 177.5 493.32 Tm [<002B00510048005100600062>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 554.547 Tm [<0024004D003200720054001C0074006200320069006D00540026006D006200320037004200480032001C00690069006000420023006D006900320062003400690060006D00320027>]TJ
-1 0 0 1 74.409 527.448 Tm [<0024>]TJ
+1 0 0 1 74.409 479.771 Tm [<0024004D003200720054001C0074006200320069006D00540026006D006200320037004200480032001C00690069006000420023006D006900320062003400690060006D00320027>]TJ
+1 0 0 1 74.409 452.673 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 527.448 Tm [<00230032003B0042004D>]TJ
+1 0 0 1 80.137 452.673 Tm [<00230032003B0042004D>]TJ
/F36 10.90909 Tf
-1 0 0 1 108.773 527.448 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
-1 0 0 1 74.409 500.35 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
-1 0 0 1 74.409 486.801 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
+1 0 0 1 108.773 452.673 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+1 0 0 1 74.409 425.574 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
+1 0 0 1 74.409 412.025 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
0 0.5 0 rg 0 0.5 0 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 459.702 Tm [<0057>]TJ
+1 0 0 1 74.409 384.927 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 80.137 459.702 Tm [<006200320069>]TJ
+1 0 0 1 80.137 384.927 Tm [<006200320069>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 103.046 459.702 Tm [<001C>]TJ
+1 0 0 1 103.046 384.927 Tm [<001C>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 114.5 459.702 Tm [<006D004D0042005B006D0032>]TJ
+1 0 0 1 114.5 384.927 Tm [<006D004D0042005B006D0032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 154.591 459.702 Tm [<0062006D0037003700420074>]TJ
+1 0 0 1 154.591 384.927 Tm [<0062006D0037003700420074>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 194.682 459.702 Tm [<00420037>]TJ
+1 0 0 1 194.682 384.927 Tm [<00420037>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 211.864 459.702 Tm [<0069003F0032>]TJ
+1 0 0 1 211.864 384.927 Tm [<0069003F0032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 234.773 459.702 Tm [<0054002F0037>]TJ
+1 0 0 1 234.773 384.927 Tm [<0054002F0037>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 257.682 459.702 Tm [<00420062>]TJ
+1 0 0 1 257.682 384.927 Tm [<00420062>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 274.864 459.702 Tm [<0042004B00540051006000690032002F>]TJ
+1 0 0 1 274.864 384.927 Tm [<0042004B00540051006000690032002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 326.409 459.702 Tm [<006900720042002B0032>]TJ
+1 0 0 1 326.409 384.927 Tm [<006900720042002B0032>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 446.153 Tm [<0024004D003200720054001C0074006200320069006D00540026002F0032006200690062006D0037003700420074003400220027>]TJ
-1 0 0 1 74.409 432.604 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
-1 0 0 1 74.409 419.055 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
+1 0 0 1 74.409 371.378 Tm [<0024004D003200720054001C0074006200320069006D00540026002F0032006200690062006D0037003700420074003400220027>]TJ
+1 0 0 1 74.409 357.829 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
+1 0 0 1 74.409 344.279 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
0 0.5 0 rg 0 0.5 0 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 391.956 Tm [<0057>]TJ
+1 0 0 1 74.409 317.181 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 85.864 391.956 Tm [<0062006D005400540060003200620062>]TJ
+1 0 0 1 85.864 317.181 Tm [<0062006D005400540060003200620062>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 137.409 391.956 Tm [<0069003F0032>]TJ
+1 0 0 1 137.409 317.181 Tm [<0069003F0032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 160.319 391.956 Tm [<001C002F002F0042004D003B>]TJ
+1 0 0 1 160.319 317.181 Tm [<001C002F002F0042004D003B>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 200.409 391.956 Tm [<00510037>]TJ
+1 0 0 1 200.409 317.181 Tm [<00510037>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 217.591 391.956 Tm [<001C004D004D00510069001C006900420051004D0062>]TJ
+1 0 0 1 217.591 317.181 Tm [<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 378.407 Tm [<0024004D003200720054001C0074006200320069006D00540026001C002F002F001C004D004D00510069006200340037001C0048006200320027>]TJ
-1 0 0 1 74.409 364.858 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
+1 0 0 1 74.409 303.632 Tm [<0024004D003200720054001C0074006200320069006D00540026001C002F002F001C004D004D00510069006200340037001C0048006200320027>]TJ
+1 0 0 1 74.409 290.083 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
0 0.5 0 rg 0 0.5 0 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 337.76 Tm [<0057>]TJ
+1 0 0 1 74.409 262.984 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 80.137 337.76 Tm [<00600032001C002B006900420070001C00690032>]TJ
+1 0 0 1 80.137 262.984 Tm [<00600032001C002B006900420070001C00690032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 137.409 337.76 Tm [<002D>]TJ
+1 0 0 1 137.409 262.984 Tm [<002D>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 148.864 337.76 Tm [<002F0051004D>]TJ
+1 0 0 1 148.864 262.984 Tm [<002F0051004D>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 166.046 337.76 Tm [<005E>]TJ
+1 0 0 1 166.046 262.984 Tm [<005E>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 171.773 337.76 Tm [<0069>]TJ
+1 0 0 1 171.773 262.984 Tm [<0069>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 183.228 337.76 Tm [<006D00620032>]TJ
+1 0 0 1 183.228 262.984 Tm [<006D00620032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 206.137 337.76 Tm [<0037004200480032>]TJ
+1 0 0 1 206.137 262.984 Tm [<0037004200480032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 234.773 337.76 Tm [<001C00690069006000420023006D006900320062>]TJ
+1 0 0 1 234.773 262.984 Tm [<001C00690069006000420023006D006900320062>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 324.21 Tm [<0024004D003200720054001C0074006200320069006D00540026001C002F002F001C004D004D005100690062003400690060006D0032002D006D006200320037004200480032001C00690069006000420023006D00690032006200340037001C0048006200320027>]TJ
-1 0 0 1 74.409 310.661 Tm [<00240042004D002B0048006D002F00320054002F003700280054001C003B003200620034004000290026002F0051002B00400042004D0054006D0069006B0027>]TJ
-1 0 0 1 74.409 297.112 Tm [<0024>]TJ
+1 0 0 1 74.409 249.435 Tm [<0024004D003200720054001C0074006200320069006D00540026001C002F002F001C004D004D005100690062003400690060006D0032002D006D006200320037004200480032001C00690069006000420023006D00690032006200340037001C0048006200320027>]TJ
+1 0 0 1 74.409 235.886 Tm [<00240042004D002B0048006D002F00320054002F003700280054001C003B003200620034004000290026002F0051002B00400042004D0054006D0069006B0027>]TJ
+1 0 0 1 74.409 222.337 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 297.112 Tm [<0032004D002F>]TJ
+1 0 0 1 80.137 222.337 Tm [<0032004D002F>]TJ
/F36 10.90909 Tf
-1 0 0 1 97.319 297.112 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+1 0 0 1 97.319 222.337 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
/F54 11.95517 Tf
-1 0 0 1 74.409 253.039 Tm [<006B0058006A>-500<002A0051004B00230042004D0042004D003B>-367<0069003F0032>-367<00620069003200540062>]TJ
+1 0 0 1 74.409 179.402 Tm [<006B0058006A>-500<002A0051004B00230042004D0042004D003B>-367<0069003F0032>-367<00620069003200540062>]TJ
0 g 0 G
/F57 10.90909 Tf
-0.986 0 0 1 73.897 224.697 Tm [<003800490046004F>-229<00560054004A004F0048>-229<004D00560042004D0042005500460059>-229<0043005000550049>-229<0054005500460051>-229<00440042004F>-230<00430046>-229<0054004A004E0051004D005A>-229<004A004F>-229<005500490046>-229<00540042004E0046>-229<0045005000440056004E0046004F0055000F>-308<0038>10<004A00550049>-228<00500055004900460053>-230<0046004F0048004A004F00460054>-229<005A>6<00500056>]TJ
-1 0 0 1 74.409 211.148 Tm [<00440042004F>-225<005600540046>]TJ
+0.986 0 0 1 73.897 151.06 Tm [<003800490046004F>-229<00560054004A004F0048>-229<004D00560042004D0042005500460059>-229<0043005000550049>-229<0054005500460051>-229<00440042004F>-230<00430046>-229<0054004A004E0051004D005A>-229<004A004F>-229<005500490046>-229<00540042004E0046>-229<0045005000440056004E0046004F0055000F>-308<0038>10<004A00550049>-228<00500055004900460053>-230<0046004F0048004A004F00460054>-229<005A>6<00500056>]TJ
+1 0 0 1 74.409 137.51 Tm [<00440042004F>-225<005600540046>]TJ
/F36 10.90909 Tf
-1 0 0 1 114.162 211.148 Tm [<004200370048006D001C006900320074>]TJ
+1 0 0 1 114.162 137.51 Tm [<004200370048006D001C006900320074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1 0 0 1 159.98 211.148 Tm [<000F>]TJ
-0 g 0 G
-/F54 14.3462 Tf
-1 0 0 1 74.409 167.732 Tm [<006A>-500<006100320069006D0054>-367<00510054006900420051004D0062>]TJ
-0 g 0 G
+1 0 0 1 159.98 137.51 Tm [<000F>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
1 0 0 1 294.747 93.476 Tm [<0014>]TJ
0 g 0 G
0 g 0 G
@@ -762,128 +759,137 @@ ET
endstream
endobj
+37 0 obj
+<< /Type /Page /Contents 38 0 R /Resources 36 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+endobj
+39 0 obj
+<< /D [ 37 0 R /XYZ 73.409 809.993 null ] >>
+endobj
+40 0 obj
+<< /D [ 37 0 R /XYZ 74.409 752.896 null ] >>
+endobj
41 0 obj
-<< /Type /Page /Contents 42 0 R /Resources 40 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+<< /D [ 37 0 R /XYZ 101.682 755.536 null ] >>
+endobj
+42 0 obj
+<< /D [ 37 0 R /XYZ 101.682 741.987 null ] >>
endobj
43 0 obj
-<< /D [ 41 0 R /XYZ 73.409 809.993 null ] >>
+<< /D [ 37 0 R /XYZ 101.682 728.438 null ] >>
endobj
44 0 obj
-<< /D [ 41 0 R /XYZ 74.409 771.732 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 697.731 null ] >>
endobj
45 0 obj
-<< /D [ 41 0 R /XYZ 74.409 757.785 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 683.009 null ] >>
endobj
46 0 obj
-<< /D [ 41 0 R /XYZ 74.409 744.235 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 669.46 null ] >>
endobj
47 0 obj
-<< /D [ 41 0 R /XYZ 74.409 730.686 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 655.911 null ] >>
endobj
48 0 obj
-<< /D [ 41 0 R /XYZ 74.409 717.137 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 642.362 null ] >>
endobj
49 0 obj
-<< /D [ 41 0 R /XYZ 74.409 703.588 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 628.812 null ] >>
endobj
50 0 obj
-<< /D [ 41 0 R /XYZ 74.409 690.039 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 615.263 null ] >>
endobj
51 0 obj
-<< /D [ 41 0 R /XYZ 74.409 676.489 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 601.714 null ] >>
endobj
52 0 obj
-<< /D [ 41 0 R /XYZ 74.409 662.94 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 588.165 null ] >>
endobj
53 0 obj
-<< /D [ 41 0 R /XYZ 74.409 649.391 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 574.616 null ] >>
endobj
54 0 obj
-<< /D [ 41 0 R /XYZ 74.409 635.842 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 561.066 null ] >>
endobj
55 0 obj
-<< /D [ 41 0 R /XYZ 74.409 622.293 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 547.517 null ] >>
endobj
56 0 obj
-<< /D [ 41 0 R /XYZ 74.409 608.744 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 533.968 null ] >>
endobj
57 0 obj
-<< /D [ 41 0 R /XYZ 74.409 595.194 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 520.419 null ] >>
endobj
58 0 obj
-<< /D [ 41 0 R /XYZ 74.409 581.645 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 506.87 null ] >>
endobj
59 0 obj
-<< /D [ 41 0 R /XYZ 74.409 568.096 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 493.32 null ] >>
endobj
60 0 obj
-<< /D [ 41 0 R /XYZ 74.409 554.547 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 479.771 null ] >>
endobj
61 0 obj
-<< /D [ 41 0 R /XYZ 74.409 540.998 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 466.222 null ] >>
endobj
62 0 obj
-<< /D [ 41 0 R /XYZ 74.409 527.448 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 452.673 null ] >>
endobj
63 0 obj
-<< /D [ 41 0 R /XYZ 74.409 513.899 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 439.124 null ] >>
endobj
64 0 obj
-<< /D [ 41 0 R /XYZ 74.409 500.35 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 425.574 null ] >>
endobj
65 0 obj
-<< /D [ 41 0 R /XYZ 74.409 486.801 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 412.025 null ] >>
endobj
66 0 obj
-<< /D [ 41 0 R /XYZ 74.409 473.252 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 398.476 null ] >>
endobj
67 0 obj
-<< /D [ 41 0 R /XYZ 74.409 459.702 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 384.927 null ] >>
endobj
68 0 obj
-<< /D [ 41 0 R /XYZ 74.409 446.153 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 371.378 null ] >>
endobj
69 0 obj
-<< /D [ 41 0 R /XYZ 74.409 432.604 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 357.829 null ] >>
endobj
70 0 obj
-<< /D [ 41 0 R /XYZ 74.409 419.055 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 344.279 null ] >>
endobj
71 0 obj
-<< /D [ 41 0 R /XYZ 74.409 405.506 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 330.73 null ] >>
endobj
72 0 obj
-<< /D [ 41 0 R /XYZ 74.409 391.956 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 317.181 null ] >>
endobj
73 0 obj
-<< /D [ 41 0 R /XYZ 74.409 378.407 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 303.632 null ] >>
endobj
74 0 obj
-<< /D [ 41 0 R /XYZ 74.409 364.858 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 290.083 null ] >>
endobj
75 0 obj
-<< /D [ 41 0 R /XYZ 74.409 351.309 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 276.533 null ] >>
endobj
76 0 obj
-<< /D [ 41 0 R /XYZ 74.409 337.76 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 262.984 null ] >>
endobj
77 0 obj
-<< /D [ 41 0 R /XYZ 74.409 324.21 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 249.435 null ] >>
endobj
78 0 obj
-<< /D [ 41 0 R /XYZ 74.409 310.661 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 235.886 null ] >>
endobj
79 0 obj
-<< /D [ 41 0 R /XYZ 74.409 269.697 null ] >>
-endobj
-80 0 obj
-<< /D [ 41 0 R /XYZ 74.409 192.308 null ] >>
+<< /D [ 37 0 R /XYZ 74.409 196.059 null ] >>
endobj
-40 0 obj
+36 0 obj
<< /ExtGState 1 0 R /Font << /F57 12 0 R /F36 14 0 R /F55 11 0 R /F54 10 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-83 0 obj
-<< /Length 13120 >>
+82 0 obj
+<< /Length 11751 >>
stream
/opacity1 gs
0 g 0 G
@@ -895,141 +901,134 @@ stream
0 g 0 G
0 g 0 G
0 g 0 G
+BT
+/F54 14.3462 Tf
+1 0 0 1 74.409 760.773 Tm [<006A>-500<006100320069006D0054>-367<00510054006900420051004D0062>]TJ
+0 g 0 G
+0 g 0 G
0 g 0 G
0 g 0 G
0 0.2 0.6 rg 0 0.2 0.6 RG
-BT
/F55 10.90909 Tf
-1 0 0 1 88.706 758.861 Tm [<0024004D003200720054001C0074006200320069006D0054>]TJ
+1 0 0 1 88.706 713.098 Tm [<0024004D003200720054001C0074006200320069006D0054>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 157.433 758.861 Tm [<002600460032007600400070001C0048>-525<00510054006900420051004D>-525<00480042006200690027>]TJ
+1 0 0 1 157.433 713.098 Tm [<002600460032007600400070001C0048>-525<00510054006900420051004D>-525<00480042006200690027>]TJ
0 g 0 G
0 g 0 G
ET
q
-1 0 0 1 74.409 771.533 cm
+1 0 0 1 74.409 725.77 cm
[] 0 d 0 J 0.398 w 0 0 m 217.593 0 l S
Q
q
-1 0 0 1 74.609 751.608 cm
+1 0 0 1 74.609 705.845 cm
[] 0 d 0 J 0.398 w 0 0 m 0 19.925 l S
Q
q
-1 0 0 1 291.803 751.608 cm
+1 0 0 1 291.803 705.845 cm
[] 0 d 0 J 0.398 w 0 0 m 0 19.925 l S
Q
q
-1 0 0 1 74.409 751.608 cm
+1 0 0 1 74.409 705.845 cm
[] 0 d 0 J 0.398 w 0 0 m 217.593 0 l S
Q
0 g 0 G
BT
/F57 10.90909 Tf
-1 0 0 1 74.071 722.791 Tm [<00350049004A0054>-225<00440050004E004E0042004F0045>-225<0042004D004D0050>30<00580054>-225<00550050>-225<004400490042004F00480046>-225<005500490046>-225<00430046004900420057004A005000560053>-225<004A004F0044004D00560054004A0050004F000F>-300<002A>24<0055>-225<004C004F0050>30<00580054>-225<005500490046>-225<00470050004D004D0050>30<0058004A004F0048>-225<004C0046005A0054001B>]TJ
+1 0 0 1 74.071 677.028 Tm [<00350049004A0054>-225<00440050004E004E0042004F0045>-225<0042004D004D0050>30<00580054>-225<00550050>-225<004400490042004F00480046>-225<005500490046>-225<00430046004900420057004A005000560053>-225<004A004F0044004D00560054004A0050004F000F>-300<002A>24<0055>-225<004C004F0050>30<00580054>-225<005500490046>-225<00470050004D004D0050>30<0058004A004F0048>-225<004C0046005A0054001B>]TJ
0 g 0 G
0 0.4 0.9 rg 0 0.4 0.9 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 699.478 Tm [<006D006200320037004200480032001C00690069006000420023006D006900320062>]TJ
+1 0 0 1 74.409 653.716 Tm [<006D006200320037004200480032001C00690069006000420023006D006900320062>]TJ
0 g 0 G
0 g 0 G
/F57 10.90909 Tf
-1.007 0 0 1 177.228 699.478 Tm [<00350049004A0054>-224<004A0054>-224<0042>-224<004300500050004D00460042004F>-224<004C0046005A>96<000F>-299<002A>5<0047>-223<005400460055>-224<00550050>-224<00550053>-8<00560046>19<000D>-223<005500490046>-224<0053>19<0046004A004F005400460053>-7<005500460045>-224<0042004F004F0050005500420055004A0050004F0054>-224<0058004A004D004D>-224<005600540046>]TJ
-0.98 0 0 1 101.682 685.929 Tm [<005500490046>-226<004D004A004F004C004300500053>19<004500460053>-226<0054004600550055004A004F00480054>-227<000900440050004D00500053>-227<0042004F0045>-227<00540055005A004D0046000A>-227<00500047>-226<005500490046>-227<004A004F0044004D0056004500460045>-227<056D004D0046>20<000D>-227<004A0047>-227<005400460055>-227<00550050>-227<00470042004D00540046>20<000D>-226<005500490046>-227<0054004600550055004A004F00480054>-227<00500047>]TJ
-1 0 0 1 101.682 672.38 Tm [<005500490046>-225<0053>20<004600440046004A0057004A004F0048>-225<003100250027>-225<0058004A004D004D>-225<00550042004C0046>-225<00510053>20<004600440046004F00450046004F00440046>20<000F>]TJ
+1.007 0 0 1 177.228 653.716 Tm [<00350049004A0054>-224<004A0054>-224<0042>-224<004300500050004D00460042004F>-224<004C0046005A>96<000F>-299<002A>5<0047>-223<005400460055>-224<00550050>-224<00550053>-8<00560046>19<000D>-223<005500490046>-224<0053>19<0046004A004F005400460053>-7<005500460045>-224<0042004F004F0050005500420055004A0050004F0054>-224<0058004A004D004D>-224<005600540046>]TJ
+0.98 0 0 1 101.682 640.167 Tm [<005500490046>-226<004D004A004F004C004300500053>19<004500460053>-226<0054004600550055004A004F00480054>-227<000900440050004D00500053>-227<0042004F0045>-227<00540055005A004D0046000A>-227<00500047>-226<005500490046>-227<004A004F0044004D0056004500460045>-227<056D004D0046>20<000D>-227<004A0047>-227<005400460055>-227<00550050>-227<00470042004D00540046>20<000D>-226<005500490046>-227<0054004600550055004A004F00480054>-227<00500047>]TJ
+1 0 0 1 101.682 626.617 Tm [<005500490046>-225<0053>20<004600440046004A0057004A004F0048>-225<003100250027>-225<0058004A004D004D>-225<00550042004C0046>-225<00510053>20<004600440046004F00450046004F00440046>20<000F>]TJ
0 g 0 G
0 0.4 0.9 rg 0 0.4 0.9 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 652.056 Tm [<002F0032006200690062006D0037003700420074>]TJ
+1 0 0 1 74.409 606.294 Tm [<002F0032006200690062006D0037003700420074>]TJ
0 g 0 G
0 g 0 G
/F57 10.90909 Tf
-0.991 0 0 1 137.137 652.056 Tm [<00350049004A0054>-226<0042004D004D0050>30<00580054>-226<00550050>-227<004200450045>-226<0042>-227<00540056056F0059>-226<00550050>-227<005500490046>-227<0045004600540055004A004F00420055004A0050004F>-226<004F0042004E00460054>19<000F>-301<00350049004A0054>-227<004A0054>-227<004F00460046004500460045>-226<004A0047>-227<0042>-227<056D004D0046>-226<0058004A00550049>]TJ
-1 0 0 1 101.682 638.507 Tm [<0045004600540055004A004F00420055004A0050004F0054>-225<004A0054>-225<004A004F0044004D0056004500460045>-225<004E00500053>20<0046>-225<005500490042004F>-225<0050004F00440046>20<000D>-225<00550050>-225<00420057>5<0050004A0045>-225<00550050>-225<004800460055>-225<004E0056004D0055004A0051004D0046>-225<0045004600540055004A004F00420055004A0050004F0054>20<000F>]TJ
+0.991 0 0 1 137.137 606.294 Tm [<00350049004A0054>-226<0042004D004D0050>30<00580054>-226<00550050>-227<004200450045>-226<0042>-227<00540056056F0059>-226<00550050>-227<005500490046>-227<0045004600540055004A004F00420055004A0050004F>-226<004F0042004E00460054>19<000F>-301<00350049004A0054>-227<004A0054>-227<004F00460046004500460045>-226<004A0047>-227<0042>-227<056D004D0046>-226<0058004A00550049>]TJ
+1 0 0 1 101.682 592.744 Tm [<0045004600540055004A004F00420055004A0050004F0054>-225<004A0054>-225<004A004F0044004D0056004500460045>-225<004E00500053>20<0046>-225<005500490042004F>-225<0050004F00440046>20<000D>-225<00550050>-225<00420057>5<0050004A0045>-225<00550050>-225<004800460055>-225<004E0056004D0055004A0051004D0046>-225<0045004600540055004A004F00420055004A0050004F0054>20<000F>]TJ
0 g 0 G
0 0.4 0.9 rg 0 0.4 0.9 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 618.183 Tm [<001C002F002F001C004D004D005100690062>]TJ
+1 0 0 1 74.409 572.421 Tm [<001C002F002F001C004D004D005100690062>]TJ
0 g 0 G
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 131.409 618.183 Tm [<00350049004A0054>-220<004A0054>-221<0042>-220<004300500050004D00460042004F>-221<004C0046005A>95<000F>-294<002A>23<0055>-219<0042004D004D0050>29<00580054>-220<00550050>-220<00540058004A005500440049>-221<0050004F>-220<0042004F0045>-221<0050056C>-220<005500490046>-220<0053>19<0046004A004F005400460053>-7<0055004A004F0048>-221<00500047>-220<005500490046>-221<0042004F004F0050000E>]TJ
-1.012 0 0 1 101.682 604.634 Tm [<005500420055004A0050004F0054>20<000F>-297<003800490046004F>-223<005400460055>-223<00550050>-222<00470042004D00540046>-223<004A0055>-223<0042004D00540050>-222<00540056005100510053>19<004600540054>-222<005800420053>-8<004F004A004F00480054>-223<004A004F>-223<005500490046>-222<004D00500048>-223<004A0047>-223<005500490046>]TJ
+1.02 0 0 1 131.409 572.421 Tm [<00350049004A0054>-220<004A0054>-221<0042>-220<004300500050004D00460042004F>-221<004C0046005A>95<000F>-294<002A>23<0055>-219<0042004D004D0050>29<00580054>-220<00550050>-220<00540058004A005500440049>-221<0050004F>-220<0042004F0045>-221<0050056C>-220<005500490046>-220<0053>19<0046004A004F005400460053>-7<0055004A004F0048>-221<00500047>-220<005500490046>-221<0042004F004F0050000E>]TJ
+1.012 0 0 1 101.682 558.871 Tm [<005500420055004A0050004F0054>20<000F>-297<003800490046004F>-223<005400460055>-223<00550050>-222<00470042004D00540046>-223<004A0055>-223<0042004D00540050>-222<00540056005100510053>19<004600540054>-222<005800420053>-8<004F004A004F00480054>-223<004A004F>-223<005500490046>-222<004D00500048>-223<004A0047>-223<005500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 432.882 604.634 Tm [<0058004D003200720054001C0074>]TJ
+1 0 0 1 432.882 558.871 Tm [<0058004D003200720054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.012 0 0 1 475.431 604.634 Tm [<056D004D0046>-222<004A0054>-223<004F00500055>]TJ
-1 0 0 1 101.682 591.085 Tm [<004700500056004F0045000F>-300<002A>24<0055>-225<004A0054>-225<0053>20<004600440050004E004E0046004F004500460045>-225<00550050>-225<005400460055>-225<004A0055>-225<00550050>-225<00470042004D00540046>-225<004700500053>-225<00480053>10<004200510049004A00440054>-225<00580049004A00440049>-225<00450050004F>80<0445>75<0055>-225<004900420057>5<0046>-225<004D004A004F004C0054>20<000F>]TJ
+1.012 0 0 1 475.431 558.871 Tm [<056D004D0046>-222<004A0054>-223<004F00500055>]TJ
+1 0 0 1 101.682 545.322 Tm [<004700500056004F0045000F>-300<002A>24<0055>-225<004A0054>-225<0053>20<004600440050004E004E0046004F004500460045>-225<00550050>-225<005400460055>-225<004A0055>-225<00550050>-225<00470042004D00540046>-225<004700500053>-225<00480053>10<004200510049004A00440054>-225<00580049004A00440049>-225<00450050004F>80<0445>75<0055>-225<004900420057>5<0046>-225<004D004A004F004C0054>20<000F>]TJ
0 g 0 G
/F54 14.3462 Tf
-1 0 0 1 74.008 547.668 Tm [<0039>-500<004A0051>31<00600032>-367<0022001C002B0046003B00600051006D004D002F>]TJ
+1 0 0 1 74.008 501.906 Tm [<0039>-500<004A0051>31<00600032>-367<0022001C002B0046003B00600051006D004D002F>]TJ
0 g 0 G
/F57 10.90909 Tf
-0.999 0 0 1 74.409 515.05 Tm [<0024004D004A0044004C00420043004D0046>-226<004D004A004F004C0054>-226<004A004F>-226<0042>-227<003100250027>-226<00420053>20<0046>-226<0050004F0046>-226<004600590042004E0051004D0046>-226<00500047>-226<0042004F>-227<0042004F004F0050005500420055004A0050004F000F>-303<0022004F004F0050005500420055004A0050004F0054>-226<00420053>19<0046>-225<00420053>19<004600420054>-225<0050004F>-227<0042>-226<0051004200480046>]TJ
-1.017 0 0 1 73.995 501.501 Tm [<00580049004A00440049>-221<00420053>19<0046>-221<00420054005400500044004A0042005500460045>-221<0058004A00550049>-222<0042004F>-221<004200440055004A0050004F000F>-296<0022>-222<0055005A0051004A00440042004D>-221<0042004F004F0050005500420055004A0050004F>-222<00500043004B004600440055>-221<004400500056004D0045>-222<004D00500050004C>-221<004D004A004C0046>-222<00550049004A0054>-221<004A004F>-222<005500490046>]TJ
-1 0 0 1 74.409 487.952 Tm [<003100250027001B>]TJ
+0.999 0 0 1 74.409 469.287 Tm [<0024004D004A0044004C00420043004D0046>-226<004D004A004F004C0054>-226<004A004F>-226<0042>-227<003100250027>-226<00420053>20<0046>-226<0050004F0046>-226<004600590042004E0051004D0046>-226<00500047>-226<0042004F>-227<0042004F004F0050005500420055004A0050004F000F>-303<0022004F004F0050005500420055004A0050004F0054>-226<00420053>19<0046>-225<00420053>19<004600420054>-225<0050004F>-227<0042>-226<0051004200480046>]TJ
+1.017 0 0 1 73.995 455.738 Tm [<00580049004A00440049>-221<00420053>19<0046>-221<00420054005400500044004A0042005500460045>-221<0058004A00550049>-222<0042004F>-221<004200440055004A0050004F000F>-296<0022>-222<0055005A0051004A00440042004D>-221<0042004F004F0050005500420055004A0050004F>-222<00500043004B004600440055>-221<004400500056004D0045>-222<004D00500050004C>-221<004D004A004C0046>-222<00550049004A0054>-221<004A004F>-222<005500490046>]TJ
+1 0 0 1 74.409 442.189 Tm [<003100250027001B>]TJ
/F36 10.90909 Tf
-1 0 0 1 74.409 468.425 Tm [<00520038>-525<0079>-525<005100230044>]TJ
-1 0 0 1 74.409 454.876 Tm [<00490049>]TJ
-1 0 0 1 74.409 441.327 Tm [<00660068007600540032>-525<0066001B004D004D00510069>]TJ
-1 0 0 1 74.409 427.777 Tm [<00660061006D00230069007600540032006600470042004D0046>]TJ
-1 0 0 1 74.409 414.228 Tm [<0066005F0032002B0069>-525<00280052003900640058006400520065>-525<00650038003900580079006B0038>-525<006A007900520058003300330064>-525<0065006500380058005200380029>]TJ
-1 0 0 1 74.409 400.679 Tm [<0066002200510060002F0032006000280079>-525<0079>-525<0052002900660022006100490049006600610066006C00660071>-525<0052003D003D0066003E006600410066002A00280079>-525<0052>-525<00520029>]TJ
-1 0 0 1 74.409 387.13 Tm [<0066001B00490049006600680076005400320066001B002B006900420051004D006600610066006C005F00410066006C005F00410055003F0069006900540062002C0066006600720072007200580048001C006900320074004000540060005100440032002B0069005800510060003B0056003D003D>]TJ
-1 0 0 1 74.409 373.581 Tm [<003D003D>]TJ
-1 0 0 1 74.409 360.031 Tm [<0032004D002F005100230044>]TJ
+1 0 0 1 74.409 422.662 Tm [<00520038>-525<0079>-525<005100230044>]TJ
+1 0 0 1 74.409 409.113 Tm [<00490049>]TJ
+1 0 0 1 74.409 395.564 Tm [<00660068007600540032>-525<0066001B004D004D00510069>]TJ
+1 0 0 1 74.409 382.015 Tm [<00660061006D00230069007600540032006600470042004D0046>]TJ
+1 0 0 1 74.409 368.466 Tm [<0066005F0032002B0069>-525<00280052003900640058006400520065>-525<00650038003900580079006B0038>-525<006A007900520058003300330064>-525<0065006500380058005200380029>]TJ
+1 0 0 1 74.409 354.916 Tm [<0066002200510060002F0032006000280079>-525<0079>-525<0052002900660022006100490049006600610066006C00660071>-525<0052003D003D0066003E006600410066002A00280079>-525<0052>-525<00520029>]TJ
+1 0 0 1 74.409 341.367 Tm [<0066001B00490049006600680076005400320066001B002B006900420051004D006600610066006C005F00410066006C005F00410055003F0069006900540062002C0066006600720072007200580048001C006900320074004000540060005100440032002B0069005800510060003B0056003D003D>]TJ
+1 0 0 1 74.409 327.818 Tm [<003D003D>]TJ
+1 0 0 1 74.409 314.269 Tm [<0032004D002F005100230044>]TJ
0 g 0 G
0 g 0 G
/F57 10.90909 Tf
-0.994 0 0 1 74.071 333.73 Tm [<00350049004A0054>-227<004A0054>-227<0042004F>-227<00500043004B004600440055>-227<00500047>-227<0055005A00510046>]TJ
+0.994 0 0 1 74.071 287.967 Tm [<00350049004A0054>-227<004A0054>-227<0042004F>-227<00500043004B004600440055>-227<00500047>-227<0055005A00510046>]TJ
/F36 10.90909 Tf
-1 0 0 1 191.872 333.73 Tm [<001B004D004D00510069>]TJ
+1 0 0 1 191.872 287.967 Tm [<001B004D004D00510069>]TJ
/F57 10.90909 Tf
-0.994 0 0 1 222.971 333.73 Tm [<0042004F0045>-227<0054005600430055005A00510046>]TJ
+0.994 0 0 1 222.971 287.967 Tm [<0042004F0045>-227<0054005600430055005A00510046>]TJ
/F36 10.90909 Tf
-1 0 0 1 285.931 333.73 Tm [<00470042004D0046>]TJ
+1 0 0 1 285.931 287.967 Tm [<00470042004D0046>]TJ
/F57 10.90909 Tf
-0.994 0 0 1 308.84 333.73 Tm [<000F>-304<003500490046>]TJ
+0.994 0 0 1 308.84 287.967 Tm [<000F>-304<003500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 336.363 333.73 Tm [<0066005F0032002B0069>]TJ
+1 0 0 1 336.363 287.967 Tm [<0066005F0032002B0069>]TJ
/F57 10.90909 Tf
-0.994 0 0 1 367.462 333.73 Tm [<0057>6<0042004D00560046>-226<00450046005400440053>-9<004A004300460054>-227<005500490046>-227<0053>20<0046004400550042004F0048004D0046>-226<00500047>]TJ
-1.013 0 0 1 74.409 320.181 Tm [<00550049004A0054>-222<0042004F004F0050005500420055004A0050004F000F>-296<003500490046>-223<0044005000500053>19<0045004A004F0042005500460054>-221<00420053>19<0046>-221<0042004300540050004D005600550046>-223<0044005000500053>19<0045004A004F0042005500460054>-221<0053>19<0046004D0042005500460045>-221<00550050>-223<005500490046>-222<0044005600530053>19<0046004F0055>-221<0051004200480046>19<000F>-295<002A>23<0055>-222<004A0054>]TJ
-0.984 0 0 1 74.409 306.632 Tm [<004A004E005100500053>-8<00550042004F0055>-229<00550050>-229<0056004F004500460053005400550042004F0045>-228<0055004900420055>-229<0042004F>-229<0042004F004F0050005500420055004A0050004F>-229<004A0054>-229<004F00500055>-229<00440050004F004F00460044005500460045>-229<00550050>-229<00540050004E0046>-229<0051004200480046>-229<00440050004F00550046004F0055>-229<004300560055>-229<0050004F004D005A>]TJ
-0.98 0 0 1 74.409 293.082 Tm [<00550050>-213<0042>-214<004D0050004400420055004A0050004F0002>-301<003500490046>]TJ
+0.994 0 0 1 367.462 287.967 Tm [<0057>6<0042004D00560046>-226<00450046005400440053>-9<004A004300460054>-227<005500490046>-227<0053>20<0046004400550042004F0048004D0046>-226<00500047>]TJ
+1.013 0 0 1 74.409 274.418 Tm [<00550049004A0054>-222<0042004F004F0050005500420055004A0050004F000F>-296<003500490046>-223<0044005000500053>19<0045004A004F0042005500460054>-221<00420053>19<0046>-221<0042004300540050004D005600550046>-223<0044005000500053>19<0045004A004F0042005500460054>-221<0053>19<0046004D0042005500460045>-221<00550050>-223<005500490046>-222<0044005600530053>19<0046004F0055>-221<0051004200480046>19<000F>-295<002A>23<0055>-222<004A0054>]TJ
+0.984 0 0 1 74.409 260.869 Tm [<004A004E005100500053>-8<00550042004F0055>-229<00550050>-229<0056004F004500460053005400550042004F0045>-228<0055004900420055>-229<0042004F>-229<0042004F004F0050005500420055004A0050004F>-229<004A0054>-229<004F00500055>-229<00440050004F004F00460044005500460045>-229<00550050>-229<00540050004E0046>-229<0051004200480046>-229<00440050004F00550046004F0055>-229<004300560055>-229<0050004F004D005A>]TJ
+0.98 0 0 1 74.409 247.32 Tm [<00550050>-213<0042>-214<004D0050004400420055004A0050004F0002>-301<003500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 160.75 293.082 Tm [<0066002200510060002F00320060>]TJ
+1 0 0 1 160.75 247.32 Tm [<0066002200510060002F00320060>]TJ
/F57 10.90909 Tf
-0.98 0 0 1 203.126 293.082 Tm [<0054004600550055004A004F0048>-213<0042004F0045>-214<005500490046>-214<00500055004900460053>-214<0057>6<0042004D005600460054>-213<004A004F>-214<00550049004A0054>-213<004D004A004F0046>-214<00450046005400440053>-9<004A00430046>-213<005500490046>-214<004D00500050004C>-214<0042004F0045>-214<00440050004D00500053>]TJ
-0.981 0 0 1 74.409 279.533 Tm [<00500047>-229<0042004F004F0050005500420055004A0050004F000F>-306<003500490046>]TJ
+0.98 0 0 1 203.126 247.32 Tm [<0054004600550055004A004F0048>-213<0042004F0045>-214<005500490046>-214<00500055004900460053>-214<0057>6<0042004D005600460054>-213<004A004F>-214<00550049004A0054>-213<004D004A004F0046>-214<00450046005400440053>-9<004A00430046>-213<005500490046>-214<004D00500050004C>-214<0042004F0045>-214<00440050004D00500053>]TJ
+0.981 0 0 1 74.409 233.771 Tm [<00500047>-229<0042004F004F0050005500420055004A0050004F000F>-306<003500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 167.553 279.533 Tm [<0066001B>]TJ
-/F57 10.90909 Tf
-0.981 0 0 1 181.462 279.533 Tm [<0057>6<0042004D00560046>-229<00440050004F00550042004A004F0054>-229<005500490046>-229<004200440055004A0050004F000D>-230<004A004F>-229<00550049004A0054>-229<0044004200540046>-230<004A0055>-229<004A0054>-230<0042004F>-229<00560053004D>-229<00550050>-230<0042004F>-229<00460059005500460053>-8<004F0042004D>-229<0058>5<004600430054004A00550046>21<000F>]TJ
-1 0 0 1 74.071 259.209 Tm [<0035>100<0050>-225<0447>50<0053>20<0046004200440055004A0057>6<004200550046>60<0448>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>-225<00500047>-225<0042004F>-225<004A004F0044004D0056004500460045>-225<005100450047>-225<0050004F0046>-225<004900420054>-225<00550050>-225<00450050>-225<0042>-225<004F0056004E004300460053>-225<00500047>-225<005500420054004C0054>20<000F>]TJ
-0 g 0 G
-1 0 0 1 91.766 238.886 Tm [<044C>]TJ
-0 g 0 G
-1.012 0 0 1 101.682 238.886 Tm [<0030>5<004F0046>-222<004E005600540055>]TJ
-/F89 10.90909 Tf
-1.012 0 0 1 152.957 238.886 Tm [<0053>26<004600550053004A00460057>6<0046>-222<0042004F0045>-223<0054005500500053>26<0046>]TJ
+1 0 0 1 167.553 233.771 Tm [<0066001B>]TJ
/F57 10.90909 Tf
-1.012 0 0 1 240.183 238.886 Tm [<005500490046>-222<0042004F004F0050005500420055004A0050004F0054>-223<00500047>-223<005500490046>-222<004A004F0044004D0056004500460045>-223<005100450047000F>-298<0027>35<00500053>-221<004D004A004F004C0054>-223<00550050>-223<00460059005500460053>-8<004F0042004D>]TJ
-1.02 0 0 1 101.682 225.336 Tm [<00560053004D>10<0445>110<0054>-238<00550049004A0054>-238<0053>19<004600520056004A0053>20<00460054>-237<00550050>-238<056D004F0045>-238<0050004F004D005A>-238<0050004F0046>-238<00500043004B004600440055>-238<004D004A004C0046>-238<005500490046>-238<0050004F0046>-238<005400490050>29<0058004F>-237<004200430050>29<0057>5<0046>20<000F>-346<0023>11<00560055>-237<0046>19<000F0048000F>-345<004A004F005500460053>-8<004F0042004D>]TJ
-1 0 0 1 101.682 211.787 Tm [<004D004A004F004C0054>-225<00510050004A004F0055>-225<00550050>-225<0045004600540055004A004F00420055004A0050004F>-225<00500043004B0046004400550054>-225<0042004F0045>-225<00550049004600540046>-225<004E005600540055>-225<00430046>-225<004700500056004F0045>-225<005500500050>40<000F>]TJ
+0.981 0 0 1 181.462 233.771 Tm [<0057>6<0042004D00560046>-229<00440050004F00550042004A004F0054>-229<005500490046>-229<004200440055004A0050004F000D>-230<004A004F>-229<00550049004A0054>-229<0044004200540046>-230<004A0055>-229<004A0054>-230<0042004F>-229<00560053004D>-229<00550050>-230<0042004F>-229<00460059005500460053>-8<004F0042004D>-229<0058>5<004600430054004A00550046>21<000F>]TJ
+1 0 0 1 74.071 213.447 Tm [<0035>100<0050>-225<0447>50<0053>20<0046004200440055004A0057>6<004200550046>60<0448>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>-225<00500047>-225<0042004F>-225<004A004F0044004D0056004500460045>-225<005100450047>-225<0050004F0046>-225<004900420054>-225<00550050>-225<00450050>-225<0042>-225<004F0056004E004300460053>-225<00500047>-225<005500420054004C0054>20<000F>]TJ
0 g 0 G
-1 0 0 1 91.766 191.463 Tm [<044C>]TJ
+1 0 0 1 91.766 193.123 Tm [<044C>]TJ
0 g 0 G
-1.02 0 0 1 101.682 191.463 Tm [<0030>5<004F0046>-220<004E005600540055>]TJ
+1.012 0 0 1 101.682 193.123 Tm [<0030>5<004F0046>-222<004E005600540055>]TJ
/F89 10.90909 Tf
-1.02 0 0 1 153.314 191.463 Tm [<0053>26<004600440042004D00440056004D004200550046>]TJ
+1.012 0 0 1 152.957 193.123 Tm [<0053>26<004600550053004A00460057>6<0046>-222<0042004F0045>-223<0054005500500053>26<0046>]TJ
/F57 10.90909 Tf
-1.02 0 0 1 210.61 191.463 Tm [<005500490046>-220<0053>19<0046004400550042004F0048004D0046>-220<0044005000500053>19<0045004A004F0042005500460054>-220<00550050>-220<056D0055>-221<00550050>-220<005500490046>-221<0044005000500053>19<0045004A004F004200550046>-220<0054005A005400550046004E>-220<00500047>-221<005500490046>]TJ
-0.99 0 0 1 101.682 177.914 Tm [<005500420053>6<004800460055>-228<0051004200480046001B>-305<00420054>-229<005500490046>-228<004A004F0044004D0056004500460045>-228<005100450047>-229<00440042004F>-228<00430046>-229<0051004D0042004400460045>-228<00420055>-228<0057>5<00420053>-7<004A005000560054>-229<005100500054004A0055004A0050004F0054>10<000D>-228<005400440042004D00460045000D>-229<0053>6<005000550042005500460045>-228<0042004F0045>]TJ
-1.02 0 0 1 101.682 164.365 Tm [<00460057>5<0046004F>-255<0044004D004A0051005100460045>-255<00550049004A0054>-255<004A0054>-255<004F00500055>-255<0042004F>-255<004600420054005A>-255<005500420054004C000F>-397<0025>5<004600540055004A004F00420055004A0050004F0054>-254<004900420057>4<0046>-254<0053>19<0046004400550042004F0048004D00460054>-254<005500500050>-255<0055004900420055>-255<004E005600540055>-255<00430046>]TJ
-1 0 0 1 101.682 150.816 Tm [<0053>20<004600440042004D00440056004D0042005500460045000F>]TJ
+1.012 0 0 1 240.183 193.123 Tm [<005500490046>-222<0042004F004F0050005500420055004A0050004F0054>-223<00500047>-223<005500490046>-222<004A004F0044004D0056004500460045>-223<005100450047000F>-298<0027>35<00500053>-221<004D004A004F004C0054>-223<00550050>-223<00460059005500460053>-8<004F0042004D>]TJ
+1.02 0 0 1 101.682 179.574 Tm [<00560053004D>10<0445>110<0054>-238<00550049004A0054>-238<0053>19<004600520056004A0053>20<00460054>-237<00550050>-238<056D004F0045>-238<0050004F004D005A>-238<0050004F0046>-238<00500043004B004600440055>-238<004D004A004C0046>-238<005500490046>-238<0050004F0046>-238<005400490050>29<0058004F>-237<004200430050>29<0057>5<0046>20<000F>-346<0023>11<00560055>-237<0046>19<000F0048000F>-345<004A004F005500460053>-8<004F0042004D>]TJ
+1 0 0 1 101.682 166.025 Tm [<004D004A004F004C0054>-225<00510050004A004F0055>-225<00550050>-225<0045004600540055004A004F00420055004A0050004F>-225<00500043004B0046004400550054>-225<0042004F0045>-225<00550049004600540046>-225<004E005600540055>-225<00430046>-225<004700500056004F0045>-225<005500500050>40<000F>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
@@ -1045,53 +1044,56 @@ ET
endstream
endobj
-82 0 obj
-<< /Type /Page /Contents 83 0 R /Resources 81 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+81 0 obj
+<< /Type /Page /Contents 82 0 R /Resources 80 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+endobj
+83 0 obj
+<< /D [ 81 0 R /XYZ 73.409 809.993 null ] >>
endobj
84 0 obj
-<< /D [ 82 0 R /XYZ 73.409 809.993 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 771.732 null ] >>
endobj
85 0 obj
-<< /D [ 82 0 R /XYZ 88.706 780.242 null ] >>
+<< /D [ 81 0 R /XYZ 88.706 734.48 null ] >>
endobj
86 0 obj
-<< /D [ 82 0 R /XYZ 74.409 569.736 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 523.973 null ] >>
endobj
87 0 obj
-<< /D [ 82 0 R /XYZ 74.409 481.843 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 436.081 null ] >>
endobj
88 0 obj
-<< /D [ 82 0 R /XYZ 74.409 481.974 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 436.212 null ] >>
endobj
89 0 obj
-<< /D [ 82 0 R /XYZ 74.409 468.425 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 422.662 null ] >>
endobj
90 0 obj
-<< /D [ 82 0 R /XYZ 74.409 454.876 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 409.113 null ] >>
endobj
91 0 obj
-<< /D [ 82 0 R /XYZ 74.409 441.327 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 395.564 null ] >>
endobj
92 0 obj
-<< /D [ 82 0 R /XYZ 74.409 427.777 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 382.015 null ] >>
endobj
93 0 obj
-<< /D [ 82 0 R /XYZ 74.409 414.228 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 368.466 null ] >>
endobj
94 0 obj
-<< /D [ 82 0 R /XYZ 74.409 400.679 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 354.916 null ] >>
endobj
95 0 obj
-<< /D [ 82 0 R /XYZ 74.409 387.13 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 341.367 null ] >>
endobj
96 0 obj
-<< /D [ 82 0 R /XYZ 74.409 373.581 null ] >>
+<< /D [ 81 0 R /XYZ 74.409 327.818 null ] >>
endobj
-81 0 obj
-<< /ExtGState 1 0 R /Font << /F55 11 0 R /F36 14 0 R /F57 12 0 R /F54 10 0 R /F89 35 0 R >> /ProcSet [ /PDF /Text ] >>
+80 0 obj
+<< /ExtGState 1 0 R /Font << /F54 10 0 R /F55 11 0 R /F36 14 0 R /F57 12 0 R /F89 35 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-123 0 obj
-<< /Length 15027 >>
+99 0 obj
+<< /Length 15847 >>
stream
/opacity1 gs
0 g 0 G
@@ -1107,157 +1109,160 @@ BT
/F57 10.90909 Tf
1 0 0 1 91.766 760.773 Tm [<044C>]TJ
0 g 0 G
-1.02 0 0 1 101.682 760.773 Tm [<0030>5<004F0046>-243<004E005600540055>]TJ
+1.02 0 0 1 101.682 760.773 Tm [<0030>5<004F0046>-220<004E005600540055>]TJ
/F89 10.90909 Tf
-1.02 0 0 1 153.831 760.773 Tm [<0053>26<0046004A004F005400460053>-8<0055>]TJ
+1.02 0 0 1 153.314 760.773 Tm [<0053>26<004600440042004D00440056004D004200550046>]TJ
/F57 10.90909 Tf
-1.02 0 0 1 195.185 760.773 Tm [<005500490046>-243<0042004F004F0050005500420055004A0050004F>-244<0042004F0045>-244<0053>19<0046004D0042005500460045>-243<00500043004B0046004400550054>19<000F>-362<00350049004A0054>-244<004900420054>-244<00550050>-244<00550042004C0046>-244<004A004F00550050>-243<00420044004400500056004F0055>]TJ
-1 0 0 1 101.682 747.224 Tm [<0055004900420055>-226<0042>-226<005100450047>-227<004A0054>-226<005100460053>-6<0049004200510054>-226<004F00500055>-227<004A004F0044004D0056004500460045>-226<00440050004E0051004D004600550046004D005A>86<000D>-226<0042>-227<004D004A004F004C>-226<0054004900500056004D0045004F>81<0445>76<0055>-225<00510050004A004F0055>-227<00550050>-226<0042>-226<004E004A00540054004A004F0048>-227<0051004200480046>]TJ
-1.006 0 0 1 101.682 733.675 Tm [<00500053>-223<0042>-223<0044004D004A0051005100460045>-223<0042004F004F0050005500420055004A0050004F000F>-298<002A>23<0055>-222<0042004D00540050>-224<004900420054>-223<00550050>-223<00550042004C0046>-224<004A004F00550050>-223<00420044004400500056004F0055>-223<0055004900420055>-223<0042>-224<005100450047>-223<004A0054>-223<005100460053>-6<0049004200510054>-223<004A004F005400460053>-9<005500460045>]TJ
-1 0 0 1 101.682 720.126 Tm [<004E00500053>20<0046>-225<005500490042004F>-225<0050004F00440046>-225<00500053>-225<004A004F>-225<00540055004600510054>20<000F>]TJ
+1.02 0 0 1 210.61 760.773 Tm [<005500490046>-220<0053>19<0046004400550042004F0048004D0046>-220<0044005000500053>19<0045004A004F0042005500460054>-220<00550050>-220<056D0055>-221<00550050>-220<005500490046>-221<0044005000500053>19<0045004A004F004200550046>-220<0054005A005400550046004E>-220<00500047>-221<005500490046>]TJ
+0.99 0 0 1 101.682 747.224 Tm [<005500420053>6<004800460055>-228<0051004200480046001B>-305<00420054>-229<005500490046>-228<004A004F0044004D0056004500460045>-228<005100450047>-229<00440042004F>-228<00430046>-229<0051004D0042004400460045>-228<00420055>-228<0057>5<00420053>-7<004A005000560054>-229<005100500054004A0055004A0050004F0054>10<000D>-228<005400440042004D00460045000D>-229<0053>6<005000550042005500460045>-228<0042004F0045>]TJ
+1.02 0 0 1 101.682 733.675 Tm [<00460057>5<0046004F>-255<0044004D004A0051005100460045>-255<00550049004A0054>-255<004A0054>-255<004F00500055>-255<0042004F>-255<004600420054005A>-255<005500420054004C000F>-397<0025>5<004600540055004A004F00420055004A0050004F0054>-254<004900420057>4<0046>-254<0053>19<0046004400550042004F0048004D00460054>-254<005500500050>-255<0055004900420055>-255<004E005600540055>-255<00430046>]TJ
+1 0 0 1 101.682 720.126 Tm [<0053>20<004600440042004D00440056004D0042005500460045000F>]TJ
+0 g 0 G
+1 0 0 1 91.766 699.802 Tm [<044C>]TJ
+0 g 0 G
+1.02 0 0 1 101.682 699.802 Tm [<0030>5<004F0046>-243<004E005600540055>]TJ
+/F89 10.90909 Tf
+1.02 0 0 1 153.831 699.802 Tm [<0053>26<0046004A004F005400460053>-8<0055>]TJ
+/F57 10.90909 Tf
+1.02 0 0 1 195.185 699.802 Tm [<005500490046>-243<0042004F004F0050005500420055004A0050004F>-244<0042004F0045>-244<0053>19<0046004D0042005500460045>-243<00500043004B0046004400550054>19<000F>-362<00350049004A0054>-244<004900420054>-244<00550050>-244<00550042004C0046>-244<004A004F00550050>-243<00420044004400500056004F0055>]TJ
+1 0 0 1 101.682 686.253 Tm [<0055004900420055>-226<0042>-226<005100450047>-227<004A0054>-226<005100460053>-6<0049004200510054>-226<004F00500055>-227<004A004F0044004D0056004500460045>-226<00440050004E0051004D004600550046004D005A>86<000D>-226<0042>-227<004D004A004F004C>-226<0054004900500056004D0045004F>81<0445>76<0055>-225<00510050004A004F0055>-227<00550050>-226<0042>-226<004E004A00540054004A004F0048>-227<0051004200480046>]TJ
+1.006 0 0 1 101.682 672.704 Tm [<00500053>-223<0042>-223<0044004D004A0051005100460045>-223<0042004F004F0050005500420055004A0050004F000F>-298<002A>23<0055>-222<0042004D00540050>-224<004900420054>-223<00550050>-223<00550042004C0046>-224<004A004F00550050>-223<00420044004400500056004F0055>-223<0055004900420055>-223<0042>-224<005100450047>-223<004A0054>-223<005100460053>-6<0049004200510054>-223<004A004F005400460053>-9<005500460045>]TJ
+1 0 0 1 101.682 659.154 Tm [<004E00500053>20<0046>-225<005500490042004F>-225<0050004F00440046>-225<00500053>-225<004A004F>-225<00540055004600510054>20<000F>]TJ
0 g 0 G
/F54 11.95517 Tf
-1 0 0 1 74.075 682.031 Tm [<003900580052>-500<005F0032006900600042003200700042004D003B>-367<001C004D002F>-367<006200690051>31<00600042004D003B>-367<001C004D004D00510069001C006900420051004D0062>]TJ
+1 0 0 1 74.075 621.162 Tm [<003900580052>-500<005F0032006900600042003200700042004D003B>-367<001C004D002F>-367<006200690051>31<00600042004D003B>-367<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 74.071 653.689 Tm [<00350049004600500053>20<00460055004A00440042004D004D005A>-295<0050004F0046>-296<00440042004F>-296<00450050>-295<004A0055>-296<004E0042004F00560042004D004D005A>-10<001B>-444<0036>39<004F00440050004E00510053>20<004600540054>-295<005500490046>-296<003100250027>-295<000900500053>-296<005800490046004F>-296<00560054004A004F0048>-295<002D>]TJ
+1.02 0 0 1 74.071 592.82 Tm [<00350049004600500053>20<00460055004A00440042004D004D005A>-295<0050004F0046>-296<00440042004F>-296<00450050>-295<004A0055>-296<004E0042004F00560042004D004D005A>-10<001B>-444<0036>39<004F00440050004E00510053>20<004600540054>-295<005500490046>-296<003100250027>-295<000900500053>-296<005800490046004F>-296<00560054004A004F0048>-295<002D>]TJ
/F57 7.63636 Tf
-1 0 0 1 463.212 655.954 Tm [<0022>]TJ
-/F57 10.90909 Tf
-1.02 0 0 1 466.425 653.689 Tm [<0035>]TJ
-1 0 0 1 471.516 651.016 Tm [<0026>]TJ
-1.02 0 0 1 476.764 653.689 Tm [<0039000D>-314<00440053>19<0046004200550046>]TJ
-1.012 0 0 1 74.409 640.14 Tm [<0045004A0053>20<004600440055004D005A>-223<0042004F>-223<0056004F00440050004E00510053>19<00460054005400460045>-222<0050004F0046000A000D>-224<005000510046004F>-223<004A0055>-224<004A004F>-223<0042004F>-223<00460045004A005500500053>-224<0042004F0045>-223<004400500051>24<005A>-222<0042004F0045>-223<00510042005400550046>-224<0042004D004D>-223<004F00460046004500460045>-223<00500043004B0046004400550054>19<000F>]TJ
-1 0 0 1 74.409 626.591 Tm [<0031>12<0053>10<004200440055004A00440042004D004D005A>-225<0050004F0046>-225<004F0042005500560053>10<0042004D004D005A>-225<00580042004F0055>-225<00540050004E0046>-225<005500500050004D000F>]TJ
-0.98 0 0 1 74.071 606.267 Tm [<003500490046>]TJ
+1 0 0 1 463.212 595.085 Tm [<0022>]TJ
+/F57 10.90909 Tf
+1.02 0 0 1 466.425 592.82 Tm [<0035>]TJ
+1 0 0 1 471.516 590.147 Tm [<0026>]TJ
+1.02 0 0 1 476.764 592.82 Tm [<0039000D>-314<00440053>19<0046004200550046>]TJ
+1.012 0 0 1 74.409 579.271 Tm [<0045004A0053>20<004600440055004D005A>-223<0042004F>-223<0056004F00440050004E00510053>19<00460054005400460045>-222<0050004F0046000A000D>-224<005000510046004F>-223<004A0055>-224<004A004F>-223<0042004F>-223<00460045004A005500500053>-224<0042004F0045>-223<004400500051>24<005A>-222<0042004F0045>-223<00510042005400550046>-224<0042004D004D>-223<004F00460046004500460045>-223<00500043004B0046004400550054>19<000F>]TJ
+1 0 0 1 74.409 565.722 Tm [<0031>12<0053>10<004200440055004A00440042004D004D005A>-225<0050004F0046>-225<004F0042005500560053>10<0042004D004D005A>-225<00580042004F0055>-225<00540050004E0046>-225<005500500050004D000F>]TJ
+0.98 0 0 1 74.071 545.398 Tm [<003500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 94.331 606.267 Tm [<0054001C0074>]TJ
+1 0 0 1 94.331 545.398 Tm [<0054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-0.98 0 0 1 113.149 606.267 Tm [<005100420044004C004200480046>-153<00470053>6<0050004E>-152<0029>30<0046004A004C0050>-152<0030004300460053>20<0045004A0046004C>-153<00440050004F0054004A005400550054>-153<00500047>-153<0042>-153<005100460053004D>-153<005400440053>-8<004A00510055>-153<0042004F0045>-153<0042>-153<004B00420057>5<0042000E004B00420053>-152<056D004D0046>]TJ
+0.98 0 0 1 113.149 545.398 Tm [<005100420044004C004200480046>-153<00470053>6<0050004E>-152<0029>30<0046004A004C0050>-152<0030004300460053>20<0045004A0046004C>-153<00440050004F0054004A005400550054>-153<00500047>-153<0042>-153<005100460053004D>-153<005400440053>-8<004A00510055>-153<0042004F0045>-153<0042>-153<004B00420057>5<0042000E004B00420053>-152<056D004D0046>]TJ
/F36 10.90909 Tf
-1 0 0 1 447.043 606.267 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
+1 0 0 1 447.043 545.398 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
/F57 10.90909 Tf
-0.988 0 0 1 73.995 592.718 Tm [<00580049004A00440049>-226<00440042004F>-227<0046005900550053>10<004200440055>-226<005500490046>-227<004F0046004400460054005400420053>-18<005A>-227<00500043004B0046004400550054>20<000F>-303<002A>24<0055>-226<00580053>-8<004A005500460054>-227<005500490046>-226<004A004F004700500053>-8<004E00420055004A0050004F>-227<00550050>-227<0042>-226<056D004D0046>-227<0058004A00550049>-227<005500490046>-226<0046005900550046004F0054004A0050004F>]TJ
+0.988 0 0 1 73.995 531.849 Tm [<00580049004A00440049>-226<00440042004F>-227<0046005900550053>10<004200440055>-226<005500490046>-227<004F0046004400460054005400420053>-18<005A>-227<00500043004B0046004400550054>20<000F>-303<002A>24<0055>-226<00580053>-8<004A005500460054>-227<005500490046>-226<004A004F004700500053>-8<004E00420055004A0050004F>-227<00550050>-227<0042>-226<056D004D0046>-227<0058004A00550049>-227<005500490046>-226<0046005900550046004F0054004A0050004F>]TJ
/F36 10.90909 Tf
-1 0 0 1 74.409 579.168 Tm [<0054001C0074>]TJ
+1 0 0 1 74.409 518.3 Tm [<0054001C0074>]TJ
/F57 10.90909 Tf
-0.984 0 0 1 91.591 579.168 Tm [<000F>-304<003800490046004F>-228<004A0055>-227<004900420054>-228<004300460046004F>-228<005400560044004400460054005400470056004D004D005A>-227<004A004F005400550042004D004D00460045>-228<004A0055>-228<005800500053>6<004C0054>-227<00520056004A00550046>-228<056D004F0046>20<000F>-304<0031>12<0053>6<00500043004D0046004E0054>-227<0058004A00550049>-227<00550049004A0054>-228<0042005100510053>5<0050004200440049>]TJ
-1 0 0 1 74.409 565.619 Tm [<00420053>20<0046>]TJ
+0.984 0 0 1 91.591 518.3 Tm [<000F>-304<003800490046004F>-228<004A0055>-227<004900420054>-228<004300460046004F>-228<005400560044004400460054005400470056004D004D005A>-227<004A004F005400550042004D004D00460045>-228<004A0055>-228<005800500053>6<004C0054>-227<00520056004A00550046>-228<056D004F0046>20<000F>-304<0031>12<0053>6<00500043004D0046004E0054>-227<0058004A00550049>-227<00550049004A0054>-228<0042005100510053>5<0050004200440049>]TJ
+1 0 0 1 74.409 504.75 Tm [<00420053>20<0046>]TJ
0 g 0 G
-1 0 0 1 91.766 545.295 Tm [<044C>]TJ
+1 0 0 1 91.766 484.427 Tm [<044C>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 101.682 545.295 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
+1 0 0 1 101.682 484.427 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
/F57 10.90909 Tf
-0.98 0 0 1 200.923 545.295 Tm [<0053>20<004600520056004A0053>21<00460054>-174<0042004F>-176<00460059005500460053>-8<004F0042004D000D>-187<0050004D0045>-175<0057>4<004600530054004A0050004F>-174<00500047>-176<005500490046>-176<004B00420057>6<0042>-175<004D004A00430053>10<00420053>-18<005A>-176<00500047>-175<00310025002700430050>17<0059>-174<00580049004A00440049>]TJ
-1 0 0 1 101.682 531.746 Tm [<004E005600540055>-225<00430046>-225<004A004F005400550042004D004D00460045>-225<004E0042004F00560042004D004D005A>-10<001C>]TJ
+0.98 0 0 1 200.923 484.427 Tm [<0053>20<004600520056004A0053>21<00460054>-174<0042004F>-176<00460059005500460053>-8<004F0042004D000D>-187<0050004D0045>-175<0057>4<004600530054004A0050004F>-174<00500047>-176<005500490046>-176<004B00420057>6<0042>-175<004D004A00430053>10<00420053>-18<005A>-176<00500047>-175<00310025002700430050>17<0059>-174<00580049004A00440049>]TJ
+1 0 0 1 101.682 470.877 Tm [<004E005600540055>-225<00430046>-225<004A004F005400550042004D004D00460045>-225<004E0042004F00560042004D004D005A>-10<001C>]TJ
0 g 0 G
-1 0 0 1 91.766 511.422 Tm [<044C>]TJ
+1 0 0 1 91.766 450.554 Tm [<044C>]TJ
0 g 0 G
-1 0 0 1 101.682 511.422 Tm [<004A0055>-225<0053>20<004600520056004A0053>20<00460054>-225<0042>-225<004B00420057>6<0042>-225<004A004F005400550042004D004D00420055004A0050004F>-225<0042004F0045>]TJ
+1 0 0 1 101.682 450.554 Tm [<004A0055>-225<0053>20<004600520056004A0053>20<00460054>-225<0042>-225<004B00420057>6<0042>-225<004A004F005400550042004D004D00420055004A0050004F>-225<0042004F0045>]TJ
0 g 0 G
-1 0 0 1 91.766 491.099 Tm [<044C>]TJ
+1 0 0 1 91.766 430.23 Tm [<044C>]TJ
0 g 0 G
-1 0 0 1 101.682 491.099 Tm [<004A0055>-225<004A0054>-225<004F00500055>-225<0046005900550046004F0054004A0043004D0046>20<000F>]TJ
-1.02 0 0 1 74.071 470.775 Tm [<003500490046>]TJ
+1 0 0 1 101.682 430.23 Tm [<004A0055>-225<004A0054>-225<004F00500055>-225<0046005900550046004F0054004A0043004D0046>20<000F>]TJ
+1.02 0 0 1 74.071 409.906 Tm [<003500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 96.366 470.775 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 96.366 409.906 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 133.641 470.775 Tm [<005100420044004C004200480046>-261<00440050004E00460054>-262<0058004A00550049>-261<0042>-262<004D00560042000E056D004D0046>19<000F>-416<002A>23<0055>-261<0056005400460054>-262<005500490046>]TJ
+1.02 0 0 1 133.641 409.906 Tm [<005100420044004C004200480046>-261<00440050004E00460054>-262<0058004A00550049>-261<0042>-262<004D00560042000E056D004D0046>19<000F>-416<002A>23<0055>-261<0056005400460054>-262<005500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 345.167 470.775 Tm [<0054002F00370032>]TJ
+1 0 0 1 345.167 409.906 Tm [<0054002F00370032>]TJ
/F57 10.90909 Tf
-1.02 0 0 1 370.987 470.775 Tm [<004D004A00430053>10<00420053>-18<005A>-261<0046004E004300460045004500460045>-262<004A004F>-261<004D00560042005500460059>-262<00550050>]TJ
-1.02 0 0 1 74.409 457.226 Tm [<0046005900550053>10<004200440055>-268<005500490046>-269<0042004F004F0050005500420055004A0050004F0054>-268<0042004F0045>-269<00500055004900460053>-268<004F00460046004500460045>-269<004A004F004700500053>-7<004E00420055004A0050004F000F>]TJ
+1.02 0 0 1 370.987 409.906 Tm [<004D004A00430053>10<00420053>-18<005A>-261<0046004E004300460045004500460045>-262<004A004F>-261<004D00560042005500460059>-262<00550050>]TJ
+1.02 0 0 1 74.409 396.357 Tm [<0046005900550053>10<004200440055>-268<005500490046>-269<0042004F004F0050005500420055004A0050004F0054>-268<0042004F0045>-269<00500055004900460053>-268<004F00460046004500460045>-269<004A004F004700500053>-7<004E00420055004A0050004F000F>]TJ
/F36 10.90909 Tf
-1 0 0 1 356.427 457.226 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 356.427 396.357 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 393.778 457.226 Tm [<00580053>-8<004A005500460054>-268<005500490046>-269<004A004F004700500053>-7<004E00420055004A0050004F>-269<00550050>]TJ
-1.02 0 0 1 74.409 443.676 Tm [<0042>-251<056D004D0046>-251<0058004A00550049>-251<005500490046>-251<0046005900550046004F0054004A0050004F>]TJ
+1.02 0 0 1 393.778 396.357 Tm [<00580053>-8<004A005500460054>-268<005500490046>-269<004A004F004700500053>-7<004E00420055004A0050004F>-269<00550050>]TJ
+1.02 0 0 1 74.409 382.808 Tm [<0042>-251<056D004D0046>-251<0058004A00550049>-251<005500490046>-251<0046005900550046004F0054004A0050004F>]TJ
/F36 10.90909 Tf
-1 0 0 1 197.444 443.676 Tm [<0054001C0074>]TJ
+1 0 0 1 197.444 382.808 Tm [<0054001C0074>]TJ
/F57 10.90909 Tf
-1.02 0 0 1 217.422 443.676 Tm [<00500053>]TJ
+1.02 0 0 1 217.422 382.808 Tm [<00500053>]TJ
/F36 10.90909 Tf
-1 0 0 1 230.966 443.676 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 230.966 382.808 Tm [<004D003200720054001C0074>]TJ
/F57 10.90909 Tf
-1.02 0 0 1 265.329 443.676 Tm [<000F>-386<003500490046>-251<00440050004F00550046004F0055>-251<00500047>-251<005500490046>-251<056D004D00460054>-252<004A0054>-251<0009004F004600420053004D005A000A>-251<004A00450046004F0055004A00440042004D>-251<00550050>-251<005500490046>]TJ
-0.98 0 0 1 74.409 430.127 Tm [<00440050004F00550046004F0055>-214<00500047>-214<005500490046>]TJ
+1.02 0 0 1 265.329 382.808 Tm [<000F>-386<003500490046>-251<00440050004F00550046004F0055>-251<00500047>-251<005500490046>-251<056D004D00460054>-252<004A0054>-251<0009004F004600420053004D005A000A>-251<004A00450046004F0055004A00440042004D>-251<00550050>-251<005500490046>]TJ
+0.98 0 0 1 74.409 369.258 Tm [<00440050004F00550046004F0055>-214<00500047>-214<005500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 144.078 430.127 Tm [<0054001C0074>]TJ
+1 0 0 1 144.078 369.258 Tm [<0054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-0.98 0 0 1 161.259 430.127 Tm [<000E056D004D0046>-214<00580053>-8<004A005500550046004F>-214<0043>25<005A>]TJ
+0.98 0 0 1 161.259 369.258 Tm [<000E056D004D0046>-214<00580053>-8<004A005500550046004F>-214<0043>25<005A>]TJ
/F36 10.90909 Tf
-1 0 0 1 233.882 430.127 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
+1 0 0 1 233.882 369.258 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
/F57 10.90909 Tf
-0.98 0 0 1 331.245 430.127 Tm [<000F>-301<003500490046>-214<004D00560042>-214<0044005000450046>-214<005800420054>-214<00580053>-9<004A005500550046004F>-214<0043>25<005A>-213<004D00500050004C004A004F0048>-214<00420055>]TJ
-1.005 0 0 1 74.409 416.578 Tm [<004600590042004E0051004D0046>-223<0050005600550051005600550054>-224<00470053>5<0050004E>]TJ
+0.98 0 0 1 331.245 369.258 Tm [<000F>-301<003500490046>-214<004D00560042>-214<0044005000450046>-214<005800420054>-214<00580053>-9<004A005500550046004F>-214<0043>25<005A>-213<004D00500050004C004A004F0048>-214<00420055>]TJ
+1.005 0 0 1 74.409 355.709 Tm [<004600590042004E0051004D0046>-223<0050005600550051005600550054>-224<00470053>5<0050004E>]TJ
/F36 10.90909 Tf
-1 0 0 1 186.689 416.578 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
+1 0 0 1 186.689 355.709 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
/F57 10.90909 Tf
-1.005 0 0 1 286.505 416.578 Tm [<0042004F0045>-223<0053>19<004600510053>6<0050004500560044004A004F0048>-223<004A0055>-223<004A004F>-224<004D00560042000F>-299<003500490046>-223<00500053>19<004500460053>-7<004A004F0048>-224<00500047>-224<00540050004E0046>]TJ
-0.98 0 0 1 74.409 403.029 Tm [<0046004D0046004E0046004F00550054>-225<004A0054>-225<0042>-225<0043004A0055>-225<0045004A056C00460053>20<0046004F0055>-225<0042004F0045>-225<00540050004E0046>-225<005400550053>-8<004A004F00480054>-225<00420053>20<0046>-225<005000560055005100560055>-225<004A004F>-225<0042>-225<0045004A056C00460053>20<0046004F0055>-225<00580042005A>-225<004300560055>-225<004700500053>-225<005500490046>-225<004600590042004E0051004D00460054>]TJ
-1.006 0 0 1 74.409 389.48 Tm [<002A>-223<0056005400460045>-223<005500490046>-224<0053>20<004600540056004D0055004A004F0048>]TJ
+1.005 0 0 1 286.505 355.709 Tm [<0042004F0045>-223<0053>19<004600510053>6<0050004500560044004A004F0048>-223<004A0055>-223<004A004F>-224<004D00560042000F>-299<003500490046>-223<00500053>19<004500460053>-7<004A004F0048>-224<00500047>-224<00540050004E0046>]TJ
+0.98 0 0 1 74.409 342.16 Tm [<0046004D0046004E0046004F00550054>-225<004A0054>-225<0042>-225<0043004A0055>-225<0045004A056C00460053>20<0046004F0055>-225<0042004F0045>-225<00540050004E0046>-225<005400550053>-8<004A004F00480054>-225<00420053>20<0046>-225<005000560055005100560055>-225<004A004F>-225<0042>-225<0045004A056C00460053>20<0046004F0055>-225<00580042005A>-225<004300560055>-225<004700500053>-225<005500490046>-225<004600590042004E0051004D00460054>]TJ
+1.006 0 0 1 74.409 328.611 Tm [<002A>-223<0056005400460045>-223<005500490046>-224<0053>20<004600540056004D0055004A004F0048>]TJ
/F36 10.90909 Tf
-1 0 0 1 171.413 389.48 Tm [<0054001C0074>]TJ
+1 0 0 1 171.413 328.611 Tm [<0054001C0074>]TJ
/F57 10.90909 Tf
-1.006 0 0 1 188.595 389.48 Tm [<000E056D004D00460054>-223<00440042004F>-223<00430046>-223<0056005400460045>-224<00550050004800460055004900460053>-223<0058004A00550049>-223<005500490046>-224<00500053>-8<004A0048004A004F0042004D>]TJ
+1.006 0 0 1 188.595 328.611 Tm [<000E056D004D00460054>-223<00440042004F>-223<00430046>-223<0056005400460045>-224<00550050004800460055004900460053>-223<0058004A00550049>-223<005500490046>-224<00500053>-8<004A0048004A004F0042004D>]TJ
/F36 10.90909 Tf
-1 0 0 1 404.822 389.48 Tm [<0054001C00740058006200690076>]TJ
+1 0 0 1 404.822 328.611 Tm [<0054001C00740058006200690076>]TJ
/F57 10.90909 Tf
-1.006 0 0 1 444.913 389.48 Tm [<000F>-298<0023>12<00560055>-223<004500560046>-223<00550050>-223<005500490046>]TJ
-1.02 0 0 1 74.409 375.93 Tm [<0047004200440055>-253<0055004900420055>-254<005500490046>-254<0044005000450046>-254<005800420054>-254<00580053>-8<004A005500550046004F>-254<0058004A00550049005000560055>-254<0053>19<00460042004D>-253<0054005100460044>-254<0054004A004E0051004D005A>-254<0043>24<005A>-253<004D00500050004C004A004F0048>-253<00420055>-254<004600590042004E0051004D00460054>9<000D>-262<004A0055>-253<004A0054>-254<00520056004A00550046>]TJ
-0.989 0 0 1 74.409 362.381 Tm [<00510053>6<0050004300420043004D005A>-227<0055004900420055>-228<005500490046>-228<004D00560042>-228<0044005000450046>-228<004A0054>-228<004F00500055>-228<005A>5<00460055>-227<00490042004F0045004D004A004F0048>-228<0042004D004D>-228<00500043004B0046004400550054>-228<00500053>-228<005000510055004A0050004F0054>-228<0055004900420055>]TJ
+1.006 0 0 1 444.913 328.611 Tm [<000F>-298<0023>12<00560055>-223<004500560046>-223<00550050>-223<005500490046>]TJ
+1.02 0 0 1 74.409 315.062 Tm [<0047004200440055>-253<0055004900420055>-254<005500490046>-254<0044005000450046>-254<005800420054>-254<00580053>-8<004A005500550046004F>-254<0058004A00550049005000560055>-254<0053>19<00460042004D>-253<0054005100460044>-254<0054004A004E0051004D005A>-254<0043>24<005A>-253<004D00500050004C004A004F0048>-253<00420055>-254<004600590042004E0051004D00460054>9<000D>-262<004A0055>-253<004A0054>-254<00520056004A00550046>]TJ
+0.989 0 0 1 74.409 301.512 Tm [<00510053>6<0050004300420043004D005A>-227<0055004900420055>-228<005500490046>-228<004D00560042>-228<0044005000450046>-228<004A0054>-228<004F00500055>-228<005A>5<00460055>-227<00490042004F0045004D004A004F0048>-228<0042004D004D>-228<00500043004B0046004400550054>-228<00500053>-228<005000510055004A0050004F0054>-228<0055004900420055>]TJ
/F36 10.90909 Tf
-1 0 0 1 423.786 362.381 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
+1 0 0 1 423.786 301.512 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
/F57 10.90909 Tf
-1 0 0 1 74.409 348.832 Tm [<0050005600550051005600550054>20<000F>-300<0023>12<00560055>-225<005500490046>-225<0044005000450046>-225<00440042004F>-225<0053>10<00420055004900460053>-225<004600420054004A004D005A>-225<00430046>-225<0046005900550046004F004500460045>-225<005800490046004F>-225<005500490046>-225<004F0046004600450054>-225<00420053>-8<004A005400460054>20<000F>]TJ
-1.019 0 0 1 74.071 328.508 Tm [<003500490046>-220<0044005000450046>-221<0042004D00540050>-220<0045005000460054004F>79<0445>75<0055>-220<00490042004F0045004D0046>-220<005400550053>-8<00560044005500560053>19<0046>-220<0046004D0046004E0046004F00550054>9<000D>-220<004F0046004A0055004900460053>-220<00420055>-221<005500490046>-220<00460059005100500053>-8<0055>-221<004F00500053>-221<00420055>-220<005500490046>-221<004A004E005100500053>-8<0055000F>-294<002A>]TJ
-0.98 0 0 1 74.409 314.959 Tm [<004900420057>5<0046>-189<005A>5<00460055>-189<004F0050>-189<0053>20<00460042004D>-189<004A004500460042>-190<0058004900420055>-190<005800500056004D0045>-189<00430046>-190<00540046004F0054004A0043004D0046>-190<004900460053>20<0046>-189<00090042004F0045>-189<002A0445>72<004E>-189<00520056004A00550046>-190<005400560053>20<0046>-189<0055004900420055>]TJ
+1 0 0 1 74.409 287.963 Tm [<0050005600550051005600550054>20<000F>-300<0023>12<00560055>-225<005500490046>-225<0044005000450046>-225<00440042004F>-225<0053>10<00420055004900460053>-225<004600420054004A004D005A>-225<00430046>-225<0046005900550046004F004500460045>-225<005800490046004F>-225<005500490046>-225<004F0046004600450054>-225<00420053>-8<004A005400460054>20<000F>]TJ
+1.019 0 0 1 74.071 267.639 Tm [<003500490046>-220<0044005000450046>-221<0042004D00540050>-220<0045005000460054004F>79<0445>75<0055>-220<00490042004F0045004D0046>-220<005400550053>-8<00560044005500560053>19<0046>-220<0046004D0046004E0046004F00550054>9<000D>-220<004F0046004A0055004900460053>-220<00420055>-221<005500490046>-220<00460059005100500053>-8<0055>-221<004F00500053>-221<00420055>-220<005500490046>-221<004A004E005100500053>-8<0055000F>-294<002A>]TJ
+0.98 0 0 1 74.409 254.09 Tm [<004900420057>5<0046>-189<005A>5<00460055>-189<004F0050>-189<0053>20<00460042004D>-189<004A004500460042>-190<0058004900420055>-190<005800500056004D0045>-189<00430046>-190<00540046004F0054004A0043004D0046>-190<004900460053>20<0046>-189<00090042004F0045>-189<002A0445>72<004E>-189<00520056004A00550046>-190<005400560053>20<0046>-189<0055004900420055>]TJ
/F36 10.90909 Tf
-1 0 0 1 423.786 314.959 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
+1 0 0 1 423.786 254.09 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
/F57 10.90909 Tf
-1 0 0 1 74.409 301.41 Tm [<0045005000460054004F>80<0445>75<0055>-225<00490042004F0045004D0046>-225<00550049004A0054>-225<0046004A0055004900460053>60<000F000A>]TJ
+1 0 0 1 74.409 240.541 Tm [<0045005000460054004F>80<0445>75<0055>-225<00490042004F0045004D0046>-225<00550049004A0054>-225<0046004A0055004900460053>60<000F000A>]TJ
0 g 0 G
/F54 14.3462 Tf
-1 0 0 1 74.409 257.993 Tm [<0038>-500<0041004B0054>-31<0051>31<006000690042004D003B>-367<001C004D004D00510069001C006900420051004D0062>]TJ
+1 0 0 1 74.409 197.227 Tm [<0038>-500<0041004B0054>-31<0051>31<006000690042004D003B>-367<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 74.071 225.375 Tm [<003500490046>]TJ
+1.02 0 0 1 74.071 164.609 Tm [<003500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 96.715 225.375 Tm [<0054001C0074>]TJ
+1 0 0 1 96.715 164.609 Tm [<0054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 117.157 225.375 Tm [<005100420044004C004200480046>-293<00470053>6<0050004E>-293<0029>30<0046004A004C0050>-293<0030004300460053>20<0045004A0046004C>-293<0045005000460054>-293<005500490046>-293<004900420053>20<0045>-293<005800500053>5<004C>-292<00550050>-293<0053>19<004600440042004D00440056004D004200550046>-292<005500490046>-293<0042004F004F0050005500420055004A0050004F>]TJ
-1.02 0 0 1 74.409 211.826 Tm [<0053>20<0046004400550042004F0048004D00460054>-315<0042004F0045>-316<00550050>-316<004500460044004A00450046>-315<00580049004A00440049>-316<0042004F004F0050005500420055004A0050004F>-315<0042004F0045>-316<00580049004A00440049>-316<0045004600540055004A004F00420055004A0050004F>-315<0054004900500056004D0045>-316<00430046>-316<0053>19<0046004A004F005400460053>-7<005500460045000F>]TJ
-1.02 0 0 1 74.409 198.277 Tm [<002A>24<0055>-252<0042004D00540050>-253<0051004200550044004900460054>-252<005500490046>]TJ
+1.02 0 0 1 117.157 164.609 Tm [<005100420044004C004200480046>-293<00470053>6<0050004E>-293<0029>30<0046004A004C0050>-293<0030004300460053>20<0045004A0046004C>-293<0045005000460054>-293<005500490046>-293<004900420053>20<0045>-293<005800500053>5<004C>-292<00550050>-293<0053>19<004600440042004D00440056004D004200550046>-292<005500490046>-293<0042004F004F0050005500420055004A0050004F>]TJ
+1.02 0 0 1 74.409 151.06 Tm [<0053>20<0046004400550042004F0048004D00460054>-315<0042004F0045>-316<00550050>-316<004500460044004A00450046>-315<00580049004A00440049>-316<0042004F004F0050005500420055004A0050004F>-315<0042004F0045>-316<00580049004A00440049>-316<0045004600540055004A004F00420055004A0050004F>-315<0054004900500056004D0045>-316<00430046>-316<0053>19<0046004A004F005400460053>-7<005500460045000F>]TJ
+1.02 0 0 1 74.409 137.51 Tm [<002A>24<0055>-252<0042004D00540050>-253<0051004200550044004900460054>-252<005500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 168.853 198.277 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B0062>]TJ
+1 0 0 1 168.853 137.51 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B0062>]TJ
/F57 10.90909 Tf
-1.02 0 0 1 263.3 198.277 Tm [<00440050004E004E0042004F0045>-252<00550050>-253<0042005600550050004E004200550046>-252<00550049004A0054>19<000F>]TJ
+1.02 0 0 1 263.3 137.51 Tm [<00440050004E004E0042004F0045>-252<00550050>-253<0042005600550050004E004200550046>-252<00550049004A0054>19<000F>]TJ
/F36 10.90909 Tf
-1 0 0 1 408.012 198.277 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 408.012 137.51 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-1.02 0 0 1 445.187 198.277 Tm [<0053>20<00460056005400460054>-252<005500490046>-253<004400500053>19<0046>]TJ
-0.983 0 0 1 74.409 184.727 Tm [<00440050004E004E0042004F00450054>-229<00500047>]TJ
-
-/F36 10.90909 Tf
-1 0 0 1 143.574 184.727 Tm [<0054001C0074>]TJ
-0 g 0 G
-/F57 10.90909 Tf
-0.983 0 0 1 160.756 184.727 Tm [<000F>-306<002A>24<0055>-229<0050004F004D005A>-229<0042004500450054>-229<0042>-230<004F0056004E004300460053>-229<00500047>-230<00540058004A00550044004900460054>-229<0042004F0045>-229<004400490042004F004800460054>-230<00510053>-8<004A004E004A0055004A0057>4<0046>-228<00550050>-230<005400560051005100500053>-8<0055>-229<004E00500053>20<0046>]TJ
-1 0 0 1 74.409 171.178 Tm [<0046004F0048004A004F00460054>-225<0042004F0045>-225<004300420044004C0046004F00450054>20<000F>]TJ
+1.02 0 0 1 445.187 137.51 Tm [<0053>20<00460056005400460054>-252<005500490046>-253<004400500053>19<0046>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
@@ -1273,23 +1278,23 @@ ET
endstream
endobj
-122 0 obj
-<< /Type /Page /Contents 123 0 R /Resources 121 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+98 0 obj
+<< /Type /Page /Contents 99 0 R /Resources 97 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
endobj
-124 0 obj
-<< /D [ 122 0 R /XYZ 73.409 809.993 null ] >>
+100 0 obj
+<< /D [ 98 0 R /XYZ 73.409 809.993 null ] >>
endobj
-125 0 obj
-<< /D [ 122 0 R /XYZ 74.409 700.244 null ] >>
+101 0 obj
+<< /D [ 98 0 R /XYZ 74.409 639.375 null ] >>
endobj
-126 0 obj
-<< /D [ 122 0 R /XYZ 74.409 281.304 null ] >>
+102 0 obj
+<< /D [ 98 0 R /XYZ 74.409 220.538 null ] >>
endobj
-121 0 obj
+97 0 obj
<< /ExtGState 1 0 R /Font << /F57 12 0 R /F89 35 0 R /F54 10 0 R /F36 14 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
129 0 obj
-<< /Length 6388 >>
+<< /Length 7077 >>
stream
/opacity1 gs
0 g 0 G
@@ -1300,14 +1305,23 @@ stream
0 g 0 G
0 g 0 G
0 g 0 G
-0 g 0 G
BT
+/F57 10.90909 Tf
+0.983 0 0 1 74.409 760.773 Tm [<00440050004E004E0042004F00450054>-229<00500047>]TJ
+
+/F36 10.90909 Tf
+1 0 0 1 143.574 760.773 Tm [<0054001C0074>]TJ
+0 g 0 G
+/F57 10.90909 Tf
+0.983 0 0 1 160.756 760.773 Tm [<000F>-306<002A>24<0055>-229<0050004F004D005A>-229<0042004500450054>-229<0042>-230<004F0056004E004300460053>-229<00500047>-230<00540058004A00550044004900460054>-229<0042004F0045>-229<004400490042004F004800460054>-230<00510053>-8<004A004E004A0055004A0057>4<0046>-228<00550050>-230<005400560051005100500053>-8<0055>-229<004E00500053>20<0046>]TJ
+1 0 0 1 74.409 747.224 Tm [<0046004F0048004A004F00460054>-225<0042004F0045>-225<004300420044004C0046004F00450054>20<000F>]TJ
+0 g 0 G
/F54 14.3462 Tf
-1 0 0 1 74.409 760.773 Tm [<0065>-500<00310074001C004B005400480032>-367<0042004D0054006D0069>]TJ
+1 0 0 1 74.409 703.808 Tm [<0065>-500<00310074001C004B005400480032>-367<0042004D0054006D0069>]TJ
0 g 0 G
0 g 0 G
ET
-1 0 0 1 77.797 568.711 cm
+1 0 0 1 77.797 511.746 cm
q
.5 0 0 .5 0 0 cm
q
@@ -1321,19 +1335,19 @@ Q
0.0 0.0 1.0 rg 0.0 0.0 1.0 RG
0 g 0 G
q
-1 0 0 1 -3.388 169.015 cm
+1 0 0 1 -3.388 169.014 cm
[] 0 d 0 J 0.398 w 0 0 m 134.334 0 l S
Q
q
-1 0 0 1 -3.188 -3.188 cm
+1 0 0 1 -3.188 -3.189 cm
[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
Q
q
-1 0 0 1 130.747 -3.188 cm
+1 0 0 1 130.747 -3.189 cm
[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
Q
q
-1 0 0 1 -3.388 -3.188 cm
+1 0 0 1 -3.388 -3.189 cm
[] 0 d 0 J 0.398 w 0 0 m 134.334 0 l S
Q
0 g 0 G
@@ -1353,162 +1367,162 @@ Q
0.0 0.0 1.0 rg 0.0 0.0 1.0 RG
0 g 0 G
q
-1 0 0 1 -3.387 169.015 cm
+1 0 0 1 -3.387 169.014 cm
[] 0 d 0 J 0.398 w 0 0 m 120.16 0 l S
Q
q
-1 0 0 1 -3.188 -3.188 cm
+1 0 0 1 -3.188 -3.189 cm
[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
Q
q
-1 0 0 1 116.574 -3.188 cm
+1 0 0 1 116.574 -3.189 cm
[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
Q
q
-1 0 0 1 -3.387 -3.188 cm
+1 0 0 1 -3.387 -3.189 cm
[] 0 d 0 J 0.398 w 0 0 m 120.16 0 l S
Q
-1 0 0 1 -214.585 -568.711 cm
+1 0 0 1 -214.585 -511.746 cm
BT
/F57 10.90909 Tf
-1 0 0 1 74.409 548.387 Tm [<0024004900460044004C>-225<0042004D00540050>-225<005500490046>-225<005000560055005100560055>-225<00500047>-225<005500490046>-225<004D004A00540055004A004F0048>-225<004200430050>30<0057>5<0046>20<000D>]TJ
+1 0 0 1 74.409 491.422 Tm [<0024004900460044004C>-225<0042004D00540050>-225<005500490046>-225<005000560055005100560055>-225<00500047>-225<005500490046>-225<004D004A00540055004A004F0048>-225<004200430050>30<0057>5<0046>20<000D>]TJ
/F36 10.90909 Tf
-1 0 0 1 282.304 548.387 Tm [<002F0051002B0040006D006200320040004D003200720054001C007400580054002F0037>]TJ
+1 0 0 1 282.304 491.422 Tm [<002F0051002B0040006D006200320040004D003200720054001C007400580054002F0037>]TJ
0 g 0 G
/F57 10.90909 Tf
-1 0 0 1 385.395 548.387 Tm [<000F>]TJ
+1 0 0 1 385.395 491.422 Tm [<000F>]TJ
0 g 0 G
/F54 14.3462 Tf
-1 0 0 1 74.008 504.971 Tm [<0064>-500<0061006D00540054>-31<0051>31<00600069>-367<00370051>31<0060>-367<0069003F0032>]TJ
+1 0 0 1 74.008 448.005 Tm [<0064>-500<0061006D00540054>-31<0051>31<00600069>-367<00370051>31<0060>-367<0069003F0032>]TJ
/F55 14.3462 Tf
-1 0 0 1 195.577 504.971 Tm [<0054001C0074>]TJ
+1 0 0 1 195.577 448.005 Tm [<0054001C0074>]TJ
0 g 0 G
/F54 14.3462 Tf
-1 0 0 1 223.438 504.971 Tm [<0054001C002B0046001C003B0032>]TJ
+1 0 0 1 223.438 448.005 Tm [<0054001C002B0046001C003B0032>]TJ
0 g 0 G
0 g 0 G
/F54 11.95517 Tf
-1 0 0 1 74.075 471.954 Tm [<006400580052>-500<0061006900320054>-367<0052002C>-489<0031007400690060001C002B00690042004D003B>-367<0069003F0032>-367<001C004D004D00510069001C006900420051004D0062>]TJ
+1 0 0 1 74.075 414.988 Tm [<006400580052>-500<0061006900320054>-367<0052002C>-489<0031007400690060001C002B00690042004D003B>-367<0069003F0032>-367<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
/F57 10.90909 Tf
-0.981 0 0 1 74.071 443.612 Tm [<003500490046>-229<004D00560042>-230<005400440053>-9<004A00510055>-230<004A0054>-229<0042004D00540050>-230<00420043004D0046>-230<00550050>-230<00580053>-8<004A00550046>]TJ
+0.981 0 0 1 74.071 386.647 Tm [<003500490046>-229<004D00560042>-230<005400440053>-9<004A00510055>-230<004A0054>-229<0042004D00540050>-230<00420043004D0046>-230<00550050>-230<00580053>-8<004A00550046>]TJ
/F36 10.90909 Tf
-1 0 0 1 237.303 443.612 Tm [<0054001C0074>]TJ
+1 0 0 1 237.303 386.647 Tm [<0054001C0074>]TJ
/F57 10.90909 Tf
-0.981 0 0 1 256.945 443.612 Tm [<056D004D00460054>-229<004700500053>-230<005500490046>]TJ
+0.981 0 0 1 256.945 386.647 Tm [<056D004D00460054>-229<004700500053>-230<005500490046>]TJ
/F36 10.90909 Tf
-1 0 0 1 313.436 443.612 Tm [<0054001C0074>]TJ
+1 0 0 1 313.436 386.647 Tm [<0054001C0074>]TJ
0 g 0 G
/F57 10.90909 Tf
-0.981 0 0 1 333.078 443.612 Tm [<005100420044004C004200480046>-229<00090042004F0045>-230<00540050>-230<00440042004F>-230<00430046>-230<0056005400460045>-230<00550050>-230<0053>20<00460051004D004200440046>]TJ
-1 0 0 1 74.409 430.063 Tm [<005500490046>-225<004B00420057>6<0042>-225<004200510051004D004A004400420055004A0050004F000A000F>]TJ
-1 0 0 1 74.409 409.739 Tm [<0027>36<00500053>-225<00550049004A0054>-225<0046005900550053>10<004200440055>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>-225<004D004A004C0046>-225<00550049004A0054001B>]TJ
+0.981 0 0 1 333.078 386.647 Tm [<005100420044004C004200480046>-229<00090042004F0045>-230<00540050>-230<00440042004F>-230<00430046>-230<0056005400460045>-230<00550050>-230<0053>20<00460051004D004200440046>]TJ
+1 0 0 1 74.409 373.097 Tm [<005500490046>-225<004B00420057>6<0042>-225<004200510051004D004A004400420055004A0050004F000A000F>]TJ
+1 0 0 1 74.409 352.774 Tm [<0027>36<00500053>-225<00550049004A0054>-225<0046005900550053>10<004200440055>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>-225<004D004A004C0046>-225<00550049004A0054001B>]TJ
0 g 0 G
0 g 0 G
-1 0 0 1 226.287 387.224 Tm [<002D004A00540055004A004F0048>-225<0014001B>]TJ
+1 0 0 1 226.287 330.258 Tm [<002D004A00540055004A004F0048>-225<0014001B>]TJ
0 g 0 G
-1 0 0 1 273.349 387.224 Tm [<004500500044000E0046005900550053>10<004200440055000E005100420059000F005500460059>]TJ
+1 0 0 1 273.349 330.258 Tm [<004500500044000E0046005900550053>10<004200440055000E005100420059000F005500460059>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 370.686 Tm [<0024>]TJ
+1 0 0 1 74.409 313.72 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 370.686 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
+1 0 0 1 80.137 313.72 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
/F36 10.90909 Tf
-1 0 0 1 154.591 370.686 Tm [<0026001C006000690042002B004800320027>]TJ
+1 0 0 1 154.591 313.72 Tm [<0026001C006000690042002B004800320027>]TJ
0 0.5 0 rg 0 0.5 0 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 357.136 Tm [<0057>]TJ
+1 0 0 1 74.409 300.171 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 85.864 357.136 Tm [<00480051001C002F>]TJ
+1 0 0 1 85.864 300.171 Tm [<00480051001C002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 114.5 357.136 Tm [<0069003F0032>]TJ
+1 0 0 1 114.5 300.171 Tm [<0069003F0032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 137.409 357.136 Tm [<0048006D001C>]TJ
+1 0 0 1 137.409 300.171 Tm [<0048006D001C>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 160.319 357.136 Tm [<002B0051002F0032>]TJ
+1 0 0 1 160.319 300.171 Tm [<002B0051002F0032>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 343.587 Tm [<0024002F004200600032002B00690048006D001C002600600032005B006D0042006000320055005D004D003200720054001C0074005D00560027>]TJ
+1 0 0 1 74.409 286.622 Tm [<0024002F004200600032002B00690048006D001C002600600032005B006D0042006000320055005D004D003200720054001C0074005D00560027>]TJ
0 0.5 0 rg 0 0.5 0 RG
/F55 10.90909 Tf
-1 0 0 1 74.409 316.489 Tm [<0057>]TJ
+1 0 0 1 74.409 259.523 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 85.864 316.489 Tm [<001C004D002F>]TJ
+1 0 0 1 85.864 259.523 Tm [<001C004D002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 103.046 316.489 Tm [<0066>]TJ
+1 0 0 1 103.046 259.523 Tm [<0066>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 108.773 316.489 Tm [<00510060>]TJ
+1 0 0 1 108.773 259.523 Tm [<00510060>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 125.955 316.489 Tm [<00720060004200690032>]TJ
+1 0 0 1 125.955 259.523 Tm [<00720060004200690032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 160.319 316.489 Tm [<0058>]TJ
+1 0 0 1 160.319 259.523 Tm [<0058>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 166.046 316.489 Tm [<0054001C0074>]TJ
+1 0 0 1 166.046 259.523 Tm [<0054001C0074>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 188.955 316.489 Tm [<00370042004800320062>]TJ
+1 0 0 1 188.955 259.523 Tm [<00370042004800320062>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 223.319 316.489 Tm [<003700510060>]TJ
+1 0 0 1 223.319 259.523 Tm [<003700510060>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 246.228 316.489 Tm [<0054001C0074>]TJ
+1 0 0 1 246.228 259.523 Tm [<0054001C0074>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 263.409 316.489 Tm [<0058>]TJ
+1 0 0 1 263.409 259.523 Tm [<0058>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 269.137 316.489 Tm [<006200690076>]TJ
+1 0 0 1 269.137 259.523 Tm [<006200690076>]TJ
0 g 0 G
/F36 10.90909 Tf
-1 0 0 1 74.409 302.94 Tm [<0024002F004200600032002B00690048006D001C>]TJ
-1 0 0 1 84.228 289.39 Tm [<0026>]TJ
-1 0 0 1 94.046 275.841 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069005D0056>]TJ
-1 0 0 1 94.046 262.292 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069006B005D0056>]TJ
-1 0 0 1 84.228 248.743 Tm [<0027>]TJ
-1 0 0 1 74.409 235.194 Tm [<0024>]TJ
+1 0 0 1 74.409 245.974 Tm [<0024002F004200600032002B00690048006D001C>]TJ
+1 0 0 1 84.228 232.425 Tm [<0026>]TJ
+1 0 0 1 94.046 218.876 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069005D0056>]TJ
+1 0 0 1 94.046 205.326 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069006B005D0056>]TJ
+1 0 0 1 84.228 191.777 Tm [<0027>]TJ
+1 0 0 1 74.409 178.228 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 235.194 Tm [<00230032003B0042004D>]TJ
+1 0 0 1 80.137 178.228 Tm [<00230032003B0042004D>]TJ
/F36 10.90909 Tf
-1 0 0 1 108.773 235.194 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
-1 0 0 1 74.409 221.644 Tm [<0024>]TJ
+1 0 0 1 108.773 178.228 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+1 0 0 1 74.409 164.679 Tm [<0024>]TJ
/F55 10.90909 Tf
-1 0 0 1 80.137 221.644 Tm [<0032004D002F>]TJ
+1 0 0 1 80.137 164.679 Tm [<0032004D002F>]TJ
/F36 10.90909 Tf
-1 0 0 1 97.319 221.644 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+1 0 0 1 97.319 164.679 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
@@ -1531,9 +1545,9 @@ endobj
<< /Type /Page /Contents 129 0 R /Resources 127 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R /Annots 152 0 R >>
endobj
152 0 obj
-[ 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 117 0 R 99 0 R 100 0 R 118 0 R 119 0 R 120 0 R ]
+[ 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 123 0 R 105 0 R 106 0 R 124 0 R 125 0 R 126 0 R ]
endobj
-98 0 obj
+104 0 obj
<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 255.118 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 153 0 R /Length 41 >>
stream
q
@@ -1543,8 +1557,8 @@ Q
endstream
endobj
-97 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200420+01'00') /ModDate (D:20210228200420+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 154 0 R /Font << /F23 155 0 R /F24 156 0 R /F36 157 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4811 >>
+103 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 154 0 R /Font << /F23 155 0 R /F24 156 0 R /F36 157 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4811 >>
stream
/opacity1 gs
BT
@@ -1840,9 +1854,9 @@ stream
endstream
endobj
153 0 obj
-<< /XObject << /Im1 97 0 R >> /ProcSet [ /PDF ] >>
+<< /XObject << /Im1 103 0 R >> /ProcSet [ /PDF ] >>
endobj
-116 0 obj
+122 0 obj
<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 226.772 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 176 0 R /Length 41 >>
stream
q
@@ -1852,8 +1866,8 @@ Q
endstream
endobj
-115 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200420+01'00') /ModDate (D:20210228200420+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 154 0 R /Font << /F24 156 0 R /F23 155 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
+121 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 154 0 R /Font << /F24 156 0 R /F23 155 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
stream
/opacity1 gs
BT
@@ -1867,136 +1881,136 @@ ET
endstream
endobj
176 0 obj
-<< /XObject << /Im2 115 0 R >> /ProcSet [ /PDF ] >>
-endobj
-101 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 99.112 702.059 176.2 707.653 ] >>
-endobj
-102 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 94.962 696.201 205.36 701.785 ] >>
-endobj
-103 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 690.218 205.36 695.753 ] >>
-endobj
-104 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 684.241 205.36 689.775 ] >>
-endobj
-105 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 678.263 205.36 683.797 ] >>
-endobj
-106 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 672.291 205.36 677.875 ] >>
+<< /XObject << /Im2 121 0 R >> /ProcSet [ /PDF ] >>
endobj
107 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 666.313 205.36 671.842 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 99.112 645.093 176.2 650.687 ] >>
endobj
108 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 660.335 205.36 665.865 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 94.962 639.235 205.36 644.819 ] >>
endobj
109 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 654.353 205.36 659.887 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 633.253 205.36 638.787 ] >>
endobj
110 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 648.435 205.36 653.909 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 627.275 205.36 632.809 ] >>
endobj
111 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 642.403 205.36 647.932 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 621.298 205.36 626.832 ] >>
endobj
112 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 87.49 636.42 205.36 641.954 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 615.325 205.36 620.909 ] >>
endobj
113 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /Rect [ 94.962 630.502 103.162 635.977 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 609.347 205.36 614.877 ] >>
endobj
114 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /Rect [ 87.49 576.209 94.853 580.772 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 603.37 205.36 608.899 ] >>
endobj
-117 0 obj
-<< /Type /Annot /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /BS <</W 1/S/U>> /Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 217.577 708.036 294.663 713.63 ] >>
+115 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 597.387 205.36 602.922 ] >>
endobj
-99 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 96.596 708.126 116.472 714.626 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
+116 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 591.469 205.36 596.944 ] >>
endobj
-100 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 93.966 701.062 99.446 708.649 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
+117 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 585.437 205.36 590.966 ] >>
endobj
118 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 216.58 702.094 222.06 708.509 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 579.455 205.36 584.989 ] >>
endobj
119 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 225.711 702.094 231.19 708.509 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 94.962 573.537 103.162 579.011 ] >>
endobj
120 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>> /Rect [ 234.842 702.094 240.321 708.509 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /BS <</S/U/W 1>> /Rect [ 87.49 519.243 94.853 523.806 ] >>
+endobj
+123 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 217.577 651.071 294.663 656.665 ] >>
+endobj
+105 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 96.596 651.16 116.472 657.661 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
+endobj
+106 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 93.966 644.097 99.446 651.683 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
+endobj
+124 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 216.58 645.128 222.06 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
+endobj
+125 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 225.711 645.128 231.19 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
+endobj
+126 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 234.842 645.128 240.321 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
endobj
130 0 obj
<< /D [ 128 0 R /XYZ 73.409 809.993 null ] >>
endobj
131 0 obj
-<< /D [ 128 0 R /XYZ 74.409 771.732 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 725.875 null ] >>
endobj
132 0 obj
-<< /D [ 128 0 R /XYZ 105.17 610.505 null ] >>
+<< /D [ 128 0 R /XYZ 105.17 553.54 null ] >>
endobj
133 0 obj
-<< /D [ 128 0 R /XYZ 122.352 623.486 null ] >>
+<< /D [ 128 0 R /XYZ 122.352 566.521 null ] >>
endobj
134 0 obj
-<< /D [ 128 0 R /XYZ 139.533 623.486 null ] >>
+<< /D [ 128 0 R /XYZ 139.533 566.521 null ] >>
endobj
135 0 obj
-<< /D [ 128 0 R /XYZ 156.715 610.505 null ] >>
+<< /D [ 128 0 R /XYZ 156.715 553.54 null ] >>
endobj
136 0 obj
-<< /D [ 128 0 R /XYZ 173.897 596.601 null ] >>
+<< /D [ 128 0 R /XYZ 173.897 539.635 null ] >>
endobj
137 0 obj
-<< /D [ 128 0 R /XYZ 74.409 527.038 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 470.073 null ] >>
endobj
138 0 obj
-<< /D [ 128 0 R /XYZ 74.409 489.578 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 432.612 null ] >>
endobj
139 0 obj
-<< /D [ 128 0 R /XYZ 74.409 403.631 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 346.665 null ] >>
endobj
140 0 obj
-<< /D [ 128 0 R /XYZ 74.409 384.235 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 327.269 null ] >>
endobj
141 0 obj
-<< /D [ 128 0 R /XYZ 74.409 370.686 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 313.72 null ] >>
endobj
142 0 obj
-<< /D [ 128 0 R /XYZ 74.409 357.136 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 300.171 null ] >>
endobj
143 0 obj
-<< /D [ 128 0 R /XYZ 74.409 343.587 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 286.622 null ] >>
endobj
144 0 obj
-<< /D [ 128 0 R /XYZ 74.409 330.038 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 273.072 null ] >>
endobj
145 0 obj
-<< /D [ 128 0 R /XYZ 74.409 316.489 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 259.523 null ] >>
endobj
146 0 obj
-<< /D [ 128 0 R /XYZ 74.409 302.94 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 245.974 null ] >>
endobj
147 0 obj
-<< /D [ 128 0 R /XYZ 74.409 289.39 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 232.425 null ] >>
endobj
148 0 obj
-<< /D [ 128 0 R /XYZ 74.409 275.841 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 218.876 null ] >>
endobj
149 0 obj
-<< /D [ 128 0 R /XYZ 74.409 262.292 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 205.326 null ] >>
endobj
150 0 obj
-<< /D [ 128 0 R /XYZ 74.409 248.743 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 191.777 null ] >>
endobj
151 0 obj
-<< /D [ 128 0 R /XYZ 74.409 235.194 null ] >>
+<< /D [ 128 0 R /XYZ 74.409 178.228 null ] >>
endobj
127 0 obj
-<< /ExtGState 1 0 R /Font << /F54 10 0 R /F57 12 0 R /F36 14 0 R /F55 11 0 R >> /XObject << /Fm1 98 0 R /Fm2 116 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ExtGState 1 0 R /Font << /F57 12 0 R /F36 14 0 R /F54 10 0 R /F55 11 0 R >> /XObject << /Fm1 104 0 R /Fm2 122 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1 0 obj
<< /opacity1 <</ca 1/CA 1>> >>
@@ -3027,7 +3041,7 @@ endobj
<< /Type /Font /Subtype /CIDFontType0 /BaseFont /NIIVWO+LMSans10-Bold /FontDescriptor 272 0 R /W 271 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
15 0 obj
-<< /Type /Pages /Count 7 /Kids [ 5 0 R 17 0 R 41 0 R 82 0 R 122 0 R 128 0 R 178 0 R ] >>
+<< /Type /Pages /Count 7 /Kids [ 5 0 R 17 0 R 37 0 R 81 0 R 98 0 R 128 0 R 178 0 R ] >>
endobj
277 0 obj
<< /Type /Outlines /First 209 0 R /Last 239 0 R /Count 7 >>
@@ -3072,7 +3086,7 @@ endobj
<< /Title 210 0 R /A 208 0 R /Parent 277 0 R /Next 212 0 R >>
endobj
278 0 obj
-<< /Names [ (Doc-Start) 9 0 R (NEWPAX@doc-input1.newpax@1@) 132 0 R (NEWPAX@doc-input1.newpax@2@) 133 0 R (NEWPAX@doc-input1.newpax@3@) 134 0 R (NEWPAX@doc-input1.newpax@4@) 135 0 R (NEWPAX@doc-input1.newpax@5@) 136 0 R (desc:newpaxsetup) 85 0 R (lstlisting.-1) 36 0 R (lstlisting.-2) 87 0 R (lstlisting.1) 22 0 R (lstlisting.2) 44 0 R (lstlisting.3) 139 0 R (lstlisting.4) 182 0 R (lstnumber.-1.1) 37 0 R (lstnumber.-1.2) 38 0 R (lstnumber.-1.3) 39 0 R (lstnumber.-2.1) 88 0 R (lstnumber.-2.2) 89 0 R (lstnumber.-2.3) 90 0 R (lstnumber.-2.4) 91 0 R (lstnumber.-2.5) 92 0 R (lstnumber.-2.6) 93 0 R (lstnumber.-2.7) 94 0 R (lstnumber.-2.8) 95 0 R (lstnumber.-2.9) 96 0 R (lstnumber.1.1) 23 0 R (lstnumber.1.10) 32 0 R (lstnumber.1.11) 33 0 R (lstnumber.1.2) 24 0 R (lstnumber.1.3) 25 0 R (lstnumber.1.4) 26 0 R (lstnumber.1.5) 27 0 R ] /Limits [ (Doc-Start) (lstnumber.1.5) ] >>
+<< /Names [ (Doc-Start) 9 0 R (NEWPAX@doc-input1.newpax@1@) 132 0 R (NEWPAX@doc-input1.newpax@2@) 133 0 R (NEWPAX@doc-input1.newpax@3@) 134 0 R (NEWPAX@doc-input1.newpax@4@) 135 0 R (NEWPAX@doc-input1.newpax@5@) 136 0 R (desc:newpaxsetup) 85 0 R (lstlisting.-1) 40 0 R (lstlisting.-2) 87 0 R (lstlisting.1) 22 0 R (lstlisting.2) 44 0 R (lstlisting.3) 139 0 R (lstlisting.4) 182 0 R (lstnumber.-1.1) 41 0 R (lstnumber.-1.2) 42 0 R (lstnumber.-1.3) 43 0 R (lstnumber.-2.1) 88 0 R (lstnumber.-2.2) 89 0 R (lstnumber.-2.3) 90 0 R (lstnumber.-2.4) 91 0 R (lstnumber.-2.5) 92 0 R (lstnumber.-2.6) 93 0 R (lstnumber.-2.7) 94 0 R (lstnumber.-2.8) 95 0 R (lstnumber.-2.9) 96 0 R (lstnumber.1.1) 23 0 R (lstnumber.1.10) 32 0 R (lstnumber.1.11) 33 0 R (lstnumber.1.2) 24 0 R (lstnumber.1.3) 25 0 R (lstnumber.1.4) 26 0 R (lstnumber.1.5) 27 0 R ] /Limits [ (Doc-Start) (lstnumber.1.5) ] >>
endobj
279 0 obj
<< /Names [ (lstnumber.1.6) 28 0 R (lstnumber.1.7) 29 0 R (lstnumber.1.8) 30 0 R (lstnumber.1.9) 31 0 R (lstnumber.2.1) 45 0 R (lstnumber.2.10) 54 0 R (lstnumber.2.11) 55 0 R (lstnumber.2.12) 56 0 R (lstnumber.2.13) 57 0 R (lstnumber.2.14) 58 0 R (lstnumber.2.15) 59 0 R (lstnumber.2.16) 60 0 R (lstnumber.2.17) 61 0 R (lstnumber.2.18) 62 0 R (lstnumber.2.19) 63 0 R (lstnumber.2.2) 46 0 R (lstnumber.2.20) 64 0 R (lstnumber.2.21) 65 0 R (lstnumber.2.22) 66 0 R (lstnumber.2.23) 67 0 R (lstnumber.2.24) 68 0 R (lstnumber.2.25) 69 0 R (lstnumber.2.26) 70 0 R (lstnumber.2.27) 71 0 R (lstnumber.2.28) 72 0 R (lstnumber.2.29) 73 0 R (lstnumber.2.3) 47 0 R (lstnumber.2.30) 74 0 R (lstnumber.2.31) 75 0 R (lstnumber.2.32) 76 0 R (lstnumber.2.33) 77 0 R (lstnumber.2.34) 78 0 R ] /Limits [ (lstnumber.1.6) (lstnumber.2.34) ] >>
@@ -3081,7 +3095,7 @@ endobj
<< /Names [ (lstnumber.2.4) 48 0 R (lstnumber.2.5) 49 0 R (lstnumber.2.6) 50 0 R (lstnumber.2.7) 51 0 R (lstnumber.2.8) 52 0 R (lstnumber.2.9) 53 0 R (lstnumber.3.1) 140 0 R (lstnumber.3.10) 149 0 R (lstnumber.3.11) 150 0 R (lstnumber.3.12) 151 0 R (lstnumber.3.2) 141 0 R (lstnumber.3.3) 142 0 R (lstnumber.3.4) 143 0 R (lstnumber.3.5) 144 0 R (lstnumber.3.6) 145 0 R (lstnumber.3.7) 146 0 R (lstnumber.3.8) 147 0 R (lstnumber.3.9) 148 0 R (lstnumber.4.1) 183 0 R (lstnumber.4.10) 192 0 R (lstnumber.4.11) 193 0 R (lstnumber.4.12) 194 0 R (lstnumber.4.13) 195 0 R (lstnumber.4.14) 196 0 R (lstnumber.4.15) 197 0 R (lstnumber.4.16) 198 0 R (lstnumber.4.17) 199 0 R (lstnumber.4.18) 200 0 R (lstnumber.4.19) 201 0 R (lstnumber.4.2) 184 0 R (lstnumber.4.20) 202 0 R (lstnumber.4.21) 203 0 R ] /Limits [ (lstnumber.2.4) (lstnumber.4.21) ] >>
endobj
281 0 obj
-<< /Names [ (lstnumber.4.22) 204 0 R (lstnumber.4.23) 205 0 R (lstnumber.4.24) 206 0 R (lstnumber.4.3) 185 0 R (lstnumber.4.4) 186 0 R (lstnumber.4.5) 187 0 R (lstnumber.4.6) 188 0 R (lstnumber.4.7) 189 0 R (lstnumber.4.8) 190 0 R (lstnumber.4.9) 191 0 R (page.1) 8 0 R (page.2) 19 0 R (page.3) 43 0 R (page.4) 84 0 R (page.5) 124 0 R (page.6) 130 0 R (page.7) 180 0 R (section.1) 13 0 R (section.2) 20 0 R (section.3) 80 0 R (section.4) 86 0 R (section.5) 126 0 R (section.6) 131 0 R (section.7) 137 0 R (subsection.2.1) 21 0 R (subsection.2.2) 34 0 R (subsection.2.3) 79 0 R (subsection.4.1) 125 0 R (subsection.7.1) 138 0 R (subsection.7.2) 181 0 R ] /Limits [ (lstnumber.4.22) (subsection.7.2) ] >>
+<< /Names [ (lstnumber.4.22) 204 0 R (lstnumber.4.23) 205 0 R (lstnumber.4.24) 206 0 R (lstnumber.4.3) 185 0 R (lstnumber.4.4) 186 0 R (lstnumber.4.5) 187 0 R (lstnumber.4.6) 188 0 R (lstnumber.4.7) 189 0 R (lstnumber.4.8) 190 0 R (lstnumber.4.9) 191 0 R (page.1) 8 0 R (page.2) 19 0 R (page.3) 39 0 R (page.4) 83 0 R (page.5) 100 0 R (page.6) 130 0 R (page.7) 180 0 R (section.1) 13 0 R (section.2) 20 0 R (section.3) 84 0 R (section.4) 86 0 R (section.5) 102 0 R (section.6) 131 0 R (section.7) 137 0 R (subsection.2.1) 21 0 R (subsection.2.2) 34 0 R (subsection.2.3) 79 0 R (subsection.4.1) 101 0 R (subsection.7.1) 138 0 R (subsection.7.2) 181 0 R ] /Limits [ (lstnumber.4.22) (subsection.7.2) ] >>
endobj
282 0 obj
<< /Kids [ 278 0 R 279 0 R 280 0 R 281 0 R ] /Limits [ (Doc-Start) (subsection.7.2) ] >>
@@ -3093,298 +3107,298 @@ endobj
<< /Type /Catalog /Pages 15 0 R /Outlines 277 0 R /Names 283 0 R /ViewerPreferences 207 0 R/Lang (en-UK)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
285 0 obj
-<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/Title <FEFF0054006800650020006E006500770070006100780020007000610063006B006100670065>/Author <FEFF0055006C00720069006B006500200046006900730063006800650072> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210228200538+01'00') /ModDate (D:20210228200538+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/Title <FEFF0054006800650020006E006500770070006100780020007000610063006B006100670065>/Author <FEFF0055006C00720069006B006500200046006900730063006800650072> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000911+01'00') /ModDate (D:20210307000911+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
endobj
xref
0 286
0000000002 65535 f
-0000102621 00000 n
+0000105447 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000012255 00000 n
-0000012547 00000 n
+0000012261 00000 n
+0000012553 00000 n
0000000020 00000 n
-0000012369 00000 n
-0000012428 00000 n
-0000159280 00000 n
-0000151065 00000 n
-0000144984 00000 n
-0000012487 00000 n
-0000133352 00000 n
-0000159631 00000 n
-0000025546 00000 n
-0000024208 00000 n
-0000012669 00000 n
-0000024325 00000 n
-0000024386 00000 n
-0000024447 00000 n
-0000024508 00000 n
-0000024568 00000 n
-0000024629 00000 n
-0000024690 00000 n
-0000024751 00000 n
-0000024812 00000 n
-0000024873 00000 n
-0000024934 00000 n
-0000024995 00000 n
-0000025056 00000 n
-0000025117 00000 n
-0000025178 00000 n
-0000025238 00000 n
-0000122268 00000 n
-0000025299 00000 n
-0000025360 00000 n
-0000025422 00000 n
-0000025484 00000 n
-0000038420 00000 n
-0000035989 00000 n
-0000025681 00000 n
-0000036106 00000 n
-0000036167 00000 n
-0000036228 00000 n
-0000036289 00000 n
-0000036350 00000 n
-0000036411 00000 n
-0000036472 00000 n
-0000036533 00000 n
-0000036594 00000 n
-0000036655 00000 n
-0000036715 00000 n
-0000036776 00000 n
-0000036837 00000 n
-0000036898 00000 n
-0000036959 00000 n
-0000037020 00000 n
-0000037081 00000 n
-0000037142 00000 n
-0000037203 00000 n
-0000037264 00000 n
-0000037325 00000 n
-0000037386 00000 n
-0000037446 00000 n
-0000037507 00000 n
-0000037568 00000 n
-0000037629 00000 n
-0000037690 00000 n
-0000037751 00000 n
-0000037812 00000 n
-0000037873 00000 n
-0000037934 00000 n
-0000037995 00000 n
-0000038056 00000 n
-0000038117 00000 n
-0000038177 00000 n
-0000038237 00000 n
-0000038298 00000 n
-0000038359 00000 n
-0000052632 00000 n
-0000051723 00000 n
-0000038543 00000 n
-0000051840 00000 n
-0000051901 00000 n
-0000051962 00000 n
-0000052023 00000 n
-0000052084 00000 n
-0000052145 00000 n
-0000052206 00000 n
-0000052267 00000 n
-0000052328 00000 n
-0000052389 00000 n
-0000052450 00000 n
-0000052511 00000 n
-0000052571 00000 n
-0000075269 00000 n
-0000075053 00000 n
-0000100011 00000 n
-0000100222 00000 n
-0000096711 00000 n
-0000096928 00000 n
-0000097146 00000 n
-0000097363 00000 n
-0000097580 00000 n
-0000097797 00000 n
-0000098014 00000 n
-0000098231 00000 n
-0000098448 00000 n
-0000098665 00000 n
-0000098882 00000 n
-0000099099 00000 n
-0000099315 00000 n
-0000099572 00000 n
-0000095760 00000 n
-0000095543 00000 n
-0000099792 00000 n
-0000100433 00000 n
-0000100644 00000 n
-0000100856 00000 n
-0000068164 00000 n
-0000067855 00000 n
-0000052767 00000 n
-0000067975 00000 n
-0000068038 00000 n
-0000068101 00000 n
-0000102457 00000 n
-0000074737 00000 n
-0000068288 00000 n
-0000101069 00000 n
-0000101132 00000 n
-0000101195 00000 n
-0000101258 00000 n
-0000101322 00000 n
-0000101386 00000 n
-0000101450 00000 n
-0000101514 00000 n
-0000101577 00000 n
-0000101640 00000 n
-0000101703 00000 n
-0000101766 00000 n
-0000101829 00000 n
-0000101892 00000 n
-0000101955 00000 n
-0000102018 00000 n
-0000102081 00000 n
-0000102143 00000 n
-0000102205 00000 n
-0000102268 00000 n
-0000102331 00000 n
-0000102394 00000 n
-0000074873 00000 n
-0000095475 00000 n
-0000080671 00000 n
-0000080722 00000 n
-0000080879 00000 n
-0000081035 00000 n
-0000081189 00000 n
-0000081392 00000 n
-0000082675 00000 n
-0000082877 00000 n
-0000083856 00000 n
-0000084056 00000 n
-0000084856 00000 n
-0000085095 00000 n
+0000012375 00000 n
+0000012434 00000 n
+0000162106 00000 n
+0000153891 00000 n
+0000147810 00000 n
+0000012493 00000 n
+0000136178 00000 n
+0000162457 00000 n
+0000027154 00000 n
+0000026063 00000 n
+0000012675 00000 n
+0000026180 00000 n
+0000026241 00000 n
+0000026302 00000 n
+0000026363 00000 n
+0000026423 00000 n
+0000026484 00000 n
+0000026545 00000 n
+0000026606 00000 n
+0000026667 00000 n
+0000026728 00000 n
+0000026789 00000 n
+0000026850 00000 n
+0000026911 00000 n
+0000026972 00000 n
+0000027033 00000 n
+0000027093 00000 n
+0000125094 00000 n
+0000041003 00000 n
+0000038386 00000 n
+0000027289 00000 n
+0000038503 00000 n
+0000038564 00000 n
+0000038625 00000 n
+0000038687 00000 n
+0000038749 00000 n
+0000038811 00000 n
+0000038872 00000 n
+0000038933 00000 n
+0000038993 00000 n
+0000039054 00000 n
+0000039115 00000 n
+0000039176 00000 n
+0000039237 00000 n
+0000039298 00000 n
+0000039359 00000 n
+0000039420 00000 n
+0000039481 00000 n
+0000039542 00000 n
+0000039603 00000 n
+0000039664 00000 n
+0000039724 00000 n
+0000039784 00000 n
+0000039845 00000 n
+0000039906 00000 n
+0000039967 00000 n
+0000040028 00000 n
+0000040089 00000 n
+0000040150 00000 n
+0000040211 00000 n
+0000040272 00000 n
+0000040333 00000 n
+0000040394 00000 n
+0000040455 00000 n
+0000040515 00000 n
+0000040576 00000 n
+0000040637 00000 n
+0000040698 00000 n
+0000040759 00000 n
+0000040820 00000 n
+0000040881 00000 n
+0000040942 00000 n
+0000053907 00000 n
+0000052937 00000 n
+0000041126 00000 n
+0000053054 00000 n
+0000053115 00000 n
+0000053176 00000 n
+0000053236 00000 n
+0000053297 00000 n
+0000053358 00000 n
+0000053419 00000 n
+0000053480 00000 n
+0000053541 00000 n
+0000053602 00000 n
+0000053663 00000 n
+0000053724 00000 n
+0000053785 00000 n
+0000053846 00000 n
+0000070252 00000 n
+0000069949 00000 n
+0000054042 00000 n
+0000070066 00000 n
+0000070128 00000 n
+0000070190 00000 n
+0000078047 00000 n
+0000077830 00000 n
+0000102837 00000 n
+0000103048 00000 n
+0000099491 00000 n
+0000099711 00000 n
+0000099932 00000 n
+0000100152 00000 n
+0000100372 00000 n
+0000100592 00000 n
+0000100812 00000 n
+0000101032 00000 n
+0000101251 00000 n
+0000101471 00000 n
+0000101691 00000 n
+0000101911 00000 n
+0000102131 00000 n
+0000102391 00000 n
+0000098540 00000 n
+0000098323 00000 n
+0000102614 00000 n
+0000103259 00000 n
+0000103470 00000 n
+0000103682 00000 n
+0000105282 00000 n
+0000077513 00000 n
+0000070375 00000 n
+0000103895 00000 n
+0000103958 00000 n
+0000104021 00000 n
+0000104083 00000 n
+0000104147 00000 n
+0000104211 00000 n
+0000104274 00000 n
+0000104338 00000 n
+0000104401 00000 n
+0000104464 00000 n
+0000104527 00000 n
+0000104590 00000 n
+0000104652 00000 n
+0000104715 00000 n
+0000104778 00000 n
+0000104841 00000 n
+0000104904 00000 n
+0000104967 00000 n
+0000105030 00000 n
+0000105093 00000 n
+0000105156 00000 n
+0000105219 00000 n
+0000077649 00000 n
+0000098254 00000 n
+0000083450 00000 n
+0000083501 00000 n
+0000083658 00000 n
+0000083814 00000 n
+0000083968 00000 n
+0000084171 00000 n
0000085454 00000 n
-0000085692 00000 n
-0000085901 00000 n
-0000086138 00000 n
-0000086219 00000 n
-0000091505 00000 n
-0000091573 00000 n
-0000094071 00000 n
-0000094138 00000 n
-0000095409 00000 n
-0000096642 00000 n
-0000115766 00000 n
-0000113947 00000 n
-0000102668 00000 n
-0000114067 00000 n
-0000114130 00000 n
-0000114193 00000 n
-0000114256 00000 n
-0000114319 00000 n
-0000114382 00000 n
-0000114445 00000 n
-0000114508 00000 n
-0000114571 00000 n
-0000114634 00000 n
-0000114697 00000 n
-0000114760 00000 n
-0000114823 00000 n
-0000114886 00000 n
-0000114949 00000 n
-0000115011 00000 n
-0000115073 00000 n
-0000115136 00000 n
-0000115199 00000 n
-0000115262 00000 n
-0000115325 00000 n
-0000115388 00000 n
-0000115451 00000 n
-0000115514 00000 n
-0000115577 00000 n
-0000115640 00000 n
-0000115703 00000 n
-0000115890 00000 n
-0000115936 00000 n
-0000160949 00000 n
-0000115983 00000 n
-0000116072 00000 n
-0000160817 00000 n
-0000116119 00000 n
-0000116264 00000 n
-0000160738 00000 n
-0000116316 00000 n
-0000116578 00000 n
-0000160645 00000 n
-0000116630 00000 n
-0000116887 00000 n
-0000160566 00000 n
-0000116939 00000 n
-0000117069 00000 n
-0000160473 00000 n
-0000117116 00000 n
-0000117213 00000 n
-0000160341 00000 n
-0000117260 00000 n
-0000117367 00000 n
-0000160276 00000 n
-0000117419 00000 n
-0000117627 00000 n
-0000160183 00000 n
-0000117674 00000 n
-0000117811 00000 n
-0000160090 00000 n
-0000117858 00000 n
-0000117955 00000 n
-0000159972 00000 n
-0000118002 00000 n
-0000118178 00000 n
-0000159893 00000 n
-0000118230 00000 n
-0000118441 00000 n
-0000159814 00000 n
-0000118493 00000 n
-0000118740 00000 n
-0000121106 00000 n
-0000118855 00000 n
-0000118927 00000 n
-0000121346 00000 n
-0000122424 00000 n
-0000122627 00000 n
-0000131399 00000 n
-0000123073 00000 n
-0000123150 00000 n
-0000131637 00000 n
-0000133507 00000 n
-0000133709 00000 n
-0000142972 00000 n
-0000134139 00000 n
-0000134374 00000 n
-0000143211 00000 n
-0000145141 00000 n
-0000145345 00000 n
-0000149678 00000 n
-0000145689 00000 n
-0000145765 00000 n
-0000149915 00000 n
-0000151219 00000 n
-0000151420 00000 n
-0000157690 00000 n
-0000151796 00000 n
-0000151873 00000 n
-0000157926 00000 n
-0000159432 00000 n
-0000159737 00000 n
-0000161028 00000 n
-0000161923 00000 n
-0000162763 00000 n
-0000163619 00000 n
-0000164339 00000 n
-0000164445 00000 n
-0000164483 00000 n
-0000164686 00000 n
+0000085656 00000 n
+0000086635 00000 n
+0000086835 00000 n
+0000087635 00000 n
+0000087874 00000 n
+0000088233 00000 n
+0000088471 00000 n
+0000088680 00000 n
+0000088917 00000 n
+0000088998 00000 n
+0000094284 00000 n
+0000094352 00000 n
+0000096850 00000 n
+0000096917 00000 n
+0000098188 00000 n
+0000099422 00000 n
+0000118592 00000 n
+0000116773 00000 n
+0000105494 00000 n
+0000116893 00000 n
+0000116956 00000 n
+0000117019 00000 n
+0000117082 00000 n
+0000117145 00000 n
+0000117208 00000 n
+0000117271 00000 n
+0000117334 00000 n
+0000117397 00000 n
+0000117460 00000 n
+0000117523 00000 n
+0000117586 00000 n
+0000117649 00000 n
+0000117712 00000 n
+0000117775 00000 n
+0000117837 00000 n
+0000117899 00000 n
+0000117962 00000 n
+0000118025 00000 n
+0000118088 00000 n
+0000118151 00000 n
+0000118214 00000 n
+0000118277 00000 n
+0000118340 00000 n
+0000118403 00000 n
+0000118466 00000 n
+0000118529 00000 n
+0000118716 00000 n
+0000118762 00000 n
+0000163774 00000 n
+0000118809 00000 n
+0000118898 00000 n
+0000163642 00000 n
+0000118945 00000 n
+0000119090 00000 n
+0000163563 00000 n
+0000119142 00000 n
+0000119404 00000 n
+0000163470 00000 n
+0000119456 00000 n
+0000119713 00000 n
+0000163391 00000 n
+0000119765 00000 n
+0000119895 00000 n
+0000163298 00000 n
+0000119942 00000 n
+0000120039 00000 n
+0000163166 00000 n
+0000120086 00000 n
+0000120193 00000 n
+0000163101 00000 n
+0000120245 00000 n
+0000120453 00000 n
+0000163008 00000 n
+0000120500 00000 n
+0000120637 00000 n
+0000162915 00000 n
+0000120684 00000 n
+0000120781 00000 n
+0000162797 00000 n
+0000120828 00000 n
+0000121004 00000 n
+0000162718 00000 n
+0000121056 00000 n
+0000121267 00000 n
+0000162639 00000 n
+0000121319 00000 n
+0000121566 00000 n
+0000123932 00000 n
+0000121681 00000 n
+0000121753 00000 n
+0000124172 00000 n
+0000125250 00000 n
+0000125453 00000 n
+0000134225 00000 n
+0000125899 00000 n
+0000125976 00000 n
+0000134463 00000 n
+0000136333 00000 n
+0000136535 00000 n
+0000145798 00000 n
+0000136965 00000 n
+0000137200 00000 n
+0000146037 00000 n
+0000147967 00000 n
+0000148171 00000 n
+0000152504 00000 n
+0000148515 00000 n
+0000148591 00000 n
+0000152741 00000 n
+0000154045 00000 n
+0000154246 00000 n
+0000160516 00000 n
+0000154622 00000 n
+0000154699 00000 n
+0000160752 00000 n
+0000162258 00000 n
+0000162562 00000 n
+0000163853 00000 n
+0000164748 00000 n
+0000165588 00000 n
+0000166444 00000 n
+0000167164 00000 n
+0000167270 00000 n
+0000167308 00000 n
+0000167511 00000 n
trailer
-<< /Size 286 /Root 284 0 R /Info 285 0 R /ID [ <14F7AD917E2BB18BD026CDBCE221ABD4> <14F7AD917E2BB18BD026CDBCE221ABD4> ] >>
+<< /Size 286 /Root 284 0 R /Info 285 0 R /ID [ <9358EBB714BBBB1865E4E2230D91F5A4> <9358EBB714BBBB1865E4E2230D91F5A4> ] >>
startxref
-165148
+167973
%%EOF
diff --git a/macros/luatex/latex/newpax/newpax.tex b/macros/latex/contrib/newpax/newpax.tex
index 6e13ab62b6..3267edf128 100644
--- a/macros/luatex/latex/newpax/newpax.tex
+++ b/macros/latex/contrib/newpax/newpax.tex
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8:Main"
\makeatletter
-\def\UlrikeFischer@package@version{0.5}
-\def\UlrikeFischer@package@date{2021-02-26}
+\def\UlrikeFischer@package@version{0.51}
+\def\UlrikeFischer@package@date{2021-03-07}
\makeatother
\RequirePackage{pdfmanagement-testphase}
\DeclareDocumentMetadata{pdfversion=1.7,lang=en-UK, uncompress}
@@ -77,6 +77,12 @@ with lualatex.
Running this document will create the files \file{doc-input1.newpax} and \file{doc-input2.newpax}.
+To find the graphics \texttt{kpathsea} is used. This means that graphics in texmf trees will work and
+you can also use paths to directories, but settings in \cs{graphicspath} are ignored. The newpax
+file is currently written into the current directory, which means that graphics with the same name
+in different locations won't work easily (with lualatex you could create the newpax file in the document
+just before it is needed). Later versions of the package will probably add some options for this case,
+but for now use at best distinct file names.
\subsection{Step 2: Using the \texttt{.newpax}-file with \texorpdfstring{\pkg{newpax}}{newpax}}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
new file mode 100644
index 0000000000..4d417af72d
--- /dev/null
+++ b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
@@ -0,0 +1,31 @@
+# Changelog
+All notable changes to the `pdfmanagement-testphase` bundle since the
+first release 0.95a, 2021-02-23 will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+this project uses date-based 'snapshot' version identifiers.
+
+## [Unreleased]
+
+## [2021-03-07]
+
+### Added
+- \pdfannot_widget_box:nnnn
+- \pdfannot_dict_use:n
+- module l3pdffield for form fields. Currently it only supports checkboxes.
+
+### Changed
+-
+
+### Removed
+- \pdfannot_box:nnnnn: Concept to mix manual specs and dictionaries is wrong.
+ This can lead to duplicate entries in the dictionaries.
+
+### Fixed
+- Wrong default setting of \g_@@_active_bool (issue #13)
+- l3pdffile: Wrong casing: FileSpec -> Filespec
+- beamer linkbordercolor error (workaround in firstaid)
+
+## [2021-02-23]
+
+First release
diff --git a/macros/latex/contrib/pdfmanagement-testphase/README.md b/macros/latex/contrib/pdfmanagement-testphase/README.md
index a3743c6504..e8ccd6bde2 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/README.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/README.md
@@ -1,6 +1,6 @@
# LaTeX PDF management testphase bundle
-Version: 0.95a, 2021-02-22
+Version: 0.95b, 2021-03-07
This package is used during a test phase to load the new PDF management code
of LaTeX.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
index 60a55ad9c3..0fbe8eb671 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{color-ltx}
- [2021/02/22 v1.2d Standard LaTeX Color (patched for l3color) (DPC)]
+ [2021/03/07 v1.2e Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase 2021-03-07 v0.95b) (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
index c279519c3b..ee7c99874a 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
@@ -86,7 +86,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -813,7 +813,7 @@
% \end{macrocode}
% \begin{macrocode}
\ProvidesFile{hgeneric-testphase.def}
- [2021/02/22 v0.95a %
+ [2021/02/22 v0.95b %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
@@ -1822,12 +1822,13 @@
\cs_set_eq:NN \% \c_percent_str
\Hy@safe@activestrue
\mode_leave_vertical:
+ \pdfannot_dict_put:nnx {link/URI}{A}{<<\pdfdict_use:n {l_hyp/annot/A/URI}>>}
\pdfannot_link:nxn { URI }
{
- /A
- <<
- \pdfdict_use:n {l_hyp/annot/A/URI}
- >>
+ % /A
+% <<
+% \pdfdict_use:n {l_hyp/annot/A/URI}
+% >>
}
{
#1
@@ -1877,12 +1878,13 @@
\pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy@href@nextactionraw}
}
\mode_leave_vertical:
+ \pdfannot_dict_put:nnx {link/GoToR}{A}{<<\pdfdict_use:n {l_hyp/annot/A/GoToR}>>}
\pdfannot_link:nxn %expansion??
{ GoToR }
{
- /A<<
- \pdfdict_use:n {l_hyp/annot/A/GoToR}
- >>
+ % /A<<
+% \pdfdict_use:n {l_hyp/annot/A/GoToR}
+% >>
}
{
#1\Hy@xspace@end
@@ -1935,13 +1937,14 @@
\pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy@href@nextactionraw}
}
\mode_leave_vertical:
+ \pdfannot_dict_put:nnx {link/Launch}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Launch}>>}
\pdfannot_link:nxn
{ Launch }
{
- /A
- <<
- \pdfdict_use:n {l_hyp/annot/A/Launch}
- >>
+ % /A
+% <<
+% \pdfdict_use:n {l_hyp/annot/A/Launch}
+% >>
}
{
#2\Hy@xspace@end
@@ -1986,12 +1989,13 @@
\str_remove_once:Nn \Hy@href@nextactionraw {/Next}
\pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy@href@nextactionraw}
}
+ \pdfannot_dict_put:nnx {link/Named}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Named}>>}
\pdfannot_link:nxn { Named }
{
- /A
- <<
- \pdfdict_use:n { l_hyp/annot/A/Named }
- >>
+% /A
+% <<
+% \pdfdict_use:n { l_hyp/annot/A/Named }
+% >>
}
{
#2
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
index 910f9e61fd..49fbd11925 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
index e0cb3a4e1b..ee89218a7d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
@@ -20,7 +20,7 @@
% for those people who are interested.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}
- {2021-02-22} {0.95a}
+ {2021-03-07} {0.95b}
{Store hyperref metadata in XMP format / temporay patches to test pdfresource management ... UF}
\cs_if_exist:NT \pdfmanagement_add:nnn
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
index ffa7fd0b63..796ba7f701 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
@@ -45,7 +45,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
%
@@ -56,27 +56,27 @@
% \begin{macrocode}
%<drivers>\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-testphase-dvipdfmx.def}{2021-02-22}{}
+ {l3backend-testphase-dvipdfmx.def}{2021-03-07}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-testphase-dvips.def}{2021-02-22}{}
+ {l3backend-testphase-dvips.def}{2021-03-07}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-testphase-dvisvgm.def}{2021-02-22}{}
+ {l3backend-testphase-dvisvgm.def}{2021-03-07}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-testphase-luatex.def}{2021-02-22}{}
+ {l3backend-testphase-luatex.def}{2021-03-07}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-testphase-pdftex.def}{2021-02-22}{}
+ {l3backend-testphase-pdftex.def}{2021-03-07}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
%</pdftex>
%<*xdvipdfmx>
- {l3backend-testphase-xetex.def}{2021-02-22}{}
+ {l3backend-testphase-xetex.def}{2021-03-07}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
%</xdvipdfmx>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
index 0d2d78f683..b89ccd6af0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
index 94b7a89af8..71ee24f53d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
@@ -52,7 +52,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-21}
+% \date{Version 0.95b, released 2021-02-21}
%
% \maketitle
% \begin{documentation}
@@ -70,26 +70,15 @@
% \subsection{General annotation commands}
%
% \begin{function}[added = 2019-09-05, updated = 2020-04-14]
-% { \pdfannot_box:nnnn }
+% { \pdfannot_box:nnnn,\pdfannot_box:nnnx }
% \begin{syntax}
% \cs{pdfannot_box:nnnn} \Arg{width} \Arg{height} \Arg{depth} \Arg{annot spec}
% \end{syntax}
% This creates an \texttt{/Type/Annot} object with the given dimensions.
-% It doesn't use hooks or dictionaries.
-% \end{function}
-% \begin{function}[added = 2020-03-30]
-% { \pdfannot_box:nnnnn }
-% \begin{syntax}
-% \cs{pdfannot_box:nnnnn} \Arg{type} \Arg{width} \Arg{height} \Arg{depth} \Arg{annot spec}
-% \end{syntax}
-% This creates an \texttt{/Type/Annot} object with the given dimensions.
-% \meta{type} should be currently one of |link/URI|, |link/GoToR|,
-% |link/Launch|, |link/GoTo| or |link/Named| or
-% |widget|, it will then insert the attribute dictionary of this type
-% additionally to the manually given \meta{annot spec}.
-% The attribute dictionaries can be filled with commands described below.
-% Hooks are not used.
+% It doesn't use hooks or dictionaries. The annotation doesn't occupy space but
+% as it is a whatsit it can affect spacing.
% \end{function}
+%
% \begin{function}[added = 2019-09-05]
% { \pdfannot_box_ref_last: }
% \begin{syntax}
@@ -97,6 +86,32 @@
% \end{syntax}
% This retrieves the object reference of the last box annotation created.
% \end{function}
+% \subsection{Dictionary for the annotation spec}
+%
+% \meta{annot spec} in the above command can be given in two ways. One way is
+% to enter the needed dictionary keys and values directly:
+% \begin{verbatim}
+% \pdfannot_box:nnnn{1cm}{1cm}{0cm}{/Subtype/Link /Border[0~0~1]}
+% \end{verbatim}
+%
+% A second method is to make use of the dictionary commands provided by \pkg{l3pdfdict}:
+%
+% \begin{verbatim}
+% \pdfdict_new:n {l_my_annot}
+% \pdfdict_put:nnn{l_my_annot}{Subtype}{/Link}
+% \pdfdict_put:nnn{l_my_annot}{Border}{[0~0~1]}
+% \pdfannot_box:nnnx{1cm}{1cm}{0cm}{\pdfdict_use:n{l_my_annot}}
+% \end{verbatim}
+%
+% The second method is clearly slower and more to type. But it has the advantage
+% that using such a dictionary makes it easy to add, remove and change entries.
+% It also avoids the potential problem that a key is added twice with different
+% values. This allows to create user interfaces to change settings and
+% also makes it easy to extend the interfaces in case some new setting
+% should be included. For these reasons both the PDF management itself,
+% but also the specific annotation commands in the following sections
+% all make use of such dictionaries.
+%
% \subsection{Link annotations}
% Link annotations are special cases of annotations. In the PDF they are identified
% by an |/Subtype/Link| entry in the dictionary.
@@ -152,16 +167,22 @@
% \begin{syntax}
% \cs{pdfannot_link:nnn} \Arg{type} \Arg{user action spec} \Arg{link text}
% \end{syntax}
-% This creates a link around the \meta{link text} with the specified
+% This creates a link around the \meta{link text}.
+% \texttt{/Subtype/Link} is added automatically through the dictionary.
% \meta{user action spec}\footnote{The wording follows the pdftex documentation}.
-% \texttt{/Subtype/Link} is added automatically.
+% is provided as a fast method to add dictionary contents,
+% but it should be noted that no provision is taken to avoid clashes with
+% values added through the dictionary. If needed clashing entries should be
+% removed from the dictionary first. Normally the argument is not needed, all
+% entries can be added through the dictionary too.
% \meta{type} should be one of \texttt{URI}, \texttt{GoToR},
% \texttt{Launch}, \texttt{GoTo} or \texttt{Named}. The |GoTo| variant does
% \emph{not} complain if the destination name is not known like
% \cs{pdfannot_link_goto_begin:nw}.
% The attributes stored in the local dictionary
% \texttt{link/}\meta{type} are inserted as
-% \emph{attr spec} and the code in the begin and end hook
+% \emph{attr spec} before \meta{user action spec}.
+% The code in the begin and end hook
% \texttt{pdfannot/link/\meta{type}/before}
% and \texttt{pdfannot/link/\meta{type}/after}
% is executed before and after the link (outside the link command)
@@ -193,10 +214,14 @@
% \cs{pdfannot_link_begin:nnw} \Arg{type} \Arg{user action spec} \meta{content}
% \cs{pdfannot_link_end:n} \Arg{type}
% \end{syntax}
-% This creates a link around the \meta{content} with the specified
-% \meta{user action spec} (e.g. an /A dictionary with an URI) or
-% \meta{destination} (a name as defined with the
-% first argument of \cs{pdf_destination:nn}).
+% This creates a link like the previous command.
+% \texttt{/Subtype/Link} is added automatically through the dictionary.
+% \meta{user action spec}\footnote{The wording follows the pdftex documentation}.
+% is provided as a fast method to add dictionary contents,
+% but it should be noted that no provision is taken to avoid clashes with
+% values added through the dictionary. If needed clashing entries should be
+% removed from the dictionary first. Normally the argument is not needed, all
+% entries can be added through the dictionary too.
% \texttt{/Subtype/Link} is added automatically.
% In contrast to \cs{pdfannot_link:nnn} this function
% does not absorb the argument when finding the \meta{content}, and so can
@@ -278,6 +303,17 @@
% \texttt{link/GoTo}, \texttt{link/Named}.
% \end{function}
%
+% \begin{function}[EXP,added = 2021-03-03]
+% { \pdfannot_dict_use:n }
+% \begin{syntax}
+% \cs{pdfannot_dict_use:n} \Arg{dictionary name}
+% \end{syntax}
+% This outputs the property list of the dictionary as a list of
+% |/key value| pairs.
+% This can be used e.g. when writing a dictionary object with
+% \cs{pdf_object_write:nx}
+% \end{function}
+%
% \begin{variable}[added = 2020-12-28]{\l_pdfannot_F_bitset}
% This is a bitset variable, with the named index names suitable for the
% /F flag in an annotation.
@@ -291,6 +327,27 @@
% |Print|, |NoZoom|, |NoRotate|, |NoView|, |ReadOnly|, |Locked|, |ToggleNoView|,
% |LockedContents| which correspond to the names used in the PDF references.
% \end{variable}
+% \subsection{Widget annotations}
+% Widget annotations are quite important for form fields, as they are used
+% to build the actually instance of such fields.
+%
+% As they can contain meaningful content hooks are probably needed to allow tagging
+% and other manipulations, so like with link special commands are provided.
+% Widget are normally in a box and line and page breaks are not relevant, so
+% the command is offered as box command.
+%
+% \begin{function}[added = 2021-03-02]
+% { \pdfannot_widget_box:nnn }
+% \begin{syntax}
+% \cs{pdfannot_widget_box:nnn} \Arg{width} \Arg{height} \Arg{depth}
+% \end{syntax}
+% This creates an \texttt{/Type/Annot} object with the given dimensions.
+% The annotation doesn't occupy space.
+% It will insert the attribute dictionary of the widget type (which
+% is prefilled with \texttt{/Subtype/Widget}).
+% The hooks \texttt{pdfannot/widget/before} and \texttt{pdfannot/widget/after}
+% are executed before and after the widget.
+% \end{function}
% \end{documentation}
%
% \begin{implementation}
@@ -300,7 +357,7 @@
% \begin{macrocode}
%<@@=pdfannot>
%<*header>
-\ProvidesExplPackage {l3pdfannot} {2021-02-22} {0.95a}
+\ProvidesExplPackage {l3pdfannot} {2021-03-07} {0.95b}
{PDF-annotations}
\RequirePackage{l3pdfdict}
%</header>
@@ -349,41 +406,45 @@
% type or not type? Syntax for type?
% should there be a version without type?
% \end{NOTE}
-
+% \begin{macro}{\pdfannot_box:nnnn,\pdfannot_box:nnnx,\pdfannot_box_ref_last:}
% \begin{macrocode}
\cs_new_protected:Npn \pdfannot_box:nnnn #1 #2 #3 #4
{
\__pdf_backend_annotation:nnnn {#1}{#2}{#3}{#4}
\bool_gset_false:N\g_@@_use_lastlink_bool
}
-
+\cs_generate_variant:Nn \pdfannot_box:nnnn {nnnx}
\cs_new:Npn \pdfannot_box_ref_last:
{
\__pdf_backend_annotation_last:
}
-\cs_new_protected:Npn \pdfannot_box:nnnnn #1 #2 #3 #4 #5
- {
- \exp_args:Nx
- \__pdf_backend_annotation:nnnn {#2}{#3}{#4}
- {
- \pdfdict_if_exist:nT { l_@@/#1 }
- {
- \pdfdict_use:n { l_@@/#1}
- }
- #5
- }
- \bool_gset_false:N\g_@@_use_lastlink_bool
- }
% \end{macrocode}
+% \end{macro}
% \subsection{Annotations, subtype Widget}\label{pdf:annot:widget}
-% Currently no code is provided here.
-% The local dictionary \texttt{l_@@/Widget} is a skeleton
-% dictionary for this subtype. It currently contains as only entry
+% Widgets are typically boxes, so we provide a box command.
+% A local dictionary \texttt{l_@@/Widget} is used.
+% It contains like the other dictionaries
% the subtype setting (the /Type is added by the backend).
% \begin{macrocode}
- \pdfdict_new:n { l_@@/widget }
+ \pdfdict_new:n { l_@@/widget }
\pdfdict_put:nnn { l_@@/widget }{ Subtype }{ /Widget }
+ \hook_new_pair:nn
+ {pdfannot/widget/before}
+ {pdfannot/widget/after}
+ \hook_new_pair:nn
+ {pdfannot/widget/begin}
+ {pdfannot/widget/end}
+\cs_new_protected:Npn \pdfannot_widget_box:nnn #1 #2 #3
+ {
+ \hook_use:n { pdfannot/widget/before }
+ \pdfannot_box:nnnx {#1}{#2}{#3}
+ {
+ \pdfdict_use:n { l_@@/widget}
+ }
+ \hook_use:n { pdfannot/widget/after }
+ \bool_gset_false:N\g_@@_use_lastlink_bool
+ }
% \end{macrocode}
%
% \subsection{Annotations, subtype Link}\label{sec:links}
@@ -427,6 +488,7 @@
\seq_map_inline:Nn \c_pdfannot_link_types_seq
{
\pdfdict_new:n { l_@@/link/#1 }
+ \pdfdict_put:nnn { l_@@/link/#1 }{ Subtype }{ /Link }
\hook_new_pair:nn
{pdfannot/link/#1/before}
{pdfannot/link/#1/after}
@@ -454,7 +516,6 @@
}
}
{
- /Subtype/Link
#2 %exp_not?
}
\bool_gset_true:N \g_@@_use_lastlink_bool
@@ -504,7 +565,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \pdfannot_link_goto_begin:nw #1 %#1 destination
{
- \hook_use:n { pdfannot/link/GoTo/before}
+ \pdfdict_remove:nn { l_@@/link/GoTo} {Subtype}
+ \hook_use:n { pdfannot/link/GoTo/before} %the backend add it too
\mode_leave_vertical:
\exp_args:Nxx %xetex needs expansion
\__pdf_backend_link_begin_goto:nnw
@@ -513,6 +575,7 @@
}
{ #1 }
\bool_gset_true:N \g_@@_use_lastlink_bool
+ \pdfdict_put:nnn { l_@@/link/GoTo} {Subtype}{GoTo}
\hook_use:n { pdfannot/link/GoTo/begin}
}
@@ -556,6 +619,7 @@
% \pdfannot_dict_put:nnx,
% \pdfannot_dict_remove:nn,
% \pdfannot_dict_show:n
+% \pdfannot_dict_use:n
% }
% \begin{macrocode}
\cs_new_protected:Npn \pdfannot_dict_put:nnn #1 #2 #3
@@ -575,6 +639,11 @@
{
\pdfdict_show:n { l_@@/#1 }
}
+
+\cs_new:Npn \pdfannot_dict_use:n #1
+ {
+ \pdfdict_use:n { l_@@/#1 }
+ }
%</package>
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
index 67a37e0921..6299ff3a30 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
index 558b721ca5..2362863e3a 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -212,7 +212,7 @@
% \begin{macrocode}
%<@@=pdfdict>
%<*header>
-\ProvidesExplPackage {l3pdfdict} {2021-02-22} {0.95a}
+\ProvidesExplPackage {l3pdfdict} {2021-03-07} {0.95b}
{Tools for PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
index f52defd085..4d2d2c1841 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
new file mode 100644
index 0000000000..3d7e6123e1
--- /dev/null
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
@@ -0,0 +1,961 @@
+% \iffalse meta-comment
+%
+%% File: l3pdfpdffield-checkbox.dtx
+%
+% Copyright (C) 2021 The LaTeX Project
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "LaTeX PDF management testphase bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/pdfresources
+%
+% for those people who are interested.
+%
+%<*driver>
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
+\makeatletter
+\declare@file@substitution{doc.sty}{doc-v3beta.sty}
+\makeatother
+\documentclass[full]{l3doc}
+\usepackage{array,booktabs}
+\usepackage{l3pdffield-testphase,bearwear}
+\hypersetup{pdfauthor=The LaTeX Project,
+ pdftitle=l3pdffield (LaTeX PDF management testphase bundle)}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+% \NewDocElement[
+% idxgroup=checkbox keys,
+% idxtype = {checkbox key},
+% printtype= \textit{checkbox key}
+% ]{Checkboxkey}{checkboxkey}
+% \providecommand\hook[1]{\texttt{#1}}
+% \ExplSyntaxOn
+% \pdffield_store_appearance:nn {bear/Yes}
+% {
+% \tikz\bear\bearwear[shirt=red,body~deco={\node[font=\tiny\bfseries,white]~at~(beartummy){Yes};}];
+% }
+% \pdffield_store_appearance:nn {bear/Off}
+% {
+% \tikz\bear\bearwear[body~deco={\node[font=\tiny\bfseries,white]~at~(beartummy){Off};}];
+% }
+% \ExplSyntaxOff
+% \title{^^A
+% The \pkg{l3pdffield} module\\ Commands to create form fields ^^A
+% \\ \LaTeX{} PDF management testphase bundle
+% }
+%
+% \author{^^A
+% The \LaTeX{} Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team@latex-project.org}
+% {latex-team@latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Version 0.95b, released 2021-03-07}
+%
+% \maketitle
+% \begin{documentation}
+% \section{\pkg{l3pdffield} Introduction}
+% The implementation of form fields in hyperref has some bugs, see for example
+% \url{https://github.com/latex3/hyperref/issues/94}. This package is a first step
+% towards the goal to review and improve the code of form fields.
+%
+% Like the \pkg{pdfmanagement-testphase} package itself it is a temporary package:
+% the definite home of the code is not yet decided.
+%
+% It handles for now \emph{only} checkboxes, other form fields like pushbutton,
+% radio buttons or text fields will follow later. As currently no fonts are used,
+% it doesn't relies on the hyperref code
+% to initialize the form, but it can be used with hyperref.
+%
+% The code requires the new PDF management. The code makes use of
+% \pkg{l3pdfxform} to create the Xobjects. This code doesn't support yet the
+% the dvips backend.
+%
+%
+%
+% Please keep in mind
+% \begin{itemize}
+% \item Not every PDF viewer supports checkboxes.
+% \item The handling can depend on settings in the PDF viewer. In adobe reader for
+% example I had to disable an option to avoid that it tries to create an appearance
+% itself
+% \item Standards like pdf/A disable form fields too (as you typically can't change the PDF).
+% \end{itemize}
+%
+% If \pkg{hyperref} is loaded before
+% the package will suppress the deprecated |/NeedAppearances| setting. If \pkg{hyperref}
+% is loaded later you should do it in the \cs{Form} options.
+%
+% So a typical use together with hyperref could look like this
+%
+% \begin{verbatim}
+% \RequirePackage{pdfmanagement-testphase}
+% \DeclareDocumentMetadata{uncompress}
+% \documentclass{article}
+% \usepackage{hyperref}
+% \usepackage{l3pdffield-testphase}
+% \begin{document}
+% \Form
+% \end{verbatim}
+% \section{Step 1: Checkboxes}
+% Click me:
+% \ExplSyntaxOn\pdffield_checkbox:n{name=bear,appearance=bear,width=23pt,height=30pt,depth=10pt}\ExplSyntaxOff
+%
+% \bigskip
+% \subsection{Commands}
+% \begin{function}{\pdffield_checkbox:n}
+% \begin{syntax}
+% \cs{pdffield_checkbox:n}\Arg{key val list}
+% \end{syntax}
+% This creates a checkbox to check and uncheck. The list of allowed keys is described below.
+% Typically the \meta{key val list} should at least set the name. Checkboxes with the same
+% name belong to the same field and are checked and unchecked together. The default appearance
+% is a quadratic frame with a \cs{texttimes} in it for the checked case.
+% \end{function}
+%
+%\begin{function}{\pdffield_setup:nn}
+% \begin{syntax}
+% \cs{pdffield_setup:nn}\Arg{field type}\Arg{key val list}
+% \end{syntax}
+% This allows to setup up values for following fields. \Arg{field type}
+% should be a field, currently the only allowed value is |checkbox|.
+% \end{function}
+%
+%\begin{function}{\pdffield_store_appearance:nn}
+% \begin{syntax}
+% \cs{pdffield_store_appearance:nn}\Arg{name/state}\Arg{content}
+% \end{syntax}
+% This is a small wrapper around \cs{pdfxform_new:nn} and store appearances for the fields.
+% \meta{state} should be for checkboxes either |Yes| or |Off| (and typically
+% you should define both). \meta{name} is the name
+% that is used in the |appearance| key, |checkbox/default| is predefined and so can't be used.
+% \meta{content} is arbitrary content. The dimensions should fit to the planed size of the
+% checkbox.%
+% \end{function}
+% \subsection{Keys}
+%
+% The new checkbox commands accepts following keys:
+%
+% \DescribeCheckboxkey{name} This sets the (internal) name of the field. It shouldn't contain
+% a period, be not empty and sensibly consist of simple chars. Checkboxes instances
+% with the same name belong to the same field and are checked and unchecked together.
+%
+% \DescribeCheckboxkey{altname} This sets an alternative name for user interaction.
+% This name can only be set at the first checkbox instance, when the field is initialized.
+% \DescribeCheckboxkey{mappingname} This sets an alternative name for export.
+% This name can only be set at the first checkbox instance, when the field is initialized.
+%
+% \DescribeCheckboxkey{width}
+% \DescribeCheckboxkey{height}
+% \DescribeCheckboxkey{depth} These keys allow to set the dimensions of checkbox instance.
+% The value should be a command that expands to a dimension expression. By default
+% |width| and |height| use \cs{normalbaselineskip}, the |depth| is zero.
+%
+% \DescribeCheckboxkey{appearance} This key sets the normal appearance. It takes as value a
+% \meta{name} and expects that the two appearances \meta{name}|/Yes| and \meta{name}|/Off|
+% has been created with the command described below. The initial value is |checkbox/default|
+% and shows a \cs{texttimes}.
+%
+% \DescribeCheckboxkey{rollover-appearance} This key sets the rollover appearance (when the
+% mouse hovers over the checkbox). It takes as value a
+% \meta{name} and expects that the two appearances \meta{name}|/Yes| and \meta{name}|/Off|
+% has been created with the command described below. Initially this is not set.
+% An empty value removes the entry.
+%
+% \DescribeCheckboxkey{down-appearance} This key sets the down appearance (when the
+% mouse clicks). It takes as value a
+% \meta{name} and expects that the two appearances \meta{name}|/Yes| and \meta{name}|/Off|
+% has been created with the command described below. Initially this is not set.
+% An empty value removes the entry.
+%
+% \DescribeCheckboxkey{checked} This is a boolean key which allows to set if the
+% checkbox should be initially checked or not. It sets the |/V| and |/DV| key of the field
+% and the |/AS| key of the annotation instance. It is possible to use different
+% values for different instances, if one wants to confuse the user.
+%
+% \DescribeCheckboxkey{setfieldflags}
+% \DescribeCheckboxkey{unsetfieldflags}
+% These keys allow to set or unset the field flags. They expect a comma lists of
+% flag names. Allowed names |ReadOnly|, |Required|,
+% |NoExport|, |Multiline|, |Password|, |NoToggleToOff|, |Radio|, |Pushbotton|,
+% |Combo|, |Edit|, |Sort|, |FileSelect|, |MultiSelect|, |DoNotSpellCheck|,
+% |DoNotScroll|, |Comb|, |RadiosInUnison|, |RichText|, |CommitOnSelChange|.
+%
+% From these |Radio|, |Pushbotton| are set automatically automatically by the code
+% as this is required for a checkbox. Not every one from the rest makes sense for
+% checkboxes but the same key will be used for other fields too.
+% Check the PDF reference to decide which one to set or unset.
+%
+% \begin{checkboxkey}{keystroke,format,validate,calculate}
+% These keys add the |/K, |/F, |/V|, |/C| key to the |/AA| dictionary of the field object.
+% Their value should be javascript code. The |/AA| dictionary is suppressed
+% if a pdf/A standard is set. These keys are probably not of much used with a checkbox.
+% \end{checkboxkey}
+%
+% \vspace{2\baselineskip}
+% \begin{checkboxkey}{onfocus,onblur,onmousedown,onmouseup,onenter,onexit}
+% These keys adds the |/F, |/Bl, |/D|, |/U|, |E| and |X| key to the |/AA| dictionary
+% of the widget annotation (the checkbox instance) object.
+% Their value should be javascript code. The |/AA| dictionary
+% is suppressed if a pdf/A standard is set.
+%
+% For example
+% \begin{verbatim}
+% onenter={app.alert('Hello');}
+% \end{verbatim}
+% \end{checkboxkey}
+%
+% \subsection{Using with hyperref}
+% The \cs{CheckBox} command from hyperref also prints a label, something that the
+% command here don't do. A redefinition like the following should allow to \cs{CheckBox}
+% to use the commands of this module. Be aware that the behaviour will not be identical!
+% Not every setting and key from \pkg{hyperref} has been copied.
+%
+% \begin{verbatim}
+% \ExplSyntaxOn\makeatletter
+% \def\@CheckBox[#1]#2{\LayoutCheckField{#2}{\pdffield_checkbox:n {name=#2,#1}}}
+% \ExplSyntaxOff\makeatother
+% \end{verbatim}
+%
+% \subsection{Some background}
+% Form fields consist of a field object and number of instances of the field:
+% A checkbox can appear on more than one page or location and if one instance
+% is checked all other instances follows and are checked too.
+%
+% All instances are in this case widget annotations and are referenced in the Kid array of the field
+% object\footnote{Fields can actually build a tree: between the root field and
+% widget annotations there can be more fields. The last one before the widget is
+% the \emph{terminal} field, but unless a sensible
+% use case comes up, I will assume that the widget annotations are direct children of
+% the root and that the root field is the terminal field.}.
+% This means that the code has to collect all the children and write
+% out the field object at the end of the document.
+%
+% If a field has only one children the content of the field dictionary and the
+% widget annotation dictionary can be merged---some examples in the PDF reference
+% show such merged dictionaries---but the code here keeps them separate, at the end
+% this is clearer.
+%
+% All the root field objects must be referenced in the AcroForm dictionary in the
+% Fields entry. This can be done with
+%
+% \begin{verbatim}
+% \pdfmanagement_add:nnx{Catalog/AcroForm}{Fields}{<obj ref>}
+% \end{verbatim}
+%
+% A checkbox has two different looks: checked and unchecked. The current hyperref
+% implementation uses symbolic names for the two states and and adds some
+% values with the /MK key and lets the PDF viewer
+% create a look from them. But this doesn't work reliably. Also newer PDF versions
+% deprecate the /NeedAppearances setting and require that such a look,
+% an \enquote{appearance}, is given as form XObjects:
+% such form XObjects are like small pictures stored in the PDF and can be referenced
+% in various part of the PDF. They can be created with the commands of
+% the \pkg{l3pdfxform} package.
+%
+% The checkbox instances---the widget annotations---cover a rectangular area on
+% the page, the XObjects are squeezed into this rectangle. So for the best result
+% both should have the same ratio of width and height.
+% XObjects used as appearances can not be rotated, if needed one has to
+% create a new appearance.
+%
+% \subsubsection{The field dictionary}
+%
+% The field dictionary shall or can have the following entries
+%
+% \begin{description}
+% \item[FT] required for terminal fields (here for the root field),
+% the value is always \texttt{Btn}, so this entry is set by the code.
+% \item[Parents] currently irrelevant as we don't have a field hierarchy.
+% \item[Kids] an array. Contains references to the children, in our case to
+% the widget annotations. The array is build by the code.
+%
+% \item[T] required, the name, a (unique) text string without a period.
+% This field is a mandatory argument which must be given by the user.
+% The value should be passed through a suitable string conversion and checked
+% if it contains a period (which is not allowed).
+%
+% \item[TU,TM] optional, alternative names for user messages (TU) and export (TM).
+% As these fields are optional they should be set by some key-val option.
+%
+% \item[Ff] A bitset, two flags must be unset for a checkbox (Radio and Pushbotton),
+% for the rest we need a keyval interface.
+%
+% \item[V] describes the initial value, for checkboxes is should be either |/Yes|
+% or |/Off|. The initial value will be |/Yes|, keys are need to set both the local
+% and the default value.
+%
+% \item[DV] optional, the default value after a reset. Should like |V| be either
+% |/Yes| or |/Off|.
+%
+% \item[AA] An action dictionary. For this we need a special command to setup such
+% dictionaries, so that they then can be used in various places.
+%
+% \end{description}
+%
+% \subsubsection{The widget annotation dictionary}
+%
+% \begin{description}
+% \item[Type] Value: |/Annot|, set automatically
+% \item[Subtype] Value: |/Widget| this is added automatically.
+% We use an internal dictionary which is locally copied over the one from l3pdfannot.
+% It can be filled with keyval options.
+% \item[Parent] The reference to the field, automatically added.
+% \item[Rect] the size, calculated from the box size
+% \item[Contents] a text string, not really needed but an optional key should allow to
+% set it,
+% \item[AP] the appearance dictionary. It should look like this
+% |/AP <</N <</Yes 17 0 R/Off 15 0 R>>>>|. I need to test if it makes sense here to
+% have a |/R| and |/D| entry too. The objects refer to suitable xforms.
+% \item[AS] should be either |/Yes| or |/Off|, and sensibly by default be
+% the same as the V entry in the field dictionary. If they differ the AS entry wins.
+%
+% \item[A] Action, this must be checked.
+% \item[AA] additional actions. This must be checked too.
+%
+% \item[Border, C, OC, AF, BM, Lang, P, NM, M, F, BS, H]: These are not specifically
+% needed for checkbox. An interface to add something to the used annot dictionary
+% is needed (or already there), but probably no special key-val support for now.
+%
+% \item[MK] this is what hyperref uses to set the appearance, but I
+% explicitly leave it out and use |AP|.
+%
+% \item[Q] (alignment), used by hyperref but not relevant as we don't have variable
+% text here.
+% \end{description}
+% \end{documentation}
+%
+% \begin{implementation}
+% \section{\pkg{l3pdffield-checkbox} Implementation}
+% \begin{macrocode}
+%<*package>
+%<@@=pdffield>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesExplPackage{l3pdffield-checkbox}{0000-00-00}{v0.00a}{form field checkbox}%
+% \end{macrocode}
+% \subsection{hyperref specific command}
+% hyperref sets NeedAppearances by default. As this is deprecated we disable this.
+% \begin{macrocode}
+\csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances
+% values from hyperref:
+%\def\DefaultOptionsofCheckBox{print}
+%\def\DefaultHeightofCheckBox{\normalbaselineskip}
+%\def\DefaultWidthofCheckBox{\normalbaselineskip}
+% \end{macrocode}
+% \subsection{local variables}
+% \begin{macrocode}
+\str_new:N \l_@@_field_name_str
+\str_new:N \l_@@_tmpa_str
+\str_new:N \l_@@_name_tmpa_str
+\tl_new:N \l_@@_keys_tmpa_tl
+% \end{macrocode}
+%
+% \subsection{messages}
+% \begin{macrocode}
+\msg_new:nnn {pdffield}{no-period}
+ {
+ The~field~name~`#1`~contains~a~period. \\
+ This~is~not~allowed. `
+ }
+\msg_new:nnn {pdffield}{empty-name}
+ {
+ The~field~name~is~empty. \\
+ This~is~not~allowed. `
+ }
+\msg_new:nnn {pdffield}{appearance-missing}
+ {
+ The~appearance~`#1`~is~missing~for~the~#2~appearance.
+ }
+\msg_new:nnn {pdffield}{field-keys-ignored}
+ {
+ The~field~`#1`~is~already~initialized\\
+ The~field~keys~`#2`~are~ignored.
+ }
+% \end{macrocode}
+
+% \subsection{bitsets}
+% A bitset for the field flag Ff
+% and an internal copy of the annot bitset.
+% \begin{macrocode}
+\bitset_new:Nn \l_@@_Ff_bitset
+ {
+ ReadOnly = 0,
+ Required = 1,
+ NoExport = 2,
+ Multiline = 12,%Tx
+ Password = 13,
+ NoToggleToOff = 14,%Btn, radio button
+ Radio = 15,%Btn: Radio: 15=1, 16=0
+ Pushbutton = 16,%Btn: Checkbox: 15=0, 16=0
+ %Btn: Pushbutton: 16=1
+ Combo = 17,%Ch: Combo=1 List=0
+ Edit = 18,%Ch, Combo=1 -> + edit field
+ Sort = 19,%Ch, not relevant for view...
+ FileSelect = 20,%Tx
+ MultiSelect = 21,%Ch
+ DoNotSpellCheck = 22,%Tx, Ch (if Combo + Edit set)
+ DoNotScroll = 23,%Tx
+ Comb = 24,%Tx, requires MaxLen in dict
+ RadiosInUnison = 25,%Btn Radio
+ RichText = 25,%Tx
+ CommitOnSelChange = 26
+ }
+
+\bitset_new:Nn \l_@@_F_bitset
+ {
+ Invisible = 1,
+ Hidden = 2,
+ Print = 3,
+ NoZoom = 4,
+ NoRotate = 5,
+ NoView = 6,
+ ReadOnly = 7,
+ Locked = 8,
+ ToggleNoView = 9,
+ LockedContents = 10
+ }
+% \end{macrocode}
+% \subsection{The field dictionary}
+% The field dictionary is the main object. It references the
+% actual widget annotations as kids. It is created at the first
+% checkbox with a specific name.
+% To be able to set values from the outside it will use a
+% dictionary which can be filled by key-val.
+% \begin{macrocode}
+\pdfdict_new:n {l_@@/checkbox/field}
+\pdfdict_put:nnn {l_@@/checkbox/field}{FT}{/Btn}
+% \end{macrocode}
+% We need to check if the name contains a dot. But we will do this in an external command
+% to avoid to have it twice. Here we assume that the name is already converted and safe.
+%
+% We also assume that values that can be changed by the user are set outside
+% in the dictionary.
+% If the field object already exists nothing is done.
+% \begin{macro}{\@@_checkbox_field_add:n}
+% \begin{syntax}
+% \cs{@@_checkbox_field_add:n}\Arg{name}
+% \end{syntax}
+% \meta{name} should be a PDF text string without period. It identifies the
+% field.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_checkbox_field_new:n #1
+ {
+ \group_begin:
+ \pdf_object_new:nn {@@_checkbox/field/#1} {dict}
+ \pdf_object_new:nn {@@_checkbox/field/#1/Kids} {array}
+ \seq_new:c {g_@@_checkbox/field/#1/Kids_seq}
+ \hook_gput_code:nnn {shipout/lastpage}{pdffield} %xetex needs this ...
+ {
+ \pdf_object_write:nx {@@_checkbox/field/#1/Kids}
+ {
+ \seq_use:cn{g_@@_checkbox/field/#1/Kids_seq}{~}
+ }
+ }
+ \pdfdict_put:nnn {l_@@/checkbox/field}{T}{(#1)}
+ % V,DV are names describing the appearance. With checkboxes
+ % the values /Yes and /Off are used.
+ % this values are taken from the outside
+ \pdfdict_put:nnx {l_@@/checkbox/field}
+ {Kids}
+ {
+ \pdf_object_ref:n {@@_checkbox/field/#1/Kids}
+ }
+ \bitset_set_false:Nn \l_@@_Ff_bitset {Radio}
+ \bitset_set_false:Nn \l_@@_Ff_bitset {Pushbutton}
+ \pdfdict_put:nnx {l_@@/checkbox/field}
+ {Ff}
+ {\bitset_to_arabic:N \l_@@_Ff_bitset }
+ \pdfdict_if_empty:nF{l_@@/checkbox/field/AA}
+ {
+ \pdfmeta_standard_verify:nT
+ {annot_widget_no_AA}
+ {
+ \pdfdict_put:nnx
+ {l_@@/checkbox/field}
+ {AA}
+ {<<\pdfdict_use:n {l_@@/checkbox/field/AA}>>}
+ }
+ }
+ \pdf_object_write:nx {@@_checkbox/field/#1} { \pdfdict_use:n {l_@@/checkbox/field} }
+ \pdfmanagement_add:nnx
+ { Catalog / AcroForm }
+ { Fields }
+ {\pdf_object_ref:n {@@_checkbox/field/#1} }
+ \group_end:
+ }
+
+% \end{macrocode}
+% \end{macro}
+% \subsection{The annot dictionary}
+% We assume that the annotation should really occupy space on the page and
+% leave vertical mode.
+% We also assume that keys like AP, AS are added before through keys to
+% the dictionary.
+% We use a local dictionary which is copied into |l__pdfannot/widget| in the code.
+% \begin{macrocode}
+\pdfdict_new:n {l_@@/checkbox/annot}
+\pdfdict_put:nnn {l_@@/checkbox/annot}{Subtype}{/Widget}
+% \end{macrocode}
+%
+% \begin{macro}{\@@_checkbox_annot_add:nnnn}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_checkbox_annot_add:nnnn #1 #2 #3 #4 %name, wd, ht, dp,
+ {
+ \group_begin:
+% \end{macrocode}
+% Copy the internal dictionary to the pdfannot dictionary. This
+% perhaps need a function in l3pdfannot,
+% as it actually uses an internal name of another module.
+% \begin{macrocode}
+ \pdfdict_put:nnx {l_@@/checkbox/annot}{AP}{<<\pdfdict_use:n{l_@@/checkbox/annot/AP}>>}
+ \pdfmeta_standard_verify:nF
+ {annot_flags}
+ {
+ \bitset_set_true:Nn \l_@@_F_bitset {Print}
+ \bitset_set_false:Nn \l_@@_F_bitset {Hidden}
+ \bitset_set_false:Nn \l_@@_F_bitset {Invisible}
+ \bitset_set_false:Nn \l_@@_F_bitset {NoView}
+ }
+ \pdfdict_if_empty:nF{l_@@/checkbox/annot/AA}
+ {
+ \pdfmeta_standard_verify:nT
+ {annot_widget_no_AA}
+ {
+ \pdfdict_put:nnx
+ {l_@@/checkbox/annot}
+ {AA}
+ {<<\pdfdict_use:n {l_@@/checkbox/annot/AA}>>}
+ }
+ }
+ \pdfdict_put:nnx {l_@@/checkbox/annot}{F}{ \bitset_to_arabic:N \l_@@_F_bitset }
+ \pdfdict_set_eq:nn {l__pdfannot/widget}{l_@@/checkbox/annot}
+ \pdfannot_dict_put:nnx {widget}{Parent}{\pdf_object_ref:n{@@_checkbox/field/#1}}
+ \mode_leave_vertical:
+ \hbox_to_wd:nn
+ { #2 }
+ {
+ \rule [-#4]{0pt}{\dim_eval:n{#3+#4} }
+ \pdfannot_widget_box:nnn
+ { #2 }
+ { #3 }
+ { #4 }
+ \hfill
+ }
+ \seq_gput_right:cx {g_@@_checkbox/field/#1/Kids_seq}{ \pdfannot_box_ref_last:}
+ \group_end:
+ }
+
+% \end{macrocode}
+% \end{macro}
+% \subsection{Appearances}
+% We don't try to force a size or content here.
+% The default appearances are a cross (\cs{texttimes}),
+% Every appearance should have two versions and follow the naming
+% checkbox/\meta{name}/Yes and checkbox/\meta{name}/Off.
+% TODO check if one delay the creation to a sensible place
+% (and don't forget that the appearance key sets an initial
+% value)
+% \begin{macro}{\pdffield_store_appearance:nn,\@@_store_default_appearances:}
+% \begin{macrocode}
+\cs_new_protected:Npn \pdffield_store_appearance:nn #1 #2
+ {
+ \pdfxform_new:nnn {@@_#1}{}{#2}
+ }
+
+\cs_new_protected:Nn \@@_store_default_appearances:
+ {
+ \pdffield_store_appearance:nn {checkbox/default/Yes}
+ {
+ \normalsize
+ \fboxsep 0pt
+ \framebox
+ [ \dim_eval:n { \box_ht:N\strutbox+\box_dp:N\strutbox } ]
+ { \texttimes \strut }
+ }
+ \pdffield_store_appearance:nn {checkbox/default/Off}
+ {
+ \normalsize
+ \fboxsep 0pt
+ \framebox
+ [ \dim_eval:n { \box_ht:N\strutbox+\box_dp:N\strutbox } ]
+ { \phantom{\texttimes} \strut }
+ }
+ }
+
+\@@_store_default_appearances:
+% \end{macrocode}
+% \end{macro}
+% We define a dictionary for the AP content, so that we can add R and D too
+% \begin{macrocode}
+\pdfdict_new:n {l_@@/checkbox/annot/AP}
+% \end{macrocode}
+%
+% \subsection{Assembling the checkbox}
+% \begin{macro}{\@@_checkbox_add:n}
+% \begin{macrocode}
+
+\cs_new_protected:Npn \@@_checkbox_add:n #1
+ {
+ \group_begin:
+ \keys_set_filter:nnnN {pdffield / checkbox }{field}{#1}\l_@@_keys_tmpa_tl
+ \str_if_empty:NT \l_@@_field_name_str
+ {
+ \msg_error:nn {pdffield}{empty-name}
+ }
+ \exp_args:Nx
+ \pdf_object_if_exist:nTF {@@_checkbox/field/\l_@@_field_name_str}
+ {
+ \tl_if_empty:NF \l_@@_keys_tmpa_tl
+ {
+ \msg_warning:nnxx
+ {pdffield}
+ {field-keys-ignored}
+ {\l_@@_field_name_str}
+ {\l_@@_keys_tmpa_tl}
+ }
+ }
+ {
+ \keys_set:nV { pdffield/checkbox } \l_@@_keys_tmpa_tl
+ \exp_args:No
+ \@@_checkbox_field_new:n {\l_@@_field_name_str}
+ }
+ \exp_args:No
+ \@@_checkbox_annot_add:nnnn
+ {\l_@@_field_name_str}
+ {\l_@@_annot_wd_tl }
+ {\l_@@_annot_ht_tl }
+ {\l_@@_annot_dp_tl }
+ \group_end:
+ }
+% \end{macrocode}
+% \end{macro}
+% \subsection{Keys}
+% The size of the checkbox
+%
+% \begin{macrocode}
+\tl_new:N \l_@@_annot_ht_tl
+\tl_new:N \l_@@_annot_wd_tl
+\tl_new:N \l_@@_annot_dp_tl
+
+\keys_define:nn { pdffield / checkbox }
+ {
+ ,width .tl_set:N = \l_@@_annot_wd_tl
+ ,height .tl_set:N = \l_@@_annot_ht_tl
+ ,depth .tl_set:N = \l_@@_annot_dp_tl
+ ,width .initial:n = \normalbaselineskip
+ ,height .initial:n = \normalbaselineskip
+ ,depth .initial:n = 0pt
+ }
+% \end{macrocode}
+% The names. The main name should not be empty, it is added to the dictionary
+% when the field is created. A new name means a new field.
+% The other names can only be set when the field is created,
+% so we put them in the field group.
+% \begin{macrocode}
+\keys_define:nn { pdffield / checkbox }
+ {
+ ,name .code:n =
+ {
+ \pdf_string_from_unicode:nnN {utf8/string-raw}{#1}\l_@@_field_name_str
+ \str_if_in:NnT \l_@@_field_name_str {.}
+ {
+ \msg_error:nnx {pdffield}{no-period}{\l_@@_field_name_str}
+ }
+ \str_if_empty:NT\l_@@_field_name_str
+ {
+ \msg_error:nn {pdffield}{empty-name}
+ }
+ }
+ ,name .value_required:n = true
+ ,name .initial:n = checkbox
+ ,altname .code:n =
+ {
+ \pdf_string_from_unicode:nnN {utf8/string}{#1}\l_@@_name_tmpa_str
+ \pdfdict_put:nnx { l_@@/checkbox/field }{TU}{\l_@@_name_tmpa_str}
+ }
+ ,altname .groups:n = {field}
+ ,mappingname .code:n =
+ {
+ \pdf_string_from_unicode:nnN {utf8/string}{#1}\l_@@_name_tmpa_str
+ \pdfdict_put:nnx { l_@@/checkbox/field }{TM}{\l_@@_name_tmpa_str}
+ }
+ ,mappingname .groups:n = {field}
+ }
+% \end{macrocode}
+
+% A key to decide if the Box is initially checked or not
+% \begin{macrocode}
+\keys_define:nn { pdffield / checkbox }
+ {
+ ,checked .choice:
+ ,checked / false .code:n =
+ {
+ \pdfdict_put:nnn {l_@@/checkbox/field}{V}{/Off}
+ \pdfdict_put:nnn {l_@@/checkbox/annot}{AS}{/Off}
+ \pdfdict_put:nnn {l_@@/checkbox/field}{DV}{/Off}
+ }
+ ,checked / true .code:n =
+ {
+ \pdfdict_put:nnn {l_@@/checkbox/field}{V}{/Yes}
+ \pdfdict_put:nnn {l_@@/checkbox/annot}{AS}{/Yes}
+ \pdfdict_put:nnn {l_@@/checkbox/field}{DV}{/Yes}
+ }
+ ,checked .default:n = {true}
+ ,checked .initial:n = {false}
+ }
+% \end{macrocode}
+% Flags. We don't add lots of individual keys but mapped the key names directly
+% \begin{macrocode}
+\keys_define:nn { pdffield / checkbox }
+ {
+ ,setfieldflags .code:n =
+ {
+ \clist_map_inline:nn {#1}
+ {
+ \bitset_set_true:Nn \l_@@_Ff_bitset {##1}
+ }
+ }
+ ,setfieldflags .groups:n = {field}
+ ,unsetfieldflags .code:n =
+ {
+ \clist_map_inline:nn {#1}
+ {
+ \bitset_set_false:Nn \l_@@_Ff_bitset {##1}
+ }
+ }
+ ,unsetfieldflags .groups:n = {field}
+ ,setannotflags .code:n =
+ {
+ \clist_map_inline:nn {#1}
+ {
+ \bitset_set_true:Nn \l_@@_F_bitset {##1}
+ }
+ }
+ ,unsetannotflags .code:n =
+ {
+ \clist_map_inline:nn {#1}
+ {
+ \bitset_set_false:Nn \l_@@_F_bitset {##1}
+ }
+ }
+ }
+
+\keys_define:nn { pdffield / checkbox }
+ {
+ appearance .code:n = %value is a name of an appearance
+ {
+ \pdfxform_if_exist:nTF { @@_#1/Yes }
+ {
+ \pdfdict_put:nnn {l_@@/checkbox/annot/AP}
+ {N}
+ {
+ <<
+ /Yes ~ \pdfxform_ref:n { @@_#1/Yes}
+ /Off ~ \pdfxform_ref:n { @@_#1/Off}
+ >>
+ }
+ }
+ {
+ \msg_error:nnnn{pdffield}{appearance-missing}{#1}{normal}
+ }
+ },
+ appearance .initial:n = checkbox/default,
+ }
+
+\keys_define:nn { pdffield / checkbox }
+ {
+ rollover-appearance .code:n = %value is a name of an appearance
+ {
+ \tl_if_empty:nTF {#1}
+ {
+ \pdfdict_remove:nn {l_@@/checkbox/annot/AP} {R}
+ }
+ {
+ \pdfxform_if_exist:nTF { @@_#1/Yes }
+ {
+ \pdfdict_put:nnn {l_@@/checkbox/annot/AP}
+ {R}
+ {
+ <<
+ /Yes ~ \pdfxform_ref:n { @@_#1/Yes}
+ /Off ~ \pdfxform_ref:n { @@_#1/Off}
+ >>
+ }
+ }
+ {
+ \msg_warning:nnnn{pdffield}{appearance-missing}{#1}{rollover}
+ }
+
+ }
+ },
+ }
+
+\keys_define:nn { pdffield / checkbox }
+ {
+ down-appearance .code:n = %value is a name of an appearance
+ {
+ \tl_if_empty:nTF {#1}
+ {
+ \pdfdict_remove:nn {l_@@/checkbox/annot/AP} {D}
+ }
+ {
+ \pdfxform_if_exist:nTF { @@_#1/Yes }
+ {
+ \pdfdict_put:nnn {l_@@/checkbox/annot/AP}
+ {D}
+ {
+ <<
+ /Yes ~ \pdfxform_ref:n { @@_#1/Yes}
+ /Off ~ \pdfxform_ref:n { @@_#1/Off}
+ >>
+ }
+ }
+ {
+ \msg_warning:nnnn{pdffield}{appearance-missing}{#1}{down}
+ }
+ }
+ },
+ }
+% \end{macrocode}
+%
+% Keys for the AA dictionary. They all trigger javascript option.
+% \begin{macro}{\@@_define_AAaction_key:nnn}
+% \begin{macrocode}
+\pdfdict_new:n {l_@@/checkbox/annot/AA}
+\pdfdict_new:n {l_@@/checkbox/field/AA}
+
+\cs_new_protected:Npn \@@_define_AAaction_key:nnn #1 #2 #3 %#1 key, #2 pdf, #3 dict
+ {
+ \keys_define:nn { pdffield / checkbox }
+ {
+ #1 .code:n =
+ {
+ \pdf_string_from_unicode:nnN {utf8/string}{##1}\l_@@_tmpa_str
+ \str_if_empty:NTF \l_@@_tmpa_str
+ {
+ \pdfdict_remove:nn {l_@@/checkbox/#3/AA}{#2}
+ }
+ {
+ \pdfdict_put:nnx {l_@@/checkbox/#3/AA}
+ {#2}
+ {<</S/JavaScript/JS\l_@@_tmpa_str>>}
+ }
+ },
+ #1 .groups:n = {#3}
+ }
+ }
+\@@_define_AAaction_key:nnn {keystroke}{K}{field}
+\@@_define_AAaction_key:nnn {format} {F}{field}
+\@@_define_AAaction_key:nnn {validate} {V}{field}
+\@@_define_AAaction_key:nnn {calculate}{C}{field}
+\@@_define_AAaction_key:nnn {onfocus} {Fo}{annot}
+\@@_define_AAaction_key:nnn {onblur} {Bl}{annot}
+\@@_define_AAaction_key:nnn {onmousedown}{D}{annot}
+\@@_define_AAaction_key:nnn {onmouseup}{U}{annot}
+\@@_define_AAaction_key:nnn {onenter} {E}{annot}
+\@@_define_AAaction_key:nnn {onexit} {X}{annot}
+% \end{macrocode}
+% \end{macro}
+% \subsection{user commands}
+% \begin{macro}{\pdffield_checkbox:n,\pdffield_setup:nn}
+% \begin{macrocode}
+\cs_set_eq:NN \pdffield_checkbox:n \@@_checkbox_add:n
+
+\cs_new_protected:Npn \pdffield_setup:nn #1 #2
+ {
+ \keys_set:n {pdffield / #1 } {#2}
+ }
+%</package>
+% \end{macrocode}
+% \end{macro}
+%\end{implementation}
+
+\endinput%
+%%%%
+%
+%Field dict
+%Ft : /Btn /Tx /Ch /Sig
+%Parent : OR
+%Kids: array, other fields or annot/widget
+%T: partial fieldname (test string)
+%TU: alternate description (test string)
+%TM: mapping name
+%Q integer (variable text field)
+%Ff: flags ->pdffield/checkbox/field
+%V: value % not pushbutton
+%DV: default value % not pushbutton
+%AA: Action dict ... -> see below
+%Opt: array of strings, connected to kids
+% or for choices, choices
+%TI integer (lists)
+%I array Ch (complicated ...)
+%
+%/DA ( 0 0 1 rg /Ti 12 Tf ) %text field
+%/MaxLen %text field
+%
+%Lock dict (Sig)
+%SV dict (Sig)
+%
+%
+%
+%
+%Connected widget:
+%/AS default appearance from AP ( here/Yes or /Off)
+%% Appearance
+%%checkbox
+%/AP <</N <</Yes 2 0 R /Off 3 0 R>>>>
+%/C / Border /BS
+%
+%/OC ?
+%/Structparens?
+%/F flags
+%
+%
+%AA: Submit:
+% /S /SubmitForm
+% /F file /URI (/F ( ftp : / / www . beatles . com / Movies / AbbeyRoad . mov )
+% /Fields array
+%
+% /S /ImportData
+% /F file
+%
+% /S /ResetData
+% /Fields array
+%
+% /S /JavaScript
+% /JS text string or stream
+% %\pdf_flag_new:nn {annot/field/submit} %name is wrong ...
+% {
+% Include/Exclude = 0,
+% IncludeNoValueFields = 1,
+% ExportFormat = 2,
+% GetMethod = 3, % if ExportFormat=0 -> =0 to
+% SubmitCoordinates = 4, % if ExportFormat=0 -> =0 to
+% XFDF = 5,
+% IncludeAppendSaves = 6,
+% IncludeAnnotations = 7,
+% SubmitPDF = 8,
+% CanonicalFormat = 9,
+% ExclNonUserAnnots = 10,
+% ExclFKey = 11,
+% EmbedForm = 12
+% }
+% source: %adapted from https://chat.stackexchange.com/transcript/message/54421537#54421537
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
new file mode 100644
index 0000000000..6fc5c3844b
--- /dev/null
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
index c1a2a25591..4a65e09fd6 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -70,7 +70,7 @@
% Case 1 (Links) are created with the \cs{pdfannot} commands.
% This module handles the two other cases. Actually from the view
% of the PDF format they are quite similar: Case 2 is case 3 without the stream
-% object and without the /EF entry in the /FileSpec dictionary (this points to the
+% object and without the /EF entry in the /Filespec dictionary (this points to the
% stream object of the file). Not embedding the file makes the PDF smaller. But it is
% also less portable: the files can only be found if they are in the right location
% relative to the PDF. The normal case is to embed the file.
@@ -78,7 +78,7 @@
% The tasks to embed and reference such a file are
% \begin{enumerate}
% \item Embed the file in a stream.
-% \item Create a FileSpec dictionary which references the stream object in the /EF
+% \item Create a Filespec dictionary which references the stream object in the /EF
% dictionary:
% \begin{verbatim}
% <<
@@ -94,7 +94,7 @@
% and name it \texttt{blub.tex}. The second name is then what the user will see
% in the attachment list or in the properties of an annotation.
%
-%\item Reference the FileSpec dictionary so that the user can access the file.
+%\item Reference the Filespec dictionary so that the user can access the file.
% This can be done in various way:
% \begin{enumerate}
% \item With an annotation (/Subtype/FileAttachment). This is done by
@@ -104,7 +104,7 @@
% \medskip
% \begin{tabular}{lll}
% key & value type & notes\\\hline
-% /FS & object reference &(FileSpec dictionary)\\
+% /FS & object reference &(Filespec dictionary)\\
% /Name & name & /Graph, /PushPin, /Paperclip, /Tag\\
% /Contents & text string & optional but recommended\\
% /F & integer & Flags\\
@@ -137,7 +137,7 @@
% /AF /NamedAF BDC
% /Properties <</NamedAF [12 0 R]
% \end{verbatim}
-% The related |/FileSpec| dictionary should contain an
+% The related |/Filespec| dictionary should contain an
% |/AFRelationship| key in this case (but it doesn't harm to add it by
% default anyway). The values of this key is describe in table~\ref{tab:AFrel}.
%
@@ -183,7 +183,7 @@
% \cs{pdf_object_new:nn}/\cs{pdf_object_write:nn} or primitive commands
% to create objects.
% The object number should be stored for the reference
-% in the |/FileSpec| dictionary.
+% in the |/Filespec| dictionary.
%
% \begin{verbatim}
% \pdf_object_unnamed_write:nx {fstream}
@@ -215,12 +215,12 @@
% see the pdf reference.
% \end{itemize}
%
-% \subsubsection{Task 2: Creating the \texttt{/FileSpec} dictionary}
-% The |/FileSpec| dictionary is a simple dictionary object, and can also
+% \subsubsection{Task 2: Creating the \texttt{/Filespec} dictionary}
+% The |/Filespec| dictionary is a simple dictionary object, and can also
% be created in various ways. If it refers to an embedded file it should
% reference it in the |/EF| key.
%
-% \subsubsection{Task 3: Referencing the \texttt{/FileSpec} dictionary}
+% \subsubsection{Task 3: Referencing the \texttt{/Filespec} dictionary}
%
% Using the dictionary reference in annotations and |/AF| keys is unproblematic.
%
@@ -233,9 +233,9 @@
% |\pdfmanagement_add:nnx{Catalog/Names}{EmbeddedFiles}{|\meta{objref}|}|
%
% \subsection{Commands and tools of these module}
-% \begin{function}{file, file/Params, file/streamParams,file/FileSpec}
+% \begin{function}{file, file/Params, file/streamParams,file/Filespec}
% The module predefines and uses a number of local dictionaries for the
-% components of the stream and the |/FileSpec| object. These dictionaries are
+% components of the stream and the |/Filespec| object. These dictionaries are
% then used by the \cs{pdffile_embed_XX}.
% The content of these dictionaries can be changed by users with the commands
% from the \pkg{l3pdfdict} module, but it should be done only locally
@@ -252,8 +252,8 @@
% l\_pdffile/Params& ModDate & |(\file_timestamp:n {\l_pdffile_source_name_str})|\\
% l\_pdffile/Params& CheckSum & |(\file_mdfive_hash:n{\l_pdffile_source_name_str})|\\
% l\_pdffile/streamParams& & a /ModDate entry with year/month/date (used with \cs{pdffile_embed_stream:nnn})\\
-% l\_pdffile/FileSpec & Type & /FileSpec\\
-% l\_pdffile/FileSpec & AFRelationship &Unspecified
+% l\_pdffile/Filespec & Type & /Filespec\\
+% l\_pdffile/Filespec & AFRelationship &Unspecified
% \end{tabular}
% \end{table}
% \begin{function}{\pdffile_embed_file:nnn}
@@ -261,12 +261,12 @@
% \cs{pdffile_embed_file:nnn} \Arg{source filename} \Arg{target filename} \Arg{object name }
% \end{syntax}
% This commands embeds the file \meta{source filename} in the PDF,
-% and creates a |/FileSpec| dictionary object named \meta{object name}.
+% and creates a |/Filespec| dictionary object named \meta{object name}.
% The object name must be unique.
% The command uses the content of the local
-% dictionaries |l_pdffile|, |l_pdffile/Params| and |l_pdffile/FileSpec|
+% dictionaries |l_pdffile|, |l_pdffile/Params| and |l_pdffile/Filespec|
% to setup the dictionary entries of the stream object and the
-% |/FileSpec| dictionary. The |/F| and |/UF| entry are filled
+% |/Filespec| dictionary. The |/F| and |/UF| entry are filled
% with \meta{target filename}.
%
% It is an error if both \meta{target filename} and \meta{source filename}
@@ -274,7 +274,7 @@
%
% If \meta{target filename} is empty \meta{source filename} is used instead.
%
-% If \meta{source filename} is empty, only a |/FileSpec| dictionary is
+% If \meta{source filename} is empty, only a |/Filespec| dictionary is
% created.
%
% If the |l_pdffile| dictionary doesn't contain a
@@ -303,11 +303,11 @@
% \cs{pdffile_embed_stream:nnn} \Arg{content} \Arg{target filename} \Arg{object name }
% \end{syntax}
% This commands embeds the \meta{content} in the PDF in a stream objects and
-% creates a |/FileSpec| dictionary object named \meta{object name}.
+% creates a |/Filespec| dictionary object named \meta{object name}.
% \meta{content} is wrapped in a \cs{exp_not:n}.
% The object name must be unique. The command uses the content of the local
-% dictionaries |l_pdffile|, |l_pdffile/streamParams| and |l_pdffile/FileSpec|
-% to setup the dictionary entries of the stream object and the /FileSpec dictionary.
+% dictionaries |l_pdffile|, |l_pdffile/streamParams| and |l_pdffile/Filespec|
+% to setup the dictionary entries of the stream object and the /Filespec dictionary.
% The /F and /UF entry are filled with \meta{target filename}.
% If \meta{target filename} is empty the fix name \texttt{stream.txt}
% is used instead.
@@ -353,12 +353,12 @@
% \begin{verbatim}
% \group_begin:
% %set the relationship:
-% \pdfdict_put:nnn {l_pdffile/FileSpec} {AFRelationship}{/Source}
+% \pdfdict_put:nnn {l_pdffile/Filespec} {AFRelationship}{/Source}
% %set the description key. The text must first be converted:
% \pdf_string_from_unicode:nnN {utf16/string}
% {this~is~an~odd~description~with~öäü}
% \l_tmpa_str
-% \pdfdict_put:nnx {l_pdffile/FileSpec} {Desc}{\l_tmpa_str}
+% \pdfdict_put:nnx {l_pdffile/Filespec} {Desc}{\l_tmpa_str}
% %embeds testinput.txt and calls it grüße.txt
% \pdffile_embed_file:nnn {testinput.txt}{grüße.txt}{file:example1}
% %reference it in the panel
@@ -376,7 +376,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {l3pdffile} {2021-02-22} {0.95a}
+\ProvidesExplPackage {l3pdffile} {2021-03-07} {0.95b}
{embedding and referencing files in PDF---LaTeX PDF management testphase bundle}
\RequirePackage{l3pdftools} %temporarly!!
%</header>
@@ -402,7 +402,7 @@
\msg_new:nnn { pdffile } { target-name-missing }
{
- a~target~name~for~the~/FileSpec~dictionary~is~missing.
+ a~target~name~for~the~/Filespec~dictionary~is~missing.
}
\msg_new:nnn { pdffile } { object-exists }
@@ -492,10 +492,10 @@
\int_use:N\c_sys_day_int
)
}
-\pdfdict_new:n { l_pdffile/FileSpec }
-\pdfdict_put:nnn { l_pdffile/FileSpec }
- {Type} { /FileSpec }
-\pdfdict_put:nnn { l_pdffile/FileSpec }
+\pdfdict_new:n { l_pdffile/Filespec }
+\pdfdict_put:nnn { l_pdffile/Filespec }
+ {Type} { /Filespec }
+\pdfdict_put:nnn { l_pdffile/Filespec }
{AFRelationship} { /Unspecified }
% \end{macrocode}
@@ -621,11 +621,11 @@
\pdf_object_new:nn { #1 } {dict}
\group_begin:
\@@_filename_convert_to_print:nN { #2 } \l_@@_tmpa_str
- \pdfdict_put:nnx {l_pdffile/FileSpec}{F} { \l_@@_tmpa_str }
- \pdfdict_put:nnx {l_pdffile/FileSpec}{UF}{ \l_@@_tmpa_str }
+ \pdfdict_put:nnx {l_pdffile/Filespec}{F} { \l_@@_tmpa_str }
+ \pdfdict_put:nnx {l_pdffile/Filespec}{UF}{ \l_@@_tmpa_str }
\pdf_object_write:nx { #1 }
{
- \pdfdict_use:n { l_pdffile/FileSpec}
+ \pdfdict_use:n { l_pdffile/Filespec}
\tl_if_empty:nF { #3 }
{
/EF <</F~#3 /UF~#3>>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
index a79ea7df55..49e015fef5 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
index 55514bd06c..f6b9a7fafe 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
@@ -61,7 +61,7 @@
% }^^A
% }
%
-% \date{Version 0.95a,released 2021-02-22}
+% \date{Version 0.95b,released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -557,7 +557,7 @@
%<@@=pdfmanagement>
%<*header>
%
-\ProvidesExplPackage {l3pdfmanagement} {2021-02-22} {0.95a}
+\ProvidesExplPackage {l3pdfmanagement} {2021-03-07} {0.95b}
{Management of core PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
index 51c580ade5..3a21c93c56 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
index a374e39fc7..48d2f14759 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-21}
+% \date{Version 0.95b, released 2021-02-21}
%
% \maketitle
% \begin{documentation}
@@ -340,7 +340,7 @@
% \begin{macrocode}
%<@@=pdfmeta>
%<*header>
-\ProvidesExplPackage {l3pdfmeta} {2021-02-22} {0.95a}
+\ProvidesExplPackage {l3pdfmeta} {2021-03-07} {0.95b}
{PDF-Standards---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
index ef9a1db31b..1162dcd1cf 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
index 481ddce872..d1ded1659b 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -164,7 +164,7 @@
% This command adds a BDC marked content operator to the current page stream.
% \meta{tag} is the tag of this operator (without the leading slash).
% As object this commands uses the last anonymous dictionary object created with
-% \cs{pdf_object_now:nn}. It lies in the responsibility of the user that the last
+% \cs{pdf_object_unnamed_write:nn}. It lies in the responsibility of the user that the last
% object is the wanted one. Like with \cs{pdf_bdcobject:nn} the command works correctly
% only if the resources management has been activated and should be used only
% if this can be ensured.
@@ -208,7 +208,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {l3pdftools} {2021-02-22} {0.95a}
+\ProvidesExplPackage {l3pdftools} {2021-03-07} {0.95b}
{candidate commands for l3pdf---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
index e185a813ec..e8988db424 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
index ec9afe865d..fa52253471 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
@@ -52,7 +52,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -133,7 +133,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*header>
-\ProvidesExplPackage {l3pdfxform-beta} {2021-02-22} {0.95a}
+\ProvidesExplPackage {l3pdfxform-beta} {2021-03-07} {0.95b}
{command to create xforms (beta)---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
index a6faf38b59..4c345d4006 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
index f37514d936..53bb237c69 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -164,7 +164,7 @@
% \begin{macrocode}
%<@@=pdfmanagement>
%<*header>
-\ProvidesExplPackage {ltdocinit} {2021-02-22} {0.95a}
+\ProvidesExplPackage {ltdocinit} {2021-03-07} {0.95b}
{Initialize document metadata}
%</header>
% \end{macrocode}
@@ -189,18 +189,19 @@
% \end{macrocode}
% The wanted backend must be detected first, we read the init key and then
% force the loading by either loading l3pdf (+ expl3) or only expl3.
+% The backend contains now management command, so the boolean should true first.
% \begin{macrocode}
\keys_set_groups:nnn { document / metadata} {init}{ #1 }
%should be loaded after the backend is set, and only if not in the kernel
+ \bool_gset_true:N \g_@@_active_bool
\cs_if_free:NTF \pdf_uncompress:
{\RequirePackage{l3pdf}}{\RequirePackage{expl3}}
% \end{macrocode}
-% Now we load the extra backend code and set the boolean to true
+% Now we load the extra backend code
% \begin{macrocode}
\ExplSyntaxOn\makeatletter
\file_input:n {l3backend-testphase-\c_sys_backend_str.def}
\ExplSyntaxOff\makeatother
- \bool_gset_true:N \g_@@_active_bool
% \end{macrocode}
% set the default language, process the rest of the keys,
% and setup the generic driver
@@ -341,7 +342,6 @@
\msg_warning:nnn{pdf}{unknown-standard}{#1}
}
,pdfmanagement .bool_gset:N = \g_@@_active_bool
- ,pdfmanagement .initial:n = {true}
,firstaidoff .clist_gset:N = \g_@@_firstaidoff_clist
}
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
index d4f5b63ecb..99ee652c79 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
index b3ade3f709..ef27c06cf1 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
@@ -1,7 +1,7 @@
%%
%% This is file `pdflscape-ltx.sty',
%%
-%% Version: 2021/02/22 v0.95a
+%% Version: 2021/02/22 v0.95b
%%
%% Copyright (C) 2021 The LaTeX Project
%%
@@ -24,7 +24,7 @@
%% This work consists of the main source file pdflscape-ltx.sty
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage {pdflscape-ltx}{2021/02/22}{v0.95a}
+\ProvidesExplPackage {pdflscape-ltx}{2021/02/22}{v0.95b}
{Display of landscape pages in PDF - adaption of pdflscape to the PDFmanagement bundle (testphase)}
\RequirePackage{lscape}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
index 08fbf856db..dc33bf093c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -67,11 +67,11 @@
% |firstaidoff={name1,name2,...}|.
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage {pdfmanagement-firstaid} {2021-02-22} {0.95a}
+\ProvidesExplPackage {pdfmanagement-firstaid} {2021-03-07} {0.95b}
{LaTeX PDF management testphase bundle / firstaid-patches}
%<@@=pdfmanagement>
-\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color}
+\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer}
{
\bool_new:c { g_@@_firstaid_#1_bool }
\bool_gset_true:c { g_@@_firstaid_#1_bool }
@@ -86,6 +86,15 @@
\msg_new:nnn { pdfmanagement } { firstaid }
{ loading~pdfmanagement~firstaid~code~for~#1 }
% \end{macrocode}
+% \subsection{\pkg{beamer}}
+% \pkg{beamer} makes use of the now unsupported syntax |linkbordercolor={.5 .5 .5}|.
+% To avoid an error we define this color as a name.
+% \begin{macrocode}
+\bool_if:NT \g_@@_firstaid_beamer_bool
+ {
+ \color_set:nnn{.5~.5~.5}{rgb}{0.5,0.5,0.5}
+ }
+% \end{macrocode}
% \subsection{\pkg{color}}
%
% \pkg{color} is not incompatible, but the new \pkg{hyperref} driver makes use of
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
index 3492a9b7af..92144a63e7 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
index 4b63544d17..7f37e132d7 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Version 0.95a, released 2021-02-22}
+% \date{Version 0.95b, released 2021-03-07}
%
% \maketitle
% \begin{documentation}
@@ -274,6 +274,10 @@
% for external incompatible packages. This patches will disappear as soon as
% the packages are natively compatible. It is loaded automatically.
%
+% \item[l3pdffield] Commands for form fields. Currently it only provides commands
+% for checkboxes. It must be loaded explicitly as with
+% |\usepackage{l3pdffield-testphase}|.
+%
% \end{description}
% \section{Incompabilities}
%
@@ -380,7 +384,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*package>
-\ProvidesExplPackage {pdfmanagement-testphase} {2021-02-22} {0.95a}
+\ProvidesExplPackage {pdfmanagement-testphase} {2021-03-07} {0.95b}
{LaTeX PDF management testphase bundle}
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2020-10-01}{}{
@@ -408,7 +412,7 @@
% \begin{macrocode}
%<*header>
\ProvidesExplFile
- {pdfmanagement-testphase.ltx}{2021-02-22}{0.95a}
+ {pdfmanagement-testphase.ltx}{2021-03-07}{0.95b}
{PDF~management~code~(testphase)}
%</header>
%<*package>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
index 6452b24c68..87ac62f1b0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
@@ -124,6 +124,14 @@ and all files in that bundle must be distributed together.
% }
\generate
+ {%
+ \file{l3pdffield-testphase.sty}
+ {%
+ \from{l3pdffield.dtx}{package}
+ }%
+ }
+
+\generate
{
\file{l3backend-testphase-dvipdfmx.def}
{
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
index d9c2da2862..c5021da118 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
index be7a252270..7fd747325d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
@@ -4,7 +4,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\ProvidesExplPackage{transparent-ltx}%
- {2021-02-22}{v0.95a}{Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}%
+ {2021-03-07}{v0.95b}{Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}%
\RequirePackage{l3opacity}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index c49a000fa2..5363a83077 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
%% LaTeX2e file `xcolor-patches.sty'
%%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2021/02/22 v0.95a patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2021/02/22 v0.95b patch xcolor for l3color]
\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
\ExplSyntaxOn
diff --git a/macros/latex/contrib/pdfpages/pdfpages.dtx b/macros/latex/contrib/pdfpages/pdfpages.dtx
index eb64a63b55..10188c05a9 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.dtx
+++ b/macros/latex/contrib/pdfpages/pdfpages.dtx
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM@fileversion{v0.5s}
+\def\AM@fileversion{v0.5t}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{5060}
+% \CheckSum{5076}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3531,9 +3531,18 @@
}
% \end{macrocode}
% Rotate page.
-% \begin{macrocode}
-\def\AM@setRotate{\PLS@Rotate{90}}
-\def\AM@resetRotate{\PLS@Rotate{0}}
+% Use new pdfmanagement macros if available, and fallback to pdflscape
+% if they are not available.
+% \begin{macrocode}
+\ExplSyntaxOn
+\@ifundefined{pdfmanagement_add:nnn}{%
+ \def\AM@setRotate{\PLS@Rotate{90}}%
+ \def\AM@resetRotate{\PLS@Rotate{0}}%
+}{%
+ \def\AM@setRotate{\pdfmanagement_add:nnn{ThisPage}{Rotate}{90}}%
+ \def\AM@resetRotate{}%
+}%
+\ExplSyntaxOff
% \end{macrocode}
% Link to original document.
% \begin{macrocode}
@@ -3706,6 +3715,8 @@
\let\AM@pagesize@boogie\relax
% \end{macrocode}
% Rotate page.
+% Use new pdfmanagement macros if available, and fallback to pdflscape
+% if they are not available.
% \begin{macrocode}
\def\AM@setRotate{\special{pS:
[{ThisPage}\string<\string</Rotate 90\string>\string>%]
@@ -3895,8 +3906,15 @@
% \end{macrocode}
% Rotate page.
% \begin{macrocode}
-\def\AM@setRotate{\PLS@Rotate{90}}
-\def\AM@resetRotate{\PLS@Rotate{0}}
+\ExplSyntaxOn
+\@ifundefined{pdfmanagement_add:nnn}{%
+ \def\AM@setRotate{\PLS@Rotate{90}}%
+ \def\AM@resetRotate{\PLS@Rotate{0}}%
+}{%
+ \def\AM@setRotate{\pdfmanagement_add:nnn{ThisPage}{Rotate}{90}}%
+ \def\AM@resetRotate{}%
+}%
+\ExplSyntaxOff
% \end{macrocode}
% Link to original document.
% \begin{macrocode}
@@ -4821,6 +4839,12 @@
% |\fboxrule| equal the values which were active just before
% calling |\includepdf|.
% \end{itemize}
+%
+% \subsection*{2021/03/06 v0.5t}
+% \begin{itemize}
+% \item Page rotation: Use new pdfmanagement macros if they are
+% available, and fallback to pdflscape if they are not available.
+% \end{itemize}
% \Finale
%
% \iffalse
diff --git a/macros/latex/contrib/pdfpages/pdfpages.pdf b/macros/latex/contrib/pdfpages/pdfpages.pdf
index a1227b99fc..df6493f4d5 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.pdf
+++ b/macros/latex/contrib/pdfpages/pdfpages.pdf
Binary files differ
diff --git a/macros/latex/contrib/ut-thesis/ut-thesis.dtx b/macros/latex/contrib/ut-thesis/ut-thesis.dtx
index f1180b7056..a3b6ad25af 100644
--- a/macros/latex/contrib/ut-thesis/ut-thesis.dtx
+++ b/macros/latex/contrib/ut-thesis/ut-thesis.dtx
@@ -5,7 +5,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{ut-thesis}
%<*class>
-[2020/11/19 v3.0.0a University of Toronto thesis class]
+[2021/03/07 v3.0.1 University of Toronto thesis class]
%</class>
%
%<*driver>
@@ -247,11 +247,11 @@
% Prints the table of contents, starting on a new page.
% \end{macro}
%
-% \begin{macro}{\tableoftables}
+% \begin{macro}{\listoftables}
% Prints the table of tables, starting on a new page.
% \end{macro}
%
-% \begin{macro}{\tableoffigures}
+% \begin{macro}{\listoffigures}
% Prints a table of figures, starting on a new page.
% \end{macro}
%
@@ -554,7 +554,7 @@
% \subsection{Page Styles}\label{imp:hf}
%
% \subsubsection{Blank Pages}\label{imp:hf:blank}
-% By defauly, all blank pages will have page style |plain|,
+% By default, all blank pages will have page style |plain|,
% but the original definition is stored in |\ocleardoublepage|.
% \begin{macrocode}
\let\ocleardoublepage\cleardoublepage
diff --git a/macros/latex/contrib/ut-thesis/ut-thesis.ins b/macros/latex/contrib/ut-thesis/ut-thesis.ins
index 362c5806c1..c750d0f10d 100644
--- a/macros/latex/contrib/ut-thesis/ut-thesis.ins
+++ b/macros/latex/contrib/ut-thesis/ut-thesis.ins
@@ -1,6 +1,6 @@
\input docstrip.tex
\keepsilent
-\usedir{.}
+\usedir{tex/latex/ut-thesis}
\preamble
diff --git a/macros/latex/contrib/ut-thesis/ut-thesis.pdf b/macros/latex/contrib/ut-thesis/ut-thesis.pdf
index 10cce05d84..0dd1571571 100644
--- a/macros/latex/contrib/ut-thesis/ut-thesis.pdf
+++ b/macros/latex/contrib/ut-thesis/ut-thesis.pdf
Binary files differ