diff options
| author | Karl Berry <karl@freefriends.org> | 2010-03-26 23:30:06 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-03-26 23:30:06 +0000 |
| commit | 9a032296aec6ef5b4ac4bb94209873531040284f (patch) | |
| tree | 185ff5001a4624653e7264244b52edfe78bd705e /Master | |
| parent | a0ee1be019cc1fb6421bf81cc552cfb85ac9fa13 (diff) | |
oberdiek update (26mar10)
git-svn-id: svn://tug.org/texlive/trunk@17570 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
113 files changed, 2243 insertions, 1541 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf Binary files differindex 751cccaa9e9..d241f94a8f3 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf Binary files differindex cfddbfb1caf..afa9d33654d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf index 7b8f6fca43c..a91740ab2c6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf @@ -4744,7 +4744,7 @@ xref 0000487686 00000 n 0000487750 00000 n trailer -<</Root 1 0 R/ID[(j!5 <)(9i-UiCB$)]/Compress<</SpecO/1.4/LengthO 570633>>/Info 6 0 R/Size 1134>> +<</Root 1 0 R/ID[(j!5 <)(S:=|撪sj )]/Compress<</SpecO/1.4/LengthO 570633>>/Info 6 0 R/Size 1134>> startxref 487814 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf b/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf Binary files differindex 17887ddf6dc..7fc7cf29eff 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf index 93ecc724a50..2a59b5b972e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf @@ -5353,7 +5353,7 @@ xref 0000503906 00000 n 0000503970 00000 n trailer -<</Root 1 0 R/ID[(I7fL=oq)(Ʉ!ZڣuUm)]/Compress<</SpecO/1.4/LengthO 608909>>/Info 6 0 R/Size 1365>> +<</Root 1 0 R/ID[(I7fL=oq)(u})]/Compress<</SpecO/1.4/LengthO 608909>>/Info 6 0 R/Size 1365>> startxref 504034 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf Binary files differindex d318b091680..ab017305f5b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf index 357ef186901..1fa6acd038c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf @@ -5417,8 +5417,7 @@ xref 0000506598 00000 n 0000506661 00000 n trailer -<</Root 1 0 R/ID[( |xzz;qJ)(B4 -d?2Gc)]/Compress<</SpecO/1.4/LengthO 617635>>/Info 6 0 R/Size 1370>> +<</Root 1 0 R/ID[( |xzz;qJ)(bQJ0y,3W.)]/Compress<</SpecO/1.4/LengthO 617635>>/Info 6 0 R/Size 1370>> startxref 506725 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf b/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf index 8da66463d4a..ce85424c340 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[12 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100324010011+01'00')/Subject(Hooks at very end of document (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100324010011+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The atveryend package)>> +6 0 obj<</ModDate(D:20100326182253+01'00')/Subject(Hooks at very end of document (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100326182253+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The atveryend package)>> endobj 7 0 obj<</Type/Pages/Kids[12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R]/Parent 2 0 R/Count 6>> endobj @@ -70,14 +70,14 @@ endobj endobj 35 0 obj<</Prev 746 0 R/A 745 0 R/Title(Z)/Parent 11 0 R>> endobj -36 0 obj<</Filter/FlateDecode/Length 1746>>stream -xYnF}|$j PȭH
(זb4(:qQ;{!MFNFH.fgwΜ =x|{"2%g˓r1qCU/7Ȗo2&vBg? *sT tKԵEvgyyj*#! QH&۳- *ejkϢZRg mʩA7NUԼ)Ӷ=yѺ=OJDZҠ-n@pn rDHXb a`;İ42RWP`~ǫ]ߕ~MM< $af0 `2R2`EӰBJ5 -k`e~dt| l0
ʳ! vmAun[ٸ wm}E02" 18_U<Mw&rBe - iVłk=m^ - n:Jp# x` AXQ0Ƹm -Fކn$`$CPHEbaȟ { x~ Z"܂ -UNj= 3e$ >T`)ux {d%% v ߃7L{
rm -~dszyz{` +36 0 obj<</Filter/FlateDecode/Length 1761>>stream +xYn6}z.( +VEͶ(A˒EÛ,eq:/HSCΙÙCG{~$"# +Q"x<(gH)j7Uerclƍ㱌"IݠWyٿ_m{AzEv +AԦ/TF2BPBrDT#mhݞTm``U=V(ZQHa-C+#*#
"0..p]E A88"?mڞYHK?$ < Gy)&f(%Ht2@0<\\75 M$ s-7 xq<dd`.20a9Ӏ* _\ZQ<> W azؠ<BgToݠw
xY pvFFK$ !R0^]s0bZ&* x_v@9 !& Wv}۪Xp
COzۅ @Wl`š̮ٞIaM$.xn(E^F5G@ºlW `˝À)_!N
+'n u-)/C`[Pi4Gay L@0. `<l4vNwtJa96"71 +A +-" endstream endobj 37 0 obj<</Font 747 0 R>> @@ -110,17 +110,17 @@ endobj endobj 51 0 obj<</Subtype/Link/Rect[181.589 338.073 288.881 348.921]/C[1 0 0]/Dest[21 0 R/XYZ 144.727 781.3 null]/Border[0 0 0]>> endobj -52 0 obj<</Subtype/Link/Rect[158.675 327.225 291.731 336.966]/C[1 0 0]/Dest[21 0 R/XYZ 144.727 704.38 null]/Border[0 0 0]>> +52 0 obj<</Subtype/Link/Rect[158.675 327.225 291.731 336.966]/C[1 0 0]/Dest[21 0 R/XYZ 144.727 705.367 null]/Border[0 0 0]>> endobj -53 0 obj<</Subtype/Link/Rect[158.675 316.1 231.679 325.011]/C[1 0 0]/Dest[21 0 R/XYZ 144.727 290.474 null]/Border[0 0 0]>> +53 0 obj<</Subtype/Link/Rect[158.675 316.1 231.679 325.011]/C[1 0 0]/Dest[21 0 R/XYZ 144.727 293.436 null]/Border[0 0 0]>> endobj -54 0 obj<</Subtype/Link/Rect[143.731 294.182 181.909 303.01]/C[1 0 0]/Dest[23 0 R/XYZ 144.727 453.211 null]/Border[0 0 0]>> +54 0 obj<</Subtype/Link/Rect[143.731 294.182 181.909 303.01]/C[1 0 0]/Dest[23 0 R/XYZ 144.727 475.128 null]/Border[0 0 0]>> endobj -55 0 obj<</Subtype/Link/Rect[158.675 280.289 300.172 291.138]/C[1 0 0]/Dest[23 0 R/XYZ 144.727 427.654 null]/Border[0 0 0]>> +55 0 obj<</Subtype/Link/Rect[158.675 280.289 300.172 291.138]/C[1 0 0]/Dest[23 0 R/XYZ 144.727 449.572 null]/Border[0 0 0]>> endobj -56 0 obj<</Subtype/Link/Rect[143.731 260.309 217.587 269.22]/C[1 0 0]/Dest[24 0 R/XYZ 144.727 222.147 null]/Border[0 0 0]>> +56 0 obj<</Subtype/Link/Rect[143.731 260.309 217.587 269.22]/C[1 0 0]/Dest[24 0 R/XYZ 144.727 244.064 null]/Border[0 0 0]>> endobj -57 0 obj<</Subtype/Link/Rect[158.675 248.354 226.892 257.265]/C[1 0 0]/Dest[24 0 R/XYZ 144.727 196.59 null]/Border[0 0 0]>> +57 0 obj<</Subtype/Link/Rect[158.675 248.354 226.892 257.265]/C[1 0 0]/Dest[24 0 R/XYZ 144.727 218.507 null]/Border[0 0 0]>> endobj 58 0 obj<</Subtype/Link/Rect[158.675 236.398 266.521 245.309]/C[1 0 0]/Dest[25 0 R/XYZ 144.727 679.19 null]/Border[0 0 0]>> endobj @@ -134,12 +134,19 @@ endobj endobj 63 0 obj<</Subtype/Link/Rect[143.731 156.697 214.46 165.608]/C[1 0 0]/Dest[26 0 R/XYZ 144.727 407.733 null]/Border[0 0 0]>> endobj -64 0 obj<</Filter/FlateDecode/Length 2782>>stream -xZݏ۸OGQb.DR]EQ`7ukK[IN(wCʲV~<`M{pg],cfvu;Z3+ZL8kֳLʶ?>3hXȌ[W]fdֳ,KфגB n TQ0~0rY拔Ǐ[ ZO*ߚ̙*zo[E攊U~GHE_pq!^EwMH]Hݫ(6U4$M 7ժ<\&T,6g3P| -sPEj.ʺIA6ESLr*>_ΥMIuRMR5{2CW.R:ϸy/K)n'6 s&|v+-H%P|kY{Fo U:NInw$9>P2nC2ۮh\R~\ؑ0! -j+5lǪP*j+>mߦ;CP7BPɫȗ*?X6K~'egeV9CřIƵ4@Y -=6 -2CZ0iΕrq$ <ޓgd +64 0 obj<</Filter/FlateDecode/Length 2786>>stream +xZK;:R/6d$A`ZHܑ E HM#x8xa`wA?{uG'9#v"f,&E!Rj1:+3'z5 ̤D.~ z2<?Zr.f:SJe +26?~o^τ&j?WTdTU$mS*W EG* *ҿ("u!uTёߜE7'Ao ͒|]T +F=%_g`B ?4yj;FWvuM]bW@EJf%5Dv_Χe᛬bKd\,qp?IUm[&.,&tr+-H%|·*.^ n& "ՉCLufJu#?MUz:/"h +,6lj<
aUTЮz;h hJ6-U:no[m
n!GrU[[ ,f?7UL s^&k2i- +]%3V c
T>PD(ayU-5m>PC&#t%l)-WM۔)+ +SD6uoQ"TnXHG5.xvޡI <uHm*=<z Q.5jCzB#pTL<j$\^N^qډ#syim* 8Ra8f ; +}k#Y$О+&p Ic{#Ĩ6 d*p1 Md?*hvc<2v|)Y`s J>\yJ^U6Q9g @ +!㣧Yxʰ^N!D (aJ1iPуX xzGԴmi=6V + |쪅h=Wt@ r F|j3 4F;VJx0)!▩O,`bD7)W*nw+ ^Q A AA()- cV1I5O$ /Õ'{$3LF(Io*R֞ "?;vc2$fl[y0,j +Fm keo]BGqA@"(ݧL$1j)ŕ*T;`~Ul^bXkC:/պ̟9_X
2 MSX䆵J$`N2F]aqķe{\KOjCU>uA 3T5 "[\ n9eyWJn`붣C|brn}E; gqT_Uh_R ]d:d1ivv{4 n_l?:GsVpwHq/`-_>:Ë6qQVtT<≋hMh4swx@ {s!xrޝZ1K3@;*l^* tA[Œ rL/e߃Etzl]YDdXk!&zIhYc_`O<qr9vRً#g}' +gq_o?pԙ2ח矴7)zOl/f\zpч9/BEu G Sԗ>^9~ +$Aω
?
^N}:vj!;8 +kbmu⼡,G꾇Ut+i|ɿ*vdK$cob endstream endobj 65 0 obj<</Font 748 0 R>> @@ -235,52 +242,50 @@ endstream endobj 91 0 obj<</Font 753 0 R>> endobj -92 0 obj<</Filter/FlateDecode/Length 1377>>stream -xڵXQ6~?ݏRqmNUVmԗ.q6t D)16Y9^_}1ޮ^#MINb]$AQ*π Haא _}ȓ S_4 ,b:(#dljGRT D%գbfxŘ ˖7jsN";<1LZ""%$ =T-* yTڼ{Uu tdBb]BP:xYvMj>mʋg? 2 p -3@='t -tuv;e#m~43$!@ϖ l7
OS )8q |4,IP" CHр·ž(F?åZZtK=lW$H%]teQ2.l,
tn A=GDD)ֵRVDσ%iPo]:LAUHҠCЌS|㣾O!tSac81 U -|Ծj`ML=cVs:n5)E4 JpG ի +92 0 obj<</Filter/FlateDecode/Length 1371>>stream +xڵXMo6/G +H@͊IvEQEkAX,Ia俗)Gk +^,R&<zw|Ϙ$ r3 +ޜ ` Y7GƔ8K7jSժ#8yIH endstream endobj 93 0 obj<</Font 754 0 R>> endobj -94 0 obj<</Filter/FlateDecode/Length 1092>>stream -xڵX[F~_!f Vty(ih@L!Dث.FN{Gxmێs97'7?~,<[E=YGm=k2&镜Z h -fYN&,S$U]&[I 7(2ɗQ4KU\c{yO ;! rmEEpq 8&lrk3K`^2+XlKy,~Ri<UiEUC>kF|\_ŋQj*Vw~E[\" -/6tΗwD0Ն9RAÞB5k;
淾 ;ۿ#D16O=,,j5 unloh~FX>sxC+\`J-_3O':G~.fL5 }0 ~A}X6"|G
CiP`pM!OV̒>; -vf! -1<R3AUywM 7Fl⍵dW I Qv cS3F;@K\*0Mr \x//=퐣y8#j*cl pvjnw_A@-qssoCUUzK?qEYd ӟN ϋ$5sa6YcIh}I2sQQ +94 0 obj<</Filter/FlateDecode/Length 1045>>stream +xڵXۊ:}0ø͗{N)4$J lgHmev@'Z[$7 whP!܀NPM.O=S't#P&\rl!`WfHFB`T2 +`1bV$f$Y*O*u]UӸQ;4Gpi|Vj]ZLY}_7I mUo״|V^ƫ/LiY1݁<nڎfǿnRB]^I&_hμ[G$NO(33g <Ij ϑ #JhrU. %he2p +-H[s i+xM,?fꐄ!H
I{ < B070. {uZdM[a DJ:Ʒҵx - veH2sUAo?!h3a + sc}Eplg "}*B(uN8!IOH@H8V=F?I o; t ē j@#Luԥz<EpjyBɎO0 _h-` kmrӆ3Dڀ7Gyԥ +t'WQe9n2:[3mB }!AW%_%id:ܘz7o$;k{HrL`¾]S6 tDP)V#t>r6[:6ktCZ
F<4u7`0ퟧ3 @-C}{MkUzo*ޢ";*=W,M)O+߳)Fg۫mvṁy{?>u endstream endobj 95 0 obj<</Font 755 0 R>> endobj -96 0 obj<</Filter/FlateDecode/Length 1050>>stream -xڭXߏ6~߿iRRu91 "ez}UFCt8 D)[rba'0ݯ ]ɩp+}pN\JHIzSg,)q+0L)u_8^ms&m[krK<W2iH ,t>4ѫ(کUK-7ht;(3zfa3st+;V(F>Z.Wq%+v<pLޤ9ܙYr;%B tu@ic;'T8V^5VG· |~m 1eˊ3VF Uiڤ0@^<xg(= h'0_%|+wV \&T5 -e ʭ*7F[mtlts3\ LҶU吼uYBVa&HƖIj=V{\PWFI_'
T SKe?dq_܌VyA7f !U+bBܝ)C=le"3k!79{ԗjjrznמ3-VaP93H@ k`b*.$0EVA+H`q21T -l Eڞvkr79o(M3j1ݓSd Aogp7PG1w6 +96 0 obj<</Filter/FlateDecode/Length 1042>>stream +xڭXQ6~_:)cHmյԨ}(ꀓM +ݞ&'gvy7o<n~{/9l(y=ΉO)f7pKJ<8j0BIL/d Z:|s;IN]Q(̓^Oe¸Kȅ g6I2ڙ6$9\YKW j _ dM`3G|B!cA'Dc/H0/tv8/ t ԐmRc%C
wk
-0Z**ߖ q
b[lZtYKf] ɺH3Ru@SP4GԮȋo'2.#>tw](sWUJWj7c!la8FFg߷/6**a/;ҹu־}qjOT+([:an)=mѢm>"U̗EhO8dl
]QM%<ϚDd
& :8n!PMDž;q|zNPZA g /q Kw@gcteN0Y33Q_@9>~T& Jp n U
DԾKA?q <SI-O)Bw ,8_H
;7cA.٨Lk2o &-1gyt&~ $!a:!iT$ VLϧs6N,&!c,% +4, C*\ Quf-8;\w¹.`{!VKԊj+փD06 ej9Nˌ RFcNm<4Efpb̫:neax3_Wo9bn9KVxl¸C*H61SXZ|uI endstream endobj 97 0 obj<</Font 756 0 R>> endobj -98 0 obj<</Filter/FlateDecode/Length 1181>>stream -xڭXn6}7 -v9ln'p$8sZ:G+ NY3.yRI CL&IuszL[oYFryх=bmY%-}Z4.W 8x5ʜ:- :}(_b_8w -H -ɦ -xiV,tXWon"֭u9rN=.b%hʊKPeZQu5dU skMд\%SV
S. Hڼ F@Vÿa\ -~װ.) WMԵ5m톇'ov#yD1l7A(ntAʿ$u=
Q$Ql&}OuA1l'1\Md_ޏ
{-Q|zGq=ޗ"G'[Q `H?8\ty:m jGt{ \9noe!]ee߲= 17p N= 41~ :3 VD1^Xϸ{jN%- -ٺA=XC/yJvfÈ>Znԙi~.݇qew:˺8 Q[`;Zk'CzffuczUeSսz
MI̪z3}_Eh +98 0 obj<</Filter/FlateDecode/Length 1156>>stream +xڭXn6}7 +Fς%II^7U?MVzݝPAz,ieeS!VӽCh E Gϰ#̀&Iswwqk"8ӫ,9y +1Bl,iAPM[MKp+3 cew>Oi/n;c-vةW0j|{ϖލk+9}j :T2N0}ۗ=b'fy:otjAIeF_4X-enuKJ8ui%;b:1͓ad| >w)Fk v4K]m}<B HnDD@n +eh!U>w=3Ƶ ll%l +/Dw)' fIm#̇nQy!nYUmu`4=UƟ7I֤% 1ƒiϲœP endstream endobj 99 0 obj<</Font 757 0 R>> endobj -100 0 obj<</Subtype/Link/Rect[349.84 161.319 356.302 173.358]/C[1 0 0]/Dest[24 0 R/XYZ 159.97 116.021 null]/Border[0 0 0]>> +100 0 obj<</Subtype/Link/Rect[349.84 183.237 356.302 195.276]/C[1 0 0]/Dest[24 0 R/XYZ 159.97 137.939 null]/Border[0 0 0]>> endobj -101 0 obj<</Subtype/Link/Rect[143.731 141.117 396.78 152.242]/A 758 0 R/C[0 1 1]/Border[0 0 0]>> +101 0 obj<</Subtype/Link/Rect[143.731 163.035 396.78 174.16]/A 758 0 R/C[0 1 1]/Border[0 0 0]>> endobj -102 0 obj<</Subtype/Link/Rect[143.731 121.192 396.78 132.317]/A 759 0 R/C[0 1 1]/Border[0 0 0]>> +102 0 obj<</Subtype/Link/Rect[143.731 143.11 396.78 154.235]/A 759 0 R/C[0 1 1]/Border[0 0 0]>> endobj -103 0 obj<</Subtype/Link/Rect[158.974 102.721 292.724 114.218]/A 760 0 R/C[0 1 1]/Border[0 0 0]>> +103 0 obj<</Subtype/Link/Rect[158.974 124.639 292.724 136.136]/A 760 0 R/C[0 1 1]/Border[0 0 0]>> endobj 104 0 obj<</Filter/FlateDecode/Length 2281>>stream xڵXK۸;#\ @@ -360,15 +365,15 @@ endstream endobj 124 0 obj<</Font 772 0 R>> endobj -125 0 obj<</Subtype/Link/Rect[282.309 389.942 298.124 402.893]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 366.226 null]/Border[0 0 0]>> +125 0 obj<</Subtype/Link/Rect[282.309 389.942 298.124 402.893]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 388.144 null]/Border[0 0 0]>> endobj -126 0 obj<</Subtype/Link/Rect[301.763 389.942 317.579 402.893]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 373.628 null]/Border[0 0 0]>> +126 0 obj<</Subtype/Link/Rect[301.763 389.942 317.579 402.893]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 395.546 null]/Border[0 0 0]>> endobj -127 0 obj<</Subtype/Link/Rect[301.763 378.694 317.579 391.645]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 340.752 null]/Border[0 0 0]>> +127 0 obj<</Subtype/Link/Rect[301.763 378.694 317.579 391.645]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 362.67 null]/Border[0 0 0]>> endobj -128 0 obj<</Subtype/Link/Rect[282.309 367.446 298.124 380.397]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 355.267 null]/Border[0 0 0]>> +128 0 obj<</Subtype/Link/Rect[282.309 367.446 298.124 380.397]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 377.185 null]/Border[0 0 0]>> endobj -129 0 obj<</Subtype/Link/Rect[301.763 367.446 317.579 380.397]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 417.464 null]/Border[0 0 0]>> +129 0 obj<</Subtype/Link/Rect[301.763 367.446 317.579 380.397]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 439.382 null]/Border[0 0 0]>> endobj 130 0 obj<</Subtype/Link/Rect[284.26 356.198 300.075 369.15]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 383.732 null]/Border[0 0 0]>> endobj @@ -386,19 +391,19 @@ endobj endobj 137 0 obj<</Subtype/Link/Rect[301.763 346.783 317.579 356.298]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 139.249 null]/Border[0 0 0]>> endobj -138 0 obj<</Subtype/Link/Rect[282.309 333.991 298.124 346.943]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> +138 0 obj<</Subtype/Link/Rect[282.309 333.991 298.124 346.943]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> endobj -139 0 obj<</Subtype/Link/Rect[301.763 333.991 317.579 346.943]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 198.286 null]/Border[0 0 0]>> +139 0 obj<</Subtype/Link/Rect[301.763 333.991 317.579 346.943]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 220.204 null]/Border[0 0 0]>> endobj -140 0 obj<</Subtype/Link/Rect[223.945 322.744 239.76 335.695]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 132.533 null]/Border[0 0 0]>> +140 0 obj<</Subtype/Link/Rect[223.945 322.744 239.76 335.695]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 154.45 null]/Border[0 0 0]>> endobj -141 0 obj<</Subtype/Link/Rect[243.399 322.744 259.215 335.695]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 110.615 null]/Border[0 0 0]>> +141 0 obj<</Subtype/Link/Rect[243.399 322.744 259.215 335.695]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 132.533 null]/Border[0 0 0]>> endobj -142 0 obj<</Subtype/Link/Rect[262.854 322.744 278.67 335.695]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 548.971 null]/Border[0 0 0]>> +142 0 obj<</Subtype/Link/Rect[262.854 322.744 278.67 335.695]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 570.889 null]/Border[0 0 0]>> endobj -143 0 obj<</Subtype/Link/Rect[282.309 322.744 298.124 335.695]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 538.012 null]/Border[0 0 0]>> +143 0 obj<</Subtype/Link/Rect[282.309 322.744 298.124 335.695]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> endobj -144 0 obj<</Subtype/Link/Rect[301.763 322.744 317.579 335.695]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> +144 0 obj<</Subtype/Link/Rect[301.763 322.744 317.579 335.695]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 548.971 null]/Border[0 0 0]>> endobj 145 0 obj<</Subtype/Link/Rect[249.958 311.496 261.166 324.447]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 712.499 null]/Border[0 0 0]>> endobj @@ -416,9 +421,9 @@ endobj endobj 152 0 obj<</Subtype/Link/Rect[259.049 302.081 274.864 311.595]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 391.304 null]/Border[0 0 0]>> endobj -153 0 obj<</Subtype/Link/Rect[280.406 302.081 296.222 311.595]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 659.639 null]/Border[0 0 0]>> +153 0 obj<</Subtype/Link/Rect[280.406 302.081 296.222 311.595]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 660.627 null]/Border[0 0 0]>> endobj -154 0 obj<</Subtype/Link/Rect[301.763 302.081 317.579 311.595]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 637.721 null]/Border[0 0 0]>> +154 0 obj<</Subtype/Link/Rect[301.763 302.081 317.579 311.595]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 638.709 null]/Border[0 0 0]>> endobj 155 0 obj<</Subtype/Link/Rect[282.309 289.289 298.124 302.24]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 537.157 null]/Border[0 0 0]>> endobj @@ -428,11 +433,11 @@ endobj endobj 158 0 obj<</Subtype/Link/Rect[243.399 278.041 259.215 290.993]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 150.208 null]/Border[0 0 0]>> endobj -159 0 obj<</Subtype/Link/Rect[262.854 278.041 278.67 290.993]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 413.562 null]/Border[0 0 0]>> +159 0 obj<</Subtype/Link/Rect[262.854 278.041 278.67 290.993]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 415.537 null]/Border[0 0 0]>> endobj -160 0 obj<</Subtype/Link/Rect[282.309 278.041 298.124 290.993]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 380.685 null]/Border[0 0 0]>> +160 0 obj<</Subtype/Link/Rect[282.309 278.041 298.124 290.993]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 382.66 null]/Border[0 0 0]>> endobj -161 0 obj<</Subtype/Link/Rect[301.763 278.041 317.579 290.993]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 369.726 null]/Border[0 0 0]>> +161 0 obj<</Subtype/Link/Rect[301.763 278.041 317.579 290.993]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 371.702 null]/Border[0 0 0]>> endobj 162 0 obj<</Subtype/Link/Rect[288.867 266.793 300.075 279.745]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 152.627 null]/Border[0 0 0]>> endobj @@ -448,9 +453,9 @@ endobj endobj 168 0 obj<</Subtype/Link/Rect[258.568 257.379 274.384 266.893]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 690.582 null]/Border[0 0 0]>> endobj -169 0 obj<</Subtype/Link/Rect[280.166 257.379 295.982 266.893]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> +169 0 obj<</Subtype/Link/Rect[280.166 257.379 295.982 266.893]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> endobj -170 0 obj<</Subtype/Link/Rect[301.763 257.379 317.579 266.893]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 154.45 null]/Border[0 0 0]>> +170 0 obj<</Subtype/Link/Rect[301.763 257.379 317.579 266.893]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 176.368 null]/Border[0 0 0]>> endobj 171 0 obj<</Subtype/Link/Rect[248.007 244.587 259.215 257.538]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 723.458 null]/Border[0 0 0]>> endobj @@ -470,21 +475,21 @@ endobj endobj 179 0 obj<</Subtype/Link/Rect[263.535 233.339 279.351 246.29]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 325.55 null]/Border[0 0 0]>> endobj -180 0 obj<</Subtype/Link/Rect[282.649 233.339 298.465 246.29]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 267.596 null]/Border[0 0 0]>> +180 0 obj<</Subtype/Link/Rect[282.649 233.339 298.465 246.29]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 289.513 null]/Border[0 0 0]>> endobj -181 0 obj<</Subtype/Link/Rect[301.763 233.339 317.579 246.29]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 234.719 null]/Border[0 0 0]>> +181 0 obj<</Subtype/Link/Rect[301.763 233.339 317.579 246.29]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 256.637 null]/Border[0 0 0]>> endobj 182 0 obj<</Subtype/Link/Rect[282.309 222.091 298.124 235.043]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 570.034 null]/Border[0 0 0]>> endobj 183 0 obj<</Subtype/Link/Rect[301.763 222.091 317.579 235.043]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 128.29 null]/Border[0 0 0]>> endobj -184 0 obj<</Subtype/Link/Rect[243.399 210.843 259.215 223.795]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> +184 0 obj<</Subtype/Link/Rect[243.399 210.843 259.215 223.795]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 581.848 null]/Border[0 0 0]>> endobj -185 0 obj<</Subtype/Link/Rect[262.854 210.843 278.67 223.795]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 307.875 null]/Border[0 0 0]>> +185 0 obj<</Subtype/Link/Rect[262.854 210.843 278.67 223.795]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 329.793 null]/Border[0 0 0]>> endobj -186 0 obj<</Subtype/Link/Rect[282.309 210.843 298.124 223.795]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 300.472 null]/Border[0 0 0]>> +186 0 obj<</Subtype/Link/Rect[282.309 210.843 298.124 223.795]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 322.39 null]/Border[0 0 0]>> endobj -187 0 obj<</Subtype/Link/Rect[301.763 210.843 317.579 223.795]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 212.801 null]/Border[0 0 0]>> +187 0 obj<</Subtype/Link/Rect[301.763 210.843 317.579 223.795]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 234.719 null]/Border[0 0 0]>> endobj 188 0 obj<</Subtype/Link/Rect[189.643 188.637 200.851 201.588]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 657.705 null]/Border[0 0 0]>> endobj @@ -498,7 +503,7 @@ endobj endobj 193 0 obj<</Subtype/Link/Rect[282.309 188.637 298.124 201.588]/C[1 0 0]/Dest[18 0 R/XYZ 143.158 255.819 null]/Border[0 0 0]>> endobj -194 0 obj<</Subtype/Link/Rect[301.763 188.637 317.579 201.588]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 592.807 null]/Border[0 0 0]>> +194 0 obj<</Subtype/Link/Rect[301.763 188.637 317.579 201.588]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 614.724 null]/Border[0 0 0]>> endobj 195 0 obj<</Subtype/Link/Rect[282.309 177.389 298.124 190.34]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 183.772 null]/Border[0 0 0]>> endobj @@ -510,9 +515,9 @@ endobj endobj 199 0 obj<</Subtype/Link/Rect[262.854 166.141 278.67 179.092]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 750.756 null]/Border[0 0 0]>> endobj -200 0 obj<</Subtype/Link/Rect[282.309 166.141 298.124 179.092]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 424.521 null]/Border[0 0 0]>> +200 0 obj<</Subtype/Link/Rect[282.309 166.141 298.124 179.092]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 426.496 null]/Border[0 0 0]>> endobj -201 0 obj<</Subtype/Link/Rect[301.763 166.141 317.579 179.092]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 680.478 null]/Border[0 0 0]>> +201 0 obj<</Subtype/Link/Rect[301.763 166.141 317.579 179.092]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 702.396 null]/Border[0 0 0]>> endobj 202 0 obj<</Subtype/Link/Rect[282.309 154.893 298.124 167.845]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 482.362 null]/Border[0 0 0]>> endobj @@ -534,23 +539,23 @@ endobj endobj 211 0 obj<</Subtype/Link/Rect[259.049 134.231 274.864 143.745]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 325.55 null]/Border[0 0 0]>> endobj -212 0 obj<</Subtype/Link/Rect[280.406 134.231 296.222 143.745]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 150.092 null]/Border[0 0 0]>> +212 0 obj<</Subtype/Link/Rect[280.406 134.231 296.222 143.745]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 165.503 null]/Border[0 0 0]>> endobj -213 0 obj<</Subtype/Link/Rect[301.763 134.231 317.579 143.745]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> +213 0 obj<</Subtype/Link/Rect[301.763 134.231 317.579 143.745]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 110.709 null]/Border[0 0 0]>> endobj 214 0 obj<</Subtype/Link/Rect[282.309 121.439 298.124 134.39]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 327.698 null]/Border[0 0 0]>> endobj 215 0 obj<</Subtype/Link/Rect[301.763 121.439 317.579 134.39]/C[1 0 0]/Dest[18 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> endobj -216 0 obj<</Subtype/Link/Rect[223.945 110.191 239.76 123.142]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 172.01 null]/Border[0 0 0]>> +216 0 obj<</Subtype/Link/Rect[223.945 110.191 239.76 123.142]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 187.421 null]/Border[0 0 0]>> endobj -217 0 obj<</Subtype/Link/Rect[243.399 110.191 259.215 123.142]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 570.889 null]/Border[0 0 0]>> +217 0 obj<</Subtype/Link/Rect[243.399 110.191 259.215 123.142]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 592.807 null]/Border[0 0 0]>> endobj -218 0 obj<</Subtype/Link/Rect[262.854 110.191 278.67 123.142]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 340.752 null]/Border[0 0 0]>> +218 0 obj<</Subtype/Link/Rect[262.854 110.191 278.67 123.142]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 362.67 null]/Border[0 0 0]>> endobj -219 0 obj<</Subtype/Link/Rect[282.309 110.191 298.124 123.142]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 724.313 null]/Border[0 0 0]>> +219 0 obj<</Subtype/Link/Rect[282.309 110.191 298.124 123.142]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 746.231 null]/Border[0 0 0]>> endobj -220 0 obj<</Subtype/Link/Rect[301.763 110.191 317.579 123.142]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 592.807 null]/Border[0 0 0]>> +220 0 obj<</Subtype/Link/Rect[301.763 110.191 317.579 123.142]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 614.724 null]/Border[0 0 0]>> endobj 221 0 obj<</Subtype/Link/Rect[243.399 98.943 259.215 111.894]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 504.28 null]/Border[0 0 0]>> endobj @@ -576,11 +581,11 @@ endobj endobj 232 0 obj<</Subtype/Link/Rect[444.672 389.922 460.488 402.873]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 442.711 null]/Border[0 0 0]>> endobj -233 0 obj<</Subtype/Link/Rect[464.127 389.922 479.943 402.873]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 505.135 null]/Border[0 0 0]>> +233 0 obj<</Subtype/Link/Rect[464.127 389.922 479.943 402.873]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> endobj -234 0 obj<</Subtype/Link/Rect[483.582 389.922 499.397 402.873]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 428.423 null]/Border[0 0 0]>> +234 0 obj<</Subtype/Link/Rect[483.582 389.922 499.397 402.873]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 450.341 null]/Border[0 0 0]>> endobj -235 0 obj<</Subtype/Link/Rect[483.582 378.655 499.397 391.606]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 603.765 null]/Border[0 0 0]>> +235 0 obj<</Subtype/Link/Rect[483.582 378.655 499.397 391.606]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> endobj 236 0 obj<</Subtype/Link/Rect[464.127 367.387 479.943 380.339]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 723.458 null]/Border[0 0 0]>> endobj @@ -606,15 +611,15 @@ endobj endobj 247 0 obj<</Subtype/Link/Rect[483.582 333.585 499.397 346.536]/C[1 0 0]/Dest[18 0 R/XYZ 143.158 255.819 null]/Border[0 0 0]>> endobj -248 0 obj<</Subtype/Link/Rect[405.763 322.318 421.578 335.269]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 182.968 null]/Border[0 0 0]>> +248 0 obj<</Subtype/Link/Rect[405.763 322.318 421.578 335.269]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 198.38 null]/Border[0 0 0]>> endobj -249 0 obj<</Subtype/Link/Rect[425.218 322.318 441.033 335.269]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 150.092 null]/Border[0 0 0]>> +249 0 obj<</Subtype/Link/Rect[425.218 322.318 441.033 335.269]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 165.503 null]/Border[0 0 0]>> endobj -250 0 obj<</Subtype/Link/Rect[444.672 322.318 460.488 335.269]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> +250 0 obj<</Subtype/Link/Rect[444.672 322.318 460.488 335.269]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> endobj -251 0 obj<</Subtype/Link/Rect[464.127 322.318 479.943 335.269]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> +251 0 obj<</Subtype/Link/Rect[464.127 322.318 479.943 335.269]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> endobj -252 0 obj<</Subtype/Link/Rect[483.582 322.318 499.397 335.269]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 603.765 null]/Border[0 0 0]>> +252 0 obj<</Subtype/Link/Rect[483.582 322.318 499.397 335.269]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> endobj 253 0 obj<</Subtype/Link/Rect[390.916 300.091 402.124 313.043]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 635.787 null]/Border[0 0 0]>> endobj @@ -652,41 +657,41 @@ endobj endobj 270 0 obj<</Subtype/Link/Rect[483.582 266.598 499.397 279.549]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 530.382 null]/Border[0 0 0]>> endobj -271 0 obj<</Subtype/Link/Rect[483.582 255.33 499.397 268.282]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 351.711 null]/Border[0 0 0]>> +271 0 obj<</Subtype/Link/Rect[483.582 255.33 499.397 268.282]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 373.628 null]/Border[0 0 0]>> endobj 272 0 obj<</Subtype/Link/Rect[464.127 244.063 479.943 257.014]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 570.034 null]/Border[0 0 0]>> endobj 273 0 obj<</Subtype/Link/Rect[483.582 244.063 499.397 257.014]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 237.879 null]/Border[0 0 0]>> endobj -274 0 obj<</Subtype/Link/Rect[483.582 232.796 499.397 245.747]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 362.67 null]/Border[0 0 0]>> +274 0 obj<</Subtype/Link/Rect[483.582 232.796 499.397 245.747]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 384.587 null]/Border[0 0 0]>> endobj -275 0 obj<</Subtype/Link/Rect[464.127 221.528 479.943 234.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 362.67 null]/Border[0 0 0]>> +275 0 obj<</Subtype/Link/Rect[464.127 221.528 479.943 234.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 384.587 null]/Border[0 0 0]>> endobj -276 0 obj<</Subtype/Link/Rect[483.582 221.528 499.397 234.48]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> +276 0 obj<</Subtype/Link/Rect[483.582 221.528 499.397 234.48]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 428.423 null]/Border[0 0 0]>> endobj -277 0 obj<</Subtype/Link/Rect[444.672 210.261 460.488 223.212]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> +277 0 obj<</Subtype/Link/Rect[444.672 210.261 460.488 223.212]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 581.848 null]/Border[0 0 0]>> endobj -278 0 obj<</Subtype/Link/Rect[464.127 210.261 479.943 223.212]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 388.144 null]/Border[0 0 0]>> +278 0 obj<</Subtype/Link/Rect[464.127 210.261 479.943 223.212]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 410.061 null]/Border[0 0 0]>> endobj -279 0 obj<</Subtype/Link/Rect[483.582 210.261 499.397 223.212]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 395.546 null]/Border[0 0 0]>> +279 0 obj<</Subtype/Link/Rect[483.582 210.261 499.397 223.212]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 417.464 null]/Border[0 0 0]>> endobj -280 0 obj<</Subtype/Link/Rect[464.127 198.993 479.943 211.945]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 377.185 null]/Border[0 0 0]>> +280 0 obj<</Subtype/Link/Rect[464.127 198.993 479.943 211.945]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 399.102 null]/Border[0 0 0]>> endobj -281 0 obj<</Subtype/Link/Rect[483.582 198.993 499.397 211.945]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 384.587 null]/Border[0 0 0]>> +281 0 obj<</Subtype/Link/Rect[483.582 198.993 499.397 211.945]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> endobj -282 0 obj<</Subtype/Link/Rect[483.582 187.726 499.397 200.677]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 351.711 null]/Border[0 0 0]>> +282 0 obj<</Subtype/Link/Rect[483.582 187.726 499.397 200.677]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 373.628 null]/Border[0 0 0]>> endobj -283 0 obj<</Subtype/Link/Rect[483.582 154.612 499.397 167.563]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 329.793 null]/Border[0 0 0]>> +283 0 obj<</Subtype/Link/Rect[483.582 154.612 499.397 167.563]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 351.711 null]/Border[0 0 0]>> endobj 284 0 obj<</Subtype/Link/Rect[483.582 121.497 499.397 134.449]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 280.32 null]/Border[0 0 0]>> endobj -285 0 obj<</Subtype/Link/Rect[464.127 110.23 479.943 123.181]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> +285 0 obj<</Subtype/Link/Rect[464.127 110.23 479.943 123.181]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> endobj -286 0 obj<</Subtype/Link/Rect[483.582 110.23 499.397 123.181]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 538.012 null]/Border[0 0 0]>> +286 0 obj<</Subtype/Link/Rect[483.582 110.23 499.397 123.181]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> endobj 287 0 obj<</Subtype/Link/Rect[483.582 98.963 499.397 111.914]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 739.797 null]/Border[0 0 0]>> endobj -288 0 obj<</Subtype/Link/Rect[483.582 87.695 499.397 100.647]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 506.215 null]/Border[0 0 0]>> +288 0 obj<</Subtype/Link/Rect[483.582 87.695 499.397 100.647]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 507.202 null]/Border[0 0 0]>> endobj 289 0 obj<</Filter/FlateDecode/Length 3373>>stream x\KWHUet}%q\vX[9 %>6$גCV @@ -716,7 +721,7 @@ endobj endobj 293 0 obj<</Subtype/Link/Rect[286.916 767.053 298.124 780.005]/C[1 0 0]/Dest[15 0 R/XYZ 143.158 410.986 null]/Border[0 0 0]>> endobj -294 0 obj<</Subtype/Link/Rect[301.763 767.053 317.579 780.005]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 614.724 null]/Border[0 0 0]>> +294 0 obj<</Subtype/Link/Rect[301.763 767.053 317.579 780.005]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 636.642 null]/Border[0 0 0]>> endobj 295 0 obj<</Subtype/Link/Rect[301.763 756.056 317.579 769.008]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 128.978 null]/Border[0 0 0]>> endobj @@ -724,23 +729,23 @@ endobj endobj 297 0 obj<</Subtype/Link/Rect[262.854 734.062 278.67 747.014]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 194.731 null]/Border[0 0 0]>> endobj -298 0 obj<</Subtype/Link/Rect[282.309 734.062 298.124 747.014]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 193.927 null]/Border[0 0 0]>> +298 0 obj<</Subtype/Link/Rect[282.309 734.062 298.124 747.014]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 209.339 null]/Border[0 0 0]>> endobj -299 0 obj<</Subtype/Link/Rect[301.763 734.062 317.579 747.014]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 746.231 null]/Border[0 0 0]>> +299 0 obj<</Subtype/Link/Rect[301.763 734.062 317.579 747.014]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 768.149 null]/Border[0 0 0]>> endobj 300 0 obj<</Subtype/Link/Rect[189.643 712.107 200.851 725.058]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 734.417 null]/Border[0 0 0]>> endobj 301 0 obj<</Subtype/Link/Rect[204.49 712.107 220.306 725.058]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 325.55 null]/Border[0 0 0]>> endobj -302 0 obj<</Subtype/Link/Rect[223.945 712.107 239.76 725.058]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 484.297 null]/Border[0 0 0]>> +302 0 obj<</Subtype/Link/Rect[223.945 712.107 239.76 725.058]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 485.284 null]/Border[0 0 0]>> endobj -303 0 obj<</Subtype/Link/Rect[243.399 712.107 259.215 725.058]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 435.48 null]/Border[0 0 0]>> +303 0 obj<</Subtype/Link/Rect[243.399 712.107 259.215 725.058]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 437.455 null]/Border[0 0 0]>> endobj -304 0 obj<</Subtype/Link/Rect[262.854 712.107 278.67 725.058]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 117.215 null]/Border[0 0 0]>> +304 0 obj<</Subtype/Link/Rect[262.854 712.107 278.67 725.058]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 132.627 null]/Border[0 0 0]>> endobj -305 0 obj<</Subtype/Link/Rect[282.309 712.107 298.124 725.058]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 318.834 null]/Border[0 0 0]>> +305 0 obj<</Subtype/Link/Rect[282.309 712.107 298.124 725.058]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 340.752 null]/Border[0 0 0]>> endobj -306 0 obj<</Subtype/Link/Rect[301.763 712.107 317.579 725.058]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 691.437 null]/Border[0 0 0]>> +306 0 obj<</Subtype/Link/Rect[301.763 712.107 317.579 725.058]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 713.354 null]/Border[0 0 0]>> endobj 307 0 obj<</Subtype/Link/Rect[246.983 693.439 258.191 701.209]/C[1 0 0]/Dest[14 0 R/XYZ -12.548 133.122 null]/Border[0 0 0]>> endobj @@ -758,9 +763,9 @@ endobj endobj 314 0 obj<</Subtype/Link/Rect[267.462 679.154 278.67 692.106]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 253.108 null]/Border[0 0 0]>> endobj -315 0 obj<</Subtype/Link/Rect[282.309 679.154 298.124 692.106]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 713.354 null]/Border[0 0 0]>> +315 0 obj<</Subtype/Link/Rect[282.309 679.154 298.124 692.106]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> endobj -316 0 obj<</Subtype/Link/Rect[301.763 679.154 317.579 692.106]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 489.195 null]/Border[0 0 0]>> +316 0 obj<</Subtype/Link/Rect[301.763 679.154 317.579 692.106]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 511.113 null]/Border[0 0 0]>> endobj 317 0 obj<</Subtype/Link/Rect[246.983 660.486 258.191 668.257]/C[1 0 0]/Dest[15 0 R/XYZ -17.255 780.525 null]/Border[0 0 0]>> endobj @@ -782,17 +787,17 @@ endobj endobj 326 0 obj<</Subtype/Link/Rect[306.371 635.243 317.579 648.194]/C[1 0 0]/Dest[15 0 R/XYZ 143.158 477.299 null]/Border[0 0 0]>> endobj -327 0 obj<</Subtype/Link/Rect[282.309 624.246 298.124 637.197]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 538.012 null]/Border[0 0 0]>> +327 0 obj<</Subtype/Link/Rect[282.309 624.246 298.124 637.197]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> endobj -328 0 obj<</Subtype/Link/Rect[301.763 624.246 317.579 637.197]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 461.3 null]/Border[0 0 0]>> +328 0 obj<</Subtype/Link/Rect[301.763 624.246 317.579 637.197]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 483.217 null]/Border[0 0 0]>> endobj -329 0 obj<</Subtype/Link/Rect[282.309 613.249 298.124 626.2]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> +329 0 obj<</Subtype/Link/Rect[282.309 613.249 298.124 626.2]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 548.971 null]/Border[0 0 0]>> endobj -330 0 obj<</Subtype/Link/Rect[301.763 613.249 317.579 626.2]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 505.135 null]/Border[0 0 0]>> +330 0 obj<</Subtype/Link/Rect[301.763 613.249 317.579 626.2]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> endobj -331 0 obj<</Subtype/Link/Rect[282.309 602.252 298.124 615.203]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 681.557 null]/Border[0 0 0]>> +331 0 obj<</Subtype/Link/Rect[282.309 602.252 298.124 615.203]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 682.545 null]/Border[0 0 0]>> endobj -332 0 obj<</Subtype/Link/Rect[301.763 602.252 317.579 615.203]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 615.804 null]/Border[0 0 0]>> +332 0 obj<</Subtype/Link/Rect[301.763 602.252 317.579 615.203]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 616.791 null]/Border[0 0 0]>> endobj 333 0 obj<</Subtype/Link/Rect[301.763 594.543 317.579 602.314]/C[1 0 0]/Dest[17 0 R/XYZ -7.841 502.715 null]/Border[0 0 0]>> endobj @@ -806,25 +811,25 @@ endobj endobj 338 0 obj<</Subtype/Link/Rect[301.763 536.309 317.579 549.26]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 464.038 null]/Border[0 0 0]>> endobj -339 0 obj<</Subtype/Link/Rect[282.309 525.312 298.124 538.263]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> +339 0 obj<</Subtype/Link/Rect[282.309 525.312 298.124 538.263]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> endobj -340 0 obj<</Subtype/Link/Rect[301.763 525.312 317.579 538.263]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 198.286 null]/Border[0 0 0]>> +340 0 obj<</Subtype/Link/Rect[301.763 525.312 317.579 538.263]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 220.204 null]/Border[0 0 0]>> endobj -341 0 obj<</Subtype/Link/Rect[282.309 514.315 298.124 527.266]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 604.845 null]/Border[0 0 0]>> +341 0 obj<</Subtype/Link/Rect[282.309 514.315 298.124 527.266]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 605.832 null]/Border[0 0 0]>> endobj -342 0 obj<</Subtype/Link/Rect[301.763 514.315 317.579 527.266]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 582.927 null]/Border[0 0 0]>> +342 0 obj<</Subtype/Link/Rect[301.763 514.315 317.579 527.266]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 583.915 null]/Border[0 0 0]>> endobj -343 0 obj<</Subtype/Link/Rect[262.854 503.318 278.67 516.269]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 691.437 null]/Border[0 0 0]>> +343 0 obj<</Subtype/Link/Rect[262.854 503.318 278.67 516.269]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 713.354 null]/Border[0 0 0]>> endobj -344 0 obj<</Subtype/Link/Rect[282.309 503.318 298.124 516.269]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 253.081 null]/Border[0 0 0]>> +344 0 obj<</Subtype/Link/Rect[282.309 503.318 298.124 516.269]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 274.998 null]/Border[0 0 0]>> endobj -345 0 obj<</Subtype/Link/Rect[301.763 503.318 317.579 516.269]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 176.368 null]/Border[0 0 0]>> +345 0 obj<</Subtype/Link/Rect[301.763 503.318 317.579 516.269]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 198.286 null]/Border[0 0 0]>> endobj -346 0 obj<</Subtype/Link/Rect[262.854 492.321 278.67 505.273]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 670.598 null]/Border[0 0 0]>> +346 0 obj<</Subtype/Link/Rect[262.854 492.321 278.67 505.273]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 671.586 null]/Border[0 0 0]>> endobj -347 0 obj<</Subtype/Link/Rect[282.309 492.321 298.124 505.273]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 506.215 null]/Border[0 0 0]>> +347 0 obj<</Subtype/Link/Rect[282.309 492.321 298.124 505.273]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 507.202 null]/Border[0 0 0]>> endobj -348 0 obj<</Subtype/Link/Rect[301.763 492.321 317.579 505.273]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 473.338 null]/Border[0 0 0]>> +348 0 obj<</Subtype/Link/Rect[301.763 492.321 317.579 505.273]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 474.325 null]/Border[0 0 0]>> endobj 349 0 obj<</Subtype/Link/Rect[264.805 473.653 280.621 481.424]/C[1 0 0]/Dest[20 0 R/XYZ 6.281 558.101 null]/Border[0 0 0]>> endobj @@ -862,29 +867,29 @@ endobj endobj 366 0 obj<</Subtype/Link/Rect[301.763 437.451 317.579 450.402]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 453.67 null]/Border[0 0 0]>> endobj -367 0 obj<</Subtype/Link/Rect[282.309 426.454 298.124 439.405]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 592.807 null]/Border[0 0 0]>> +367 0 obj<</Subtype/Link/Rect[282.309 426.454 298.124 439.405]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 614.724 null]/Border[0 0 0]>> endobj -368 0 obj<</Subtype/Link/Rect[301.763 426.454 317.579 439.405]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> +368 0 obj<</Subtype/Link/Rect[301.763 426.454 317.579 439.405]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 428.423 null]/Border[0 0 0]>> endobj -369 0 obj<</Subtype/Link/Rect[245.35 415.457 261.166 428.408]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 626.763 null]/Border[0 0 0]>> +369 0 obj<</Subtype/Link/Rect[245.35 415.457 261.166 428.408]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 627.75 null]/Border[0 0 0]>> endobj -370 0 obj<</Subtype/Link/Rect[264.805 415.457 280.621 428.408]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 615.804 null]/Border[0 0 0]>> +370 0 obj<</Subtype/Link/Rect[264.805 415.457 280.621 428.408]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 616.791 null]/Border[0 0 0]>> endobj -371 0 obj<</Subtype/Link/Rect[284.26 415.457 300.075 428.408]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 204.886 null]/Border[0 0 0]>> +371 0 obj<</Subtype/Link/Rect[284.26 415.457 300.075 428.408]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 220.298 null]/Border[0 0 0]>> endobj -372 0 obj<</Subtype/Link/Rect[173.619 406.042 189.435 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> +372 0 obj<</Subtype/Link/Rect[173.619 406.042 189.435 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> endobj -373 0 obj<</Subtype/Link/Rect[194.976 406.042 210.792 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 636.642 null]/Border[0 0 0]>> +373 0 obj<</Subtype/Link/Rect[194.976 406.042 210.792 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 658.56 null]/Border[0 0 0]>> endobj -374 0 obj<</Subtype/Link/Rect[216.334 406.042 232.149 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> +374 0 obj<</Subtype/Link/Rect[216.334 406.042 232.149 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> endobj -375 0 obj<</Subtype/Link/Rect[237.691 406.042 253.507 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 603.765 null]/Border[0 0 0]>> +375 0 obj<</Subtype/Link/Rect[237.691 406.042 253.507 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> endobj -376 0 obj<</Subtype/Link/Rect[259.049 406.042 274.864 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 472.259 null]/Border[0 0 0]>> +376 0 obj<</Subtype/Link/Rect[259.049 406.042 274.864 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 494.176 null]/Border[0 0 0]>> endobj -377 0 obj<</Subtype/Link/Rect[280.406 406.042 296.222 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 461.3 null]/Border[0 0 0]>> +377 0 obj<</Subtype/Link/Rect[280.406 406.042 296.222 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 483.217 null]/Border[0 0 0]>> endobj -378 0 obj<</Subtype/Link/Rect[301.763 406.042 317.579 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> +378 0 obj<</Subtype/Link/Rect[301.763 406.042 317.579 415.557]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 428.423 null]/Border[0 0 0]>> endobj 379 0 obj<</Subtype/Link/Rect[204.49 385.83 220.306 393.601]/C[1 0 0]/Dest[20 0 R/XYZ 62.769 762.135 null]/Border[0 0 0]>> endobj @@ -910,9 +915,9 @@ endobj endobj 390 0 obj<</Subtype/Link/Rect[301.763 327.558 317.579 340.509]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 533.179 null]/Border[0 0 0]>> endobj -391 0 obj<</Subtype/Link/Rect[282.309 316.561 298.124 329.512]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> +391 0 obj<</Subtype/Link/Rect[282.309 316.561 298.124 329.512]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> endobj -392 0 obj<</Subtype/Link/Rect[301.763 316.561 317.579 329.512]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 209.245 null]/Border[0 0 0]>> +392 0 obj<</Subtype/Link/Rect[301.763 316.561 317.579 329.512]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 231.163 null]/Border[0 0 0]>> endobj 393 0 obj<</Subtype/Link/Rect[281.188 305.564 287.885 318.516]/C[1 0 0]/Dest[13 0 R/XYZ 124.536 327.012 null]/Border[0 0 0]>> endobj @@ -936,9 +941,9 @@ endobj endobj 403 0 obj<</Subtype/Link/Rect[301.763 240.541 317.579 253.493]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 292.674 null]/Border[0 0 0]>> endobj -404 0 obj<</Subtype/Link/Rect[282.309 229.544 298.124 242.496]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 168.965 null]/Border[0 0 0]>> +404 0 obj<</Subtype/Link/Rect[282.309 229.544 298.124 242.496]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 190.883 null]/Border[0 0 0]>> endobj -405 0 obj<</Subtype/Link/Rect[301.763 229.544 317.579 242.496]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 125.13 null]/Border[0 0 0]>> +405 0 obj<</Subtype/Link/Rect[301.763 229.544 317.579 242.496]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 147.048 null]/Border[0 0 0]>> endobj 406 0 obj<</Subtype/Link/Rect[282.309 197.512 298.124 210.463]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 338.657 null]/Border[0 0 0]>> endobj @@ -964,7 +969,7 @@ endobj endobj 417 0 obj<</Subtype/Link/Rect[282.309 153.563 298.124 166.514]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 161.855 null]/Border[0 0 0]>> endobj -418 0 obj<</Subtype/Link/Rect[301.763 153.563 317.579 166.514]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 550.05 null]/Border[0 0 0]>> +418 0 obj<</Subtype/Link/Rect[301.763 153.563 317.579 166.514]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 551.038 null]/Border[0 0 0]>> endobj 419 0 obj<</Subtype/Link/Rect[269.413 145.853 280.621 153.624]/C[1 0 0]/Dest[15 0 R/XYZ 25.11 294.971 null]/Border[0 0 0]>> endobj @@ -980,9 +985,9 @@ endobj endobj 425 0 obj<</Subtype/Link/Rect[259.049 133.151 274.864 142.665]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 739.797 null]/Border[0 0 0]>> endobj -426 0 obj<</Subtype/Link/Rect[280.406 133.151 296.222 142.665]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 413.562 null]/Border[0 0 0]>> +426 0 obj<</Subtype/Link/Rect[280.406 133.151 296.222 142.665]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 415.537 null]/Border[0 0 0]>> endobj -427 0 obj<</Subtype/Link/Rect[301.763 133.151 317.579 142.665]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 358.768 null]/Border[0 0 0]>> +427 0 obj<</Subtype/Link/Rect[301.763 133.151 317.579 142.665]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 360.743 null]/Border[0 0 0]>> endobj 428 0 obj<</Subtype/Link/Rect[209.098 112.939 220.306 120.71]/C[1 0 0]/Dest[15 0 R/XYZ 15.696 581.023 null]/Border[0 0 0]>> endobj @@ -994,7 +999,7 @@ endobj endobj 432 0 obj<</Subtype/Link/Rect[282.309 109.651 298.124 122.602]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 380.345 null]/Border[0 0 0]>> endobj -433 0 obj<</Subtype/Link/Rect[301.763 109.651 317.579 122.602]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 571.968 null]/Border[0 0 0]>> +433 0 obj<</Subtype/Link/Rect[301.763 109.651 317.579 122.602]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 572.956 null]/Border[0 0 0]>> endobj 434 0 obj<</Subtype/Link/Rect[222.824 98.654 229.424 111.606]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 614.752 null]/Border[0 0 0]>> endobj @@ -1020,37 +1025,37 @@ endobj endobj 445 0 obj<</Subtype/Link/Rect[231.576 89.239 242.784 98.754]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 395.574 null]/Border[0 0 0]>> endobj -446 0 obj<</Subtype/Link/Rect[246.066 89.239 261.881 98.754]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 388.144 null]/Border[0 0 0]>> +446 0 obj<</Subtype/Link/Rect[246.066 89.239 261.881 98.754]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 410.061 null]/Border[0 0 0]>> endobj -447 0 obj<</Subtype/Link/Rect[265.163 89.239 280.978 98.754]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 377.185 null]/Border[0 0 0]>> +447 0 obj<</Subtype/Link/Rect[265.163 89.239 280.978 98.754]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 399.102 null]/Border[0 0 0]>> endobj -448 0 obj<</Subtype/Link/Rect[284.26 89.239 300.075 98.754]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 366.226 null]/Border[0 0 0]>> +448 0 obj<</Subtype/Link/Rect[284.26 89.239 300.075 98.754]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 388.144 null]/Border[0 0 0]>> endobj -449 0 obj<</Subtype/Link/Rect[355.437 768.597 371.253 778.112]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 355.267 null]/Border[0 0 0]>> +449 0 obj<</Subtype/Link/Rect[355.437 768.597 371.253 778.112]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 377.185 null]/Border[0 0 0]>> endobj -450 0 obj<</Subtype/Link/Rect[377.565 768.597 393.381 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 658.56 null]/Border[0 0 0]>> +450 0 obj<</Subtype/Link/Rect[377.565 768.597 393.381 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 680.478 null]/Border[0 0 0]>> endobj -451 0 obj<</Subtype/Link/Rect[399.693 768.597 415.509 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> +451 0 obj<</Subtype/Link/Rect[399.693 768.597 415.509 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 581.848 null]/Border[0 0 0]>> endobj -452 0 obj<</Subtype/Link/Rect[421.822 768.597 437.637 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 417.464 null]/Border[0 0 0]>> +452 0 obj<</Subtype/Link/Rect[421.822 768.597 437.637 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 439.382 null]/Border[0 0 0]>> endobj -453 0 obj<</Subtype/Link/Rect[443.95 768.597 459.765 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> +453 0 obj<</Subtype/Link/Rect[443.95 768.597 459.765 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 428.423 null]/Border[0 0 0]>> endobj -454 0 obj<</Subtype/Link/Rect[466.078 768.597 481.893 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 395.546 null]/Border[0 0 0]>> +454 0 obj<</Subtype/Link/Rect[466.078 768.597 481.893 778.112]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 417.464 null]/Border[0 0 0]>> endobj -455 0 obj<</Subtype/Link/Rect[355.437 757.638 371.253 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 384.587 null]/Border[0 0 0]>> +455 0 obj<</Subtype/Link/Rect[355.437 757.638 371.253 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> endobj -456 0 obj<</Subtype/Link/Rect[376.795 757.638 392.61 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 373.628 null]/Border[0 0 0]>> +456 0 obj<</Subtype/Link/Rect[376.795 757.638 392.61 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 395.546 null]/Border[0 0 0]>> endobj -457 0 obj<</Subtype/Link/Rect[398.152 757.638 413.968 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 362.67 null]/Border[0 0 0]>> +457 0 obj<</Subtype/Link/Rect[398.152 757.638 413.968 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 384.587 null]/Border[0 0 0]>> endobj -458 0 obj<</Subtype/Link/Rect[419.509 757.638 435.325 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 351.711 null]/Border[0 0 0]>> +458 0 obj<</Subtype/Link/Rect[419.509 757.638 435.325 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 373.628 null]/Border[0 0 0]>> endobj -459 0 obj<</Subtype/Link/Rect[440.867 757.638 456.682 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 340.752 null]/Border[0 0 0]>> +459 0 obj<</Subtype/Link/Rect[440.867 757.638 456.682 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 362.67 null]/Border[0 0 0]>> endobj -460 0 obj<</Subtype/Link/Rect[462.224 757.638 478.04 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 329.793 null]/Border[0 0 0]>> +460 0 obj<</Subtype/Link/Rect[462.224 757.638 478.04 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 351.711 null]/Border[0 0 0]>> endobj -461 0 obj<</Subtype/Link/Rect[483.582 757.638 499.397 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 318.834 null]/Border[0 0 0]>> +461 0 obj<</Subtype/Link/Rect[483.582 757.638 499.397 767.153]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 340.752 null]/Border[0 0 0]>> endobj 462 0 obj<</Subtype/Link/Rect[470.686 745.01 481.893 757.962]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 701.54 null]/Border[0 0 0]>> endobj @@ -1068,17 +1073,17 @@ endobj endobj 469 0 obj<</Subtype/Link/Rect[355.437 724.637 371.253 734.151]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 369.386 null]/Border[0 0 0]>> endobj -470 0 obj<</Subtype/Link/Rect[376.795 724.637 392.61 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 604.845 null]/Border[0 0 0]>> +470 0 obj<</Subtype/Link/Rect[376.795 724.637 392.61 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 605.832 null]/Border[0 0 0]>> endobj -471 0 obj<</Subtype/Link/Rect[398.152 724.637 413.968 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 593.886 null]/Border[0 0 0]>> +471 0 obj<</Subtype/Link/Rect[398.152 724.637 413.968 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 594.873 null]/Border[0 0 0]>> endobj -472 0 obj<</Subtype/Link/Rect[419.509 724.637 435.325 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 582.927 null]/Border[0 0 0]>> +472 0 obj<</Subtype/Link/Rect[419.509 724.637 435.325 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 583.915 null]/Border[0 0 0]>> endobj -473 0 obj<</Subtype/Link/Rect[440.867 724.637 456.682 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 561.009 null]/Border[0 0 0]>> +473 0 obj<</Subtype/Link/Rect[440.867 724.637 456.682 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 561.997 null]/Border[0 0 0]>> endobj -474 0 obj<</Subtype/Link/Rect[462.224 724.637 478.04 734.151]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> +474 0 obj<</Subtype/Link/Rect[462.224 724.637 478.04 734.151]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 110.709 null]/Border[0 0 0]>> endobj -475 0 obj<</Subtype/Link/Rect[483.582 724.637 499.397 734.151]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 658.56 null]/Border[0 0 0]>> +475 0 obj<</Subtype/Link/Rect[483.582 724.637 499.397 734.151]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 680.478 null]/Border[0 0 0]>> endobj 476 0 obj<</Subtype/Link/Rect[392.867 712.008 404.075 724.96]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 668.664 null]/Border[0 0 0]>> endobj @@ -1104,25 +1109,25 @@ endobj endobj 487 0 obj<</Subtype/Link/Rect[483.582 702.594 499.397 712.108]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 325.55 null]/Border[0 0 0]>> endobj -488 0 obj<</Subtype/Link/Rect[446.623 689.966 462.439 702.917]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 333.349 null]/Border[0 0 0]>> +488 0 obj<</Subtype/Link/Rect[446.623 689.966 462.439 702.917]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 355.267 null]/Border[0 0 0]>> endobj -489 0 obj<</Subtype/Link/Rect[466.078 689.966 481.893 702.917]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 702.396 null]/Border[0 0 0]>> +489 0 obj<</Subtype/Link/Rect[466.078 689.966 481.893 702.917]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 724.313 null]/Border[0 0 0]>> endobj -490 0 obj<</Subtype/Link/Rect[355.437 680.551 371.253 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 658.56 null]/Border[0 0 0]>> +490 0 obj<</Subtype/Link/Rect[355.437 680.551 371.253 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 680.478 null]/Border[0 0 0]>> endobj -491 0 obj<</Subtype/Link/Rect[376.795 680.551 392.61 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 636.642 null]/Border[0 0 0]>> +491 0 obj<</Subtype/Link/Rect[376.795 680.551 392.61 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 658.56 null]/Border[0 0 0]>> endobj -492 0 obj<</Subtype/Link/Rect[398.152 680.551 413.968 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> +492 0 obj<</Subtype/Link/Rect[398.152 680.551 413.968 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> endobj -493 0 obj<</Subtype/Link/Rect[419.509 680.551 435.325 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 581.848 null]/Border[0 0 0]>> +493 0 obj<</Subtype/Link/Rect[419.509 680.551 435.325 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 603.765 null]/Border[0 0 0]>> endobj -494 0 obj<</Subtype/Link/Rect[440.867 680.551 456.682 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> +494 0 obj<</Subtype/Link/Rect[440.867 680.551 456.682 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 581.848 null]/Border[0 0 0]>> endobj -495 0 obj<</Subtype/Link/Rect[462.224 680.551 478.04 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 548.971 null]/Border[0 0 0]>> +495 0 obj<</Subtype/Link/Rect[462.224 680.551 478.04 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 570.889 null]/Border[0 0 0]>> endobj -496 0 obj<</Subtype/Link/Rect[483.582 680.551 499.397 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 538.012 null]/Border[0 0 0]>> +496 0 obj<</Subtype/Link/Rect[483.582 680.551 499.397 690.065]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> endobj -497 0 obj<</Subtype/Link/Rect[483.582 667.923 499.397 680.874]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 333.349 null]/Border[0 0 0]>> +497 0 obj<</Subtype/Link/Rect[483.582 667.923 499.397 680.874]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 355.267 null]/Border[0 0 0]>> endobj 498 0 obj<</Subtype/Link/Rect[436.384 656.839 442.984 669.79]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 581.875 null]/Border[0 0 0]>> endobj @@ -1130,19 +1135,19 @@ endobj endobj 500 0 obj<</Subtype/Link/Rect[466.078 656.839 481.893 669.79]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 712.499 null]/Border[0 0 0]>> endobj -501 0 obj<</Subtype/Link/Rect[355.437 647.424 371.253 656.938]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> +501 0 obj<</Subtype/Link/Rect[355.437 647.424 371.253 656.938]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 691.437 null]/Border[0 0 0]>> endobj -502 0 obj<</Subtype/Link/Rect[376.795 647.424 392.61 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 344.308 null]/Border[0 0 0]>> +502 0 obj<</Subtype/Link/Rect[376.795 647.424 392.61 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 366.226 null]/Border[0 0 0]>> endobj -503 0 obj<</Subtype/Link/Rect[398.152 647.424 413.968 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 311.431 null]/Border[0 0 0]>> +503 0 obj<</Subtype/Link/Rect[398.152 647.424 413.968 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 333.349 null]/Border[0 0 0]>> endobj -504 0 obj<</Subtype/Link/Rect[419.509 647.424 435.325 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 278.555 null]/Border[0 0 0]>> +504 0 obj<</Subtype/Link/Rect[419.509 647.424 435.325 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 300.472 null]/Border[0 0 0]>> endobj -505 0 obj<</Subtype/Link/Rect[440.867 647.424 456.682 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 245.678 null]/Border[0 0 0]>> +505 0 obj<</Subtype/Link/Rect[440.867 647.424 456.682 656.938]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 267.596 null]/Border[0 0 0]>> endobj -506 0 obj<</Subtype/Link/Rect[462.224 647.424 478.04 656.938]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 505.135 null]/Border[0 0 0]>> +506 0 obj<</Subtype/Link/Rect[462.224 647.424 478.04 656.938]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> endobj -507 0 obj<</Subtype/Link/Rect[483.582 647.424 499.397 656.938]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 264.039 null]/Border[0 0 0]>> +507 0 obj<</Subtype/Link/Rect[483.582 647.424 499.397 656.938]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 285.957 null]/Border[0 0 0]>> endobj 508 0 obj<</Subtype/Link/Rect[483.582 634.796 499.397 647.747]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 346.073 null]/Border[0 0 0]>> endobj @@ -1166,7 +1171,7 @@ endobj endobj 518 0 obj<</Subtype/Link/Rect[483.582 547.991 499.397 560.943]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 302.238 null]/Border[0 0 0]>> endobj -519 0 obj<</Subtype/Link/Rect[483.582 536.907 499.397 549.859]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 253.081 null]/Border[0 0 0]>> +519 0 obj<</Subtype/Link/Rect[483.582 536.907 499.397 549.859]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 274.998 null]/Border[0 0 0]>> endobj 520 0 obj<</Subtype/Link/Rect[436.384 525.823 442.984 538.775]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 581.875 null]/Border[0 0 0]>> endobj @@ -1174,19 +1179,19 @@ endobj endobj 522 0 obj<</Subtype/Link/Rect[466.078 525.823 481.893 538.775]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 712.499 null]/Border[0 0 0]>> endobj -523 0 obj<</Subtype/Link/Rect[355.437 516.409 371.253 525.923]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> +523 0 obj<</Subtype/Link/Rect[355.437 516.409 371.253 525.923]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 691.437 null]/Border[0 0 0]>> endobj -524 0 obj<</Subtype/Link/Rect[376.795 516.409 392.61 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 344.308 null]/Border[0 0 0]>> +524 0 obj<</Subtype/Link/Rect[376.795 516.409 392.61 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 366.226 null]/Border[0 0 0]>> endobj -525 0 obj<</Subtype/Link/Rect[398.152 516.409 413.968 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 311.431 null]/Border[0 0 0]>> +525 0 obj<</Subtype/Link/Rect[398.152 516.409 413.968 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 333.349 null]/Border[0 0 0]>> endobj -526 0 obj<</Subtype/Link/Rect[419.509 516.409 435.325 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 278.555 null]/Border[0 0 0]>> +526 0 obj<</Subtype/Link/Rect[419.509 516.409 435.325 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 300.472 null]/Border[0 0 0]>> endobj -527 0 obj<</Subtype/Link/Rect[440.867 516.409 456.682 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 245.678 null]/Border[0 0 0]>> +527 0 obj<</Subtype/Link/Rect[440.867 516.409 456.682 525.923]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 267.596 null]/Border[0 0 0]>> endobj -528 0 obj<</Subtype/Link/Rect[462.224 516.409 478.04 525.923]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 505.135 null]/Border[0 0 0]>> +528 0 obj<</Subtype/Link/Rect[462.224 516.409 478.04 525.923]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> endobj -529 0 obj<</Subtype/Link/Rect[483.582 516.409 499.397 525.923]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 264.039 null]/Border[0 0 0]>> +529 0 obj<</Subtype/Link/Rect[483.582 516.409 499.397 525.923]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 285.957 null]/Border[0 0 0]>> endobj 530 0 obj<</Subtype/Link/Rect[483.582 503.78 499.397 516.732]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 400.868 null]/Border[0 0 0]>> endobj @@ -1194,11 +1199,11 @@ endobj endobj 532 0 obj<</Subtype/Link/Rect[488.189 481.612 499.397 494.564]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 253.108 null]/Border[0 0 0]>> endobj -533 0 obj<</Subtype/Link/Rect[444.672 470.528 460.488 483.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 395.546 null]/Border[0 0 0]>> +533 0 obj<</Subtype/Link/Rect[444.672 470.528 460.488 483.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 417.464 null]/Border[0 0 0]>> endobj -534 0 obj<</Subtype/Link/Rect[464.127 470.528 479.943 483.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 384.587 null]/Border[0 0 0]>> +534 0 obj<</Subtype/Link/Rect[464.127 470.528 479.943 483.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> endobj -535 0 obj<</Subtype/Link/Rect[483.582 470.528 499.397 483.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 209.245 null]/Border[0 0 0]>> +535 0 obj<</Subtype/Link/Rect[483.582 470.528 499.397 483.48]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 231.163 null]/Border[0 0 0]>> endobj 536 0 obj<</Subtype/Link/Rect[483.582 459.444 499.397 472.396]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 324.156 null]/Border[0 0 0]>> endobj @@ -1222,7 +1227,7 @@ endobj endobj 546 0 obj<</Subtype/Link/Rect[488.189 383.599 499.397 396.55]/C[1 0 0]/Dest[15 0 R/XYZ 143.158 609.367 null]/Border[0 0 0]>> endobj -547 0 obj<</Subtype/Link/Rect[483.582 372.515 499.397 385.466]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 413.562 null]/Border[0 0 0]>> +547 0 obj<</Subtype/Link/Rect[483.582 372.515 499.397 385.466]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 415.537 null]/Border[0 0 0]>> endobj 548 0 obj<</Subtype/Link/Rect[483.582 340.134 499.397 353.086]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 378.95 null]/Border[0 0 0]>> endobj @@ -1250,9 +1255,9 @@ endobj endobj 560 0 obj<</Subtype/Link/Rect[440.867 276.171 456.682 285.685]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 336.509 null]/Border[0 0 0]>> endobj -561 0 obj<</Subtype/Link/Rect[462.224 276.171 478.04 285.685]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 161.051 null]/Border[0 0 0]>> +561 0 obj<</Subtype/Link/Rect[462.224 276.171 478.04 285.685]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 176.462 null]/Border[0 0 0]>> endobj -562 0 obj<</Subtype/Link/Rect[483.582 276.171 499.397 285.685]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 106.256 null]/Border[0 0 0]>> +562 0 obj<</Subtype/Link/Rect[483.582 276.171 499.397 285.685]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 121.668 null]/Border[0 0 0]>> endobj 563 0 obj<</Subtype/Link/Rect[464.127 263.542 479.943 276.494]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 734.417 null]/Border[0 0 0]>> endobj @@ -1274,9 +1279,9 @@ endobj endobj 572 0 obj<</Subtype/Link/Rect[444.672 230.29 460.488 243.242]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 105.133 null]/Border[0 0 0]>> endobj -573 0 obj<</Subtype/Link/Rect[464.127 230.29 479.943 243.242]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 636.642 null]/Border[0 0 0]>> +573 0 obj<</Subtype/Link/Rect[464.127 230.29 479.943 243.242]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 658.56 null]/Border[0 0 0]>> endobj -574 0 obj<</Subtype/Link/Rect[483.582 230.29 499.397 243.242]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 548.971 null]/Border[0 0 0]>> +574 0 obj<</Subtype/Link/Rect[483.582 230.29 499.397 243.242]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 570.889 null]/Border[0 0 0]>> endobj 575 0 obj<</Subtype/Link/Rect[402.082 219.206 413.29 232.158]/C[1 0 0]/Dest[15 0 R/XYZ 143.158 543.053 null]/Border[0 0 0]>> endobj @@ -1292,27 +1297,27 @@ endobj endobj 581 0 obj<</Subtype/Link/Rect[377.565 209.792 393.381 219.306]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 530.382 null]/Border[0 0 0]>> endobj -582 0 obj<</Subtype/Link/Rect[399.693 209.792 415.509 219.306]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 615.804 null]/Border[0 0 0]>> +582 0 obj<</Subtype/Link/Rect[399.693 209.792 415.509 219.306]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 616.791 null]/Border[0 0 0]>> endobj -583 0 obj<</Subtype/Link/Rect[421.822 209.792 437.637 219.306]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> +583 0 obj<</Subtype/Link/Rect[421.822 209.792 437.637 219.306]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> endobj -584 0 obj<</Subtype/Link/Rect[443.95 209.792 459.765 219.306]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> +584 0 obj<</Subtype/Link/Rect[443.95 209.792 459.765 219.306]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 691.437 null]/Border[0 0 0]>> endobj -585 0 obj<</Subtype/Link/Rect[466.078 209.792 481.893 219.306]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 625.683 null]/Border[0 0 0]>> +585 0 obj<</Subtype/Link/Rect[466.078 209.792 481.893 219.306]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 647.601 null]/Border[0 0 0]>> endobj -586 0 obj<</Subtype/Link/Rect[355.437 198.833 371.253 208.347]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 406.505 null]/Border[0 0 0]>> +586 0 obj<</Subtype/Link/Rect[355.437 198.833 371.253 208.347]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 428.423 null]/Border[0 0 0]>> endobj -587 0 obj<</Subtype/Link/Rect[376.795 198.833 392.61 208.347]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 176.368 null]/Border[0 0 0]>> +587 0 obj<</Subtype/Link/Rect[376.795 198.833 392.61 208.347]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 198.286 null]/Border[0 0 0]>> endobj -588 0 obj<</Subtype/Link/Rect[398.152 198.833 413.968 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 344.308 null]/Border[0 0 0]>> +588 0 obj<</Subtype/Link/Rect[398.152 198.833 413.968 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 366.226 null]/Border[0 0 0]>> endobj -589 0 obj<</Subtype/Link/Rect[419.509 198.833 435.325 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 311.431 null]/Border[0 0 0]>> +589 0 obj<</Subtype/Link/Rect[419.509 198.833 435.325 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 333.349 null]/Border[0 0 0]>> endobj -590 0 obj<</Subtype/Link/Rect[440.867 198.833 456.682 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 278.555 null]/Border[0 0 0]>> +590 0 obj<</Subtype/Link/Rect[440.867 198.833 456.682 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 300.472 null]/Border[0 0 0]>> endobj -591 0 obj<</Subtype/Link/Rect[462.224 198.833 478.04 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 245.678 null]/Border[0 0 0]>> +591 0 obj<</Subtype/Link/Rect[462.224 198.833 478.04 208.347]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 267.596 null]/Border[0 0 0]>> endobj -592 0 obj<</Subtype/Link/Rect[483.582 198.833 499.397 208.347]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 505.135 null]/Border[0 0 0]>> +592 0 obj<</Subtype/Link/Rect[483.582 198.833 499.397 208.347]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> endobj 593 0 obj<</Subtype/Link/Rect[470.686 186.205 481.893 199.156]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 668.664 null]/Border[0 0 0]>> endobj @@ -1338,9 +1343,9 @@ endobj endobj 604 0 obj<</Subtype/Link/Rect[440.867 165.831 456.682 175.345]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 325.55 null]/Border[0 0 0]>> endobj -605 0 obj<</Subtype/Link/Rect[462.224 165.831 478.04 175.345]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 150.092 null]/Border[0 0 0]>> +605 0 obj<</Subtype/Link/Rect[462.224 165.831 478.04 175.345]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 165.503 null]/Border[0 0 0]>> endobj -606 0 obj<</Subtype/Link/Rect[483.582 165.831 499.397 175.345]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> +606 0 obj<</Subtype/Link/Rect[483.582 165.831 499.397 175.345]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 110.709 null]/Border[0 0 0]>> endobj 607 0 obj<</Subtype/Link/Rect[451.231 153.203 462.439 166.154]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 613.869 null]/Border[0 0 0]>> endobj @@ -1358,13 +1363,13 @@ endobj endobj 614 0 obj<</Subtype/Link/Rect[462.224 143.788 478.04 153.303]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 259.797 null]/Border[0 0 0]>> endobj -615 0 obj<</Subtype/Link/Rect[483.582 143.788 499.397 153.303]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 494.176 null]/Border[0 0 0]>> +615 0 obj<</Subtype/Link/Rect[483.582 143.788 499.397 153.303]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 516.094 null]/Border[0 0 0]>> endobj -616 0 obj<</Subtype/Link/Rect[444.672 131.16 460.488 144.111]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 158.007 null]/Border[0 0 0]>> +616 0 obj<</Subtype/Link/Rect[444.672 131.16 460.488 144.111]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 179.924 null]/Border[0 0 0]>> endobj -617 0 obj<</Subtype/Link/Rect[464.127 131.16 479.943 144.111]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 136.089 null]/Border[0 0 0]>> +617 0 obj<</Subtype/Link/Rect[464.127 131.16 479.943 144.111]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 158.007 null]/Border[0 0 0]>> endobj -618 0 obj<</Subtype/Link/Rect[483.582 131.16 499.397 144.111]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 114.171 null]/Border[0 0 0]>> +618 0 obj<</Subtype/Link/Rect[483.582 131.16 499.397 144.111]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 136.089 null]/Border[0 0 0]>> endobj 619 0 obj<</Subtype/Link/Rect[429.825 98.779 441.033 111.731]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 613.869 null]/Border[0 0 0]>> endobj @@ -1395,15 +1400,15 @@ endobj endobj 627 0 obj<</Subtype/Link/Rect[301.763 756.094 317.579 769.046]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 313.197 null]/Border[0 0 0]>> endobj -628 0 obj<</Subtype/Link/Rect[282.309 724.812 298.124 737.763]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 494.176 null]/Border[0 0 0]>> +628 0 obj<</Subtype/Link/Rect[282.309 724.812 298.124 737.763]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 516.094 null]/Border[0 0 0]>> endobj -629 0 obj<</Subtype/Link/Rect[301.763 724.812 317.579 737.763]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 307.875 null]/Border[0 0 0]>> +629 0 obj<</Subtype/Link/Rect[301.763 724.812 317.579 737.763]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 329.793 null]/Border[0 0 0]>> endobj -630 0 obj<</Subtype/Link/Rect[262.854 713.853 278.67 726.804]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 179.924 null]/Border[0 0 0]>> +630 0 obj<</Subtype/Link/Rect[262.854 713.853 278.67 726.804]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 201.842 null]/Border[0 0 0]>> endobj -631 0 obj<</Subtype/Link/Rect[282.309 713.853 298.124 726.804]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 691.437 null]/Border[0 0 0]>> +631 0 obj<</Subtype/Link/Rect[282.309 713.853 298.124 726.804]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 713.354 null]/Border[0 0 0]>> endobj -632 0 obj<</Subtype/Link/Rect[301.763 713.853 317.579 726.804]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 570.889 null]/Border[0 0 0]>> +632 0 obj<</Subtype/Link/Rect[301.763 713.853 317.579 726.804]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 592.807 null]/Border[0 0 0]>> endobj 633 0 obj<</Subtype/Link/Rect[288.867 682.57 300.075 695.521]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 624.828 null]/Border[0 0 0]>> endobj @@ -1421,23 +1426,23 @@ endobj endobj 640 0 obj<</Subtype/Link/Rect[301.763 673.155 317.579 682.67]/C[1 0 0]/Dest[19 0 R/XYZ 143.158 270.756 null]/Border[0 0 0]>> endobj -641 0 obj<</Subtype/Link/Rect[282.309 660.652 298.124 673.604]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> +641 0 obj<</Subtype/Link/Rect[282.309 660.652 298.124 673.604]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> endobj -642 0 obj<</Subtype/Link/Rect[301.763 660.652 317.579 673.604]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> +642 0 obj<</Subtype/Link/Rect[301.763 660.652 317.579 673.604]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> endobj 643 0 obj<</Subtype/Link/Rect[223.945 649.693 239.76 662.645]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 570.034 null]/Border[0 0 0]>> endobj 644 0 obj<</Subtype/Link/Rect[243.399 649.693 259.215 662.645]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 128.29 null]/Border[0 0 0]>> endobj -645 0 obj<</Subtype/Link/Rect[262.854 649.693 278.67 662.645]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 121.574 null]/Border[0 0 0]>> +645 0 obj<</Subtype/Link/Rect[262.854 649.693 278.67 662.645]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 143.491 null]/Border[0 0 0]>> endobj -646 0 obj<</Subtype/Link/Rect[282.309 649.693 298.124 662.645]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 548.971 null]/Border[0 0 0]>> +646 0 obj<</Subtype/Link/Rect[282.309 649.693 298.124 662.645]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 570.889 null]/Border[0 0 0]>> endobj -647 0 obj<</Subtype/Link/Rect[301.763 649.693 317.579 662.645]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 538.012 null]/Border[0 0 0]>> +647 0 obj<</Subtype/Link/Rect[301.763 649.693 317.579 662.645]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> endobj -648 0 obj<</Subtype/Link/Rect[282.309 638.734 298.124 651.686]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 172.01 null]/Border[0 0 0]>> +648 0 obj<</Subtype/Link/Rect[282.309 638.734 298.124 651.686]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 187.421 null]/Border[0 0 0]>> endobj -649 0 obj<</Subtype/Link/Rect[301.763 638.734 317.579 651.686]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 724.313 null]/Border[0 0 0]>> +649 0 obj<</Subtype/Link/Rect[301.763 638.734 317.579 651.686]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 746.231 null]/Border[0 0 0]>> endobj 650 0 obj<</Subtype/Link/Rect[306.371 607.452 317.579 620.403]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 225.213 null]/Border[0 0 0]>> endobj @@ -1461,17 +1466,17 @@ endobj endobj 660 0 obj<</Subtype/Link/Rect[301.763 574.575 317.579 587.526]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 148.968 null]/Border[0 0 0]>> endobj -661 0 obj<</Subtype/Link/Rect[262.854 563.616 278.67 576.567]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 114.171 null]/Border[0 0 0]>> +661 0 obj<</Subtype/Link/Rect[262.854 563.616 278.67 576.567]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 136.089 null]/Border[0 0 0]>> endobj -662 0 obj<</Subtype/Link/Rect[282.309 563.616 298.124 576.567]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> +662 0 obj<</Subtype/Link/Rect[282.309 563.616 298.124 576.567]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 114.171 null]/Border[0 0 0]>> endobj -663 0 obj<</Subtype/Link/Rect[301.763 563.616 317.579 576.567]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> +663 0 obj<</Subtype/Link/Rect[301.763 563.616 317.579 576.567]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> endobj 664 0 obj<</Subtype/Link/Rect[301.763 532.333 317.579 545.285]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 258.402 null]/Border[0 0 0]>> endobj 665 0 obj<</Subtype/Link/Rect[282.309 521.374 298.124 534.326]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 690.582 null]/Border[0 0 0]>> endobj -666 0 obj<</Subtype/Link/Rect[301.763 521.374 317.579 534.326]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 154.45 null]/Border[0 0 0]>> +666 0 obj<</Subtype/Link/Rect[301.763 521.374 317.579 534.326]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 176.368 null]/Border[0 0 0]>> endobj 667 0 obj<</Subtype/Link/Rect[193.227 479.133 204.435 492.084]/C[1 0 0]/Dest[15 0 R/XYZ 143.158 532.094 null]/Border[0 0 0]>> endobj @@ -1487,53 +1492,53 @@ endobj endobj 673 0 obj<</Subtype/Link/Rect[282.309 479.133 298.124 492.084]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 679.623 null]/Border[0 0 0]>> endobj -674 0 obj<</Subtype/Link/Rect[301.763 479.133 317.579 492.084]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 143.491 null]/Border[0 0 0]>> +674 0 obj<</Subtype/Link/Rect[301.763 479.133 317.579 492.084]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 165.409 null]/Border[0 0 0]>> endobj -675 0 obj<</Subtype/Link/Rect[301.763 468.174 317.579 481.125]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 559.93 null]/Border[0 0 0]>> +675 0 obj<</Subtype/Link/Rect[301.763 468.174 317.579 481.125]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 581.848 null]/Border[0 0 0]>> endobj 676 0 obj<</Subtype/Link/Rect[301.763 457.215 317.579 470.166]/C[1 0 0]/Dest[20 0 R/XYZ 143.158 335.115 null]/Border[0 0 0]>> endobj -677 0 obj<</Subtype/Link/Rect[301.763 446.256 317.579 459.208]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 351.711 null]/Border[0 0 0]>> +677 0 obj<</Subtype/Link/Rect[301.763 446.256 317.579 459.208]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 373.628 null]/Border[0 0 0]>> endobj 678 0 obj<</Subtype/Link/Rect[488.189 767.053 499.397 780.005]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 214.254 null]/Border[0 0 0]>> endobj -679 0 obj<</Subtype/Link/Rect[405.763 723.093 421.578 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 592.807 null]/Border[0 0 0]>> +679 0 obj<</Subtype/Link/Rect[405.763 723.093 421.578 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 614.724 null]/Border[0 0 0]>> endobj -680 0 obj<</Subtype/Link/Rect[425.218 723.093 441.033 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 461.3 null]/Border[0 0 0]>> +680 0 obj<</Subtype/Link/Rect[425.218 723.093 441.033 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 483.217 null]/Border[0 0 0]>> endobj -681 0 obj<</Subtype/Link/Rect[444.672 723.093 460.488 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 450.341 null]/Border[0 0 0]>> +681 0 obj<</Subtype/Link/Rect[444.672 723.093 460.488 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 472.259 null]/Border[0 0 0]>> endobj -682 0 obj<</Subtype/Link/Rect[464.127 723.093 479.943 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 439.382 null]/Border[0 0 0]>> +682 0 obj<</Subtype/Link/Rect[464.127 723.093 479.943 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 461.3 null]/Border[0 0 0]>> endobj -683 0 obj<</Subtype/Link/Rect[483.582 723.093 499.397 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 428.423 null]/Border[0 0 0]>> +683 0 obj<</Subtype/Link/Rect[483.582 723.093 499.397 736.044]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 450.341 null]/Border[0 0 0]>> endobj -684 0 obj<</Subtype/Link/Rect[425.218 711.854 441.033 724.805]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 179.924 null]/Border[0 0 0]>> +684 0 obj<</Subtype/Link/Rect[425.218 711.854 441.033 724.805]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 201.842 null]/Border[0 0 0]>> endobj -685 0 obj<</Subtype/Link/Rect[444.672 711.854 460.488 724.805]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> +685 0 obj<</Subtype/Link/Rect[444.672 711.854 460.488 724.805]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> endobj -686 0 obj<</Subtype/Link/Rect[464.127 711.854 479.943 724.805]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 614.724 null]/Border[0 0 0]>> +686 0 obj<</Subtype/Link/Rect[464.127 711.854 479.943 724.805]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 636.642 null]/Border[0 0 0]>> endobj -687 0 obj<</Subtype/Link/Rect[483.582 711.854 499.397 724.805]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 527.053 null]/Border[0 0 0]>> +687 0 obj<</Subtype/Link/Rect[483.582 711.854 499.397 724.805]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 548.971 null]/Border[0 0 0]>> endobj -688 0 obj<</Subtype/Link/Rect[425.218 700.615 441.033 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 713.354 null]/Border[0 0 0]>> +688 0 obj<</Subtype/Link/Rect[425.218 700.615 441.033 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> endobj -689 0 obj<</Subtype/Link/Rect[444.672 700.615 460.488 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 680.478 null]/Border[0 0 0]>> +689 0 obj<</Subtype/Link/Rect[444.672 700.615 460.488 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 702.396 null]/Border[0 0 0]>> endobj -690 0 obj<</Subtype/Link/Rect[464.127 700.615 479.943 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 669.519 null]/Border[0 0 0]>> +690 0 obj<</Subtype/Link/Rect[464.127 700.615 479.943 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 691.437 null]/Border[0 0 0]>> endobj -691 0 obj<</Subtype/Link/Rect[483.582 700.615 499.397 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 296.916 null]/Border[0 0 0]>> +691 0 obj<</Subtype/Link/Rect[483.582 700.615 499.397 713.566]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 318.834 null]/Border[0 0 0]>> endobj 692 0 obj<</Subtype/Link/Rect[464.127 667.614 479.943 680.565]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 559.075 null]/Border[0 0 0]>> endobj 693 0 obj<</Subtype/Link/Rect[483.582 667.614 499.397 680.565]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 117.331 null]/Border[0 0 0]>> endobj -694 0 obj<</Subtype/Link/Rect[464.127 656.374 479.943 669.326]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 182.968 null]/Border[0 0 0]>> +694 0 obj<</Subtype/Link/Rect[464.127 656.374 479.943 669.326]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 198.38 null]/Border[0 0 0]>> endobj -695 0 obj<</Subtype/Link/Rect[483.582 656.374 499.397 669.326]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 735.272 null]/Border[0 0 0]>> +695 0 obj<</Subtype/Link/Rect[483.582 656.374 499.397 669.326]/C[1 0 0]/Dest[23 0 R/XYZ 143.158 757.19 null]/Border[0 0 0]>> endobj -696 0 obj<</Subtype/Link/Rect[464.127 623.373 479.943 636.325]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 472.259 null]/Border[0 0 0]>> +696 0 obj<</Subtype/Link/Rect[464.127 623.373 479.943 636.325]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 494.176 null]/Border[0 0 0]>> endobj -697 0 obj<</Subtype/Link/Rect[483.582 623.373 499.397 636.325]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 274.998 null]/Border[0 0 0]>> +697 0 obj<</Subtype/Link/Rect[483.582 623.373 499.397 636.325]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 296.916 null]/Border[0 0 0]>> endobj 698 0 obj<</Subtype/Link/Rect[403.715 612.134 410.315 625.085]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 570.916 null]/Border[0 0 0]>> endobj @@ -1545,9 +1550,9 @@ endobj endobj 702 0 obj<</Subtype/Link/Rect[449.28 612.134 460.488 625.085]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 417.492 null]/Border[0 0 0]>> endobj -703 0 obj<</Subtype/Link/Rect[464.127 612.134 479.943 625.085]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 347.809 null]/Border[0 0 0]>> +703 0 obj<</Subtype/Link/Rect[464.127 612.134 479.943 625.085]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 349.784 null]/Border[0 0 0]>> endobj -704 0 obj<</Subtype/Link/Rect[483.582 612.134 499.397 625.085]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 658.56 null]/Border[0 0 0]>> +704 0 obj<</Subtype/Link/Rect[483.582 612.134 499.397 625.085]/C[1 0 0]/Dest[24 0 R/XYZ 143.158 680.478 null]/Border[0 0 0]>> endobj 705 0 obj<</Subtype/Link/Rect[455.839 600.895 467.046 613.846]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 450.369 null]/Border[0 0 0]>> endobj @@ -1573,25 +1578,25 @@ endobj endobj 716 0 obj<</Subtype/Link/Rect[488.189 591.48 499.397 600.995]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 264.067 null]/Border[0 0 0]>> endobj -717 0 obj<</Subtype/Link/Rect[464.127 578.697 479.943 591.648]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 380.685 null]/Border[0 0 0]>> +717 0 obj<</Subtype/Link/Rect[464.127 578.697 479.943 591.648]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 382.66 null]/Border[0 0 0]>> endobj -718 0 obj<</Subtype/Link/Rect[483.582 578.697 499.397 591.648]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 347.809 null]/Border[0 0 0]>> +718 0 obj<</Subtype/Link/Rect[483.582 578.697 499.397 591.648]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 349.784 null]/Border[0 0 0]>> endobj 719 0 obj<</Subtype/Link/Rect[483.582 567.458 499.397 580.409]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 474.997 null]/Border[0 0 0]>> endobj 720 0 obj<</Subtype/Link/Rect[483.582 556.219 499.397 569.17]/C[1 0 0]/Dest[17 0 R/XYZ 143.158 544.138 null]/Border[0 0 0]>> endobj -721 0 obj<</Subtype/Link/Rect[464.127 523.217 479.943 536.169]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 150.092 null]/Border[0 0 0]>> +721 0 obj<</Subtype/Link/Rect[464.127 523.217 479.943 536.169]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 165.503 null]/Border[0 0 0]>> endobj -722 0 obj<</Subtype/Link/Rect[483.582 523.217 499.397 536.169]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 779.108 null]/Border[0 0 0]>> +722 0 obj<</Subtype/Link/Rect[483.582 523.217 499.397 536.169]/C[1 0 0]/Dest[21 0 R/XYZ 143.158 110.709 null]/Border[0 0 0]>> endobj 723 0 obj<</Subtype/Link/Rect[439.041 490.216 445.641 503.168]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 592.834 null]/Border[0 0 0]>> endobj 724 0 obj<</Subtype/Link/Rect[449.28 490.216 460.488 503.168]/C[1 0 0]/Dest[14 0 R/XYZ 143.158 505.163 null]/Border[0 0 0]>> endobj -725 0 obj<</Subtype/Link/Rect[464.127 490.216 479.943 503.168]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 329.793 null]/Border[0 0 0]>> +725 0 obj<</Subtype/Link/Rect[464.127 490.216 479.943 503.168]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 351.711 null]/Border[0 0 0]>> endobj -726 0 obj<</Subtype/Link/Rect[483.582 490.216 499.397 503.168]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 274.998 null]/Border[0 0 0]>> +726 0 obj<</Subtype/Link/Rect[483.582 490.216 499.397 503.168]/C[1 0 0]/Dest[22 0 R/XYZ 143.158 296.916 null]/Border[0 0 0]>> endobj 727 0 obj<</Subtype/Link/Rect[446.623 457.215 462.439 470.166]/C[1 0 0]/Dest[16 0 R/XYZ 143.158 394.691 null]/Border[0 0 0]>> endobj @@ -1771,7 +1776,7 @@ endobj endobj 815 0 obj<</Type/Font/Subtype/Type1/BaseFont/WOWCDU+CMTI9/FontDescriptor 857 0 R/Widths[524.7]/FirstChar 50/LastChar 50>> endobj -816 0 obj<</D[23 0 R/XYZ 144.727 453.211 null]/S/GoTo>> +816 0 obj<</D[23 0 R/XYZ 144.727 475.128 null]/S/GoTo>> endobj 817 0 obj<</Next 781 0 R/Last 860 0 R/A 858 0 R/Prev 776 0 R/First 859 0 R/Title(4 Installation)/Parent 3 0 R/Count -5>> endobj @@ -1781,7 +1786,7 @@ endobj endobj 820 0 obj<</Next 863 0 R/Last 865 0 R/A 862 0 R/Prev 777 0 R/First 864 0 R/Title(2.2 Redefining \\enddocument)/Parent 737 0 R/Count -6>> endobj -821 0 obj<</D[21 0 R/XYZ 144.727 290.474 null]/S/GoTo>> +821 0 obj<</D[21 0 R/XYZ 144.727 293.436 null]/S/GoTo>> endobj 822 0 obj<</Next 778 0 R/Prev 863 0 R/A 866 0 R/Title(2.4 Hack into \\enddocument)/Parent 737 0 R>> endobj @@ -1855,13 +1860,13 @@ endobj endobj 857 0 obj<</Type/FontDescriptor/FontBBox[-35 -250 1148 750]/CharSet(/two)/Descent -194/XHeight 431/FontName/WOWCDU+CMTI9/FontFile 898 0 R/CapHeight 683/StemV 70/Flags 4/Ascent 694/ItalicAngle -14>> endobj -858 0 obj<</D[24 0 R/XYZ 144.727 222.147 null]/S/GoTo>> +858 0 obj<</D[24 0 R/XYZ 144.727 244.064 null]/S/GoTo>> endobj 859 0 obj<</Next 900 0 R/A 899 0 R/Title(4.1 Download)/Parent 817 0 R>> endobj 860 0 obj<</Prev 902 0 R/A 901 0 R/Title(4.5 Some details for the interested)/Parent 817 0 R>> endobj -861 0 obj<</D[23 0 R/XYZ 144.727 427.654 null]/S/GoTo>> +861 0 obj<</D[23 0 R/XYZ 144.727 449.572 null]/S/GoTo>> endobj 862 0 obj<</D[15 0 R/XYZ 144.727 147.479 null]/S/GoTo>> endobj @@ -1871,7 +1876,7 @@ endobj endobj 865 0 obj<</Prev 909 0 R/A 908 0 R/Title(2.2.6 Testing and redefining)/Parent 820 0 R>> endobj -866 0 obj<</D[21 0 R/XYZ 144.727 704.38 null]/S/GoTo>> +866 0 obj<</D[21 0 R/XYZ 144.727 705.367 null]/S/GoTo>> endobj 867 0 obj<</D[27 0 R/XYZ 144.727 739.007 null]/S/GoTo>> endobj @@ -2970,7 +2975,7 @@ f;L .Нؤt}zUq'Y-҄
fkm;ئYoӏ C2%X&]2jW&Ȼ +3I1Z9Y2 OP^a3Vqu/ Yڊ>M*4Ku]Ó,Qڏ݅-R j, zbvӜ^a#Mv-n&>zhDKrpW|[y詖 r(ڟz;4MI.Kc'=c#5߀N8ۄ-*:c7/tլbt}-} h~\Lc@V;@35\5`PQ"]S @6o~5n'h].<9&If\6 ȼ|^M3 bWPHWdcDUE R>yr3U;5F$EfbJ$oO$1Gu)$WUYzyP~0Ӻ[Nԟzk>*smV Z endstream endobj -899 0 obj<</D[24 0 R/XYZ 144.727 196.59 null]/S/GoTo>> +899 0 obj<</D[24 0 R/XYZ 144.727 218.507 null]/S/GoTo>> endobj 900 0 obj<</Next 915 0 R/Prev 859 0 R/A 914 0 R/Title(4.2 Bundle installation)/Parent 817 0 R>> endobj @@ -3111,921 +3116,922 @@ xref 0000008326 00000 n 0000008398 00000 n 0000008464 00000 n -0000010278 00000 n -0000010311 00000 n -0000010442 00000 n -0000010572 00000 n -0000010702 00000 n -0000010834 00000 n -0000010966 00000 n -0000011096 00000 n -0000011228 00000 n -0000011359 00000 n -0000011491 00000 n -0000011621 00000 n -0000011751 00000 n -0000011882 00000 n -0000012014 00000 n -0000012144 00000 n -0000012275 00000 n -0000012405 00000 n -0000012536 00000 n -0000012668 00000 n -0000012799 00000 n -0000012930 00000 n -0000013061 00000 n -0000013193 00000 n -0000013325 00000 n -0000013457 00000 n -0000013589 00000 n -0000013720 00000 n -0000016570 00000 n -0000016603 00000 n -0000016735 00000 n -0000016866 00000 n -0000016997 00000 n -0000017128 00000 n -0000017260 00000 n -0000017392 00000 n -0000017524 00000 n -0000017655 00000 n -0000017787 00000 n -0000017919 00000 n -0000018050 00000 n -0000018182 00000 n -0000018314 00000 n -0000018446 00000 n -0000019996 00000 n -0000020029 00000 n -0000021163 00000 n -0000021196 00000 n -0000022443 00000 n -0000022476 00000 n -0000023599 00000 n -0000023632 00000 n -0000024549 00000 n -0000025533 00000 n -0000026771 00000 n -0000026804 00000 n -0000028249 00000 n -0000028282 00000 n -0000029442 00000 n -0000029475 00000 n -0000030593 00000 n -0000030626 00000 n -0000031875 00000 n -0000031908 00000 n -0000032039 00000 n -0000032143 00000 n -0000032247 00000 n -0000032352 00000 n -0000034702 00000 n -0000034736 00000 n -0000034841 00000 n -0000034946 00000 n -0000035051 00000 n -0000037520 00000 n -0000037554 00000 n -0000037659 00000 n -0000037764 00000 n -0000037868 00000 n -0000037973 00000 n -0000038078 00000 n -0000038183 00000 n -0000038287 00000 n -0000038391 00000 n -0000038496 00000 n -0000038601 00000 n -0000038705 00000 n -0000038810 00000 n -0000041337 00000 n -0000041371 00000 n -0000041504 00000 n -0000041637 00000 n -0000041770 00000 n -0000041903 00000 n -0000042036 00000 n -0000042167 00000 n -0000042300 00000 n -0000042433 00000 n -0000042566 00000 n -0000042699 00000 n -0000042831 00000 n -0000042964 00000 n -0000043097 00000 n -0000043230 00000 n -0000043363 00000 n -0000043495 00000 n -0000043628 00000 n -0000043760 00000 n -0000043893 00000 n -0000044026 00000 n -0000044159 00000 n -0000044292 00000 n -0000044424 00000 n -0000044557 00000 n -0000044690 00000 n -0000044822 00000 n -0000044954 00000 n -0000045087 00000 n -0000045220 00000 n -0000045353 00000 n -0000045485 00000 n -0000045617 00000 n -0000045749 00000 n -0000045882 00000 n -0000046014 00000 n -0000046147 00000 n -0000046280 00000 n -0000046413 00000 n -0000046546 00000 n -0000046679 00000 n -0000046812 00000 n -0000046945 00000 n -0000047078 00000 n -0000047211 00000 n -0000047344 00000 n -0000047476 00000 n -0000047609 00000 n -0000047741 00000 n -0000047874 00000 n -0000048007 00000 n -0000048138 00000 n -0000048270 00000 n -0000048401 00000 n -0000048533 00000 n -0000048664 00000 n -0000048796 00000 n -0000048928 00000 n -0000049061 00000 n -0000049193 00000 n -0000049325 00000 n -0000049457 00000 n -0000049590 00000 n -0000049723 00000 n -0000049856 00000 n -0000049988 00000 n -0000050119 00000 n -0000050252 00000 n -0000050384 00000 n -0000050517 00000 n -0000050650 00000 n -0000050782 00000 n -0000050914 00000 n -0000051046 00000 n -0000051179 00000 n -0000051311 00000 n -0000051444 00000 n -0000051577 00000 n -0000051710 00000 n -0000051843 00000 n -0000051976 00000 n -0000052109 00000 n -0000052241 00000 n -0000052374 00000 n -0000052507 00000 n -0000052640 00000 n -0000052773 00000 n -0000052905 00000 n -0000053038 00000 n -0000053171 00000 n -0000053303 00000 n -0000053435 00000 n -0000053566 00000 n -0000053699 00000 n -0000053831 00000 n -0000053964 00000 n -0000054097 00000 n -0000054228 00000 n -0000054359 00000 n -0000054491 00000 n -0000054623 00000 n -0000054755 00000 n -0000054887 00000 n -0000055020 00000 n -0000055153 00000 n -0000055286 00000 n -0000055418 00000 n -0000055551 00000 n -0000055684 00000 n -0000055817 00000 n -0000055950 00000 n -0000056083 00000 n -0000056216 00000 n -0000056349 00000 n -0000056480 00000 n -0000056612 00000 n -0000056745 00000 n -0000056878 00000 n -0000057011 00000 n -0000057144 00000 n -0000057277 00000 n -0000057409 00000 n -0000057542 00000 n -0000057675 00000 n -0000057808 00000 n -0000057941 00000 n -0000058074 00000 n -0000058207 00000 n -0000058340 00000 n -0000058473 00000 n -0000058606 00000 n -0000058739 00000 n -0000058872 00000 n -0000059005 00000 n -0000059138 00000 n -0000059271 00000 n -0000059404 00000 n -0000059536 00000 n -0000059668 00000 n -0000059801 00000 n -0000059934 00000 n -0000060066 00000 n -0000060199 00000 n -0000060332 00000 n -0000060465 00000 n -0000060598 00000 n -0000060731 00000 n -0000060863 00000 n -0000060996 00000 n -0000061129 00000 n -0000061261 00000 n -0000061392 00000 n -0000061524 00000 n -0000061656 00000 n -0000061789 00000 n -0000061922 00000 n -0000062055 00000 n -0000062188 00000 n -0000062321 00000 n -0000062454 00000 n -0000062586 00000 n -0000062718 00000 n -0000062850 00000 n -0000062982 00000 n -0000063114 00000 n -0000066556 00000 n -0000066590 00000 n -0000066722 00000 n -0000066854 00000 n -0000066987 00000 n -0000067120 00000 n -0000067253 00000 n -0000067386 00000 n -0000067518 00000 n -0000067651 00000 n -0000067784 00000 n -0000067917 00000 n -0000068048 00000 n -0000068180 00000 n -0000068312 00000 n -0000068444 00000 n -0000068577 00000 n -0000068710 00000 n -0000068843 00000 n -0000068975 00000 n -0000069108 00000 n -0000069241 00000 n -0000069374 00000 n -0000069506 00000 n -0000069639 00000 n -0000069771 00000 n -0000069904 00000 n -0000070037 00000 n -0000070170 00000 n -0000070301 00000 n -0000070433 00000 n -0000070565 00000 n -0000070697 00000 n -0000070828 00000 n -0000070960 00000 n -0000071093 00000 n -0000071226 00000 n -0000071359 00000 n -0000071492 00000 n -0000071623 00000 n -0000071754 00000 n -0000071885 00000 n -0000072018 00000 n -0000072151 00000 n -0000072283 00000 n -0000072415 00000 n -0000072547 00000 n -0000072678 00000 n -0000072811 00000 n -0000072943 00000 n -0000073076 00000 n -0000073209 00000 n -0000073342 00000 n -0000073475 00000 n -0000073607 00000 n -0000073740 00000 n -0000073873 00000 n -0000074005 00000 n -0000074138 00000 n -0000074271 00000 n -0000074402 00000 n -0000074534 00000 n -0000074667 00000 n -0000074799 00000 n -0000074932 00000 n -0000075065 00000 n -0000075198 00000 n -0000075330 00000 n -0000075463 00000 n -0000075596 00000 n -0000075729 00000 n -0000075862 00000 n -0000075994 00000 n -0000076127 00000 n -0000076260 00000 n -0000076392 00000 n -0000076524 00000 n -0000076656 00000 n -0000076789 00000 n -0000076922 00000 n -0000077054 00000 n -0000077187 00000 n -0000077319 00000 n -0000077452 00000 n -0000077585 00000 n -0000077718 00000 n -0000077851 00000 n -0000077984 00000 n -0000078115 00000 n -0000078248 00000 n -0000078378 00000 n -0000078510 00000 n -0000078643 00000 n -0000078775 00000 n -0000078908 00000 n -0000079041 00000 n -0000079172 00000 n -0000079303 00000 n -0000079434 00000 n -0000079566 00000 n -0000079698 00000 n -0000079831 00000 n -0000079964 00000 n -0000080097 00000 n -0000080230 00000 n -0000080362 00000 n -0000080494 00000 n -0000080627 00000 n -0000080760 00000 n -0000080892 00000 n -0000081024 00000 n -0000081157 00000 n -0000081289 00000 n -0000081422 00000 n -0000081555 00000 n -0000081688 00000 n -0000081820 00000 n -0000081953 00000 n -0000082086 00000 n -0000082219 00000 n -0000082352 00000 n -0000082484 00000 n -0000082616 00000 n -0000082747 00000 n -0000082879 00000 n -0000083011 00000 n -0000083144 00000 n -0000083276 00000 n -0000083409 00000 n -0000083541 00000 n -0000083672 00000 n -0000083804 00000 n -0000083937 00000 n -0000084070 00000 n -0000084203 00000 n -0000084336 00000 n -0000084469 00000 n -0000084602 00000 n -0000084735 00000 n -0000084866 00000 n -0000084998 00000 n -0000085131 00000 n -0000085263 00000 n -0000085396 00000 n -0000085529 00000 n -0000085661 00000 n -0000085793 00000 n -0000085925 00000 n -0000086057 00000 n -0000086189 00000 n -0000086319 00000 n -0000086451 00000 n -0000086582 00000 n -0000086713 00000 n -0000086844 00000 n -0000086975 00000 n -0000087106 00000 n -0000087237 00000 n -0000087368 00000 n -0000087498 00000 n -0000087631 00000 n -0000087763 00000 n -0000087895 00000 n -0000088028 00000 n -0000088160 00000 n -0000088293 00000 n -0000088426 00000 n -0000088558 00000 n -0000088690 00000 n -0000088823 00000 n -0000088956 00000 n -0000089088 00000 n -0000089221 00000 n -0000089352 00000 n -0000089484 00000 n -0000089616 00000 n -0000089748 00000 n -0000089880 00000 n -0000090011 00000 n -0000090143 00000 n -0000090276 00000 n -0000090408 00000 n -0000090541 00000 n -0000090674 00000 n -0000090807 00000 n -0000090939 00000 n -0000091071 00000 n -0000091203 00000 n -0000091335 00000 n -0000091467 00000 n -0000091599 00000 n -0000091731 00000 n -0000091864 00000 n -0000091996 00000 n -0000092128 00000 n -0000092261 00000 n -0000092394 00000 n -0000092526 00000 n -0000092658 00000 n -0000092791 00000 n -0000092924 00000 n -0000093056 00000 n -0000093188 00000 n -0000093321 00000 n -0000093454 00000 n -0000093586 00000 n -0000093718 00000 n -0000093851 00000 n -0000093984 00000 n -0000094116 00000 n -0000094248 00000 n -0000094380 00000 n -0000094513 00000 n -0000094645 00000 n -0000094778 00000 n -0000094911 00000 n -0000095044 00000 n -0000095176 00000 n -0000095309 00000 n -0000095442 00000 n -0000095575 00000 n -0000095704 00000 n -0000095832 00000 n -0000095961 00000 n -0000096089 00000 n -0000096218 00000 n -0000096346 00000 n -0000096475 00000 n -0000096608 00000 n -0000096741 00000 n -0000096874 00000 n -0000097007 00000 n -0000097140 00000 n -0000097273 00000 n -0000097406 00000 n -0000097538 00000 n -0000097671 00000 n -0000097804 00000 n -0000097937 00000 n -0000098069 00000 n -0000098202 00000 n -0000098334 00000 n -0000098467 00000 n -0000098600 00000 n -0000098732 00000 n -0000098864 00000 n -0000098996 00000 n -0000099129 00000 n -0000099262 00000 n -0000099395 00000 n -0000099528 00000 n -0000099661 00000 n -0000099793 00000 n -0000099925 00000 n -0000100057 00000 n -0000100189 00000 n -0000100320 00000 n -0000100452 00000 n -0000100585 00000 n -0000100717 00000 n -0000100849 00000 n -0000100982 00000 n -0000101115 00000 n -0000101248 00000 n -0000101381 00000 n -0000101513 00000 n -0000101646 00000 n -0000101779 00000 n -0000101911 00000 n -0000102044 00000 n -0000102177 00000 n -0000102310 00000 n -0000102442 00000 n -0000102575 00000 n -0000102708 00000 n -0000102841 00000 n -0000102973 00000 n -0000103105 00000 n -0000103237 00000 n -0000103369 00000 n -0000103502 00000 n -0000103635 00000 n -0000103767 00000 n -0000103899 00000 n -0000104031 00000 n -0000104163 00000 n -0000104295 00000 n -0000104428 00000 n -0000104561 00000 n -0000104693 00000 n -0000104826 00000 n -0000104959 00000 n -0000105092 00000 n -0000105225 00000 n -0000105358 00000 n -0000105490 00000 n -0000105623 00000 n -0000105756 00000 n -0000105888 00000 n -0000106021 00000 n -0000106154 00000 n -0000106287 00000 n -0000106419 00000 n -0000106552 00000 n -0000106685 00000 n -0000106817 00000 n -0000106949 00000 n -0000107081 00000 n -0000107213 00000 n -0000107344 00000 n -0000107476 00000 n -0000107608 00000 n -0000107740 00000 n -0000107873 00000 n -0000108006 00000 n -0000108138 00000 n -0000108270 00000 n -0000108403 00000 n -0000108536 00000 n -0000108669 00000 n -0000108801 00000 n -0000108932 00000 n -0000109065 00000 n -0000109198 00000 n -0000109331 00000 n -0000109463 00000 n -0000109596 00000 n -0000109728 00000 n -0000109860 00000 n -0000109992 00000 n -0000110124 00000 n -0000110256 00000 n -0000110388 00000 n -0000110520 00000 n -0000110651 00000 n -0000110782 00000 n -0000112251 00000 n -0000112285 00000 n -0000112418 00000 n -0000112551 00000 n -0000112684 00000 n -0000112816 00000 n -0000112949 00000 n -0000113082 00000 n -0000113214 00000 n -0000113346 00000 n -0000113478 00000 n -0000113610 00000 n -0000113742 00000 n -0000113874 00000 n -0000114005 00000 n -0000114137 00000 n -0000114270 00000 n -0000114402 00000 n -0000114534 00000 n -0000114666 00000 n -0000114798 00000 n -0000114931 00000 n -0000115064 00000 n -0000115196 00000 n -0000115329 00000 n -0000115462 00000 n -0000115595 00000 n -0000115727 00000 n -0000115859 00000 n -0000115992 00000 n -0000116125 00000 n -0000116258 00000 n -0000116391 00000 n -0000116524 00000 n -0000116657 00000 n -0000116790 00000 n -0000116922 00000 n -0000117055 00000 n -0000117187 00000 n -0000117320 00000 n -0000117453 00000 n -0000117585 00000 n -0000117718 00000 n -0000117851 00000 n -0000117984 00000 n -0000118116 00000 n -0000118249 00000 n -0000118381 00000 n -0000118514 00000 n -0000118647 00000 n -0000118779 00000 n -0000118912 00000 n -0000119045 00000 n -0000119178 00000 n -0000119311 00000 n -0000119442 00000 n -0000119575 00000 n -0000119708 00000 n -0000119841 00000 n -0000119974 00000 n -0000120107 00000 n -0000120240 00000 n -0000120373 00000 n -0000120506 00000 n -0000120639 00000 n -0000120772 00000 n -0000120905 00000 n -0000121038 00000 n -0000121171 00000 n -0000121304 00000 n -0000121437 00000 n -0000121570 00000 n -0000121703 00000 n -0000121836 00000 n -0000121969 00000 n -0000122102 00000 n -0000122234 00000 n -0000122366 00000 n -0000122499 00000 n -0000122631 00000 n -0000122764 00000 n -0000122897 00000 n -0000123029 00000 n -0000123161 00000 n -0000123293 00000 n -0000123425 00000 n -0000123557 00000 n -0000123689 00000 n -0000123821 00000 n -0000123953 00000 n -0000124085 00000 n -0000124217 00000 n -0000124350 00000 n -0000124483 00000 n -0000124616 00000 n -0000124748 00000 n -0000124881 00000 n -0000125014 00000 n -0000125147 00000 n -0000125279 00000 n -0000125412 00000 n -0000125545 00000 n -0000125678 00000 n -0000125811 00000 n -0000125942 00000 n -0000126072 00000 n -0000126203 00000 n -0000126333 00000 n -0000126464 00000 n -0000126594 00000 n -0000126725 00000 n -0000126788 00000 n -0000126917 00000 n -0000126986 00000 n -0000127049 00000 n -0000127138 00000 n -0000127221 00000 n -0000127304 00000 n -0000127367 00000 n -0000127446 00000 n -0000127509 00000 n -0000127588 00000 n -0000127787 00000 n -0000127914 00000 n -0000128053 00000 n -0000128156 00000 n -0000128235 00000 n -0000128314 00000 n -0000128405 00000 n -0000128532 00000 n -0000128587 00000 n -0000128702 00000 n -0000128853 00000 n -0000128960 00000 n -0000129067 00000 n -0000129131 00000 n -0000129247 00000 n -0000129356 00000 n -0000129431 00000 n -0000129594 00000 n -0000129687 00000 n -0000129793 00000 n -0000129899 00000 n -0000129993 00000 n -0000130051 00000 n -0000130157 00000 n -0000130221 00000 n -0000130325 00000 n -0000130405 00000 n -0000130473 00000 n -0000130536 00000 n -0000130656 00000 n -0000130732 00000 n -0000130815 00000 n -0000130877 00000 n -0000130940 00000 n -0000131035 00000 n -0000131098 00000 n -0000131194 00000 n -0000131257 00000 n -0000131353 00000 n -0000131416 00000 n -0000131496 00000 n -0000131559 00000 n -0000131639 00000 n -0000131937 00000 n -0000132208 00000 n -0000132715 00000 n -0000132857 00000 n -0000133414 00000 n -0000133878 00000 n -0000134623 00000 n -0000134847 00000 n -0000135347 00000 n -0000136090 00000 n -0000136823 00000 n -0000137551 00000 n -0000138016 00000 n -0000138242 00000 n -0000138977 00000 n -0000139612 00000 n -0000140169 00000 n -0000140903 00000 n -0000141459 00000 n -0000141979 00000 n -0000142108 00000 n -0000142237 00000 n -0000142817 00000 n -0000142946 00000 n -0000143676 00000 n -0000143805 00000 n -0000143868 00000 n -0000143996 00000 n -0000144080 00000 n -0000144143 00000 n -0000144287 00000 n -0000144350 00000 n -0000144457 00000 n -0000144520 00000 n -0000144583 00000 n -0000144679 00000 n -0000144742 00000 n -0000144838 00000 n -0000144901 00000 n -0000144981 00000 n -0000145044 00000 n -0000145124 00000 n -0000145338 00000 n -0000145553 00000 n -0000145813 00000 n -0000146028 00000 n -0000146275 00000 n -0000146539 00000 n -0000146862 00000 n -0000147066 00000 n -0000147590 00000 n -0000147950 00000 n -0000148294 00000 n -0000148788 00000 n -0000149169 00000 n -0000149419 00000 n -0000149697 00000 n -0000149958 00000 n -0000150225 00000 n -0000150496 00000 n -0000150739 00000 n -0000150958 00000 n -0000151160 00000 n -0000151367 00000 n -0000151618 00000 n -0000151821 00000 n -0000152059 00000 n -0000152264 00000 n -0000152327 00000 n -0000152406 00000 n -0000152508 00000 n -0000152571 00000 n -0000152634 00000 n -0000152783 00000 n -0000152868 00000 n -0000152963 00000 n -0000153025 00000 n -0000153088 00000 n -0000153151 00000 n -0000153214 00000 n -0000153294 00000 n -0000153357 00000 n -0000153437 00000 n -0000161869 00000 n -0000169622 00000 n -0000179721 00000 n -0000186848 00000 n -0000191669 00000 n -0000204752 00000 n -0000220202 00000 n -0000227417 00000 n -0000245855 00000 n -0000261673 00000 n -0000279937 00000 n -0000303700 00000 n -0000320089 00000 n -0000328914 00000 n -0000339223 00000 n -0000347047 00000 n -0000361459 00000 n -0000371968 00000 n -0000379326 00000 n -0000387337 00000 n -0000394410 00000 n -0000401389 00000 n -0000406029 00000 n -0000413122 00000 n -0000422238 00000 n -0000429319 00000 n -0000429381 00000 n -0000429484 00000 n -0000429547 00000 n -0000429658 00000 n -0000429721 00000 n -0000429810 00000 n -0000429899 00000 n -0000429960 00000 n -0000430075 00000 n -0000430136 00000 n -0000430233 00000 n -0000430296 00000 n -0000430376 00000 n -0000430439 00000 n -0000430519 00000 n -0000430581 00000 n -0000430685 00000 n -0000430748 00000 n -0000430811 00000 n -0000430872 00000 n -0000430935 00000 n -0000431035 00000 n -0000431096 00000 n -0000431195 00000 n -0000431258 00000 n -0000431338 00000 n -0000431401 00000 n -0000431481 00000 n -0000431544 00000 n -0000431606 00000 n -0000431669 00000 n -0000431732 00000 n -0000431812 00000 n -0000431875 00000 n -0000431955 00000 n -0000432018 00000 n -0000432098 00000 n -0000432161 00000 n -0000432241 00000 n -0000432304 00000 n -0000432384 00000 n -0000432447 00000 n -0000432527 00000 n -0000432590 00000 n -0000432670 00000 n -0000432733 00000 n -0000432813 00000 n -0000432876 00000 n -0000432956 00000 n -0000433019 00000 n +0000010293 00000 n +0000010326 00000 n +0000010457 00000 n +0000010587 00000 n +0000010717 00000 n +0000010849 00000 n +0000010981 00000 n +0000011111 00000 n +0000011243 00000 n +0000011374 00000 n +0000011506 00000 n +0000011636 00000 n +0000011766 00000 n +0000011897 00000 n +0000012029 00000 n +0000012159 00000 n +0000012291 00000 n +0000012421 00000 n +0000012552 00000 n +0000012684 00000 n +0000012815 00000 n +0000012947 00000 n +0000013078 00000 n +0000013210 00000 n +0000013342 00000 n +0000013474 00000 n +0000013606 00000 n +0000013737 00000 n +0000016591 00000 n +0000016624 00000 n +0000016756 00000 n +0000016887 00000 n +0000017018 00000 n +0000017149 00000 n +0000017281 00000 n +0000017413 00000 n +0000017545 00000 n +0000017676 00000 n +0000017808 00000 n +0000017940 00000 n +0000018071 00000 n +0000018203 00000 n +0000018335 00000 n +0000018467 00000 n +0000020017 00000 n +0000020050 00000 n +0000021184 00000 n +0000021217 00000 n +0000022464 00000 n +0000022497 00000 n +0000023620 00000 n +0000023653 00000 n +0000024570 00000 n +0000025554 00000 n +0000026792 00000 n +0000026825 00000 n +0000028264 00000 n +0000028297 00000 n +0000029410 00000 n +0000029443 00000 n +0000030553 00000 n +0000030586 00000 n +0000031810 00000 n +0000031843 00000 n +0000031974 00000 n +0000032077 00000 n +0000032180 00000 n +0000032285 00000 n +0000034635 00000 n +0000034669 00000 n +0000034774 00000 n +0000034879 00000 n +0000034984 00000 n +0000037453 00000 n +0000037487 00000 n +0000037592 00000 n +0000037697 00000 n +0000037801 00000 n +0000037906 00000 n +0000038011 00000 n +0000038116 00000 n +0000038220 00000 n +0000038324 00000 n +0000038429 00000 n +0000038534 00000 n +0000038638 00000 n +0000038743 00000 n +0000041270 00000 n +0000041304 00000 n +0000041437 00000 n +0000041570 00000 n +0000041702 00000 n +0000041835 00000 n +0000041968 00000 n +0000042099 00000 n +0000042232 00000 n +0000042365 00000 n +0000042498 00000 n +0000042631 00000 n +0000042763 00000 n +0000042896 00000 n +0000043029 00000 n +0000043162 00000 n +0000043295 00000 n +0000043426 00000 n +0000043559 00000 n +0000043691 00000 n +0000043823 00000 n +0000043956 00000 n +0000044089 00000 n +0000044222 00000 n +0000044354 00000 n +0000044487 00000 n +0000044620 00000 n +0000044752 00000 n +0000044884 00000 n +0000045017 00000 n +0000045150 00000 n +0000045283 00000 n +0000045415 00000 n +0000045547 00000 n +0000045679 00000 n +0000045812 00000 n +0000045944 00000 n +0000046076 00000 n +0000046209 00000 n +0000046342 00000 n +0000046475 00000 n +0000046608 00000 n +0000046741 00000 n +0000046874 00000 n +0000047007 00000 n +0000047140 00000 n +0000047273 00000 n +0000047406 00000 n +0000047539 00000 n +0000047671 00000 n +0000047804 00000 n +0000047937 00000 n +0000048068 00000 n +0000048200 00000 n +0000048331 00000 n +0000048463 00000 n +0000048594 00000 n +0000048726 00000 n +0000048858 00000 n +0000048991 00000 n +0000049123 00000 n +0000049256 00000 n +0000049388 00000 n +0000049520 00000 n +0000049653 00000 n +0000049786 00000 n +0000049918 00000 n +0000050049 00000 n +0000050182 00000 n +0000050314 00000 n +0000050447 00000 n +0000050580 00000 n +0000050712 00000 n +0000050844 00000 n +0000050976 00000 n +0000051109 00000 n +0000051241 00000 n +0000051374 00000 n +0000051507 00000 n +0000051640 00000 n +0000051773 00000 n +0000051906 00000 n +0000052039 00000 n +0000052171 00000 n +0000052304 00000 n +0000052437 00000 n +0000052570 00000 n +0000052703 00000 n +0000052835 00000 n +0000052968 00000 n +0000053101 00000 n +0000053233 00000 n +0000053365 00000 n +0000053497 00000 n +0000053630 00000 n +0000053761 00000 n +0000053894 00000 n +0000054027 00000 n +0000054158 00000 n +0000054289 00000 n +0000054421 00000 n +0000054553 00000 n +0000054685 00000 n +0000054817 00000 n +0000054950 00000 n +0000055083 00000 n +0000055216 00000 n +0000055348 00000 n +0000055481 00000 n +0000055614 00000 n +0000055747 00000 n +0000055880 00000 n +0000056013 00000 n +0000056146 00000 n +0000056279 00000 n +0000056410 00000 n +0000056542 00000 n +0000056675 00000 n +0000056808 00000 n +0000056941 00000 n +0000057074 00000 n +0000057207 00000 n +0000057339 00000 n +0000057472 00000 n +0000057605 00000 n +0000057737 00000 n +0000057870 00000 n +0000058002 00000 n +0000058135 00000 n +0000058268 00000 n +0000058401 00000 n +0000058534 00000 n +0000058667 00000 n +0000058800 00000 n +0000058933 00000 n +0000059066 00000 n +0000059199 00000 n +0000059332 00000 n +0000059464 00000 n +0000059596 00000 n +0000059729 00000 n +0000059862 00000 n +0000059994 00000 n +0000060127 00000 n +0000060260 00000 n +0000060393 00000 n +0000060526 00000 n +0000060659 00000 n +0000060791 00000 n +0000060924 00000 n +0000061057 00000 n +0000061190 00000 n +0000061322 00000 n +0000061454 00000 n +0000061587 00000 n +0000061720 00000 n +0000061853 00000 n +0000061986 00000 n +0000062119 00000 n +0000062252 00000 n +0000062385 00000 n +0000062517 00000 n +0000062649 00000 n +0000062780 00000 n +0000062912 00000 n +0000063044 00000 n +0000066486 00000 n +0000066520 00000 n +0000066652 00000 n +0000066784 00000 n +0000066917 00000 n +0000067050 00000 n +0000067183 00000 n +0000067316 00000 n +0000067448 00000 n +0000067581 00000 n +0000067714 00000 n +0000067847 00000 n +0000067978 00000 n +0000068110 00000 n +0000068243 00000 n +0000068375 00000 n +0000068508 00000 n +0000068641 00000 n +0000068774 00000 n +0000068906 00000 n +0000069039 00000 n +0000069172 00000 n +0000069305 00000 n +0000069437 00000 n +0000069570 00000 n +0000069702 00000 n +0000069835 00000 n +0000069968 00000 n +0000070101 00000 n +0000070232 00000 n +0000070364 00000 n +0000070496 00000 n +0000070628 00000 n +0000070759 00000 n +0000070891 00000 n +0000071024 00000 n +0000071157 00000 n +0000071290 00000 n +0000071422 00000 n +0000071555 00000 n +0000071686 00000 n +0000071817 00000 n +0000071950 00000 n +0000072083 00000 n +0000072215 00000 n +0000072347 00000 n +0000072479 00000 n +0000072610 00000 n +0000072743 00000 n +0000072875 00000 n +0000073008 00000 n +0000073141 00000 n +0000073274 00000 n +0000073407 00000 n +0000073539 00000 n +0000073672 00000 n +0000073805 00000 n +0000073937 00000 n +0000074070 00000 n +0000074203 00000 n +0000074334 00000 n +0000074466 00000 n +0000074599 00000 n +0000074731 00000 n +0000074864 00000 n +0000074997 00000 n +0000075130 00000 n +0000075262 00000 n +0000075395 00000 n +0000075528 00000 n +0000075661 00000 n +0000075794 00000 n +0000075926 00000 n +0000076059 00000 n +0000076192 00000 n +0000076324 00000 n +0000076456 00000 n +0000076588 00000 n +0000076721 00000 n +0000076854 00000 n +0000076985 00000 n +0000077118 00000 n +0000077250 00000 n +0000077382 00000 n +0000077514 00000 n +0000077647 00000 n +0000077780 00000 n +0000077913 00000 n +0000078046 00000 n +0000078179 00000 n +0000078309 00000 n +0000078441 00000 n +0000078574 00000 n +0000078706 00000 n +0000078839 00000 n +0000078972 00000 n +0000079103 00000 n +0000079234 00000 n +0000079365 00000 n +0000079497 00000 n +0000079629 00000 n +0000079762 00000 n +0000079895 00000 n +0000080028 00000 n +0000080161 00000 n +0000080293 00000 n +0000080425 00000 n +0000080558 00000 n +0000080691 00000 n +0000080823 00000 n +0000080955 00000 n +0000081088 00000 n +0000081220 00000 n +0000081353 00000 n +0000081486 00000 n +0000081619 00000 n +0000081752 00000 n +0000081885 00000 n +0000082018 00000 n +0000082151 00000 n +0000082284 00000 n +0000082416 00000 n +0000082548 00000 n +0000082679 00000 n +0000082811 00000 n +0000082943 00000 n +0000083076 00000 n +0000083208 00000 n +0000083341 00000 n +0000083474 00000 n +0000083605 00000 n +0000083737 00000 n +0000083870 00000 n +0000084003 00000 n +0000084136 00000 n +0000084269 00000 n +0000084402 00000 n +0000084535 00000 n +0000084668 00000 n +0000084799 00000 n +0000084931 00000 n +0000085064 00000 n +0000085196 00000 n +0000085329 00000 n +0000085462 00000 n +0000085594 00000 n +0000085726 00000 n +0000085858 00000 n +0000085990 00000 n +0000086122 00000 n +0000086252 00000 n +0000086384 00000 n +0000086515 00000 n +0000086646 00000 n +0000086777 00000 n +0000086908 00000 n +0000087039 00000 n +0000087170 00000 n +0000087301 00000 n +0000087431 00000 n +0000087564 00000 n +0000087697 00000 n +0000087830 00000 n +0000087963 00000 n +0000088095 00000 n +0000088228 00000 n +0000088361 00000 n +0000088493 00000 n +0000088626 00000 n +0000088759 00000 n +0000088891 00000 n +0000089023 00000 n +0000089156 00000 n +0000089287 00000 n +0000089419 00000 n +0000089551 00000 n +0000089683 00000 n +0000089815 00000 n +0000089946 00000 n +0000090078 00000 n +0000090211 00000 n +0000090343 00000 n +0000090476 00000 n +0000090609 00000 n +0000090742 00000 n +0000090874 00000 n +0000091007 00000 n +0000091139 00000 n +0000091271 00000 n +0000091403 00000 n +0000091535 00000 n +0000091667 00000 n +0000091800 00000 n +0000091932 00000 n +0000092064 00000 n +0000092197 00000 n +0000092330 00000 n +0000092462 00000 n +0000092594 00000 n +0000092727 00000 n +0000092860 00000 n +0000092993 00000 n +0000093124 00000 n +0000093257 00000 n +0000093390 00000 n +0000093523 00000 n +0000093655 00000 n +0000093787 00000 n +0000093920 00000 n +0000094052 00000 n +0000094184 00000 n +0000094316 00000 n +0000094449 00000 n +0000094581 00000 n +0000094714 00000 n +0000094847 00000 n +0000094980 00000 n +0000095112 00000 n +0000095245 00000 n +0000095378 00000 n +0000095511 00000 n +0000095640 00000 n +0000095768 00000 n +0000095897 00000 n +0000096025 00000 n +0000096154 00000 n +0000096282 00000 n +0000096411 00000 n +0000096544 00000 n +0000096677 00000 n +0000096810 00000 n +0000096943 00000 n +0000097076 00000 n +0000097209 00000 n +0000097342 00000 n +0000097474 00000 n +0000097607 00000 n +0000097740 00000 n +0000097873 00000 n +0000098005 00000 n +0000098138 00000 n +0000098270 00000 n +0000098403 00000 n +0000098536 00000 n +0000098668 00000 n +0000098800 00000 n +0000098932 00000 n +0000099065 00000 n +0000099198 00000 n +0000099331 00000 n +0000099464 00000 n +0000099597 00000 n +0000099729 00000 n +0000099861 00000 n +0000099993 00000 n +0000100125 00000 n +0000100256 00000 n +0000100388 00000 n +0000100521 00000 n +0000100653 00000 n +0000100785 00000 n +0000100918 00000 n +0000101051 00000 n +0000101184 00000 n +0000101317 00000 n +0000101449 00000 n +0000101582 00000 n +0000101715 00000 n +0000101847 00000 n +0000101980 00000 n +0000102113 00000 n +0000102246 00000 n +0000102378 00000 n +0000102511 00000 n +0000102644 00000 n +0000102777 00000 n +0000102909 00000 n +0000103041 00000 n +0000103173 00000 n +0000103305 00000 n +0000103438 00000 n +0000103571 00000 n +0000103703 00000 n +0000103835 00000 n +0000103966 00000 n +0000104098 00000 n +0000104230 00000 n +0000104363 00000 n +0000104496 00000 n +0000104628 00000 n +0000104761 00000 n +0000104894 00000 n +0000105027 00000 n +0000105160 00000 n +0000105292 00000 n +0000105424 00000 n +0000105557 00000 n +0000105690 00000 n +0000105822 00000 n +0000105955 00000 n +0000106088 00000 n +0000106221 00000 n +0000106353 00000 n +0000106486 00000 n +0000106619 00000 n +0000106751 00000 n +0000106883 00000 n +0000107015 00000 n +0000107147 00000 n +0000107278 00000 n +0000107410 00000 n +0000107542 00000 n +0000107674 00000 n +0000107807 00000 n +0000107940 00000 n +0000108072 00000 n +0000108204 00000 n +0000108337 00000 n +0000108470 00000 n +0000108603 00000 n +0000108735 00000 n +0000108866 00000 n +0000108999 00000 n +0000109132 00000 n +0000109265 00000 n +0000109397 00000 n +0000109530 00000 n +0000109662 00000 n +0000109794 00000 n +0000109926 00000 n +0000110058 00000 n +0000110190 00000 n +0000110322 00000 n +0000110454 00000 n +0000110585 00000 n +0000110716 00000 n +0000112185 00000 n +0000112219 00000 n +0000112352 00000 n +0000112485 00000 n +0000112618 00000 n +0000112750 00000 n +0000112883 00000 n +0000113016 00000 n +0000113148 00000 n +0000113280 00000 n +0000113412 00000 n +0000113544 00000 n +0000113676 00000 n +0000113808 00000 n +0000113939 00000 n +0000114071 00000 n +0000114203 00000 n +0000114336 00000 n +0000114468 00000 n +0000114600 00000 n +0000114732 00000 n +0000114865 00000 n +0000114997 00000 n +0000115130 00000 n +0000115263 00000 n +0000115396 00000 n +0000115529 00000 n +0000115661 00000 n +0000115793 00000 n +0000115926 00000 n +0000116059 00000 n +0000116192 00000 n +0000116325 00000 n +0000116458 00000 n +0000116591 00000 n +0000116724 00000 n +0000116856 00000 n +0000116989 00000 n +0000117122 00000 n +0000117255 00000 n +0000117388 00000 n +0000117521 00000 n +0000117654 00000 n +0000117787 00000 n +0000117920 00000 n +0000118052 00000 n +0000118185 00000 n +0000118317 00000 n +0000118450 00000 n +0000118583 00000 n +0000118716 00000 n +0000118849 00000 n +0000118982 00000 n +0000119115 00000 n +0000119248 00000 n +0000119381 00000 n +0000119514 00000 n +0000119645 00000 n +0000119778 00000 n +0000119911 00000 n +0000120043 00000 n +0000120176 00000 n +0000120309 00000 n +0000120442 00000 n +0000120575 00000 n +0000120708 00000 n +0000120841 00000 n +0000120974 00000 n +0000121107 00000 n +0000121239 00000 n +0000121371 00000 n +0000121504 00000 n +0000121637 00000 n +0000121770 00000 n +0000121903 00000 n +0000122036 00000 n +0000122168 00000 n +0000122300 00000 n +0000122433 00000 n +0000122566 00000 n +0000122699 00000 n +0000122832 00000 n +0000122964 00000 n +0000123096 00000 n +0000123228 00000 n +0000123360 00000 n +0000123492 00000 n +0000123624 00000 n +0000123756 00000 n +0000123888 00000 n +0000124020 00000 n +0000124152 00000 n +0000124284 00000 n +0000124417 00000 n +0000124550 00000 n +0000124682 00000 n +0000124815 00000 n +0000124948 00000 n +0000125081 00000 n +0000125213 00000 n +0000125346 00000 n +0000125479 00000 n +0000125612 00000 n +0000125745 00000 n +0000125876 00000 n +0000126006 00000 n +0000126137 00000 n +0000126267 00000 n +0000126398 00000 n +0000126528 00000 n +0000126659 00000 n +0000126722 00000 n +0000126851 00000 n +0000126920 00000 n +0000126983 00000 n +0000127072 00000 n +0000127155 00000 n +0000127238 00000 n +0000127301 00000 n +0000127380 00000 n +0000127443 00000 n +0000127522 00000 n +0000127721 00000 n +0000127848 00000 n +0000127987 00000 n +0000128090 00000 n +0000128169 00000 n +0000128248 00000 n +0000128339 00000 n +0000128466 00000 n +0000128521 00000 n +0000128636 00000 n +0000128787 00000 n +0000128894 00000 n +0000129001 00000 n +0000129065 00000 n +0000129181 00000 n +0000129290 00000 n +0000129365 00000 n +0000129528 00000 n +0000129621 00000 n +0000129727 00000 n +0000129833 00000 n +0000129927 00000 n +0000129985 00000 n +0000130091 00000 n +0000130155 00000 n +0000130259 00000 n +0000130339 00000 n +0000130407 00000 n +0000130470 00000 n +0000130590 00000 n +0000130666 00000 n +0000130749 00000 n +0000130811 00000 n +0000130874 00000 n +0000130969 00000 n +0000131032 00000 n +0000131128 00000 n +0000131191 00000 n +0000131287 00000 n +0000131350 00000 n +0000131430 00000 n +0000131493 00000 n +0000131573 00000 n +0000131871 00000 n +0000132142 00000 n +0000132649 00000 n +0000132791 00000 n +0000133348 00000 n +0000133812 00000 n +0000134557 00000 n +0000134781 00000 n +0000135281 00000 n +0000136024 00000 n +0000136757 00000 n +0000137485 00000 n +0000137950 00000 n +0000138176 00000 n +0000138911 00000 n +0000139546 00000 n +0000140103 00000 n +0000140837 00000 n +0000141393 00000 n +0000141913 00000 n +0000142042 00000 n +0000142171 00000 n +0000142751 00000 n +0000142880 00000 n +0000143610 00000 n +0000143739 00000 n +0000143802 00000 n +0000143930 00000 n +0000144014 00000 n +0000144077 00000 n +0000144221 00000 n +0000144284 00000 n +0000144391 00000 n +0000144454 00000 n +0000144517 00000 n +0000144613 00000 n +0000144676 00000 n +0000144772 00000 n +0000144835 00000 n +0000144915 00000 n +0000144978 00000 n +0000145058 00000 n +0000145272 00000 n +0000145487 00000 n +0000145747 00000 n +0000145962 00000 n +0000146209 00000 n +0000146473 00000 n +0000146796 00000 n +0000147000 00000 n +0000147524 00000 n +0000147884 00000 n +0000148228 00000 n +0000148722 00000 n +0000149103 00000 n +0000149353 00000 n +0000149631 00000 n +0000149892 00000 n +0000150159 00000 n +0000150430 00000 n +0000150673 00000 n +0000150892 00000 n +0000151094 00000 n +0000151301 00000 n +0000151552 00000 n +0000151755 00000 n +0000151993 00000 n +0000152198 00000 n +0000152261 00000 n +0000152340 00000 n +0000152442 00000 n +0000152505 00000 n +0000152568 00000 n +0000152717 00000 n +0000152802 00000 n +0000152897 00000 n +0000152960 00000 n +0000153023 00000 n +0000153086 00000 n +0000153149 00000 n +0000153229 00000 n +0000153292 00000 n +0000153372 00000 n +0000161804 00000 n +0000169557 00000 n +0000179656 00000 n +0000186783 00000 n +0000191604 00000 n +0000204687 00000 n +0000220137 00000 n +0000227352 00000 n +0000245790 00000 n +0000261608 00000 n +0000279872 00000 n +0000303635 00000 n +0000320024 00000 n +0000328849 00000 n +0000339158 00000 n +0000346982 00000 n +0000361394 00000 n +0000371903 00000 n +0000379261 00000 n +0000387272 00000 n +0000394345 00000 n +0000401324 00000 n +0000405964 00000 n +0000413057 00000 n +0000422173 00000 n +0000429254 00000 n +0000429317 00000 n +0000429420 00000 n +0000429483 00000 n +0000429594 00000 n +0000429657 00000 n +0000429746 00000 n +0000429835 00000 n +0000429896 00000 n +0000430011 00000 n +0000430072 00000 n +0000430169 00000 n +0000430232 00000 n +0000430312 00000 n +0000430375 00000 n +0000430455 00000 n +0000430517 00000 n +0000430621 00000 n +0000430684 00000 n +0000430747 00000 n +0000430808 00000 n +0000430871 00000 n +0000430971 00000 n +0000431032 00000 n +0000431131 00000 n +0000431194 00000 n +0000431274 00000 n +0000431337 00000 n +0000431417 00000 n +0000431480 00000 n +0000431542 00000 n +0000431605 00000 n +0000431668 00000 n +0000431748 00000 n +0000431811 00000 n +0000431891 00000 n +0000431954 00000 n +0000432034 00000 n +0000432097 00000 n +0000432177 00000 n +0000432240 00000 n +0000432320 00000 n +0000432383 00000 n +0000432463 00000 n +0000432526 00000 n +0000432606 00000 n +0000432669 00000 n +0000432749 00000 n +0000432812 00000 n +0000432892 00000 n +0000432955 00000 n trailer -<</Root 1 0 R/ID[( v`in\r *}})(:+xc6q<pr)]/Compress<</SpecO/1.4/LengthO 502094>>/Info 6 0 R/Size 950>> +<</Root 1 0 R/ID[(1[ݽb.,"p&)( +YIUjZ 恬)]/Compress<</SpecO/1.4/LengthO 502021>>/Info 6 0 R/Size 950>> startxref -433082 +433018 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf Binary files differindex 01d37300baa..dd7ab94a75a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf b/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf Binary files differindex cf89f2dcc9d..56ab62b5c06 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf b/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf Binary files differindex 458cf856302..1f54009775b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf Binary files differindex 868d8f5cc16..4107d8b7e4a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf Binary files differindex 5dc8a5095c7..902daf687e5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf Binary files differindex e5002eada4c..7aaa04a66bb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf Binary files differindex aa676016655..e2af28b8b88 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf Binary files differindex 0fcbb58789b..0e52c3495ea 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf Binary files differindex b77035dc009..fb61615aec5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf Binary files differindex 5f843174013..51178b584ef 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf Binary files differindex c382e56f48c..27a8d6baa3c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf index 2ee5a8b36a1..2ae0d4cb29a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf @@ -5210,7 +5210,7 @@ xref 0000505482 00000 n 0000505546 00000 n trailer -<</Root 1 0 R/ID[(a t>ZPiƖ)(sj +<</Root 1 0 R/ID[(a t>ZPiƖ)(?a>Tt|f)]/Compress<</SpecO/1.4/LengthO 606932>>/Info 6 0 R/Size 1312>> startxref 505610 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf Binary files differindex 5fdd98cf050..9d8c91d93de 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf index fde7cd7d7e4..59fc9c4990f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf @@ -4011,7 +4011,7 @@ xref 0000423903 00000 n 0000423966 00000 n trailer -<</Root 1 0 R/ID[( Yӫн:D)(!8 \\1K* #{)]/Compress<</SpecO/1.4/LengthO 489353>>/Info 6 0 R/Size 935>> +<</Root 1 0 R/ID[( Yӫн:D)(z startxref 424029 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf Binary files differindex 47407d2ceed..28ae4d2322f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf Binary files differindex 4e2600424c5..5e51582dce8 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf b/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf Binary files differindex 7ae837916ad..d215aa2e8f9 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf b/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf Binary files differindex 6be13918d4c..60c8ebe3bd5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf Binary files differindex 1aedae1e3f9..b60468ddff4 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf Binary files differindex 7255617454a..17984577e5c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf index a62148780f7..69b5d6973b0 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf @@ -6002,7 +6002,7 @@ xref 0000550974 00000 n 0000551037 00000 n trailer -<</Root 1 0 R/ID[(c@8 `5y)(>91'-uZy)]/Compress<</SpecO/1.4/LengthO 671976>>/Info 6 0 R/Size 1521>> +<</Root 1 0 R/ID[(c@8 `5y)(5ǎ :p)]/Compress<</SpecO/1.4/LengthO 671976>>/Info 6 0 R/Size 1521>> startxref 551101 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf Binary files differindex 86a34874493..e3916ed800c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf Binary files differindex 1ac0f51a925..764e0a79ea9 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf Binary files differindex 41b36646d31..0af13bb9dce 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf Binary files differindex e3efa686814..57053d21a36 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf Binary files differindex 99a6350774f..d8d6c786028 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf Binary files differindex c17f57c8c31..285962ca966 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf Binary files differindex cfb4be2fb38..0c0baa7dd2c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf Binary files differindex cda5510475f..b68cf2078cd 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf Binary files differindex 72155a512ba..698fea59f6a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf Binary files differindex e52c3cf501f..a45caac816b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf Binary files differindex baea4972d64..47fde9e0c06 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf Binary files differindex df4dbcffcca..39e269b2b9a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf Binary files differindex 020b17d0d31..4a20b0377d8 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf b/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf Binary files differindex bd604994c6a..bb04ec2e6fd 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf Binary files differindex c471387eeca..3c3332fdf1a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf Binary files differindex 245ed90f4f2..bea62956f17 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf index f8fb4f5cc73..433b5a6ed8d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf @@ -4861,7 +4861,7 @@ xref 0000472832 00000 n 0000472896 00000 n trailer -<</Root 1 0 R/ID[( c<eVVYW#)(!hTI?)]/Compress<</SpecO/1.4/LengthO 563089>>/Info 6 0 R/Size 1198>> +<</Root 1 0 R/ID[( c<eVVYW#)(.x[Hɕ )]/Compress<</SpecO/1.4/LengthO 563089>>/Info 6 0 R/Size 1198>> startxref 472960 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf index f267b865cfe..dcd17276985 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf @@ -3498,7 +3498,7 @@ xref 0000375622 00000 n 0000375685 00000 n trailer -<</Root 1 0 R/ID[(%ERu0r)(Qjȿ<&@rU;{)]/Compress<</SpecO/1.4/LengthO 438064>>/Info 6 0 R/Size 832>> +<</Root 1 0 R/ID[(%ERu0r)(O gq{A5[Q^)]/Compress<</SpecO/1.4/LengthO 438064>>/Info 6 0 R/Size 832>> startxref 375748 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf Binary files differindex e96f0e14709..37381c9041b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf Binary files differindex 3df59d46462..d25b463f1b7 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf b/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf Binary files differindex 1fb50ad5fc4..23646c3ef38 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf index 06c075ac827..3c61f9eb8be 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf @@ -5137,7 +5137,7 @@ xref 0000483391 00000 n 0000483455 00000 n trailer -<</Root 1 0 R/ID[(Iy#nF&4)([< Mi8F)]/Compress<</SpecO/1.4/LengthO 581222>>/Info 6 0 R/Size 1285>> +<</Root 1 0 R/ID[(Iy#nF&4)(\)!>Q %%b)]/Compress<</SpecO/1.4/LengthO 581222>>/Info 6 0 R/Size 1285>> startxref 483519 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf b/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf Binary files differindex 6afd26a2f58..c2c18d92b4e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf Binary files differindex 13caa4753e5..59beb1ebff5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf Binary files differindex feb08e5a172..26020c4dddb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf b/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf Binary files differindex b91328b9b85..888bd4ba3c3 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf Binary files differindex fee7df0ed36..f6754449dc0 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf Binary files differindex 2797b46d7a9..4288214cfd2 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf Binary files differindex e0e53e77240..f2930715ade 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf index 8a20d9702c5..5e4379462c5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf @@ -3916,7 +3916,7 @@ xref 0000395786 00000 n 0000395849 00000 n trailer -<</Root 1 0 R/ID[( ؆{s_4Úh'j)(ds ,y\))]/Compress<</SpecO/1.4/LengthO 466015>>/Info 6 0 R/Size 944>> +<</Root 1 0 R/ID[( ؆{s_4Úh'j)(!=iE6)]/Compress<</SpecO/1.4/LengthO 466015>>/Info 6 0 R/Size 944>> startxref 395912 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf index 984750bb779..a0d5c15bfdb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf @@ -3766,7 +3766,8 @@ xref 0000409254 00000 n 0000409317 00000 n trailer -<</Root 1 0 R/ID[(-!\rwdc9)(e4 p{S<ܐo)]/Compress<</SpecO/1.4/LengthO 472634>>/Info 6 0 R/Size 856>> +<</Root 1 0 R/ID[(-!\rwdc9)(h3톤 +QlQ)]/Compress<</SpecO/1.4/LengthO 472634>>/Info 6 0 R/Size 856>> startxref 409380 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf Binary files differindex a9c8b9d13b0..75b0f02824c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf Binary files differindex 185e08f2361..1b84487bac7 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf index e1b9f3e1141..77f03b1fccb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf @@ -5768,7 +5768,7 @@ xref 0000519898 00000 n 0000519962 00000 n trailer -<</Root 1 0 R/ID[( T *R2D)(H2G )]/Compress<</SpecO/1.4/LengthO 640743>>/Info 6 0 R/Size 1533>> +<</Root 1 0 R/ID[( T *R2D)(%N%*FS)]/Compress<</SpecO/1.4/LengthO 640743>>/Info 6 0 R/Size 1533>> startxref 520026 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf Binary files differindex c447ef162a9..0cda95810f1 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf index a19771eaf4a..c0c35374e75 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf @@ -4928,7 +4928,7 @@ xref 0000489968 00000 n 0000490032 00000 n trailer -<</Root 1 0 R/ID[(`߷H8YB{7)(Lv\r[W09)]/Compress<</SpecO/1.4/LengthO 584321>>/Info 6 0 R/Size 1209>> +<</Root 1 0 R/ID[(`߷H8YB{7)(g\rCEm:s9P)]/Compress<</SpecO/1.4/LengthO 584321>>/Info 6 0 R/Size 1209>> startxref 490096 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf index 51fa51b9d16..a1937c0d271 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf @@ -3802,7 +3802,7 @@ xref 0000415963 00000 n trailer <</Root 1 0 R/ID[(._Qޟ -J,)( D\)@3nU])]/Compress<</SpecO/1.4/LengthO 479992>>/Info 6 0 R/Size 897>> +J,)(ޣU0QB)]/Compress<</SpecO/1.4/LengthO 479992>>/Info 6 0 R/Size 897>> startxref 416026 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf Binary files differindex 9788dd3cfa0..09796fddd04 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf index df96cacb7a6..e19c953383f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf @@ -4319,7 +4319,7 @@ xref 0000415839 00000 n 0000415903 00000 n trailer -<</Root 1 0 R/ID[(dhyOr^x:و?)(y O' H)]/Compress<</SpecO/1.4/LengthO 493313>>/Info 6 0 R/Size 1047>> +<</Root 1 0 R/ID[(dhyOr^x:و?)( !y/4\ru)]/Compress<</SpecO/1.4/LengthO 493313>>/Info 6 0 R/Size 1047>> startxref 415967 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf Binary files differindex 6ced816b4cc..c172d1ee76d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf b/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf Binary files differindex 770a54f9860..4d86dedeee0 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf b/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf Binary files differindex 3c8e09a43e1..3fd26426b20 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf b/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf Binary files differindex a335a128377..a69a72f5ddc 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf b/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf Binary files differindex fdc693e95ad..b9416a0c66f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf Binary files differindex aa99ff97c70..17a18991ea0 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf Binary files differindex fc582b145da..109387102ed 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf index ef12fa459eb..d6c9a1e1ca8 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf @@ -6261,7 +6261,7 @@ xref 0000549744 00000 n 0000549808 00000 n trailer -<</Root 1 0 R/ID[(ˍNb[>iMΨcf)(_Aw }SR)]/Compress<</SpecO/1.4/LengthO 685295>>/Info 6 0 R/Size 1670>> +<</Root 1 0 R/ID[(ˍNb[>iMΨcf)(߅U$NbCK)]/Compress<</SpecO/1.4/LengthO 685295>>/Info 6 0 R/Size 1670>> startxref 549872 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf Binary files differindex 500d75fcd3d..72506d902de 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf b/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf Binary files differindex ec9cfe92979..d6d3bc45c55 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf b/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf Binary files differindex ca67e0a8472..6c25ad82922 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf Binary files differindex f0e6694de61..27e44c8c945 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf Binary files differindex 406e4ce52d5..0520a0550aa 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf Binary files differindex f2a6b6ff7fc..d8b2c602d6d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex index 8ffc8ab4357..ef971d21fea 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,15 +29,16 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{zref-runs}[2009/12/08] +\usepackage{zref-runs}[2010/03/26] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex index 735d98c825e..b5b3b35c220 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,16 +29,17 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \nofiles \documentclass{article} -\usepackage{zref-base}[2009/12/08] +\usepackage{zref-base}[2010/03/26] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} diff --git a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf Binary files differindex 613bfcfa3f9..570adf091bd 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf Binary files differindex 3372caeef1e..8e8c83477c9 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf b/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf Binary files differindex b951414a7db..23fd3d349d2 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex b/Master/texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex index dbae50c3f55..44b34765c16 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \documentclass{report} - % + \newcounter{foo} \renewcommand*{\thefoo}{\Alph{foo}} - % + \usepackage{zref-lastpage,zref-user}[2008/10/01] - % + \makeatletter \zref@newprop{thefoo}{\thefoo} \zref@newprop{valuefoo}{\the\value{foo}} @@ -51,22 +52,22 @@ \zref@addprop{LastPage}{valuefoo} \zref@addprop{LastPage}{chapter} \makeatother - % + \newcommand*{\foo}{% \stepcounter{foo}% [Current foo: \thefoo]% } - % + \begin{document} - \chapter{First chapter}% - Last page is \zref{LastPage}.\\% - Last chapter is \zref[chapter]{LastPage}.\\% - Last foo is \zref[thefoo]{LastPage}.\\% - Last value of foo is \zref[valuefoo]{LastPage}.\\% + \chapter{First chapter} + Last page is \zref{LastPage}.\\ + Last chapter is \zref[chapter]{LastPage}.\\ + Last foo is \zref[thefoo]{LastPage}.\\ + Last value of foo is \zref[valuefoo]{LastPage}.\\ \foo - \chapter{Second chapter}% + \chapter{Second chapter} \foo\foo\foo - \chapter{Last chapter}% + \chapter{Last chapter} \foo \end{document} \endinput diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex b/Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex new file mode 100644 index 00000000000..e3ac580d857 --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex @@ -0,0 +1,67 @@ +%% +%% This is file `zref-example-nextpage.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `example-nextpage') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. +%% +\documentclass{book} + +\usepackage{zref-nextpage}[2010/03/26] +\znextpagesetup + {\thepage}% next page is unknown + {\thepage\ (#1)}% this page is last page + {\thepage\ $\rightarrow$ #1}% next page is known +\renewcommand*{\znonextpagename}{last page} + +\usepackage{fancyhdr} +\pagestyle{fancy} +\fancyhf{} +\fancyhead[LE,RO]{\znextpage} +\fancypagestyle{plain}{% + \fancyhf{}% + \fancyhead[LE,RO]{\znextpage}% +} + +\begin{document} +\frontmatter + \tableofcontents +\mainmatter + \chapter{Hello World} + \clearpage + \section{Last section} +\end{document} +\endinput +%% +%% End of file `zref-example-nextpage.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex b/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex index 24ee3f8a308..3ceb796b3ce 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,11 +29,12 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \documentclass{book} diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf Binary files differindex ea5037b140d..30ca1aa7212 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf diff --git a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx index a29cb91a39d..bf12ff3b168 100644 --- a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx @@ -185,9 +185,9 @@ and the derived files % This \LaTeX\ package provides two hooks for \verb|\end{document}| % that are executed after the hook of \cs{AtEndDocument}. % \cs{AfterLastShipout} can be used for code that is to be executed -% right after the last \cs{clearpage} before the \xext{.aux} file +% right after the last \cs{clearpage} before the \xext{aux} file % is closed. \cs{AtVeryEndDocument} is used for code after closing -% and final reading of the \xext{.aux} file. +% and final reading of the \xext{aux} file. % \end{abstract} % % \tableofcontents @@ -223,12 +223,12 @@ and the derived files % \begin{declcs}{AfterLastShipout} \M{code} % \end{declcs} % The code is called after the final \cs{clearpage} of \cs{enddocument} -% before the main \xext{.aux} file is closed. This is the right place -% to remember the last page in the \xext{.aux} file, for instance. +% before the main \xext{aux} file is closed. This is the right place +% to remember the last page in the \xext{aux} file, for instance. % % \begin{declcs}{AtVeryEndDocument} \M{code} % \end{declcs} -% The code is called after the \xext{.aux} file is closed and read in again. +% The code is called after the \xext{aux} file is closed and read in again. % It is the place for final checks, rerun hints, final messages. % % \subsection{Related work} @@ -809,7 +809,7 @@ and the derived files % a precondition of this package that the \cs{clearpage} in % \cs{enddocument} is the final call with no material at % later times. Therefore we move the label making -% from the \xext{.aux} file to \cs{AtEndDocument}. +% from the \xext{aux} file to \cs{AtEndDocument}. % \begin{macrocode} \def\AtVeryEnd@temp{% \AtBeginDocument{% diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx index a4167e7ef3a..118dc56f878 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx @@ -71,7 +71,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hypdoc 2010/02/03 v1.8 Hyper extensions for doc.sty (HO)} +\Msg{* Package: hypdoc 2010/03/26 v1.9 Hyper extensions for doc.sty (HO)} \Msg{************************************************************************} \keepsilent @@ -141,7 +141,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hypdoc.drv}% - [2010/02/03 v1.8 Hyper extensions for doc.sty (HO)]% + [2010/03/26 v1.9 Hyper extensions for doc.sty (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -150,7 +150,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{710} +% \CheckSum{718} % % \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 @@ -171,7 +171,7 @@ and the derived files % \GetFileInfo{hypdoc.drv} % % \title{The \xpackage{hypdoc} package} -% \date{2010/02/03 v1.8} +% \date{2010/03/26 v1.9} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -348,7 +348,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2010/02/03 v1.8 Hyper extensions for doc.sty (HO)]% + [2010/03/26 v1.9 Hyper extensions for doc.sty (HO)]% % \end{macrocode} % The package identification is done at the top of the |.dtx| file % in order to use only one identification string. @@ -370,6 +370,7 @@ and the derived files % \subsection{Package loading} % % \begin{macrocode} +\RequirePackage{atveryend}[2010/03/24] \RequirePackage{doc} % \end{macrocode} % \begin{macrocode} @@ -1097,10 +1098,13 @@ and the derived files % % \cs{MacroIndent} automatically calculated. % \begin{macrocode} -\AtEndDocument{% +\AfterLastShipout{% \if@filesw \immediate\write\@auxout{% - \noexpand\HD@SetMacroIndent{\number\value{CodelineNo}}% + \string\providecommand\string\HD@SetMacroIndent[1]{}% + }% + \immediate\write\@auxout{% + \string\HD@SetMacroIndent{\number\value{CodelineNo}}% }% \fi } @@ -1351,6 +1355,10 @@ and the derived files % \item % Fix for bug latex/4096 added. % \end{Version} +% \begin{Version}{2010/03/26 v1.9} +% \item +% Definition of \cs{HD@SetMacroIndex} is provided in the \xext{aux} file. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index f6f73602622..48f89f2f44b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2010/03/25 +% 2010/03/26 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index fada005bfbc..ef0dbe9e6f0 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,7 +6,7 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{heiko.oberdiek at googlemail.com} -\newcommand*{\Date}{2010/03/25} +\newcommand*{\Date}{2010/03/26} % Copyright (C) 2006 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -226,7 +226,7 @@ [\entrysep] \entry{hypdestopt}{2008/08/08}{2.2}{Hyperref destination optimizer}% [\entrysep] -\entry{hypdoc}{2010/02/03}{1.8}{Hyper extensions for doc.sty}% +\entry{hypdoc}{2010/03/26}{1.9}{Hyper extensions for doc.sty}% [\entrysep] \entry{hypgotoe}{2007/10/30}{0.1}{Experimental links to embedded files}% [\entrysep] @@ -330,7 +330,7 @@ [\entrysep] \entry{uniquecounter}{2009/12/18}{1.1}{Provides unlimited unique counter}% [\entrysep] -\entry{zref}{2009/12/08}{2.7}{New reference scheme for \LaTeXe{}}% +\entry{zref}{2010/03/26}{2.8}{New reference scheme for \LaTeXe{}}% \end{overview} \section{Packages} @@ -417,9 +417,9 @@ the attached files. This \LaTeX\ package provides two hooks for \verb|\end{document}| that are executed after the hook of \cs{AtEndDocument}. \cs{AfterLastShipout} can be used for code that is to be executed -right after the last \cs{clearpage} before the \xext{.aux} file +right after the last \cs{clearpage} before the \xext{aux} file is closed. \cs{AtVeryEndDocument} is used for code after closing -and final reading of the \xext{.aux} file. +and final reading of the \xext{aux} file. \end{abstract} \tocinclude{atveryend} diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx index 926878f4341..7defc471004 100644 --- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2006-2009 by +% Copyright (C) 2006-2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -21,11 +21,12 @@ % and the derived files % zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, % zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -% zref-totpages.sty, zref-user.sty, zref-xr.sty, -% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -% zref-test-runs.tex. +% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +% zref-user.sty, zref-xr.sty, zref-example.tex, +% zref-example-lastpage.tex, zref-example-nextpage.tex, +% zref-test1.tex, zref-test-runs.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/zref.dtx @@ -65,9 +66,11 @@ % TDS:tex/latex/oberdiek/zref-dotfill.sty % TDS:tex/latex/oberdiek/zref-hyperref.sty % TDS:tex/latex/oberdiek/zref-lastpage.sty +% TDS:tex/latex/oberdiek/zref-nextpage.sty % TDS:tex/latex/oberdiek/zref-perpage.sty % TDS:tex/latex/oberdiek/zref-runs.sty % TDS:tex/latex/oberdiek/zref-savepos.sty +% TDS:tex/latex/oberdiek/zref-thepage.sty % TDS:tex/latex/oberdiek/zref-titleref.sty % TDS:tex/latex/oberdiek/zref-totpages.sty % TDS:tex/latex/oberdiek/zref-user.sty @@ -75,6 +78,7 @@ % TDS:doc/latex/oberdiek/zref.pdf % TDS:doc/latex/oberdiek/zref-example.tex % TDS:doc/latex/oberdiek/zref-example-lastpage.tex +% TDS:doc/latex/oberdiek/zref-example-nextpage.tex % TDS:doc/latex/oberdiek/test/zref-test1.tex % TDS:doc/latex/oberdiek/test/zref-test-runs.tex % TDS:source/latex/oberdiek/zref.dtx @@ -94,7 +98,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: zref 2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)} +\Msg{* Package: zref 2010/03/26 v2.8 New reference scheme for LaTeX2e (HO)} \Msg{************************************************************************} \keepsilent @@ -105,7 +109,7 @@ This is a generated file. -Copyright (C) 2006-2009 by +Copyright (C) 2006-2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -126,11 +130,12 @@ This work consists of the main source file zref.dtx and the derived files zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, - zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, - zref-runs.sty, zref-savepos.sty, zref-titleref.sty, - zref-totpages.sty, zref-user.sty, zref-xr.sty, - zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, - zref-test-runs.tex. + zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, + zref-perpage.sty, zref-runs.sty, zref-savepos.sty, + zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, + zref-user.sty, zref-xr.sty, zref-example.tex, + zref-example-lastpage.tex, zref-example-nextpage.tex, + zref-test1.tex, zref-test-runs.tex. \endpreamble \let\MetaPrefix\DoubleperCent @@ -146,9 +151,11 @@ and the derived files \file{zref-dotfill.sty}{\from{zref.dtx}{dotfill}}% \file{zref-hyperref.sty}{\from{zref.dtx}{hyperref}}% \file{zref-lastpage.sty}{\from{zref.dtx}{lastpage}}% + \file{zref-nextpage.sty}{\from{zref.dtx}{nextpage}}% \file{zref-perpage.sty}{\from{zref.dtx}{perpage}}% \file{zref-runs.sty}{\from{zref.dtx}{runs}}% \file{zref-savepos.sty}{\from{zref.dtx}{savepos}}% + \file{zref-thepage.sty}{\from{zref.dtx}{thepage}}% \file{zref-titleref.sty}{\from{zref.dtx}{titleref}}% \file{zref-totpages.sty}{\from{zref.dtx}{totpages}}% \file{zref-user.sty}{\from{zref.dtx}{user}}% @@ -156,6 +163,7 @@ and the derived files \usedir{doc/latex/oberdiek}% \file{zref-example.tex}{\from{zref.dtx}{example}}% \file{zref-example-lastpage.tex}{\from{zref.dtx}{example-lastpage}}% + \file{zref-example-nextpage.tex}{\from{zref.dtx}{example-nextpage}}% \usedir{doc/latex/oberdiek/test}% \file{zref-test1.tex}{\from{zref.dtx}{test1}}% \file{zref-test-runs.tex}{\from{zref.dtx}{test-runs}}% @@ -170,9 +178,9 @@ and the derived files \Msg{*} \Msg{* zref.sty, zref-base.sty, zref-abspage.sty, zref-counter.sty,} \Msg{* zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,} -\Msg{* zref-perpage.sty, zref-runs.sty, zref-savepos.sty,} -\Msg{* zref-titleref.sty, zref-totpages.sty, zref-user.sty,} -\Msg{* zref-xr.sty} +\Msg{* zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,} +\Msg{* zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,} +\Msg{* zref-totpages.sty, zref-user.sty, zref-xr.sty} \Msg{*} \Msg{* And install the following script file:} \Msg{*} @@ -193,7 +201,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{zref.drv}% - [2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)]% + [2010/03/26 v2.8 New reference scheme for LaTeX2e (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -202,7 +210,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1668} +% \CheckSum{1838} % % \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 @@ -223,7 +231,7 @@ and the derived files % \GetFileInfo{zref.drv} % % \title{The \xpackage{zref} package} -% \date{2009/12/08 v2.7} +% \date{2010/03/26 v2.8} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -559,6 +567,13 @@ and the derived files % \end{declcs} % A possibility to check whether a reference exists. % +% \begin{declcs}{zifrefundefined} +% \M{refname} \M{then} \M{else} +% \end{declcs} +% Macro \cs{zifrefundefined} calls \cs{ref@refused} before +% executing \cs{zref@ifrefundefined}. Babel shorthands are +% supported in \meta{refname}. +% % \begin{declcs}{zref@ifrefcontainsprop}\markexp % \M{refname} \M{propname} \M{then} \M{else} % \end{declcs} @@ -760,7 +775,11 @@ and the derived files % The label |LastPage| is put at the end of the document. % You can refer the last page number with: % \begin{quote} -% |\zpageref{LastPage}| +% |\zref@extract{LastPage}{page}| (+ |\zref@refused{LastPage}|)\\ +% \end{quote} +% or +% \begin{quote} +% |\zpageref{LastPage}| (module \xmodule{user}) % \end{quote} % % Since version 2008/10/01 v2.3 the module defines the list |LastPage|. @@ -769,18 +788,47 @@ and the derived files % list is empty. The list can be used by the user to add additional % properties for label |LastPage|. % +% \subsubsection{Tests for last page} +% +% Since version 2010/03/26 v2.8 the macros \cs{zref@iflastpage} +% and \cs{ziflastpage} were added. They test the reference, +% whether it is a reference of the last page. +% +% \begin{declcs}{zref@iflastpage}\markexp \M{refname} \M{then} \M{else} +% \end{declcs} +% Macro \cs{zref@iflastpage} compares the references \meta{refname} +% with \meta{LastPage}. Basis of the comparison is the value of +% property |abspage|, because the values are different for different +% pages. This is not ensured by property |page|. Therefore module +% \xmodule{abspage} is loaded by module \xmodule{lastpage}. +% If both values of property |abspage| are present and match, +% then \meta{then} is executed, otherwise code \meta{else} is called. +% If one or both references are undefined or lack the property |abspage|, +% then \meta{else} is executed. +% +% Macro \cs{zref@iflastpage} is expandable, therefore \cs{zref@refused} +% should be called on \meta{refname} and \meta{LastPage}. +% +% \begin{declcs}{ziflastpage} \M{refname} \M{then} \M{else} +% \end{declcs} +% Macro \cs{ziflastpage} has the same function as \cs{zref@iflastpage}, +% but adds support for babel shorthands in \meta{refname} and +% calls \cs{zref@refused}. However macro \cs{ziflastpage} is not +% expandable. +% % \subsubsection{Example} % % \begin{macrocode} %<*example-lastpage> +%<<END_EXAMPLE \NeedsTeXFormat{LaTeX2e} \documentclass{report} - % + \newcounter{foo} \renewcommand*{\thefoo}{\Alph{foo}} - % + \usepackage{zref-lastpage,zref-user}[2008/10/01] - % + \makeatletter \zref@newprop{thefoo}{\thefoo} \zref@newprop{valuefoo}{\the\value{foo}} @@ -789,27 +837,141 @@ and the derived files \zref@addprop{LastPage}{valuefoo} \zref@addprop{LastPage}{chapter} \makeatother - % + \newcommand*{\foo}{% \stepcounter{foo}% [Current foo: \thefoo]% } - % + \begin{document} - \chapter{First chapter}% - Last page is \zref{LastPage}.\\% - Last chapter is \zref[chapter]{LastPage}.\\% - Last foo is \zref[thefoo]{LastPage}.\\% - Last value of foo is \zref[valuefoo]{LastPage}.\\% + \chapter{First chapter} + Last page is \zref{LastPage}.\\ + Last chapter is \zref[chapter]{LastPage}.\\ + Last foo is \zref[thefoo]{LastPage}.\\ + Last value of foo is \zref[valuefoo]{LastPage}.\\ \foo - \chapter{Second chapter}% + \chapter{Second chapter} \foo\foo\foo - \chapter{Last chapter}% + \chapter{Last chapter} \foo \end{document} +%END_EXAMPLE %</example-lastpage> % \end{macrocode} % +% \subsection{Module \xmodule{thepage}} +% +% This module \xmodule{thepage} loads module \xmodule{abspage}, +% constructs a reference name using the absolute page number +% and remembers property |page|. Other properties can be added +% by adding them to the property list |thepage|. +% +% \begin{declcs}{zthepage} \M{absolute page number}\\ +% \end{declcs} +% Macro \cs{zthepage} is basically a \cs{zpageref}. The reference +% name is yield by the \meta{absolute page number}. If the reference +% is not defined, then the default for property |page| is used. +% +% \begin{declcs}{zref@thepage@name}\markexp \M{absolute page number} +% \end{declcs} +% Macro \cs{zref@thepage@name} returns the internal reference +% name that is constructed using the \meta{absolute page number}. +% The internal reference name should not be used directly, because +% it might change in future versions. +% +% \begin{declcs}{zref@thepage}\markexp \M{absolute page number}\\ +% \cs{zref@thepage@refused} \M{absolute page number} +% \end{declcs} +% Macro \cs{zref@thepage} returns the page number (\cs{thepage}) +% of \meta{absolute page number}. Because this macro is expandable, +% \cs{zref@thepage@refused} is used outside an expandable context +% to mark the reference as used. +% +% +% \subsection{Module \xmodule{nextpage}} +% +% \begin{declcs}{znextpage} +% \end{declcs} +% Macro \cs{znextpage} prints \cs{thepage} of the following page. +% It gets the current absolute page number by using a label. +% There are three cases for the next page: +% \begin{enumerate} +% \item The next page is not known yet because of undefined references. +% Then \cs{zunknownnextpagename} is used instead. The default for +% this macro is the default of property |page|. +% \item This page is the last page. Then \cs{znonextpagename} +% is used. Its default is empty. +% \item The next page is known, then \cs{thepage} of the next +% page is used (the value of property |page| of the next page). +% \end{enumerate} +% +% \subsubsection{Configuration} +% +% The behaviour can be configured by the following macros. +% +% \begin{declcs}{zunknownnextpagename}\\ +% \cs{znonextpagename} +% \end{declcs} +% If the next page is not known or available, then +% \cs{znextpage} uses these name macros as default. +% \cs{zunknownnextpagename} is used in case of undefined +% references. Default is the value of property |page| of the +% next page (\cs{thepage}). Module \xmodule{thepage} is used. +% +% Macro \cs{znonextpagename} is used, if the next page does +% not exists. That means that the current page is last page. +% The default is empty. +% +% \begin{declcs}{znextpagesetup} \M{unknown} \M{no next} +% \M{next} +% \end{declcs} +% Acording to the case (see \cs{znextpage}) macro \cs{znextpage} +% calls an internal macro with an argument. The argument is +% either \cs{thepage} of the next page or one of \cs{zunknownnextpagename} +% or \cs{znonextpagename}. These internal macro can be changed by +% \cs{znextpagesetup}. It expects the definition texts for these +% three cases of a macro with one argument. +% The default is +% \begin{quote} +% |\znextpagesetup{#1}{#1}{#1}| +% \end{quote} +% +% \subsubsection{Example} +% +% \begin{macrocode} +%<*example-nextpage> +%<<END_EXAMPLE +\documentclass{book} + +\usepackage{zref-nextpage}[2010/03/26] +\znextpagesetup + {\thepage}% next page is unknown + {\thepage\ (#1)}% this page is last page + {\thepage\ $\rightarrow$ #1}% next page is known +\renewcommand*{\znonextpagename}{last page} + +\usepackage{fancyhdr} +\pagestyle{fancy} +\fancyhf{} +\fancyhead[LE,RO]{\znextpage} +\fancypagestyle{plain}{% + \fancyhf{}% + \fancyhead[LE,RO]{\znextpage}% +} + +\begin{document} +\frontmatter + \tableofcontents +\mainmatter + \chapter{Hello World} + \clearpage + \section{Last section} +\end{document} +%END_EXAMPLE +%</example-nextpage> +% \end{macrocode} +% +% % \subsection{Module \xmodule{totpages}} % % For the total number of pages of a document you need to @@ -1253,13 +1415,13 @@ the height difference of the two baselines is %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)]% + [2010/03/26 v2.8 New reference scheme for LaTeX2e (HO)]% % \end{macrocode} % % \subsubsection{Load basic module} % % \begin{macrocode} -\RequirePackage{zref-base}[2009/12/08] +\RequirePackage{zref-base}[2010/03/26] % \end{macrocode} % Abort package loading if \xpackage{zref-base} could not be % loaded successfully. @@ -1274,7 +1436,7 @@ the height difference of the two baselines is \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2009/12/08]% + \RequirePackage{zref-#1}[2010/03/26]% }% }% } @@ -1334,11 +1496,15 @@ the height difference of the two baselines is %<*base> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2009/12/08 v2.7 Module base for zref (HO)]% + [2010/03/26 v2.8 Module base for zref (HO)]% % \end{macrocode} % % \subsubsection{Utilities} % +% \begin{macrocode} +\RequirePackage{ltxcmds}[2009/12/12] +% \end{macrocode} +% % \begin{macro}{\ZREF@name} % Several times the package name is used, thus we store it % in \cmd{\ZREF@name}. @@ -1382,11 +1548,11 @@ the height difference of the two baselines is \def\ZREF@patch#1{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax - \expandafter\@gobble + \expandafter\ltx@gobble \else \expandafter\let\csname ZREF@org@#1\expandafter\endcsname \csname #1\endcsname - \expandafter\@firstofone + \expandafter\ltx@firstofone \fi } % \end{macrocode} @@ -1397,18 +1563,15 @@ the height difference of the two baselines is % The use of \eTeX\ should be standard nowadays for \LaTeX. % We test for \eTeX\ in order to use its features later. % \begin{macrocode} -\begingroup - \@ifundefined{eTeXversion}{% - \ZREF@ErrorNoLine{% - Missing support for eTeX; package is abandoned% - }{% - Use a TeX compiler that support eTeX and enable eTeX % - in the format.% - }% - \endgroup - \endinput - }{}% -\endgroup +\ltx@IfUndefined{eTeXversion}{% + \ZREF@ErrorNoLine{% + Missing support for eTeX; package is abandoned% + }{% + Use a TeX compiler that support eTeX and enable eTeX % + in the format.% + }% + \endinput +}{}% % \end{macrocode} % % \begin{macrocode} @@ -1486,9 +1649,9 @@ the height difference of the two baselines is % \begin{macrocode} \def\zref@iflistundefined#1{% \expandafter\ifx\csname Z@L@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } % \end{macrocode} @@ -1528,9 +1691,9 @@ the height difference of the two baselines is }% \expandafter\endgroup \ifZREF@found - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } % \end{macrocode} @@ -1616,9 +1779,9 @@ the height difference of the two baselines is % \begin{macrocode} \def\zref@ifpropundefined#1{% \expandafter\ifx\csname Z@E@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } % \end{macrocode} @@ -1849,14 +2012,33 @@ the height difference of the two baselines is % \begin{macrocode} \def\zref@ifrefundefined#1{% \expandafter\ifx\csname Z@R@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } % \end{macrocode} % \end{macro} % +% \begin{macro}{\zifrefundefined} +% If a reference \verb|#1| is undefined, then macro +% \cs{zref@ifrefundefined} calls \verb|#2| and \verb|#3| otherwise. +% Also the reference is marked used. +% \begin{macrocode} +\newcommand*{\zifrefundefined}[1]{% + \zref@wrapper@babel\ZREF@ifrefundefined{#1}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ZREF@ifrefundefined} +% \begin{macrocode} +\def\ZREF@ifrefundefined#1{% + \zref@refused{#1}% + \zref@ifrefundefined{#1}% +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\zref@refused} % The problem with undefined references is addressed by % the macro \cs{zref@refused}. This can be used outside @@ -1905,7 +2087,7 @@ the height difference of the two baselines is % \begin{macrocode} \def\zref@ifrefcontainsprop#1#2{% \zref@ifrefundefined{#1}{% - \@secondoftwo + \ltx@secondoftwo }{% \expandafter\ZREF@ifrefcontainsprop \csname Z@E@#2\expandafter\endcsname @@ -1918,9 +2100,9 @@ the height difference of the two baselines is \def\ZREF@ifrefcontainsprop#1#2#3{% \expandafter\ifx\expandafter\ZREF@novalue #1#3#2\ZREF@novalue\ZREF@nil\@empty - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi } \def\ZREF@novalue{\ZREF@NOVALUE} @@ -1952,9 +2134,9 @@ the height difference of the two baselines is \long\def\zref@wrapper@unexpanded#1{% \let\ZREF@unexpanded\etex@unexpanded #1% - \let\ZREF@unexpanded\@firstofone + \let\ZREF@unexpanded\ltx@firstofone } -\let\ZREF@unexpanded\@firstofone +\let\ZREF@unexpanded\ltx@firstofone % \end{macrocode} % \end{macro} % @@ -1964,15 +2146,15 @@ the height difference of the two baselines is % \begin{macrocode} \long\def\zref@wrapper@babel#1#2{% \ifcsname if@safe@actives\endcsname - \expandafter\@firstofone + \expandafter\ltx@firstofone \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi {% \if@safe@actives - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi {% \begingroup @@ -2000,7 +2182,7 @@ the height difference of the two baselines is \def\zref@require@unique{% \@ifundefined{c@zref@unique}{% \begingroup - \let\@addtoreset\@gobbletwo + \let\@addtoreset\ltx@gobbletwo \newcounter{zref@unique}% \endgroup % \end{macrocode} @@ -2093,8 +2275,8 @@ the height difference of the two baselines is %<*user> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2009/12/08 v2.7 Module user for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2112,8 +2294,8 @@ the height difference of the two baselines is % table of contents. Therefore we have to check this situation. % \begin{macrocode} \newcommand*\zlabel{% - \ifx\label\@gobble - \expandafter\@gobble + \ifx\label\ltx@gobble + \expandafter\ltx@gobble \else \expandafter\zref@wrapper@babel\expandafter\zref@label \fi @@ -2168,8 +2350,8 @@ the height difference of the two baselines is %<*abspage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2009/12/08 v2.7 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2184,7 +2366,7 @@ the height difference of the two baselines is % \xfile{.aux} files of included \TeX\ files. % \begin{macrocode} \begingroup - \let\@addtoreset\@gobbletwo + \let\@addtoreset\ltx@gobbletwo \newcounter{abspage}% \endgroup \setcounter{abspage}{0}% @@ -2213,8 +2395,8 @@ the height difference of the two baselines is %<*counter> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2009/12/08 v2.7 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2250,8 +2432,9 @@ the height difference of the two baselines is %<*lastpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2009/12/08 v2.7 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\RequirePackage{zref-abspage}[2010/03/26] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} @@ -2279,27 +2462,216 @@ the height difference of the two baselines is \fi } % \end{macrocode} +% \begin{macro}{\zref@iflastpage} +% \begin{macrocode} +\def\zref@iflastpage#1{% + \ifnum\zref@extractdefault{#1}{abspage}{-1}=% + \zref@extractdefault{LastPage}{abspage}{-2} % + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ziflastpage} +% \begin{macrocode} +\newcommand*{\ziflastpage}{% + \zref@wrapper@babel\ZREF@iflastpage +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{ZREF@iflastpage} +% \begin{macrocode} +\def\ZREF@iflastpage#1{% + \zref@refused{LastPage}% + \zref@refused{#1}% + \zref@iflastpage{#1}% +} +% \end{macrocode} +% \end{macro} % \begin{macrocode} %</lastpage> % \end{macrocode} % % +% \subsection{Module \xmodule{thepage}} +% +% \begin{macrocode} +%<*thepage> +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-thepage}% + [2010/03/26 v2.8 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\@ifundefined{ZREF@baseok}{\endinput}{} +% \end{macrocode} +% +% \begin{macrocode} +\RequirePackage{atbegshi} +\RequirePackage{zref-abspage}[2010/03/26] +% \end{macrocode} +% \begin{macrocode} +\zref@newlist{thepage} +\zref@addprop{thepage}{page} +\AtBeginShipout{% + \zref@wrapper@immediate{% + \zref@labelbylist{thepage\the\value{abspage}}{thepage}% + }% +} +% \end{macrocode} +% \begin{macro}{\zref@thepage@name} +% \begin{macrocode} +\ltx@IfUndefined{numexpr}{% + \def\zref@thepage@name#1{thepage\number#1}% +}{% + \def\zref@thepage@name#1{thepage\the\numexpr#1}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\zref@thepage} +% \begin{macrocode} +\def\zref@thepage#1{% + \zref@extract{\zref@thepage@name{#1}}{page}% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\zref@thepage@refused} +% \begin{macrocode} +\def\zref@thepage@refused#1{% + \zref@refused{\zref@thepage@name{#1}}% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\zthepage} +% \begin{macrocode} +\newcommand*{\zthepage}[1]{% + \zref@thepage@refused{#1}% + \zref@thepage{#1}% +} +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +%</thepage> +% \end{macrocode} +% +% +% \subsection{Module \xmodule{nextpage}} +% +% \begin{macrocode} +%<*nextpage> +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-nextpage}% + [2010/03/26 v2.8 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\@ifundefined{ZREF@baseok}{\endinput}{} +% \end{macrocode} +% +% \begin{macrocode} +\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-thepage}[2010/03/26] +\RequirePackage{zref-lastpage}[2010/03/26] +\RequirePackage{uniquecounter}[2009/12/18] +% \end{macrocode} +% \begin{macrocode} +\UniqueCounterNew{znextpage} + +\newcommand*{\znextpagesetup}{% + \afterassignment\ZREF@np@setup@i + \def\ZREF@np@call@unknown##1% +} +\def\ZREF@np@setup@i{% + \afterassignment\ZREF@np@setup@ii + \def\ZREF@np@call@nonext##1% +} +\def\ZREF@np@setup@ii{% + \def\ZREF@np@call@next##1% +} +\def\ZREF@np@call@unknown#1{#1} +\def\ZREF@np@call@nonext#1{#1} +\def\ZREF@np@call@next#1{#1} +\newcommand*{\znextpage}{% + \UniqueCounterCall{znextpage}{\ZREF@nextpage}% +} +\newcommand*{\znonextpagename}{} +\newcommand*{\zunknownnextpagename}{\Z@D@page} +\def\ZREF@nextpage#1{% + \begingroup + \def\ZREF@refname@this{zref@np#1}% + \zref@labelbyprops\ZREF@refname@this{abspage}% + \chardef\ZREF@call=0 % unknown + \ZREF@ifrefundefined\ZREF@refname@this{% + }{% + \edef\ZREF@pagenum@this{% + \zref@extractdefault\ZREF@refname@this{abspage}{0}% + }% + \edef\ZREF@refname@next{% + \zref@thepage@name{% + \the\numexpr\ZREF@pagenum@this+1% + }% + }% + \ifnum\ZREF@pagenum@this>0 % + \ZREF@ifrefundefined{LastPage}{% + \zref@ifrefundefined\ZREF@refname@next{% + }{% + \chardef\ZREF@call=2 % next page + }% + }{% + \edef\ZREF@pagenum@last{% + \zref@extractdefault{LastPage}{abspage}{0}% + }% + \ifnum\ZREF@pagenum@this<\ZREF@pagenum@last\ltx@space + \ZREF@ifrefundefined\ZREF@refname@next{% + }{% + \chardef\ZREF@call=2 % next page + }% + \else + \ifnum\ZREF@pagenum@this=\ZREF@pagenum@this\ltx@space + \chardef\ZREF@call=1 % no next page + \fi + \fi + }% + \fi + }% + \edef\x{% + \endgroup + \ifcase\ZREF@call + \noexpand\ZREF@np@call@unknown{% + \noexpand\zunknownnextpagename + }% + \or + \noexpand\ZREF@np@call@nonext{% + \noexpand\znonextpagename + }% + \else + \noexpand\ZREF@np@call@next{% + \noexpand\zref@extract{\ZREF@refname@next}{page}% + }% + \fi + }% + \x +} +% \end{macrocode} +% \begin{macrocode} +%</nextpage> +% \end{macrocode} +% +% % \subsection{Module \xmodule{totpages}} % % \begin{macrocode} %<*totpages> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2009/12/08 v2.7 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % The absolute page number of the last page is the total % page number. % \begin{macrocode} -\RequirePackage{zref-abspage}[2009/12/08] -\RequirePackage{zref-lastpage}[2009/12/08] +\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-lastpage}[2010/03/26] % \end{macrocode} % % \begin{macro}{\ztotpages} @@ -2332,7 +2704,7 @@ the height difference of the two baselines is %<*runs> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2009/12/08 v2.7 Module runs for zref (HO)]% + [2010/03/26 v2.8 Module runs for zref (HO)]% % \end{macrocode} % % \begin{macro}{\zruns} @@ -2364,8 +2736,8 @@ the height difference of the two baselines is %<*perpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2009/12/08 v2.7 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2377,7 +2749,7 @@ the height difference of the two baselines is % For detecting changed pages module \xmodule{abspage} % is loaded. % \begin{macrocode} -\RequirePackage{zref-abspage}[2009/12/08] +\RequirePackage{zref-abspage}[2010/03/26] % \end{macrocode} % % We group the properties for the needed references @@ -2521,8 +2893,8 @@ the height difference of the two baselines is %<*titleref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2009/12/08 v2.7 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] % \end{macrocode} @@ -2692,7 +3064,7 @@ the height difference of the two baselines is \def\ZREF@titleref#1{% \begingroup \zref@refused{#1}% - \let\label\@gobble + \let\label\ltx@gobble \zref@extract{#1}{title}% \endgroup }% @@ -2839,8 +3211,8 @@ the height difference of the two baselines is %<*xr> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2009/12/08 v2.7 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % \begin{macrocode} @@ -2865,7 +3237,7 @@ the height difference of the two baselines is % Use the setting of \xpackage{hyperref} if available. % \begin{macrocode} \providecommand*{\zref@xr@ext}{% - \@ifundefined{XR@ext}{pdf}{\XR@ext}% + \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}% }% % \end{macrocode} % \end{macro} @@ -3183,14 +3555,14 @@ the height difference of the two baselines is %<*hyperref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2009/12/08 v2.7 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % \begin{macrocode} \zref@newprop{anchor}[]{% - \@ifundefined{@currentHref}{}{\@currentHref}% + \ltx@ifundefined{@currentHref}{}{\@currentHref}% }% \zref@addprop\ZREF@mainlist{anchor}% % \end{macrocode} @@ -3212,8 +3584,8 @@ the height difference of the two baselines is %<*savepos> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2009/12/08 v2.7 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -3221,16 +3593,13 @@ the height difference of the two baselines is % % First we check, whether the feature is available. % \begin{macrocode} -\begingroup - \@ifundefined{pdfsavepos}{% - \ZREF@ErrorNoLine{% - \string\pdfsavepos\space is not supported.\MessageBreak - It is provided by pdfTeX (1.40) or XeTeX% - }\ZREF@UpdatePdfTeX - \endgroup - \endinput - }{}% -\endgroup +\ltx@IfUndefined{pdfsavepos}{% + \ZREF@ErrorNoLine{% + \string\pdfsavepos\space is not supported.\MessageBreak + It is provided by pdfTeX (1.40) or XeTeX% + }\ZREF@UpdatePdfTeX + \endinput +}{}% % \end{macrocode} % In PDF mode we are done. However support for DVI mode % was added later in version 1.40.0. In earlier versions @@ -3318,15 +3687,15 @@ the height difference of the two baselines is %<*dotfill> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2009/12/08 v2.7 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % For measuring the width of \cs{zdotfill} we use the features % provided by module \xmodule{savepos}. % \begin{macrocode} -\RequirePackage{zref-savepos}[2009/12/08] +\RequirePackage{zref-savepos}[2010/03/26] % \end{macrocode} % For automatically generated label names we use the unique % counter of module \xmodule{base}. @@ -3415,7 +3784,7 @@ the height difference of the two baselines is \NeedsTeXFormat{LaTeX2e} \nofiles \documentclass{article} -\usepackage{zref-base}[2009/12/08] +\usepackage{zref-base}[2010/03/26] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -3445,7 +3814,7 @@ the height difference of the two baselines is %<*test-runs> \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{zref-runs}[2009/12/08] +\usepackage{zref-runs}[2010/03/26] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -3534,9 +3903,11 @@ the height difference of the two baselines is % zref-dotfill.sty & tex/latex/oberdiek/zref-dotfill.sty\\ % zref-hyperref.sty & tex/latex/oberdiek/zref-hyperref.sty\\ % zref-lastpage.sty & tex/latex/oberdiek/zref-lastpage.sty\\ +% zref-nextpage.sty & tex/latex/oberdiek/zref-nextpage.sty\\ % zref-perpage.sty & tex/latex/oberdiek/zref-perpage.sty\\ % zref-runs.sty & tex/latex/oberdiek/zref-runs.sty\\ % zref-savepos.sty & tex/latex/oberdiek/zref-savepos.sty\\ +% zref-thepage.sty & tex/latex/oberdiek/zref-thepage.sty\\ % zref-titleref.sty & tex/latex/oberdiek/zref-titleref.sty\\ % zref-totpages.sty & tex/latex/oberdiek/zref-totpages.sty\\ % zref-user.sty & tex/latex/oberdiek/zref-user.sty\\ @@ -3544,6 +3915,7 @@ the height difference of the two baselines is % zref.pdf & doc/latex/oberdiek/zref.pdf\\ % zref-example.tex & doc/latex/oberdiek/zref-example.tex\\ % zref-example-lastpage.tex & doc/latex/oberdiek/zref-example-lastpage.tex\\ +% zref-example-nextpage.tex & doc/latex/oberdiek/zref-example-nextpage.tex\\ % test/zref-test1.tex & doc/latex/oberdiek/test/zref-test1.tex\\ % test/zref-test-runs.tex & doc/latex/oberdiek/test/zref-test-runs.tex\\ % zref.dtx & source/latex/oberdiek/zref.dtx\\ @@ -3794,6 +4166,17 @@ the height difference of the two baselines is % \item % Module \xmodule{titleref}: Use of package \xpackage{gettitlestring}. % \end{Version} +% \begin{Version}{2010/03/26 v2.8} +% \item +% \cs{zifrefundefined} added. +% \item +% Module \xmodule{lastpage}: Macros \cs{zref@iflastpage} +% and \cs{ziflastpage} added. +% \item +% Module \xmodule{thepage} added. +% \item +% Module \xmodule{nextpage} added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty index 4b58542c916..679b6b82f08 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty @@ -31,10 +31,11 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2010/02/03 v1.8 Hyper extensions for doc.sty (HO)]% + [2010/03/26 v1.9 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax +\RequirePackage{atveryend}[2010/03/24] \RequirePackage{doc} \ifx\numexpr\@undefined \RequirePackage{calc}% @@ -456,10 +457,13 @@ }% \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% } -\AtEndDocument{% +\AfterLastShipout{% \if@filesw \immediate\write\@auxout{% - \noexpand\HD@SetMacroIndent{\number\value{CodelineNo}}% + \string\providecommand\string\HD@SetMacroIndent[1]{}% + }% + \immediate\write\@auxout{% + \string\HD@SetMacroIndent{\number\value{CodelineNo}}% }% \fi } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 34801f984bb..8c6fc3ebd8d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2009/12/08 v2.7 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi}% \begingroup - \let\@addtoreset\@gobbletwo + \let\@addtoreset\ltx@gobbletwo \newcounter{abspage}% \endgroup \setcounter{abspage}{0}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index d9002083971..73f6f08b3cf 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,15 +29,17 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2009/12/08 v2.7 Module base for zref (HO)]% + [2010/03/26 v2.8 Module base for zref (HO)]% +\RequirePackage{ltxcmds}[2009/12/12] \def\ZREF@name{zref} \def\ZREF@ErrorNoLine#1#2{% \begingroup @@ -50,25 +52,22 @@ \def\ZREF@patch#1{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax - \expandafter\@gobble + \expandafter\ltx@gobble \else \expandafter\let\csname ZREF@org@#1\expandafter\endcsname \csname #1\endcsname - \expandafter\@firstofone + \expandafter\ltx@firstofone \fi } -\begingroup - \@ifundefined{eTeXversion}{% - \ZREF@ErrorNoLine{% - Missing support for eTeX; package is abandoned% - }{% - Use a TeX compiler that support eTeX and enable eTeX % - in the format.% - }% - \endgroup - \endinput - }{}% -\endgroup +\ltx@IfUndefined{eTeXversion}{% + \ZREF@ErrorNoLine{% + Missing support for eTeX; package is abandoned% + }{% + Use a TeX compiler that support eTeX and enable eTeX % + in the format.% + }% + \endinput +}{}% \RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded \else @@ -103,9 +102,9 @@ } \def\zref@iflistundefined#1{% \expandafter\ifx\csname Z@L@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } \def\zref@listexists#1{% @@ -131,9 +130,9 @@ }% \expandafter\endgroup \ifZREF@found - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } \def\zref@listforloop#1#2{% @@ -187,9 +186,9 @@ \fi \def\zref@ifpropundefined#1{% \expandafter\ifx\csname Z@E@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } \def\zref@propexists#1{% @@ -308,11 +307,18 @@ } \def\zref@ifrefundefined#1{% \expandafter\ifx\csname Z@R@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } +\newcommand*{\zifrefundefined}[1]{% + \zref@wrapper@babel\ZREF@ifrefundefined{#1}% +} +\def\ZREF@ifrefundefined#1{% + \zref@refused{#1}% + \zref@ifrefundefined{#1}% +} \def\zref@refused#1{% \zref@wrapper@babel\ZREF@refused{#1}% } @@ -335,7 +341,7 @@ } \def\zref@ifrefcontainsprop#1#2{% \zref@ifrefundefined{#1}{% - \@secondoftwo + \ltx@secondoftwo }{% \expandafter\ZREF@ifrefcontainsprop \csname Z@E@#2\expandafter\endcsname @@ -348,9 +354,9 @@ \def\ZREF@ifrefcontainsprop#1#2#3{% \expandafter\ifx\expandafter\ZREF@novalue #1#3#2\ZREF@novalue\ZREF@nil\@empty - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi } \def\ZREF@novalue{\ZREF@NOVALUE} @@ -369,20 +375,20 @@ \long\def\zref@wrapper@unexpanded#1{% \let\ZREF@unexpanded\etex@unexpanded #1% - \let\ZREF@unexpanded\@firstofone + \let\ZREF@unexpanded\ltx@firstofone } -\let\ZREF@unexpanded\@firstofone +\let\ZREF@unexpanded\ltx@firstofone \long\def\zref@wrapper@babel#1#2{% \ifcsname if@safe@actives\endcsname - \expandafter\@firstofone + \expandafter\ltx@firstofone \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi {% \if@safe@actives - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi {% \begingroup @@ -401,7 +407,7 @@ \def\zref@require@unique{% \@ifundefined{c@zref@unique}{% \begingroup - \let\@addtoreset\@gobbletwo + \let\@addtoreset\ltx@gobbletwo \newcounter{zref@unique}% \endgroup \renewcommand*{\thezref@unique}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 8c8a4531c6c..e1e157138ec 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,16 +29,17 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2009/12/08 v2.7 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{counter}{} \zref@addprop\ZREF@mainlist{counter} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty index eb3d3806af3..d1285c9de64 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,18 +29,19 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2009/12/08 v2.7 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2009/12/08] +\RequirePackage{zref-savepos}[2010/03/26] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty index 07828fa9dbc..483d4e6e589 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,19 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2009/12/08 v2.7 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{anchor}[]{% - \@ifundefined{@currentHref}{}{\@currentHref}% + \ltx@ifundefined{@currentHref}{}{\@currentHref}% }% \zref@addprop\ZREF@mainlist{anchor}% \endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index c3a249cff33..9499cc12f6a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,16 +29,18 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2009/12/08 v2.7 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\RequirePackage{zref-abspage}[2010/03/26] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newlist{LastPage} @@ -56,6 +58,22 @@ \endgroup \fi } +\def\zref@iflastpage#1{% + \ifnum\zref@extractdefault{#1}{abspage}{-1}=% + \zref@extractdefault{LastPage}{abspage}{-2} % + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi +} +\newcommand*{\ziflastpage}{% + \zref@wrapper@babel\ZREF@iflastpage +} +\def\ZREF@iflastpage#1{% + \zref@refused{LastPage}% + \zref@refused{#1}% + \zref@iflastpage{#1}% +} \endinput %% %% End of file `zref-lastpage.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty new file mode 100644 index 00000000000..b556d838c92 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -0,0 +1,127 @@ +%% +%% This is file `zref-nextpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `nextpage') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-nextpage}% + [2010/03/26 v2.8 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\@ifundefined{ZREF@baseok}{\endinput}{} +\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-thepage}[2010/03/26] +\RequirePackage{zref-lastpage}[2010/03/26] +\RequirePackage{uniquecounter}[2009/12/18] +\UniqueCounterNew{znextpage} + +\newcommand*{\znextpagesetup}{% + \afterassignment\ZREF@np@setup@i + \def\ZREF@np@call@unknown##1% +} +\def\ZREF@np@setup@i{% + \afterassignment\ZREF@np@setup@ii + \def\ZREF@np@call@nonext##1% +} +\def\ZREF@np@setup@ii{% + \def\ZREF@np@call@next##1% +} +\def\ZREF@np@call@unknown#1{#1} +\def\ZREF@np@call@nonext#1{#1} +\def\ZREF@np@call@next#1{#1} +\newcommand*{\znextpage}{% + \UniqueCounterCall{znextpage}{\ZREF@nextpage}% +} +\newcommand*{\znonextpagename}{} +\newcommand*{\zunknownnextpagename}{\Z@D@page} +\def\ZREF@nextpage#1{% + \begingroup + \def\ZREF@refname@this{zref@np#1}% + \zref@labelbyprops\ZREF@refname@this{abspage}% + \chardef\ZREF@call=0 % unknown + \ZREF@ifrefundefined\ZREF@refname@this{% + }{% + \edef\ZREF@pagenum@this{% + \zref@extractdefault\ZREF@refname@this{abspage}{0}% + }% + \edef\ZREF@refname@next{% + \zref@thepage@name{% + \the\numexpr\ZREF@pagenum@this+1% + }% + }% + \ifnum\ZREF@pagenum@this>0 % + \ZREF@ifrefundefined{LastPage}{% + \zref@ifrefundefined\ZREF@refname@next{% + }{% + \chardef\ZREF@call=2 % next page + }% + }{% + \edef\ZREF@pagenum@last{% + \zref@extractdefault{LastPage}{abspage}{0}% + }% + \ifnum\ZREF@pagenum@this<\ZREF@pagenum@last\ltx@space + \ZREF@ifrefundefined\ZREF@refname@next{% + }{% + \chardef\ZREF@call=2 % next page + }% + \else + \ifnum\ZREF@pagenum@this=\ZREF@pagenum@this\ltx@space + \chardef\ZREF@call=1 % no next page + \fi + \fi + }% + \fi + }% + \edef\x{% + \endgroup + \ifcase\ZREF@call + \noexpand\ZREF@np@call@unknown{% + \noexpand\zunknownnextpagename + }% + \or + \noexpand\ZREF@np@call@nonext{% + \noexpand\znonextpagename + }% + \else + \noexpand\ZREF@np@call@next{% + \noexpand\zref@extract{\ZREF@refname@next}{page}% + }% + \fi + }% + \x +} +\endinput +%% +%% End of file `zref-nextpage.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index eb5f8543a5d..eb71e521af3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,18 +29,19 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2009/12/08 v2.7 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2009/12/08] +\RequirePackage{zref-abspage}[2010/03/26] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} \zref@addprop{perpage}{abspage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index 818c5fb4846..0fe67466965 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,15 +29,16 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2009/12/08 v2.7 Module runs for zref (HO)]% + [2010/03/26 v2.8 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index a1708bfdb87..fd55e1d592b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,27 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2009/12/08 v2.7 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\begingroup - \@ifundefined{pdfsavepos}{% - \ZREF@ErrorNoLine{% - \string\pdfsavepos\space is not supported.\MessageBreak - It is provided by pdfTeX (1.40) or XeTeX% - }\ZREF@UpdatePdfTeX - \endgroup - \endinput - }{}% -\endgroup +\ltx@IfUndefined{pdfsavepos}{% + \ZREF@ErrorNoLine{% + \string\pdfsavepos\space is not supported.\MessageBreak + It is provided by pdfTeX (1.40) or XeTeX% + }\ZREF@UpdatePdfTeX + \endinput +}{}% \RequirePackage{ifpdf} \ifpdf \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty new file mode 100644 index 00000000000..b32709f9a28 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -0,0 +1,70 @@ +%% +%% This is file `zref-thepage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `thepage') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-thepage}% + [2010/03/26 v2.8 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\@ifundefined{ZREF@baseok}{\endinput}{} +\RequirePackage{atbegshi} +\RequirePackage{zref-abspage}[2010/03/26] +\zref@newlist{thepage} +\zref@addprop{thepage}{page} +\AtBeginShipout{% + \zref@wrapper@immediate{% + \zref@labelbylist{thepage\the\value{abspage}}{thepage}% + }% +} +\ltx@IfUndefined{numexpr}{% + \def\zref@thepage@name#1{thepage\number#1}% +}{% + \def\zref@thepage@name#1{thepage\the\numexpr#1}% +} +\def\zref@thepage#1{% + \zref@extract{\zref@thepage@name{#1}}{page}% +}% +\def\zref@thepage@refused#1{% + \zref@refused{\zref@thepage@name{#1}}% +}% +\newcommand*{\zthepage}[1]{% + \zref@thepage@refused{#1}% + \zref@thepage{#1}% +} +\endinput +%% +%% End of file `zref-thepage.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 7d84650a779..20ea3adcdca 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,16 +29,17 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2009/12/08 v2.7 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] \RequirePackage{keyval} @@ -101,7 +102,7 @@ \def\ZREF@titleref#1{% \begingroup \zref@refused{#1}% - \let\label\@gobble + \let\label\ltx@gobble \zref@extract{#1}{title}% \endgroup }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 62393cc94c3..460af656c15 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,19 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2009/12/08 v2.7 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2009/12/08] -\RequirePackage{zref-lastpage}[2009/12/08] +\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-lastpage}[2010/03/26] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty index 62693f19903..3c0130cc545 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2009/12/08 v2.7 Module user for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \newcommand*\zlabel{% - \ifx\label\@gobble - \expandafter\@gobble + \ifx\label\ltx@gobble + \expandafter\ltx@gobble \else \expandafter\zref@wrapper@babel\expandafter\zref@label \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 6086e6bb38f..edc7467aff6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,21 +29,22 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2009/12/08 v2.7 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \zref@newprop{url}{}% \providecommand*{\zref@xr@ext}{% - \@ifundefined{XR@ext}{pdf}{\XR@ext}% + \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}% }% \newif\ifZREF@xr@zreflabel \newcommand*{\zexternaldocument}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index 749263bece0..15d9b45047d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,21 +29,22 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, +%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, +%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-example-nextpage.tex, +%% zref-test1.tex, zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2009/12/08]% + \RequirePackage{zref-#1}[2010/03/26]% }% }% } |