diff options
| author | Karl Berry <karl@freefriends.org> | 2010-04-18 18:04:32 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-04-18 18:04:32 +0000 |
| commit | b26ee2030e017af00dee74ea37ca13189caa593c (patch) | |
| tree | e0e1d27675ac1f3e51102650e015abd0367b5666 | |
| parent | 4f5df459139365b598a08e7b946698649b36efec (diff) | |
oberdiek update (17apr10)
git-svn-id: svn://tug.org/texlive/trunk@17903 c570f23f-e606-0410-a88d-b1316a301751
117 files changed, 1757 insertions, 446 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf Binary files differindex de13f2200d3..c1f54a10d64 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 418d35cb67a..7b0257c438c 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 b4827df8b48..9736ecb861b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[14 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132034+02'00')/Subject(Converting numbers to letters (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132034+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The alphalph package)>> +6 0 obj<</ModDate(D:20100418045602+02'00')/Subject(Converting numbers to letters (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045602+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The alphalph package)>> endobj 7 0 obj<</Type/Pages/Kids[14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R]/Parent 2 0 R/Count 6>> endobj @@ -4772,7 +4772,7 @@ xref 0000487316 00000 n 0000487380 00000 n trailer -<</Root 1 0 R/ID[(1aЂb)( g+ݳS!C)]/Compress<</SpecO/1.4/LengthO 570265>>/Info 6 0 R/Size 1134>> +<</Root 1 0 R/ID[(JaHJ {\\:)(쭱=U|>ؒȌ)]/Compress<</SpecO/1.4/LengthO 570265>>/Info 6 0 R/Size 1134>> startxref 487444 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf b/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf Binary files differindex fc11ee13be8..c8f313feb64 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 1bdff6df87d..a114729f101 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[15 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132037+02'00')/Subject(At begin shipout hook (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132037+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The atbegshi package)>> +6 0 obj<</ModDate(D:20100418045607+02'00')/Subject(At begin shipout hook (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045607+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The atbegshi package)>> endobj 7 0 obj<</Type/Pages/Kids[15 0 R 16 0 R 17 0 R 18 0 R 19 0 R 20 0 R]/Parent 2 0 R/Count 6>> endobj @@ -5400,7 +5400,7 @@ xref 0000511394 00000 n 0000511458 00000 n trailer -<</Root 1 0 R/ID[(|aC5 B!)(?%!r)]/Compress<</SpecO/1.4/LengthO 616466>>/Info 6 0 R/Size 1368>> +<</Root 1 0 R/ID[(^Вv yb<)(\) 1Q5)]/Compress<</SpecO/1.4/LengthO 616466>>/Info 6 0 R/Size 1368>> startxref 511522 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf Binary files differindex 22c648f9a34..dcd8400313d 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 089b0832d0b..ce0454cabaa 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[15 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132040+02'00')/Subject(attach files into PDF (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132040+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The attachfile2 package)>> +6 0 obj<</ModDate(D:20100418045610+02'00')/Subject(attach files into PDF (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045610+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The attachfile2 package)>> endobj 7 0 obj<</Type/Pages/Kids[15 0 R 16 0 R 17 0 R 18 0 R 19 0 R 20 0 R]/Parent 2 0 R/Count 6>> endobj @@ -5420,7 +5420,7 @@ xref 0000506528 00000 n 0000506591 00000 n trailer -<</Root 1 0 R/ID[(Jf Ƿf)(nB E8+~)]/Compress<</SpecO/1.4/LengthO 617565>>/Info 6 0 R/Size 1370>> +<</Root 1 0 R/ID[(#SO[Y^o.)(0aP< <<{/XO)]/Compress<</SpecO/1.4/LengthO 617565>>/Info 6 0 R/Size 1370>> startxref 506655 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf b/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf index af2839ff32b..507b2f85961 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:20100404132042+02'00')/Subject(Hooks at very end of document (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132042+02'00')/Producer(pdfTeX-1.40.10)/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:20100418045612+02'00')/Subject(Hooks at very end of document (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045612+02'00')/Producer(pdfTeX-1.40.10)/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 @@ -4019,7 +4019,7 @@ xref 0000432824 00000 n 0000432887 00000 n trailer -<</Root 1 0 R/ID[(# ̹]l[)(y\r~X:ڥC5M')]/Compress<</SpecO/1.4/LengthO 501955>>/Info 6 0 R/Size 950>> +<</Root 1 0 R/ID[(W\\Fl mY)(j%[Q 7$³l)]/Compress<</SpecO/1.4/LengthO 501955>>/Info 6 0 R/Size 950>> startxref 432950 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf Binary files differindex 5ab5a803fa1..76a6bf29440 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 0ffafda411d..91ad058f2f0 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 2a30f026609..a93ef8c33b8 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 f47e78f383e..f2ccf5ddf48 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 a792ce4a6dd..61592b38466 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 6748965907c..6fabf711e90 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 eb386aa4c01..c6320af5cd9 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 633c7266a50..2c6f73126de 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 b069029e9c8..629fb1e64b4 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 a5e25c7f193..64774ada7ca 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 981918c1e87..8d17dcb422c 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 18c2d18df16..c1226e7ffe9 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[14 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132058+02'00')/Subject(embed files into PDF (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132058+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The embedfile package)>> +6 0 obj<</ModDate(D:20100418045635+02'00')/Subject(embed files into PDF (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045635+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The embedfile package)>> endobj 7 0 obj<</Type/Pages/Kids[14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R]/Parent 2 0 R/Count 6>> endobj @@ -5221,7 +5221,7 @@ xref 0000505397 00000 n 0000505461 00000 n trailer -<</Root 1 0 R/ID[([jHiSL[Jq)(pm/Hw"\)V[)]/Compress<</SpecO/1.4/LengthO 606845>>/Info 6 0 R/Size 1312>> +<</Root 1 0 R/ID[(1ίϜ0` @)(Zm:A+i)]/Compress<</SpecO/1.4/LengthO 606845>>/Info 6 0 R/Size 1312>> startxref 505525 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf Binary files differindex 3cbb0e44845..0125014fd4f 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 7bfa74d7060..b28dcc6f8cb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[13 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132101+02'00')/Subject(Conversion with epstopdf on the fly (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132101+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The epstopdf package)>> +6 0 obj<</ModDate(D:20100418045639+02'00')/Subject(Conversion with epstopdf on the fly (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045639+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The epstopdf package)>> endobj 7 0 obj<</Type/Pages/Kids[13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R]/Parent 2 0 R/Count 6>> endobj @@ -4006,7 +4006,7 @@ xref 0000423834 00000 n 0000423897 00000 n trailer -<</Root 1 0 R/ID[(LLS OL)({V6Li= i)]/Compress<</SpecO/1.4/LengthO 489284>>/Info 6 0 R/Size 935>> +<</Root 1 0 R/ID[(YH_"H%8浇}|8)(#.~fgeܧ{)]/Compress<</SpecO/1.4/LengthO 489284>>/Info 6 0 R/Size 935>> startxref 423960 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf Binary files differindex 8b8553c5679..7e8dddaa0c8 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 8ff3f8f6e7d..f9bd9199b1e 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 210c601bc52..38df027e691 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 e46c907353a..bcf19d4a169 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 256fdec3e77..e7804c51642 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/hologo.pdf b/Master/texmf-dist/doc/latex/oberdiek/hologo.pdf Binary files differindex 1bac36d07bb..79ac824a521 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hologo.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hologo.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf Binary files differindex d31859a5d3a..5f991b43c39 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 5f54c16c75d..8d63b0dcf65 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[15 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132109+02'00')/Subject(Color options of hyperref/bookmark (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132109+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The hycolor package)>> +6 0 obj<</ModDate(D:20100418045652+02'00')/Subject(Color options of hyperref/bookmark (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045652+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The hycolor package)>> endobj 7 0 obj<</Type/Pages/Kids[15 0 R 16 0 R 17 0 R 18 0 R 19 0 R 20 0 R]/Parent 2 0 R/Count 6>> endobj @@ -5998,8 +5998,8 @@ xref 0000550901 00000 n 0000550964 00000 n trailer -<</Root 1 0 R/ID[( $D , -! +<</Root 1 0 R/ID[(J0xH 7q)(۪頱 +T)]/Compress<</SpecO/1.4/LengthO 671903>>/Info 6 0 R/Size 1521>> startxref 551028 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf Binary files differindex 8ce083e21b6..63c54414f38 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 5411b1e1038..cd4b90cfc0b 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 8503aedc53c..a8833b6ef35 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 6d72aa07b4f..6884036ec6e 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 b45ca2c6d95..e508ea85dd6 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 2da63bc725c..a51dfd5dcb4 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 063eda82881..830d2680567 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 db61fd5ea1f..8a93da931f5 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 ae396efa9ca..b7b77307d5b 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 8e9e8d135b3..f1f664df922 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 81591deeb2b..b84256ea4c0 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 index 906a02b0709..762cfb1d788 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.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:20100408010429+02'00')/Subject(Providing info/warning/message (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100408010429+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The infwarerr package)>> +6 0 obj<</ModDate(D:20100418045714+02'00')/Subject(Providing info/warning/message (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045714+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The infwarerr 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 @@ -3472,7 +3472,7 @@ xref 0000379666 00000 n 0000379729 00000 n trailer -<</Root 1 0 R/ID[(ӏS2K,")(\\t{5s"#pDc)]/Compress<</SpecO/1.4/LengthO 437933>>/Info 6 0 R/Size 789>> +<</Root 1 0 R/ID[(-48kob)( a9.2\\hM)]/Compress<</SpecO/1.4/LengthO 437933>>/Info 6 0 R/Size 789>> startxref 379792 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf Binary files differindex efb8ce1ca80..bdc99a564fc 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 d69ba439227..30f599c8400 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 305e724cfc8..37587c5a01c 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 4dc475ffc31..dffa4eba4ef 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 a95f6f81cce..5d96e68b194 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[13 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132133+02'00')/Subject(Key value parser (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132133+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The kvsetkeys package)>> +6 0 obj<</ModDate(D:20100418045726+02'00')/Subject(Key value parser (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045726+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The kvsetkeys package)>> endobj 7 0 obj<</Type/Pages/Kids[13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R]/Parent 2 0 R/Count 6>> endobj @@ -4864,7 +4864,7 @@ xref 0000479783 00000 n 0000479847 00000 n trailer -<</Root 1 0 R/ID[(?Wॱ )(,/dMWN8D!$p/)]/Compress<</SpecO/1.4/LengthO 570102>>/Info 6 0 R/Size 1201>> +<</Root 1 0 R/ID[(w\\۬N2\r)(6T#wUe )]/Compress<</SpecO/1.4/LengthO 570102>>/Info 6 0 R/Size 1201>> startxref 479911 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf index bb514bc9cf0..ddac19e92a7 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.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:20100404132134+02'00')/Subject(Let assignment for LaTeX macros (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132134+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The letltxmacro package)>> +6 0 obj<</ModDate(D:20100418045728+02'00')/Subject(Let assignment for LaTeX macros (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045728+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The letltxmacro 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 @@ -3497,7 +3497,7 @@ xref 0000375560 00000 n 0000375623 00000 n trailer -<</Root 1 0 R/ID[(9w :<b #R)(Z%\\PX6)]/Compress<</SpecO/1.4/LengthO 438002>>/Info 6 0 R/Size 832>> +<</Root 1 0 R/ID[(s2a}0R9)(Bׇ DhLJ)]/Compress<</SpecO/1.4/LengthO 438002>>/Info 6 0 R/Size 832>> startxref 375686 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf Binary files differindex e2fda3ee222..69a3f7edd4d 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 f1a6846bd67..80d0a4d8e09 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 9710dd4fcf8..d59917ab42b 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 c161440748b..a30a005bf20 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[14 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132138+02'00')/Subject(LuaTeX basic definition package (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132138+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The luatex package)>> +6 0 obj<</ModDate(D:20100418045733+02'00')/Subject(LuaTeX basic definition package (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045733+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The luatex package)>> endobj 7 0 obj<</Type/Pages/Kids[14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R]/Parent 2 0 R/Count 6>> endobj @@ -5185,8 +5185,7 @@ xref 0000490364 00000 n 0000490428 00000 n trailer -<</Root 1 0 R/ID[(6%,y -WG>Ә)(虿p\(A[X)]/Compress<</SpecO/1.4/LengthO 588254>>/Info 6 0 R/Size 1288>> +<</Root 1 0 R/ID[(_Xn֠n@r)(C[Yl)]/Compress<</SpecO/1.4/LengthO 588254>>/Info 6 0 R/Size 1288>> startxref 490492 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf b/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf Binary files differindex 88657f6bf1b..f85ffed168e 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 993a1e95a9d..835244e6486 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 56feb6a181b..32243836dfe 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 505f6d9fe5d..0df1daf0227 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 53404cd3575..3776947eb13 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 a1098c73c46..cfbb8d784cc 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 595687979b7..c4babb3f31a 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 41812ca1315..e6b03d04fce 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.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:20100404132149+02'00')/Subject(PDFtex COLor MarK (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132149+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfcolmk package)>> +6 0 obj<</ModDate(D:20100418045747+02'00')/Subject(PDFtex COLor MarK (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045747+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfcolmk 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 @@ -3902,7 +3902,7 @@ xref 0000395721 00000 n 0000395784 00000 n trailer -<</Root 1 0 R/ID[(B<\rhK7 j' )(HqbZ&VZ)]/Compress<</SpecO/1.4/LengthO 465948>>/Info 6 0 R/Size 944>> +<</Root 1 0 R/ID[(v llʬ M)()]/Compress<</SpecO/1.4/LengthO 465948>>/Info 6 0 R/Size 944>> startxref 395847 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf index 2423daa4658..b006cd548f9 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.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:20100404132150+02'00')/Subject(Fixed parallel with color stacks support (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132150+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfcolparallel package)>> +6 0 obj<</ModDate(D:20100418045748+02'00')/Subject(Fixed parallel with color stacks support (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045748+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfcolparallel 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 @@ -3770,7 +3770,7 @@ xref 0000409178 00000 n 0000409241 00000 n trailer -<</Root 1 0 R/ID[( zѳgi4Rq)(5L#8 l4ܷ@)]/Compress<</SpecO/1.4/LengthO 472558>>/Info 6 0 R/Size 856>> +<</Root 1 0 R/ID[(e }LW"?)(>uWh\rd2)]/Compress<</SpecO/1.4/LengthO 472558>>/Info 6 0 R/Size 856>> startxref 409304 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf Binary files differindex 9b82df9c126..b16723514ef 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 53fc0dd3d40..6c9acfb6046 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 75326a7b2d8..d82fd2785a6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[14 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132155+02'00')/Subject(Provides hex, PDF name and string conversions (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132155+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfescape package)>> +6 0 obj<</ModDate(D:20100418045754+02'00')/Subject(Provides hex, PDF name and string conversions (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045754+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfescape package)>> endobj 7 0 obj<</Type/Pages/Kids[14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R]/Parent 2 0 R/Count 6>> endobj @@ -5817,7 +5817,7 @@ xref 0000526915 00000 n 0000526979 00000 n trailer -<</Root 1 0 R/ID[(+2U+5E^)(GW%#E%)]/Compress<</SpecO/1.4/LengthO 647816>>/Info 6 0 R/Size 1536>> +<</Root 1 0 R/ID[(\rzUuTR^k)(wG']_C j)]/Compress<</SpecO/1.4/LengthO 647816>>/Info 6 0 R/Size 1536>> startxref 527043 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf Binary files differindex 1fbf07b2146..9975fea9a17 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 99ef73ddf6c..5dddb54d287 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[14 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132158+02'00')/Subject(Access to some PDF graphics parameters (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132158+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfrender package)>> +6 0 obj<</ModDate(D:20100418045757+02'00')/Subject(Access to some PDF graphics parameters (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045757+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdfrender package)>> endobj 7 0 obj<</Type/Pages/Kids[14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R]/Parent 2 0 R/Count 6>> endobj @@ -4935,7 +4935,7 @@ xref 0000489833 00000 n 0000489897 00000 n trailer -<</Root 1 0 R/ID[(f:-Z\\.Oa0)(M\rk olJO)]/Compress<</SpecO/1.4/LengthO 584183>>/Info 6 0 R/Size 1209>> +<</Root 1 0 R/ID[(*{|< startxref 489961 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf index f606664b6ad..dcb67f08e3e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[13 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100409033959+02'00')/Subject(Utility functions of pdfTeX for LuaTeX (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100409033959+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdftexcmds package)>> +6 0 obj<</ModDate(D:20100418045759+02'00')/Subject(Utility functions of pdfTeX for LuaTeX (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045759+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pdftexcmds package)>> endobj 7 0 obj<</Type/Pages/Kids[13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R]/Parent 2 0 R/Count 6>> endobj @@ -3892,7 +3892,7 @@ xref 0000417864 00000 n 0000417927 00000 n trailer -<</Root 1 0 R/ID[(@aAr<"P%$ )(ar/)]/Compress<</SpecO/1.4/LengthO 482914>>/Info 6 0 R/Size 909>> +<</Root 1 0 R/ID[(m5˝)(P]Ӹ startxref 417990 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf Binary files differindex fc8ff11892a..e06ad407d7d 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 c1f09f1fce8..12cd78fc0a6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[14 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132203+02'00')/Subject(Poor man's box drawing characters (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132203+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pmboxdraw package)>> +6 0 obj<</ModDate(D:20100418045803+02'00')/Subject(Poor man's box drawing characters (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045803+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The pmboxdraw package)>> endobj 7 0 obj<</Type/Pages/Kids[14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R]/Parent 2 0 R/Count 6>> endobj @@ -4314,7 +4314,7 @@ xref 0000415773 00000 n 0000415837 00000 n trailer -<</Root 1 0 R/ID[(m˥'hIL =)(}e#РF̆,)]/Compress<</SpecO/1.4/LengthO 493249>>/Info 6 0 R/Size 1047>> +<</Root 1 0 R/ID[("fDpP^~D)(@^%i3CJv;k)]/Compress<</SpecO/1.4/LengthO 493249>>/Info 6 0 R/Size 1047>> startxref 415901 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf Binary files differindex b048706f88b..7a67bd8b513 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 ecb25521ff1..7c75245a297 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 07bb9927689..d38d7a6abe5 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 8fda62938b5..d2d40764f46 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 0955743dc78..49e14d667ae 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 ebd337f83b9..9bf1b37d1f1 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 479c1571970..fe34fff24cb 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 00d56287978..37b4f8c9b40 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</D[14 0 R/FitBH 781.29782]/S/GoTo>> endobj -6 0 obj<</ModDate(D:20100404132213+02'00')/Subject(Adding support for UTF-8 to soul (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100404132213+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The soulutf8 package)>> +6 0 obj<</ModDate(D:20100418045817+02'00')/Subject(Adding support for UTF-8 to soul (HO))/Creator(LaTeX with hyperref package)/Author(Heiko Oberdiek, <heiko.oberdiek at googlemail.com>)/Trapped/False/CreationDate(D:20100418045817+02'00')/Producer(pdfTeX-1.40.10)/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(The soulutf8 package)>> endobj 7 0 obj<</Type/Pages/Kids[14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R]/Parent 2 0 R/Count 6>> endobj @@ -6296,8 +6296,8 @@ xref 0000557159 00000 n 0000557223 00000 n trailer -<</Root 1 0 R/ID[(nCtձ -)(V2&<@~I>j8,)]/Compress<</SpecO/1.4/LengthO 692771>>/Info 6 0 R/Size 1673>> +<</Root 1 0 R/ID[(I\( +L R*)(o\)fu'a])]/Compress<</SpecO/1.4/LengthO 692771>>/Info 6 0 R/Size 1673>> startxref 557287 %%EOF diff --git a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf Binary files differindex a2593823dec..b70923c33c8 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 ac4f5ed651f..fb91c1ce378 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 b7142234356..697c29c9dcd 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 84fbd76eebc..dd264fa5e3a 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 a6691883c83..008224a4d67 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 3b0d8297cf5..9ec3d29a6f9 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 594540eb054..3c791c0201e 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 @@ -35,11 +35,11 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{zref-runs}[2010/04/08] +\usepackage{zref-runs}[2010/04/17] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex new file mode 100644 index 00000000000..744f735074e --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex @@ -0,0 +1,98 @@ +%% +%% This is file `zref-test-titleref-memoir.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `test-titleref-memoir') +%% +%% 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-marks.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, zref-test-titleref-memoir.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\documentclass{memoir} +\usepackage{zref-titleref}[2010/04/17] +\usepackage{qstest} +\IncludeTests{*} +\LogTests{log}{*}{*} +\begin{document} +\makeatletter +\def\List{} +\def\Label#1{% + \zref@label{#1}% + \g@addto@macro\List{% + \par + #1: [\ztitleref{#1}]% + }% + \mbox{}% + \zref@refused{#1}% + \zref@ifrefundefined{#1}{% + }{% + \begingroup + \edef\x{\zref@extract{#1}{title}}% + \Expect{OK/}*{\expandafter\ltx@carthree\x{}{}{}\@nil}% + \endgroup + }% +} +\def\Test#1{% + \csname#1\endcsname*{OK/#1}% + \Label{#1*}% + \csname#1\endcsname{OK/#1}% + \Label{#1}% + \csname#1\endcsname[OK/#1-toc]% + {WRONG-in-titleref/#1-toc-2}% + \Label{#1-toc}% + \expandafter\ifx\csname#1\endcsname\part + \else + \headnamereffalse + \csname#1\endcsname[OK/#1-th-toc]% + [WRONG-in-titleref/#1-th-toc-2]% + {WRONG-in-titleref/#1-th-toc-3}% + \Label{#1-th-toc}% + \headnamereftrue + \csname#1\endcsname[WRONG-in-titleref/#1-th-head-1]% + [OK/#1-th-head]% + {WRONG-in-titleref/#1-th-head-3}% + \Label{#1-th-head}% + \fi +} +\begin{qstest}{section}{section} + \@for\x:=part,chapter,section,subsection,subsubsection\do{% + \expandafter\Test\expandafter{\x}% + }% +\end{qstest} +\newpage +\List +\end{document} + +\endinput +%% +%% End of file `zref-test-titleref-memoir.tex'. 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 e77bcd92cb3..df8296c7c74 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \nofiles \documentclass{article} -\usepackage{zref-base}[2010/04/08] +\usepackage{zref-base}[2010/04/17] \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 a881030fa43..d0856f57813 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 74b47823844..aef2fbacc75 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 e778a5c54c3..32f2e61ee47 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 7995705380f..4811073e2bd 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex @@ -35,7 +35,7 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \documentclass{report} @@ -43,7 +43,7 @@ \newcounter{foo} \renewcommand*{\thefoo}{\Alph{foo}} -\usepackage{zref-lastpage,zref-user}[2008/10/01] +\usepackage{zref-lastpage,zref-user}[2010/04/17] \makeatletter \zref@newprop{thefoo}{\thefoo} diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex b/Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex index 8cea5327605..7833c595305 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex @@ -35,11 +35,11 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \documentclass{book} -\usepackage{zref-nextpage}[2010/04/08] +\usepackage{zref-nextpage}[2010/04/17] \znextpagesetup {\thepage}% next page is unknown {\thepage\ (#1)}% this page is last page diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex b/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex index 9c5eb493641..1ee5fab7273 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex @@ -35,7 +35,7 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.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 0821cbac664..4f1e9c249d2 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/hologo.dtx b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx index e73b149cf5f..69e8569b6fc 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hologo.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx @@ -75,7 +75,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hologo 2010/04/08 v1.0 Logo collection (HO)} +\Msg{* Package: hologo 2010/04/16 v1.1 Logo collection (HO)} \Msg{************************************************************************} \keepsilent @@ -149,10 +149,10 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hologo.drv}% - [2010/04/08 v1.0 Logo collection (HO)]% + [2010/04/16 v1.1 Logo collection (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] -\usepackage{hologo}[2010/04/08] +\usepackage{hologo}[2010/04/16] \usepackage{longtable} \usepackage{array} \begin{document} @@ -161,7 +161,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{810} +% \CheckSum{1145} % % \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 @@ -182,7 +182,7 @@ and the derived files % \GetFileInfo{hologo.drv} % % \title{The \xpackage{hologo} package} -% \date{2010/04/08 v1.0} +% \date{2010/04/16 v1.1} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -196,32 +196,96 @@ and the derived files % % \section{Documentation} % +% \subsection{Logo macros} +% % \begin{declcs}{hologo} \M{name} % \end{declcs} % Macro \cs{hologo} sets the logo with name \meta{name}. % The following table shows the supported names. % -% \tracingmacros=1 % \newcommand*{\entry}{} -% \def\entry#1[#2]{#1&\hologo{#1}\tabularnewline} -% \begin{longtable}{>{\ttfamily}lll} -% \rmfamily\bfseries{name} & \bfseries logo & \bfseries since\\ +% \def\entry#1#2[#3]{^^A +% #1&\hologoLogoSetup{#1}{variant=#2}\hologo{#1}\tabularnewline +% } +% \begin{longtable}{>{\ttfamily}l>{\ttfamily}lll} +% \rmfamily\bfseries{name} & \rmfamily\bfseries variant +% & \bfseries logo & \bfseries since\\ % \hline % \endhead -% \entry{eTeX}[2010/04/08] -% \entry{LaTeX}[2010/04/08] -% \entry{LaTeX2e}[2010/04/08] -% \entry{LaTeXe}[2010/04/08] -% \entry{LuaLaTeX}[2010/04/08] -% \entry{LuaTeX}[2010/04/08] -% \entry{pdfTeX}[2010/04/08] -% \entry{pdfLaTeX}[2010/04/08] -% \entry{plainTeX}[2010/04/08] -% \entry{TeX}[2010/04/08] -% \entry{XeLaTeX}[2010/04/08] -% \entry{XeTeX}[2010/04/08] +% \entry{AmSLaTeX}{}[2010/04/16] +% \entry{AmSTeX}{}[2010/04/16] +% \entry{eTeX}{}[2010/04/08] +% \entry{LaTeX}{}[2010/04/08] +% \entry{LaTeX2e}{}[2010/04/08] +% \entry{LaTeXe}{}[2010/04/08] +% \entry{LuaLaTeX}{}[2010/04/08] +% \entry{LuaTeX}{}[2010/04/08] +% \entry{pdfTeX}{}[2010/04/08] +% \entry{pdfLaTeX}{}[2010/04/08] +% \entry{plainTeX}{}[2010/04/08] +% \entry{plainTeX}{space}[2010/04/16] +% \entry{plainTeX}{hyphen}[2010/04/16] +% \entry{plainTeX}{runtogether}[2010/04/16] +% \entry{TeX}{}[2010/04/08] +% \entry{XeLaTeX}{}[2010/04/08] +% \entry{XeTeX}{}[2010/04/08] % \end{longtable} % +% \begin{declcs}{Hologo} \M{name} +% \end{declcs} +% Macro \cs{Hologo} starts the logo \meta{name} with an uppercase +% letter. +% +% \subsection{Setup macros} +% +% The package does not support package options, but the following +% setup macros can be used to set options. +% +% \begin{declcs}{hologoSetup} \M{key value list} +% \end{declcs} +% Macro \cs{hologoSetup} sets global options. +% +% \begin{declcs}{hologoLogoSetup} \M{logo} \M{key value list} +% \end{declcs} +% Some options can also be used to configure a logo. +% These settings take precedence over global option settings. +% +% \subsection{Options}\label{sec:options} +% +% There are boolean and string options: +% \begin{description} +% \item[Boolean option:] +% It takes |true| or |false| +% as value. If the value is omitted, then |true| is used. +% \item[String option:] +% A value must be given as string. (But the string might be empty.) +% \end{description} +% The following options can be used both in \cs{hologoSetup} +% and \cs{hologoLogoSetup}: +% \begin{description} +% \def\entry#1{\item[\xoption{#1}:]} +% \entry{break} +% enables or disables line breaks inside the logo. This setting is +% refined by options \xoption{hyphenbreak} or \xoption{spacebreak}. +% Default is |false|. +% \entry{hyphenbreak} +% enables or disables the line break right after the hyphen character. +% \entry{spacebreak} +% enables or disables line breaks at space characters. +% \end{description} +% Macro \cs{hologoLogoSetup} also knows: +% \begin{description} +% \item[\xoption{variant}:] +% This is a string option. It specifies a variant of a logo that +% must exist. An empty string selects the package default variant. +% \end{description} +% Example: +% \begin{quote} +% |\hologoSetup{break=false}|\\ +% |\hologoLogoSetup{plainTeX}{variant=hyphen,hyphenbreak}|\\ +% Then ``plain-\TeX'' contains one break point after the hyphen. +% \end{quote} +% % \StopEventually{ % } % @@ -294,7 +358,7 @@ and the derived files \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2010/04/08 v1.0 Logo collection (HO)] + [2010/04/16 v1.1 Logo collection (HO)] % \end{macrocode} % % \begin{macrocode} @@ -361,15 +425,17 @@ and the derived files \input ltxcmds.sty\relax \input infwarerr.sty\relax \input kvsetkeys.sty\relax + \input kvdefinekeys.sty\relax \input pdftexcmds.sty\relax \input ifpdf.sty\relax \input ifluatex.sty\relax \input ifxetex.sty\relax \input ifvtex.sty\relax \else - \RequirePackage{ltxcmds}[2010/04/08]% + \RequirePackage{ltxcmds}[2010/04/16]% \RequirePackage{infwarerr}[2010/04/08]% \RequirePackage{kvsetkeys}[2010/03/01]% + \RequirePackage{kvdefinekeys}[2010/03/01]% \RequirePackage{pdftexcmds}[2010/04/01]% \RequirePackage{ifpdf}[2010/01/28]% \RequirePackage{ifluatex}[2010/03/01]% @@ -394,6 +460,226 @@ and the derived files % \end{macrocode} % \end{macro} % +% \subsection{Setup macros} +% +% \begin{macro}{\hologoSetup} +% \begin{macrocode} +\def\hologoSetup{% + \let\HOLOGO@name\relax + \HOLOGO@Setup +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\hologoLogoSetup} +% \begin{macrocode} +\def\hologoLogoSetup#1{% + \edef\HOLOGO@name{#1}% + \ltx@IfUndefined{HoLogo@\HOLOGO@name}{% + \@PackageError{hologo}{% + Unknown logo `\HOLOGO@name'% + }\@ehc + \@gobble + }{% + \HOLOGO@Setup + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HOLOGO@Setup} +% \begin{macrocode} +\def\HOLOGO@Setup{% + \kvsetkeys{HoLogo}% +} +% \end{macrocode} +% \end{macro} +% +% \subsection{Options} +% +% \begin{macro}{\HOLOGO@DefineBoolOption} +% \begin{macrocode} +\def\HOLOGO@DeclareBoolOption#1{% + \expandafter\chardef\csname HOLOGOOPT@#1\endcsname\ltx@zero + \kv@define@key{HoLogo}{#1}[true]{% + \def\HOLOGO@temp{##1}% + \ifx\HOLOGO@temp\HOLOGO@true + \ifx\HOLOGO@name\relax + \expandafter\chardef\csname HOLOGOOPT@#1\endcsname=\ltx@one + \else + \expandafter\chardef\csname + HoLogoOpt@#1@\HOLOGO@name\endcsname\ltx@one + \fi + \HOLOGO@SetBreakAll{#1}% + \else + \ifx\HOLOGO@temp\HOLOGO@false + \ifx\HOLOGO@name\relax + \expandafter\chardef\csname HOLOGOOPT@#1\endcsname=\ltx@zero + \else + \expandafter\chardef\csname + HoLogoOpt@#1@\HOLOGO@name\endcsname=\ltx@zero + \fi + \HOLOGO@SetBreakAll{#1}% + \else + \@PackageError{hologo}{% + Unknown value `##1' for boolean option `#1'.\MessageBreak + Known values are `true' and `false'% + }\@ehc + \fi + \fi + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HOLOGO@SetBreakAll} +% \begin{macrocode} +\def\HOLOGO@SetBreakAll#1{% + \def\HOLOGO@temp{#1}% + \ifx\HOLOGO@temp\HOLOGO@break + \ifx\HOLOGO@name\relax + \chardef\HOLOGOOPT@hyphenbreak=\HOLOGOOPT@break + \chardef\HOLOGOOPT@spacebreak=\HOLOGOOPT@break + \else + \expandafter\chardef + \csname HoLogoOpt@hyphenbreak@\HOLOGO@name\endcsname=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + \expandafter\chardef + \csname HoLogoOpt@spacebreak@\HOLOGO@name\endcsname=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + \fi + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HOLOGO@true} +% \begin{macrocode} +\def\HOLOGO@true{true} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@false} +% \begin{macrocode} +\def\HOLOGO@false{false} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@break} +% \begin{macrocode} +\def\HOLOGO@break{break} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\HOLOGO@DeclareBoolOption{break} +\HOLOGO@DeclareBoolOption{hyphenbreak} +\HOLOGO@DeclareBoolOption{spacebreak} +% \end{macrocode} +% +% \begin{macrocode} +\kv@define@key{HoLogo}{variant}{% + \ifx\HOLOGO@name\relax + \@PackageError{hologo}{% + Option `variant' is not available in \string\hologoSetup,% + \MessageBreak + Use \string\hologoLogoSetup\space instead% + }\@ehc + \else + \edef\HOLOGO@temp{#1}% + \ifx\HOLOGO@temp\ltx@empty + \expandafter + \let\csname HoLogoOpt@variant@\HOLOGO@name\endcsname\@undefined + \else + \ltx@IfUndefined{HoLogo@\HOLOGO@name @\HOLOGO@temp}{% + \@PackageError{hologo}{% + Unknown variant `\HOLOGO@temp' of logo `\HOLOGO@name'% + }\@ehc + }{% + \expandafter + \let\csname HoLogoOpt@variant@\HOLOGO@name\endcsname + \HOLOGO@temp + }% + \fi + \fi +} +% \end{macrocode} +% +% \begin{macro}{\HOLOGO@Variant} +% \begin{macrocode} +\def\HOLOGO@Variant#1{% + #1% + \ltx@ifundefined{HoLogoOpt@variant@#1}{% + }{% + @\csname HoLogoOpt@variant@#1\endcsname + }% +} +% \end{macrocode} +% \end{macro} +% +% \subsection{Break/no-break support} +% +% \begin{macro}{\HOLOGO@space} +% \begin{macrocode} +\def\HOLOGO@space{% + \ltx@ifundefined{HoLogoOpt@spacebreak@\HOLOGO@name}{% + \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% + \chardef\HOLOGO@temp=\HOLOGOOPT@spacebreak + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + }% + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@spacebreak@\HOLOGO@name\endcsname + }% + \ifcase\HOLOGO@temp + \penalty10000 % + \fi + \ltx@space +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HOLOGO@hyphen} +% \begin{macrocode} +\def\HOLOGO@hyphen{% + \ltx@ifundefined{HoLogoOpt@hyphenbreak@\HOLOGO@name}{% + \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% + \chardef\HOLOGO@temp=\HOLOGOOPT@hyphenbreak + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + }% + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@hyphenbreak@\HOLOGO@name\endcsname + }% + \ifcase\HOLOGO@temp + \ltx@mbox{-}% + \else + -% + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HOLOGO@mbox} +% \begin{macrocode} +\def\HOLOGO@mbox#1{% + \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% + \chardef\HOLOGO@temp=\HOLOGOOPT@hyphenbreak + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + }% + \ifcase\HOLOGO@temp + \ltx@mbox{#1}% + \else + #1% + \fi +} +% \end{macrocode} +% \end{macro} +% % \subsection{\cs{hologo}} % % \begin{macrocode} @@ -425,13 +711,14 @@ and the derived files \protected\def\hologorobust#1% }% {% - \ltx@ifundefined{HoLogo@#1}{% + \edef\HOLOGO@name{#1}% + \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% \@PackageError{hologo}{% - Unknown logo `#1'% + Unknown logo `\HOLOGO@name'% }\@ehc - ?#1?% + ?\HOLOGO@name?% }{% - \csname HoLogo@#1\endcsname + \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@firstoftwo }% } % \end{macrocode} @@ -443,10 +730,51 @@ and the derived files {% \hologorobust{#1}% }{% - \ltx@ifundefined{HoLogoBkm@#1}{% + \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% + \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + }{% + \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@firstoftwo + }% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\Hologorobust} +% \begin{macrocode} +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\Hologorobust#1% + }{% + \DeclareRobustCommand*\Hologorobust[1]% + }% +}{% + \protected\def\Hologorobust#1% +}% +{% + \edef\HOLOGO@name{#1}% + \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% + \@PackageError{hologo}{% + Unknown logo `\HOLOGO@name'% + }\@ehc + ?\HOLOGO@name?% + }{% + \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@secondoftwo + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\Hologo} +% \begin{macrocode} +\def\Hologo#1{% + \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo + {% + \Hologorobust{#1}% + }{% + \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% }{% - \csname HoLogoBkm@#1\endcsname + \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@secondoftwo }% }% } @@ -514,7 +842,6 @@ and the derived files % \end{macrocode} % \end{macro} % -% % \subsection{\hologo{TeX} and friends} % % \subsubsection{\hologo{TeX}} @@ -522,7 +849,7 @@ and the derived files % \begin{macro}{\HoLogo@TeX} % Source: \hologo{LaTeX} kernel. % \begin{macrocode} -\def\HoLogo@TeX{% +\def\HoLogo@TeX#1{% T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000 % } % \end{macrocode} @@ -530,28 +857,69 @@ and the derived files % % \subsubsection{\hologo{plainTeX}} % -% \begin{macro}{\HoLogo@plainTeX} +% \begin{macro}{\HoLogo@plainTeX@space} % Source: ``The \hologo{TeX}book'' % \begin{macrocode} -\def\HoLogo@plainTeX{% - plain \hologo{TeX}% +\def\HoLogo@plainTeX@space#1{% + \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@space\hologo{TeX}% } % \end{macrocode} % \end{macro} -% \begin{macro}{\HoLogoBkm@plainTeX} +% \begin{macro}{\HoLogoBkm@plainTeX@space} +% \begin{macrocode} +\def\HoLogoBkm@plainTeX@space#1{% + #1{p}{P}lain \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@plainTeX@hyphen} +% \begin{macrocode} +\def\HoLogo@plainTeX@hyphen#1{% + \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@hyphen\hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@plainTeX@hyphen} +% \begin{macrocode} +\def\HoLogoBkm@plainTeX@hyphen#1{% + #1{p}{P}lain-\hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@plainTeX@runtogether} +% \begin{macrocode} +\def\HoLogo@plainTeX@runtogether#1{% + \HOLOGO@mbox{#1{p}{P}lain\hologo{TeX}}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@plainTeX@runtogether} % \begin{macrocode} -\def\HoLogoBkm@plainTeX{% - plain \hologo{TeX}% +\def\HoLogoBkm@plainTeX@runtogether#1{% + #1{p}{P}lain\hologo{TeX}% } % \end{macrocode} % \end{macro} % +% \begin{macro}{\HoLogo@plainTeX} +% \begin{macrocode} +\def\HoLogo@plainTeX{\HoLogo@plainTeX@space} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@plainTeX} +% \begin{macrocode} +\def\HoLogoBkm@plainTeX{\HoLogoBkm@plainTeX@space} +% \end{macrocode} +% \end{macro} +% % \subsubsection{\hologo{LaTeX}} % % \begin{macro}{\HoLogo@LaTeX} % Source: \hologo{LaTeX} kernel. % \begin{macrocode} -\def\HoLogo@LaTeX{% +\def\HoLogo@LaTeX#1{% L% \kern-.36em% \begingroup @@ -581,7 +949,7 @@ and the derived files % \begin{macro}{\HoLogo@LaTeXe} % Source: \hologo{LaTeX} kernel % \begin{macrocode} -\def\HoLogo@LaTeXe{% +\def\HoLogo@LaTeXe#1{% \hologo{LaTeX}% \kern.15em% \hbox{% @@ -595,7 +963,7 @@ and the derived files % % \begin{macro}{\HoLogoBkm@LaTeXe} % \begin{macrocode} -\def\HoLogoBkm@LaTeXe{% +\def\HoLogoBkm@LaTeXe#1{% \hologo{LaTeX}% 2% \HOLOGO@PdfdocUnicode{e}{\textepsilon}% @@ -619,22 +987,23 @@ and the derived files % \begin{macro}{\HoLogo@eTeX} % Source: package \xpackage{etex} % \begin{macrocode} -\def\HoLogo@eTeX{% - \leavevmode - \hbox{% - \HOLOGO@MathSetup - $\varepsilon$% - -% - \HOLOGO@NegativeKerning{-T,T-,To}% - \hologo{TeX}% +\def\HoLogo@eTeX#1{% + \ltx@mbox{% + \hbox{% + \HOLOGO@MathSetup + $\varepsilon$% + -% + \HOLOGO@NegativeKerning{-T,T-,To}% + \hologo{TeX}% + }% }% } % \end{macrocode} % \end{macro} % \begin{macro}{\HoLogoBkm@eTeX} % \begin{macrocode} -\def\HoLogoBkm@eTeX{% - \HOLOGO@PdfdocUnicode{e}{\textepsilon}% +\def\HoLogoBkm@eTeX#1{% + \HOLOGO@PdfdocUnicode{#1{e}{E}}{\textepsilon}% -% \hologo{TeX}% } @@ -647,10 +1016,12 @@ and the derived files % The kerning is an idea of Hans Hagen, see mailing list % `luatex at tug dot org' in March 2010. % \begin{macrocode} -\def\HoLogo@LuaTeX{% - Lua% - \HOLOGO@NegativeKerning{aT,oT,To}% - \hologo{TeX}% +\def\HoLogo@LuaTeX#1{% + \HOLOGO@mbox{% + Lua% + \HOLOGO@NegativeKerning{aT,oT,To}% + \hologo{TeX}% + }% } % \end{macrocode} % \end{macro} @@ -659,9 +1030,11 @@ and the derived files % % \begin{macro}{\HoLogo@LuaLaTeX} % \begin{macrocode} -\def\HoLogo@LuaLaTeX{% - Lua% - \hologo{LaTeX}% +\def\HoLogo@LuaLaTeX#1{% + \HOLOGO@mbox{% + Lua% + \hologo{LaTeX}% + }% } % \end{macrocode} % \end{macro} @@ -671,7 +1044,7 @@ and the derived files % \begin{macro}{\HoLogo@Xe} % Source: package \xpackage{dtklogos} % \begin{macrocode} -\def\HoLogo@Xe{% +\def\HoLogo@Xe#1{% X% \kern-.1em\relax \ltx@IfUndefined{HOLOGO@ReflectBox}\ltx@firstoftwo{% @@ -689,7 +1062,7 @@ and the derived files % % \begin{macro}{\HoLogo@XeTeX} % \begin{macrocode} -\def\HoLogo@XeTeX{% +\def\HoLogo@XeTeX#1{% \hologo{Xe}% \kern-.15em\relax \hologo{TeX}% @@ -699,13 +1072,13 @@ and the derived files % % \begin{macro}{\HoLogoBkm@XeTeX} % \begin{macrocode} -\def\HoLogoBkm@XeTeX{XeTeX} +\def\HoLogoBkm@XeTeX#1{XeTeX} % \end{macrocode} % \end{macro} % % \begin{macro}{\HoLogo@XeLaTeX} % \begin{macrocode} -\def\HoLogo@XeLaTeX{% +\def\HoLogo@XeLaTeX#1{% \hologo{Xe}% \hologo{LaTeX}% } @@ -716,19 +1089,77 @@ and the derived files % % \begin{macro}{\HoLogo@pdfTeX} % \begin{macrocode} -\def\HoLogo@pdfTeX{% - pdf\hologo{TeX}% +\def\HoLogo@pdfTeX#1{% + \HOLOGO@mbox{% + #1{p}{P}df\hologo{TeX}% + }% } % \end{macrocode} % \end{macro} % % \begin{macro}{\HoLogo@pdfLaTeX} % \begin{macrocode} -\def\HoLogo@pdfLaTeX{% - pdf\hologo{LaTeX}% +\def\HoLogo@pdfLaTeX#1{% + \HOLOGO@mbox{% + #1{p}{P}df\hologo{LaTeX}% + }% +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{AmS}, \dots} +% +% Source: class \xclass{amsdtx} +% +% \begin{macro}{\HoLogo@AmS} +% \begin{macrocode} +\def\HoLogo@AmS#1{% + \begingroup + \usefont{OMS}{cmsy}{m}{n}% + A% + \kern-.1667em% + \lower.5ex\hbox{M}% + \kern-.125em% + S% + \endgroup } % \end{macrocode} % \end{macro} +% \begin{macro}{\HoLogoBkm@AmS} +% \begin{macrocode} +\def\HoLogoBkm@AmS#1{AmS} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@AmSTeX} +% \begin{macrocode} +\def\HoLogo@AmSTeX#1{% + \hologo{AmS}% + \HOLOGO@hyphen + \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@AmSTeX} +% \begin{macrocode} +\def\HoLogoBkm@AmSLaTeX#1{AmS-TeX}% +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@AmSLaTeX} +% \begin{macrocode} +\def\HoLogo@AmSLaTeX#1{% + \hologo{AmS}% + \HOLOGO@hyphen + \hologo{LaTeX}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@AmSLaTeX} +% \begin{macrocode} +\def\HoLogoBkm@AmSLaTeX#1{AmS-LaTeX}% +% \end{macrocode} +% \end{macro} % % \subsection{Driver detection} % @@ -1254,6 +1685,17 @@ and the derived files % \item % The first version. % \end{Version} +% \begin{Version}{2010/04/16 v1.1} +% \item +% \cs{Hologo} added for support of logos at start of a sentence. +% \item +% \cs{hologoSetup} and \cs{hologoLogoSetup} added. +% \item +% Options \xoption{break}, \xoption{hyphenbreak}, \xoption{spacebreak} +% added. +% \item +% Variant support added by option \xoption{variant}. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx index 45d0174d420..538f1ac4117 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx @@ -76,7 +76,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: ltxcmds 2010/04/08 v1.5 LaTeX kernel commands for general use (HO)} +\Msg{* Package: ltxcmds 2010/04/16 v1.6 LaTeX kernel commands for general use (HO)} \Msg{************************************************************************} \keepsilent @@ -152,7 +152,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltxcmds.drv}% - [2010/04/08 v1.5 LaTeX kernel commands for general use (HO)]% + [2010/04/16 v1.6 LaTeX kernel commands for general use (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage{zref-savepos} @@ -162,7 +162,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{705} +% \CheckSum{760} % % \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 @@ -183,7 +183,7 @@ and the derived files % \GetFileInfo{ltxcmds.drv} % % \title{The \xpackage{ltxcmds} package} -% \date{2010/04/08 v1.5} +% \date{2010/04/16 v1.6} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -417,6 +417,20 @@ and the derived files % If next character is \meta{char} then \meta{yes} is called, % otherwise \meta{no}. The character is not removed. % +% \subsection{\cs{ltx@leavevmode}, \cs{ltx@mbox}} +% +% \begin{declcs}{ltx@leavevmode} +% \end{declcs} +% Macro \cs{ltx@leavevmode} calls \hologo{pdfTeX}'s \cs{quitvmode}. +% Otherwise it uses \cs{leavevmode} and defines it if necessary. +% +% \begin{declcs}{ltx@mbox} +% \end{declcs} +% Macro \cs{ltx@mbox} reimplements \cs{mbox} with two changes. +% It uses \cs{ltx@leavevmode} instead of \cs{leavevmode} and +% stops right after \cs{hbox}. Especially it does not grab +% the argument and allows the extended syntax of \cs{hbox}. +% % \StopEventually{ % } % @@ -492,7 +506,7 @@ and the derived files \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2010/04/08 v1.5 LaTeX kernel commands for general use (HO)] + [2010/04/16 v1.6 LaTeX kernel commands for general use (HO)] % \end{macrocode} % % \begin{macrocode} @@ -1036,6 +1050,55 @@ and the derived files % \end{macrocode} % \end{macro} % +% \subsection{\cs{ltx@leavevmode}, \cs{ltx@mbox}} +% +% \begin{macro}{\ltx@leavevmode} +% \begin{macrocode} +\ltx@IfUndefined{quitvmode}{% + \ltx@IfUndefined{leavevmode}{% + \ltx@IfUndefined{voidb@x}{% + \ltx@IfUndefined{newbox}{% + \def\ltx@leavevmode{% + \begingroup + \setbox\ltx@zero=\hbox{}% + \begingroup + \setbox\ltx@zero=\hbox{\box\ltx@zero}% + \endgroup + \unhbox\ltx@zero + \endgroup + }% + }{% + \csname newbox\endcsname\LTXcmds@VoidBox + \ifvoid\LTXcmds@VoidBox + \else + \setbox\LTXcmds@VoidBox=\hbox{}% + \begingroup + \setbox\LTXcmds@VoidBox=\hbox{\box\LTXcmds@VoidBox}% + \endgroup + \fi + \def\ltx@leavevmode{\unhbox\LTXcmds@VoidBox}% + }% + }{% + \def\ltx@leavevmode{\unhbox\voidb@x}% + }% + }{% + \let\ltx@leavevmode\leavevmode + }% +}{% + \let\ltx@leavevmode\quitvmode +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\ltx@mbox} +% \begin{macrocode} +\def\ltx@mbox{% + \ltx@leavevmode + \hbox +} +% \end{macrocode} +% \end{macro} +% % \begin{macrocode} \LTXcmds@AtEnd %</package> @@ -1357,6 +1420,10 @@ and the derived files % \item % \cs{ltx@ReturnAfterFi} and \cs{ltx@ReturnAfterElseFi} fixed. % \end{Version} +% \begin{Version}{2010/04/16 v1.6} +% \item +% \cs{ltx@leavevmode}, \cs{ltx@mbox} added. +% \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 52addc76258..0215cb16e6c 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/04/09 +% 2010/04/18 % % 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 900757dd665..60f7c375864 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/04/09} +\newcommand*{\Date}{2010/04/18} % Copyright (C) 2006-2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -218,7 +218,7 @@ [\entrysep] \entry{grffile}{2010/01/28}{1.11}{Extended file name support for graphics}% [\entrysep] -\entry{hologo}{2010/04/08}{1.0}{Logo collection}% +\entry{hologo}{2010/04/16}{1.1}{Logo collection}% [\entrysep] \entry{holtxdoc}{2010/04/08}{0.17}{Private additional ltxdoc support}% [\entrysep] @@ -262,7 +262,7 @@ [\entrysep] \entry{listingsutf8}{2007/11/11}{1.1}{Adding support for UTF-8 to listings}% [\entrysep] -\entry{ltxcmds}{2010/04/08}{1.5}{\LaTeX{} kernel commands for general use}% +\entry{ltxcmds}{2010/04/16}{1.6}{\LaTeX{} kernel commands for general use}% [\entrysep] \entry{luacolor}{2010/03/09}{1.2}{Coloring based on LuaTeX's node attributes}% [\entrysep] @@ -334,7 +334,7 @@ [\entrysep] \entry{uniquecounter}{2009/12/18}{1.1}{Provides unlimited unique counter}% [\entrysep] -\entry{zref}{2010/04/08}{2.10}{New reference scheme for \LaTeXe{}}% +\entry{zref}{2010/04/17}{2.12}{New reference scheme for \LaTeXe{}}% \end{overview} \section{Packages} diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx index 6226af914cd..9a632a0c32a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx @@ -27,7 +27,7 @@ % 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. +% zref-test-runs.tex, zref-test-titleref-memoir.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/zref.dtx @@ -83,6 +83,7 @@ % 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:doc/latex/oberdiek/test/zref-test-titleref-memoir.tex % TDS:source/latex/oberdiek/zref.dtx % %<*ignore> @@ -100,7 +101,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: zref 2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)} +\Msg{* Package: zref 2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)} \Msg{************************************************************************} \keepsilent @@ -138,7 +139,7 @@ and the derived files 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. + zref-test-runs.tex, zref-test-titleref-memoir.tex. \endpreamble \let\MetaPrefix\DoubleperCent @@ -171,6 +172,7 @@ and the derived files \usedir{doc/latex/oberdiek/test}% \file{zref-test1.tex}{\from{zref.dtx}{test1}}% \file{zref-test-runs.tex}{\from{zref.dtx}{test-runs}}% + \file{zref-test-titleref-memoir.tex}{\from{zref.dtx}{test-titleref-memoir}}% } \catcode32=13\relax% active space @@ -206,7 +208,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{zref.drv}% - [2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)]% + [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -215,7 +217,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{2027} +% \CheckSum{2292} % % \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 @@ -236,7 +238,7 @@ and the derived files % \GetFileInfo{zref.drv} % % \title{The \xpackage{zref} package} -% \date{2010/04/08 v2.10} +% \date{2010/04/17 v2.12} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -832,7 +834,7 @@ and the derived files \newcounter{foo} \renewcommand*{\thefoo}{\Alph{foo}} -\usepackage{zref-lastpage,zref-user}[2008/10/01] +\usepackage{zref-lastpage,zref-user}[2010/04/17] \makeatletter \zref@newprop{thefoo}{\thefoo} @@ -948,7 +950,7 @@ and the derived files %<<END_EXAMPLE \documentclass{book} -\usepackage{zref-nextpage}[2010/04/08] +\usepackage{zref-nextpage}[2010/04/17] \znextpagesetup {\thepage}% next page is unknown {\thepage\ (#1)}% this page is last page @@ -1214,8 +1216,17 @@ and the derived files % \begin{declcs}{zxrsetup} % |{|\textit{key$_1$=value$_1$, key$_2$=value$_2$, \dots}|}| % \end{declcs} -% Currently the key |ext| is defined, this sets the -% url default extension. +% The following setup options are available: +% \begin{description} +% \item[\xoption{ext}:] It sets the default extension. +% \item[\xoption{tozreflabel}:] The found references +% are imported as zref labels. This is enabled by default. +% \item[\xoption{toltxlabel}:] The found references +% are imported as \LaTeX\ labels. Packages \xpackage{nameref}, +% \xpackage{titleref} and class \xclass{memoir} are supported. +% \item[\xoption{verbose}:] List the imported labels in the +% \xext{log} file. Default is |false|. +% \end{description} % % \begin{declcs}{zref@xr@ext} % \end{declcs} @@ -1426,13 +1437,13 @@ the height difference of the two baselines is %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)]% + [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]% % \end{macrocode} % % \subsubsection{Load basic module} % % \begin{macrocode} -\RequirePackage{zref-base}[2010/04/08] +\RequirePackage{zref-base}[2010/04/17] % \end{macrocode} % Abort package loading if \xpackage{zref-base} could not be % loaded successfully. @@ -1447,7 +1458,7 @@ the height difference of the two baselines is \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/04/08]% + \RequirePackage{zref-#1}[2010/04/17]% }% }% } @@ -1507,7 +1518,7 @@ the height difference of the two baselines is %<*base> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2010/04/08 v2.10 Module base for zref (HO)]% + [2010/04/17 v2.12 Module base for zref (HO)]% % \end{macrocode} % % \subsubsection{Utilities} @@ -1839,6 +1850,7 @@ the height difference of the two baselines is \global\@namedef{Z@D@\ZREF@P}{#1}% \global\expandafter\let\csname Z@X@\ZREF@P\endcsname\ZREF@X \expandafter\ZREF@@@newprop\csname\ZREF@P\endcsname + \expandafter\gdef\csname Z@C@\ZREF@P\endcsname{}% \zref@setcurrent\ZREF@P } \def\ZREF@@@newprop#1{% @@ -2287,8 +2299,8 @@ the height difference of the two baselines is %<*user> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/04/08 v2.10 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2362,8 +2374,8 @@ the height difference of the two baselines is %<*abspage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/04/08 v2.10 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2407,8 +2419,8 @@ the height difference of the two baselines is %<*counter> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/04/08 v2.10 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2444,9 +2456,9 @@ the height difference of the two baselines is %<*lastpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/04/08 v2.10 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] -\RequirePackage{zref-abspage}[2010/04/08] + [2010/04/17 v2.12 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] +\RequirePackage{zref-abspage}[2010/04/17] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} @@ -2513,14 +2525,14 @@ the height difference of the two baselines is %<*thepage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/04/08 v2.10 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % \begin{macrocode} \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] % \end{macrocode} % \begin{macrocode} \zref@newlist{thepage} @@ -2573,15 +2585,15 @@ the height difference of the two baselines is %<*nextpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/04/08 v2.10 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/04/08] -\RequirePackage{zref-thepage}[2010/04/08] -\RequirePackage{zref-lastpage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] +\RequirePackage{zref-thepage}[2010/04/17] +\RequirePackage{zref-lastpage}[2010/04/17] \RequirePackage{uniquecounter}[2009/12/18] % \end{macrocode} % \begin{macrocode} @@ -2674,16 +2686,16 @@ the height difference of the two baselines is %<*totpages> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/04/08 v2.10 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % The absolute page number of the last page is the total % page number. % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/04/08] -\RequirePackage{zref-lastpage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] +\RequirePackage{zref-lastpage}[2010/04/17] % \end{macrocode} % % \begin{macro}{\ztotpages} @@ -2713,8 +2725,8 @@ the height difference of the two baselines is %<*marks> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2010/04/08 v2.10 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2817,7 +2829,7 @@ the height difference of the two baselines is %<*runs> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/04/08 v2.10 Module runs for zref (HO)]% + [2010/04/17 v2.12 Module runs for zref (HO)]% % \end{macrocode} % % \begin{macro}{\zruns} @@ -2849,8 +2861,8 @@ the height difference of the two baselines is %<*perpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/04/08 v2.10 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2862,7 +2874,7 @@ the height difference of the two baselines is % For detecting changed pages module \xmodule{abspage} % is loaded. % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] % \end{macrocode} % % We group the properties for the needed references @@ -3006,8 +3018,8 @@ the height difference of the two baselines is %<*titleref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/04/08 v2.10 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] % \end{macrocode} @@ -3245,7 +3257,50 @@ the height difference of the two baselines is }% % \end{macrocode} % -% Class \xpackage{beamer}. +% \subsubsection{Class \xclass{memoir}} +% +% \begin{macrocode} + \@ifclassloaded{memoir}{% + \ltx@IfUndefined{ifheadnameref}{}{% + \def\@chapter[#1]#2{% + \ltx@IfUndefined{ch@pt@c}{% + \zref@titleref@setcurrent{#1}% + }{% + \ifx\ch@pt@c\ltx@empty + \zref@titleref@setcurrent{#2}% + \else + \def\NR@temp{#1}% + \ifx\NR@temp\ltx@empty + \expandafter\zref@titleref@setcurrent + \expandafter{\ch@pt@c}% + \else + \ifheadnameref + \zref@titleref@setcurrent{#1}% + \else + \expandafter\zref@titleref@setcurrent + \expandafter{\ch@pt@c}% + \fi + \fi + \fi + }% + \ZREF@org@@chapter[{#1}]{#2}% + }% + \ZREF@patch{M@sect}{% + \def\M@sect#1#2#3#4#5#6[#7][#8]{% + \ifheadnameref + \zref@titleref@setcurrent{#8}% + \else + \zref@titleref@setcurrent{#7}% + \fi + \ZREF@org@M@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]% + }% + }% + }% + }{}% +% \end{macrocode} +% +% \subsubsection{Class \xclass{beamer}} +% % \begin{macrocode} \@ifclassloaded{beamer}{% \ZREF@patch{beamer@section}{% @@ -3269,7 +3324,8 @@ the height difference of the two baselines is }{}% % \end{macrocode} % -% Package \xpackage{titlesec}. +% \subsubsection{Package \xpackage{titlesec}} +% % \begin{macrocode} \@ifpackageloaded{titlesec}{% \ZREF@patch{ttl@sect@i}{% @@ -3281,6 +3337,8 @@ the height difference of the two baselines is }{}% % \end{macrocode} % +% \subsubsection{Package \xpackage{longtable}} +% % Package \xpackage{longtable}: some support for its \cs{caption}. % However \cs{label} inside the caption is not supported. % \begin{macrocode} @@ -3294,6 +3352,8 @@ the height difference of the two baselines is }{}% % \end{macrocode} % +% \subsubsection{Package \xpackage{listings}} +% % Package \xpackage{listings}: support for its caption. % \begin{macrocode} \@ifpackageloaded{listings}{% @@ -3309,9 +3369,39 @@ the height difference of the two baselines is }% }% }{}% -} % \end{macrocode} % +% \subsubsection{Theorems} +% +% \begin{macrocode} + \ZREF@patch{@opargbegintheorem}{% + \def\@opargbegintheorem#1#2#3{% + \zref@titleref@setcurrent{#3}% + \ZREF@org@@opargbegintheorem{#1}{#2}{#3}% + }% + }% + \@ifpackageloaded{amsthm}{% + \begingroup + \edef\x{macro:\string#1\string#2[\string#3]}% + \@onelevel@sanitize\x + \def\y#1->#2\@nil{#1}% + \edef\z{\expandafter\y\meaning\@begintheorem->\@nil}% + \@onelevel@sanitize\z + \expandafter\endgroup + \ifx\x\z + \ZREF@patch{@begintheorem}{% + \def\@begintheorem#1#2[#3]{% + \zref@titleref@setcurrent{#3}% + \ZREF@org@@begintheorem{#1}{#2}[{#3}]% + }% + }% + \fi + }{}% +% \end{macrocode} +% +% \begin{macrocode} +} +% \end{macrocode} % % \begin{macrocode} %</titleref> @@ -3324,12 +3414,13 @@ the height difference of the two baselines is %<*xr> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/04/08 v2.10 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % \begin{macrocode} \RequirePackage{keyval} +\RequirePackage{kvoptions}[2010/02/22] % \end{macrocode} % % We declare property |url|, because this is added, @@ -3363,6 +3454,26 @@ the height difference of the two baselines is \newif\ifZREF@xr@zreflabel % \end{macrocode} % \end{macro} +% \begin{macrocode} +\SetupKeyvalOptions{% + family=ZREF@XR,% + prefix=ZREF@xr@% +} +\DeclareBoolOption[true]{tozreflabel} +\DeclareBoolOption[false]{toltxlabel} +\DeclareBoolOption{verbose} +\define@key{ZREF@XR}{ext}{% + \def\zref@xr@{#1}% +} +% \end{macrocode} +% \begin{macro}{\zxrsetup} +% \begin{macrocode} +\newcommand*{\zxrsetup}{% + \setkeys{ZREF@XR}% +}% +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\zexternaldocument} % In its star form it looks for \cs{newlabel}, % otherwise for \cs{zref@newlabel}. @@ -3371,6 +3482,17 @@ the height difference of the two baselines is % |@| to have catcode 11 (letter). % \begin{macrocode} \newcommand*{\zexternaldocument}{% + \zref@ifpropundefined{title}{% + \zref@newprop{title}{}% + }{}% + \zref@ifpropundefined{anchor}{% + \zref@newprop{anchor}{% + \ltx@ifundefined{@currentHref}{}{\@currentHref}% + }% + }{}% + \zref@ifpropundefined{url}{% + \zref@newprop{url}{}% + }{}% \begingroup \csname @safe@actives@true\endcsname \makeatletter @@ -3427,15 +3549,30 @@ the height difference of the two baselines is Label \ifZREF@xr@zreflabel (zref) \fi import from `\ZREF@xr@file'% }% \def\ZREF@xr@found{0}% - \def\ZREF@xr@ignored{0}% + \def\ZREF@xr@ignored@empty{0}% + \def\ZREF@xr@ignored@zref{0}% + \def\ZREF@xr@ignored@ltx{0}% \ZREF@xr@processfile \closein\@inputcheck \begingroup \let\on@line\@empty \PackageInfo{zref-xr}{% - Statistics for `\ZREF@xr@file': % - \ZREF@xr@found\space found, % - \ZREF@xr@ignored\space ignored% + Statistics for `\ZREF@xr@file':\MessageBreak + \ZREF@xr@found\space + \ifZREF@xr@zreflabel zref\else LaTeX\fi\space + label(s) found% + \ifnum\ZREF@xr@ignored@empty>0 % + ,\MessageBreak + \ZREF@xr@ignored@empty\space empty label(s) ignored% + \fi + \ifnum\ZREF@xr@ignored@zref>0 % + ,\MessageBreak + \ZREF@xr@ignored@zref\space doublicated zref label(s) ignored% + \fi + \ifnum\ZREF@xr@ignored@ltx>0 % + ,\MessageBreak + \ZREF@xr@ignored@ltx\space doublicated latex label(s) ignored% + \fi }% \endgroup \fi @@ -3456,7 +3593,7 @@ the height difference of the two baselines is \expandafter\ZREF@xr@processline\ZREF@xr@line..\ZREF@nil \ifeof\@inputcheck \else - \expandafter\ZREF@xr@procesfile + \expandafter\ZREF@xr@processfile \fi }% % \end{macrocode} @@ -3483,81 +3620,160 @@ the height difference of the two baselines is {\filename@area\the\toks@}% }% \fi - \ifeof\@inputcheck - \else - \expandafter\ZREF@xr@processfile - \fi }% \def\ZREF@xr@process@zreflabel\zref@newlabel#1#2#3\ZREF@nil{% - \def\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% + \edef\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% \edef\ZREF@xr@found{\the\numexpr\ZREF@xr@found+1\relax}% \def\x{#2}% - \@ifundefined{\ZREF@xr@refname}{% - \let\ZREF@xr@list\x - \ifx\ZREF@xr@list\@empty - \PackageWarningNoLine{zref-xr}{% - Label `#1' without properties ignored\MessageBreak - in file `\ZREF@xr@file'% + \edef\ZREF@xr@tempname{$temp$}% + \edef\ZREF@xr@temprefname{Z@R@\ZREF@xr@tempname}% + \let\ZREF@xr@list\x + \ifx\ZREF@xr@list\@empty + \PackageWarningNoLine{zref-xr}{% + Label `#1' without properties ignored\MessageBreak + in file `\ZREF@xr@file'% + }% + \edef\ZREF@xr@ignored@empty{% + \the\numexpr\ZREF@xr@ignored@empty+1\relax + }% + \else + \expandafter\ZREF@xr@checklist\x\ZREF@nil + \expandafter\let\csname\ZREF@xr@temprefname\endcsname\x + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\expandafter\endcsname + \expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile }% - \edef\ZREF@xr@ignored{\the\numexpr\ZREF@xr@ignored+1\relax}% - \else - \expandafter\ZREF@xr@checklist\x\ZREF@nil - \expandafter\global\expandafter\let - \csname \ZREF@xr@refname\endcsname\x - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% - \expandafter\externaldocument\expandafter{% - \ZREF@xr@externalfile - }% + }% + \ZREF@xr@urlcheck\ZREF@xr@tempname + \ifZREF@xr@tozreflabel + \@ifundefined{\ZREF@xr@refname}{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to zref label `\ZREF@xr@tempname#1'% + }% + \fi + \global\expandafter + \let\csname\ZREF@xr@refname\expandafter\endcsname + \csname\ZREF@xr@temprefname\endcsname + }{% + \ZREF@xr@zref@ignorewarning{\ZREF@xr@prefix#1}% }% \fi - \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% - }{% - \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}% - }% + \ifZREF@xr@toltxlabel + \ZREF@xr@tolabel{\ZREF@xr@tempname}{\ZREF@xr@prefix#1}% + \fi + \fi }% \def\ZREF@xr@process@label\newlabel#1#2#3[#4]#5\ZREF@nil{% \def\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% \edef\ZREF@xr@found{\the\numexpr\ZREF@xr@found+1\relax}% \def\x{#2}% - \@ifundefined{\ZREF@xr@refname}{% - \expandafter\ZREF@xr@scanparams - \csname\ZREF@xr@refname\expandafter\endcsname - \x{}{}{}{}{}\ZREF@nil - \ifx\\#4\\% - \else - % ntheorem knows an optional argument at the end of \newlabel - \zref@ifpropundefined{theotype}{% - \zref@newprop{theotype}{}% - }{}% - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\endcsname{\theotype{#4}}% - \fi - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% - \expandafter\externaldocument\expandafter{% - \ZREF@xr@externalfile - }% + \edef\ZREF@xr@tempname{$temp$}% + \edef\ZREF@xr@temprefname{Z@R@\ZREF@xr@tempname}% + \expandafter\ZREF@xr@scanparams + \csname\ZREF@xr@temprefname\expandafter\endcsname + \x{}{}{}{}{}\ZREF@nil + \ifx\\#4\\% + \else + % ntheorem knows an optional argument at the end of \newlabel + \zref@ifpropundefined{theotype}{% + \zref@newprop{theotype}{}% + }{}% + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\endcsname{\theotype{#4}}% + \fi + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\expandafter\endcsname\expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile }% - \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% - }{% - \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}% }% + \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% + \ifZREF@xr@tozreflabel + \@ifundefined{\ZREF@xr@refname}{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to zref label `\ZREF@xr@prefix#1'% + }% + \fi + \global\expandafter + \let\csname\ZREF@xr@refname\expandafter\endcsname + \csname\ZREF@xr@temprefname\endcsname + }{% + \ZREF@xr@zref@ignorewarning{\ZREF@xr@prefix#1}% + }% + \fi + \ifZREF@xr@toltxlabel + \ZREF@xr@tolabel{\ZREF@xr@tempname}{\ZREF@xr@prefix#1}% + \fi } \def\ZREF@xr@zref@newlabel{\zref@newlabel}% \def\ZREF@xr@newlabel{\newlabel}% \def\ZREF@xr@@input{\@input}% +\def\ZREF@xr@relax{\relax}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ZREF@xr@tolabel} +% \begin{macrocode} +\def\ZREF@xr@tolabel#1#2{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to LaTeX label `#2'% + }% + \fi + \expandafter\xdef\csname r@#2\endcsname{% + {% + \ltx@ifundefined{M@TitleReference}{% + \ltx@ifundefined{TR@TitleReference}{% + \zref@extractdefault{#1}{default}{}% + }{% + \noexpand\TR@TitleReference + {\zref@extractdefault{#1}{default}{}}% + {\zref@extractdefault{#1}{title}{}}% + }% + }{% + \noexpand\M@TitleReference + {\zref@extractdefault{#1}{default}{}}% + {\zref@extractdefault{#1}{title}{}}% + }% + }% + {\zref@extractdefault{#1}{page}{}}% + \ltx@ifpackageloaded{nameref}{% + {\zref@extractdefault{#1}{title}{}}% + {\zref@extractdefault{#1}{anchor}{}}% + {\zref@extractdefault{#1}{url}{}}% + }{}% + }% +} % \end{macrocode} % \end{macro} % -% \begin{macro}{\ZREF@xr@ignorewarning} +% \begin{macro}{\ZREF@xr@zref@ignorewarning} % \begin{macrocode} -\def\ZREF@xr@ignorewarning#1{% +\def\ZREF@xr@zref@ignorewarning#1{% \PackageWarningNoLine{zref-xr}{% - Label `#1' is already in use\MessageBreak + Zref label `#1' is already in use\MessageBreak in file `\ZREF@xr@file'% }% - \edef\ZREF@xr@ignored{\the\numexpr\ZREF@xr@ignored+1\relax}% + \edef\ZREF@xr@ignored@empty{% + \the\numexpr\ZREF@xr@ignored+1% + }% +}% +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\ZREF@xr@ltx@ignorewarning} +% \begin{macrocode} +\def\ZREF@xr@ltx@ignorewarning#1{% + \PackageWarningNoLine{zref-xr}{% + LaTeX label `#1' is already in use\MessageBreak + in file `\ZREF@xr@file'% + }% + \edef\ZREF@xr@ignored@ltx{% + \the\numexpr\ZREF@xr@ignored@ltx+1% + }% }% % \end{macrocode} % \end{macro} @@ -3570,12 +3786,11 @@ the height difference of the two baselines is \fi \ifx\\#3\\% \else - \@ReturnAfterFi{% + \ltx@ReturnAfterFi{% \ZREF@xr@checklist#3\ZREF@nil }% \fi }% -\long\def\@ReturnAfterFi#1\fi{\fi#1}% \def\ZREF@xr@checkkey#1#2\@nil{% \zref@ifpropundefined{#2}{% \zref@newprop{#2}{}% @@ -3587,40 +3802,35 @@ the height difference of the two baselines is % \begin{macro}{\ZREF@xr@scanparams} % \begin{macrocode} \def\ZREF@xr@scanparams#1#2#3#4#5#6#7\ZREF@nil{% - \global\let#1\@empty + \let#1\@empty \ZREF@foundfalse \ZREF@xr@scantitleref#1#2\TR@TitleReference{}{}\ZREF@nil \ifZREF@found \else - \g@addto@macro#1{\default{#2}}% + \ltx@LocalAppendToMacro#1{\default{#2}}% \fi % page - \g@addto@macro#1{\page{#3}}% + \ltx@LocalAppendToMacro#1{\page{#3}}% % nameref title \ifZREF@found \else \ifx\\#4\\% \else - \zref@ifpropundefined{title}{% - \zref@newprop{title}{}% - }{}% - \g@addto@macro#1{\title{#4}}% + \def\ZREF@xr@temp{#4}% + \ifx\ZREF@xr@temp\ZREF@xr@relax + \else + \ltx@LocalAppendToMacro#1{\title{#4}}% + \fi \fi \fi % anchor \ifx\\#5\\% \else - \zref@ifpropundefined{anchor}{% - \zref@newprop{anchor}{}% - }{}% - \g@addto@macro#1{\anchor{#5}}% + \ltx@LocalAppendToMacro#1{\anchor{#5}}% \fi \ifx\\#6\\% \else - \zref@ifpropundefined{url}{% - \zref@newprop{url}{}% - }{}% - \g@addto@macro#1{\url{#6}}% + \ltx@LocalAppendToMacro#1{\url{#6}}% \fi }% % \end{macrocode} @@ -3631,7 +3841,7 @@ the height difference of the two baselines is \def\ZREF@xr@scantitleref#1#2\TR@TitleReference#3#4#5\ZREF@nil{% \ifx\\#5\\% \else - \g@addto@macro#1{% + \ltx@LocalAppendToMacro#1{% \default{#3}% \title{#4}% }% @@ -3647,7 +3857,8 @@ the height difference of the two baselines is \zref@ifrefcontainsprop{#1}{anchor}{% \zref@ifrefcontainsprop{#1}{url}{% }{% - \expandafter\g@addto@macro\csname Z@R@#1\expandafter\endcsname + \expandafter + \ltx@LocalAppendToMacro\csname Z@R@#1\expandafter\endcsname \expandafter{% \expandafter\url\expandafter{\ZREF@xr@url}% }% @@ -3658,18 +3869,6 @@ the height difference of the two baselines is % \end{macrocode} % \end{macro} % -% \begin{macro}{\zxrsetup} -% Just one key for setting the default extension is currently used. -% \begin{macrocode} -\define@key{ZREF@XR}{ext}{% - \def\zref@xr@ext{#1}% -}% -\newcommand*{\zxrsetup}{% - \setkeys{ZREF@XR}% -}% -% \end{macrocode} -% \end{macro} -% % \begin{macrocode} %</xr> % \end{macrocode} @@ -3683,8 +3882,8 @@ the height difference of the two baselines is %<*hyperref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/04/08 v2.10 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -3712,8 +3911,8 @@ the height difference of the two baselines is %<*savepos> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/04/08 v2.10 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -3815,15 +4014,15 @@ the height difference of the two baselines is %<*dotfill> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/04/08 v2.10 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@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}[2010/04/08] +\RequirePackage{zref-savepos}[2010/04/17] % \end{macrocode} % For automatically generated label names we use the unique % counter of module \xmodule{base}. @@ -3912,7 +4111,7 @@ the height difference of the two baselines is \NeedsTeXFormat{LaTeX2e} \nofiles \documentclass{article} -\usepackage{zref-base}[2010/04/08] +\usepackage{zref-base}[2010/04/17] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -3942,7 +4141,7 @@ the height difference of the two baselines is %<*test-runs> \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{zref-runs}[2010/04/08] +\usepackage{zref-runs}[2010/04/17] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -3965,6 +4164,69 @@ the height difference of the two baselines is %</test-runs> % \end{macrocode} % +% \subsection{Module \xmodule{titleref}} +% +% \begin{macrocode} +%<*test-titleref-memoir> +\NeedsTeXFormat{LaTeX2e} +\documentclass{memoir} +\usepackage{zref-titleref}[2010/04/17] +\usepackage{qstest} +\IncludeTests{*} +\LogTests{log}{*}{*} +\begin{document} +\makeatletter +\def\List{} +\def\Label#1{% + \zref@label{#1}% + \g@addto@macro\List{% + \par + #1: [\ztitleref{#1}]% + }% + \mbox{}% + \zref@refused{#1}% + \zref@ifrefundefined{#1}{% + }{% + \begingroup + \edef\x{\zref@extract{#1}{title}}% + \Expect{OK/}*{\expandafter\ltx@carthree\x{}{}{}\@nil}% + \endgroup + }% +} +\def\Test#1{% + \csname#1\endcsname*{OK/#1}% + \Label{#1*}% + \csname#1\endcsname{OK/#1}% + \Label{#1}% + \csname#1\endcsname[OK/#1-toc]% + {WRONG-in-titleref/#1-toc-2}% + \Label{#1-toc}% + \expandafter\ifx\csname#1\endcsname\part + \else + \headnamereffalse + \csname#1\endcsname[OK/#1-th-toc]% + [WRONG-in-titleref/#1-th-toc-2]% + {WRONG-in-titleref/#1-th-toc-3}% + \Label{#1-th-toc}% + \headnamereftrue + \csname#1\endcsname[WRONG-in-titleref/#1-th-head-1]% + [OK/#1-th-head]% + {WRONG-in-titleref/#1-th-head-3}% + \Label{#1-th-head}% + \fi +} +\begin{qstest}{section}{section} + \@for\x:=part,chapter,section,subsection,subsubsection\do{% + \expandafter\Test\expandafter{\x}% + }% +\end{qstest} +\newpage +\List +\end{document} + +%</test-titleref-memoir> +% \end{macrocode} +% % \section{Installation} % % \subsection{Download} @@ -4047,6 +4309,7 @@ the height difference of the two baselines is % 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\\ +% test/zref-test-titleref-memoir.tex & doc/latex/oberdiek/test/zref-test-titleref-memoir.tex\\ % zref.dtx & source/latex/oberdiek/zref.dtx\\ % \end{tabular}^^A % }^^A @@ -4319,6 +4582,20 @@ the height difference of the two baselines is % Module \xmodule{xr} remembers the external document name % in property `externaldocument'. % \end{Version} +% \begin{Version}{2010/04/15 v2.11} +% \item +% Module \xmodule{titleref}: Better support of class \xclass{memoir}. +% \item +% Module \xmodule{titleref}: Support of theorems. +% \end{Version} +% \begin{Version}{2010/04/17 v2.12} +% \item +% Module \xmodule{base}: \cs{zref@newprop} ensures global +% empty default. +% \item +% Module \xmodule{xr}: Setup options \xoption{tozreflabel} +% and \xoption{toltxlabel} added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index 847353f3596..c9b95fa5cf8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty @@ -92,7 +92,7 @@ \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2010/04/08 v1.0 Logo collection (HO)] + [2010/04/16 v1.1 Logo collection (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -151,15 +151,17 @@ \input ltxcmds.sty\relax \input infwarerr.sty\relax \input kvsetkeys.sty\relax + \input kvdefinekeys.sty\relax \input pdftexcmds.sty\relax \input ifpdf.sty\relax \input ifluatex.sty\relax \input ifxetex.sty\relax \input ifvtex.sty\relax \else - \RequirePackage{ltxcmds}[2010/04/08]% + \RequirePackage{ltxcmds}[2010/04/16]% \RequirePackage{infwarerr}[2010/04/08]% \RequirePackage{kvsetkeys}[2010/03/01]% + \RequirePackage{kvdefinekeys}[2010/03/01]% \RequirePackage{pdftexcmds}[2010/04/01]% \RequirePackage{ifpdf}[2010/01/28]% \RequirePackage{ifluatex}[2010/03/01]% @@ -177,6 +179,156 @@ \fi \fi } +\def\hologoSetup{% + \let\HOLOGO@name\relax + \HOLOGO@Setup +} +\def\hologoLogoSetup#1{% + \edef\HOLOGO@name{#1}% + \ltx@IfUndefined{HoLogo@\HOLOGO@name}{% + \@PackageError{hologo}{% + Unknown logo `\HOLOGO@name'% + }\@ehc + \@gobble + }{% + \HOLOGO@Setup + }% +} +\def\HOLOGO@Setup{% + \kvsetkeys{HoLogo}% +} +\def\HOLOGO@DeclareBoolOption#1{% + \expandafter\chardef\csname HOLOGOOPT@#1\endcsname\ltx@zero + \kv@define@key{HoLogo}{#1}[true]{% + \def\HOLOGO@temp{##1}% + \ifx\HOLOGO@temp\HOLOGO@true + \ifx\HOLOGO@name\relax + \expandafter\chardef\csname HOLOGOOPT@#1\endcsname=\ltx@one + \else + \expandafter\chardef\csname + HoLogoOpt@#1@\HOLOGO@name\endcsname\ltx@one + \fi + \HOLOGO@SetBreakAll{#1}% + \else + \ifx\HOLOGO@temp\HOLOGO@false + \ifx\HOLOGO@name\relax + \expandafter\chardef\csname HOLOGOOPT@#1\endcsname=\ltx@zero + \else + \expandafter\chardef\csname + HoLogoOpt@#1@\HOLOGO@name\endcsname=\ltx@zero + \fi + \HOLOGO@SetBreakAll{#1}% + \else + \@PackageError{hologo}{% + Unknown value `##1' for boolean option `#1'.\MessageBreak + Known values are `true' and `false'% + }\@ehc + \fi + \fi + }% +} +\def\HOLOGO@SetBreakAll#1{% + \def\HOLOGO@temp{#1}% + \ifx\HOLOGO@temp\HOLOGO@break + \ifx\HOLOGO@name\relax + \chardef\HOLOGOOPT@hyphenbreak=\HOLOGOOPT@break + \chardef\HOLOGOOPT@spacebreak=\HOLOGOOPT@break + \else + \expandafter\chardef + \csname HoLogoOpt@hyphenbreak@\HOLOGO@name\endcsname=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + \expandafter\chardef + \csname HoLogoOpt@spacebreak@\HOLOGO@name\endcsname=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + \fi + \fi +} +\def\HOLOGO@true{true} +\def\HOLOGO@false{false} +\def\HOLOGO@break{break} +\HOLOGO@DeclareBoolOption{break} +\HOLOGO@DeclareBoolOption{hyphenbreak} +\HOLOGO@DeclareBoolOption{spacebreak} +\kv@define@key{HoLogo}{variant}{% + \ifx\HOLOGO@name\relax + \@PackageError{hologo}{% + Option `variant' is not available in \string\hologoSetup,% + \MessageBreak + Use \string\hologoLogoSetup\space instead% + }\@ehc + \else + \edef\HOLOGO@temp{#1}% + \ifx\HOLOGO@temp\ltx@empty + \expandafter + \let\csname HoLogoOpt@variant@\HOLOGO@name\endcsname\@undefined + \else + \ltx@IfUndefined{HoLogo@\HOLOGO@name @\HOLOGO@temp}{% + \@PackageError{hologo}{% + Unknown variant `\HOLOGO@temp' of logo `\HOLOGO@name'% + }\@ehc + }{% + \expandafter + \let\csname HoLogoOpt@variant@\HOLOGO@name\endcsname + \HOLOGO@temp + }% + \fi + \fi +} +\def\HOLOGO@Variant#1{% + #1% + \ltx@ifundefined{HoLogoOpt@variant@#1}{% + }{% + @\csname HoLogoOpt@variant@#1\endcsname + }% +} +\def\HOLOGO@space{% + \ltx@ifundefined{HoLogoOpt@spacebreak@\HOLOGO@name}{% + \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% + \chardef\HOLOGO@temp=\HOLOGOOPT@spacebreak + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + }% + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@spacebreak@\HOLOGO@name\endcsname + }% + \ifcase\HOLOGO@temp + \penalty10000 % + \fi + \ltx@space +} +\def\HOLOGO@hyphen{% + \ltx@ifundefined{HoLogoOpt@hyphenbreak@\HOLOGO@name}{% + \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% + \chardef\HOLOGO@temp=\HOLOGOOPT@hyphenbreak + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + }% + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@hyphenbreak@\HOLOGO@name\endcsname + }% + \ifcase\HOLOGO@temp + \ltx@mbox{-}% + \else + -% + \fi +} +\def\HOLOGO@mbox#1{% + \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% + \chardef\HOLOGO@temp=\HOLOGOOPT@hyphenbreak + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + }% + \ifcase\HOLOGO@temp + \ltx@mbox{#1}% + \else + #1% + \fi +} \HOLOGO@IfExists\hologo{% \@PackageError{hologo}{% \string\hologo\ltx@space is already defined.\MessageBreak @@ -201,13 +353,14 @@ \protected\def\hologorobust#1% }% {% - \ltx@ifundefined{HoLogo@#1}{% + \edef\HOLOGO@name{#1}% + \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% \@PackageError{hologo}{% - Unknown logo `#1'% + Unknown logo `\HOLOGO@name'% }\@ehc - ?#1?% + ?\HOLOGO@name?% }{% - \csname HoLogo@#1\endcsname + \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@firstoftwo }% } \def\hologo#1{% @@ -215,10 +368,42 @@ {% \hologorobust{#1}% }{% - \ltx@ifundefined{HoLogoBkm@#1}{% + \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% + \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + }{% + \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@firstoftwo + }% + }% +} +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\Hologorobust#1% + }{% + \DeclareRobustCommand*\Hologorobust[1]% + }% +}{% + \protected\def\Hologorobust#1% +}% +{% + \edef\HOLOGO@name{#1}% + \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% + \@PackageError{hologo}{% + Unknown logo `\HOLOGO@name'% + }\@ehc + ?\HOLOGO@name?% + }{% + \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@secondoftwo + }% +} +\def\Hologo#1{% + \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo + {% + \Hologorobust{#1}% + }{% + \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% }{% - \csname HoLogoBkm@#1\endcsname + \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@secondoftwo }% }% } @@ -258,16 +443,30 @@ \setbox\ltx@zero\hbox{#1\kern0pt#2}% \advance\HOLOGO@TempDimen by -\wd\ltx@zero } -\def\HoLogo@TeX{% +\def\HoLogo@TeX#1{% T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000 % } -\def\HoLogo@plainTeX{% - plain \hologo{TeX}% +\def\HoLogo@plainTeX@space#1{% + \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@space\hologo{TeX}% } -\def\HoLogoBkm@plainTeX{% - plain \hologo{TeX}% +\def\HoLogoBkm@plainTeX@space#1{% + #1{p}{P}lain \hologo{TeX}% } -\def\HoLogo@LaTeX{% +\def\HoLogo@plainTeX@hyphen#1{% + \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@hyphen\hologo{TeX}% +} +\def\HoLogoBkm@plainTeX@hyphen#1{% + #1{p}{P}lain-\hologo{TeX}% +} +\def\HoLogo@plainTeX@runtogether#1{% + \HOLOGO@mbox{#1{p}{P}lain\hologo{TeX}}% +} +\def\HoLogoBkm@plainTeX@runtogether#1{% + #1{p}{P}lain\hologo{TeX}% +} +\def\HoLogo@plainTeX{\HoLogo@plainTeX@space} +\def\HoLogoBkm@plainTeX{\HoLogoBkm@plainTeX@space} +\def\HoLogo@LaTeX#1{% L% \kern-.36em% \begingroup @@ -289,7 +488,7 @@ \kern-.15em% \hologo{TeX}% } -\def\HoLogo@LaTeXe{% +\def\HoLogo@LaTeXe#1{% \hologo{LaTeX}% \kern.15em% \hbox{% @@ -298,38 +497,43 @@ $_{\textstyle\varepsilon}$% }% } -\def\HoLogoBkm@LaTeXe{% +\def\HoLogoBkm@LaTeXe#1{% \hologo{LaTeX}% 2% \HOLOGO@PdfdocUnicode{e}{\textepsilon}% } \expandafter\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe \expandafter\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe -\def\HoLogo@eTeX{% - \leavevmode - \hbox{% - \HOLOGO@MathSetup - $\varepsilon$% - -% - \HOLOGO@NegativeKerning{-T,T-,To}% - \hologo{TeX}% +\def\HoLogo@eTeX#1{% + \ltx@mbox{% + \hbox{% + \HOLOGO@MathSetup + $\varepsilon$% + -% + \HOLOGO@NegativeKerning{-T,T-,To}% + \hologo{TeX}% + }% }% } -\def\HoLogoBkm@eTeX{% - \HOLOGO@PdfdocUnicode{e}{\textepsilon}% +\def\HoLogoBkm@eTeX#1{% + \HOLOGO@PdfdocUnicode{#1{e}{E}}{\textepsilon}% -% \hologo{TeX}% } -\def\HoLogo@LuaTeX{% - Lua% - \HOLOGO@NegativeKerning{aT,oT,To}% - \hologo{TeX}% +\def\HoLogo@LuaTeX#1{% + \HOLOGO@mbox{% + Lua% + \HOLOGO@NegativeKerning{aT,oT,To}% + \hologo{TeX}% + }% } -\def\HoLogo@LuaLaTeX{% - Lua% - \hologo{LaTeX}% +\def\HoLogo@LuaLaTeX#1{% + \HOLOGO@mbox{% + Lua% + \hologo{LaTeX}% + }% } -\def\HoLogo@Xe{% +\def\HoLogo@Xe#1{% X% \kern-.1em\relax \ltx@IfUndefined{HOLOGO@ReflectBox}\ltx@firstoftwo{% @@ -342,22 +546,49 @@ }% }% } -\def\HoLogo@XeTeX{% +\def\HoLogo@XeTeX#1{% \hologo{Xe}% \kern-.15em\relax \hologo{TeX}% } -\def\HoLogoBkm@XeTeX{XeTeX} -\def\HoLogo@XeLaTeX{% +\def\HoLogoBkm@XeTeX#1{XeTeX} +\def\HoLogo@XeLaTeX#1{% \hologo{Xe}% \hologo{LaTeX}% } -\def\HoLogo@pdfTeX{% - pdf\hologo{TeX}% +\def\HoLogo@pdfTeX#1{% + \HOLOGO@mbox{% + #1{p}{P}df\hologo{TeX}% + }% +} +\def\HoLogo@pdfLaTeX#1{% + \HOLOGO@mbox{% + #1{p}{P}df\hologo{LaTeX}% + }% +} +\def\HoLogo@AmS#1{% + \begingroup + \usefont{OMS}{cmsy}{m}{n}% + A% + \kern-.1667em% + \lower.5ex\hbox{M}% + \kern-.125em% + S% + \endgroup +} +\def\HoLogoBkm@AmS#1{AmS} +\def\HoLogo@AmSTeX#1{% + \hologo{AmS}% + \HOLOGO@hyphen + \hologo{TeX}% } -\def\HoLogo@pdfLaTeX{% - pdf\hologo{LaTeX}% +\def\HoLogoBkm@AmSLaTeX#1{AmS-TeX}% +\def\HoLogo@AmSLaTeX#1{% + \hologo{AmS}% + \HOLOGO@hyphen + \hologo{LaTeX}% } +\def\HoLogoBkm@AmSLaTeX#1{AmS-LaTeX}% \HOLOGO@IfExists\InputIfFileExists{% \InputIfFileExists{hologo.cfg}{}{}% }{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty index 700cb7746e0..325a483fbf4 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty @@ -93,7 +93,7 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2010/04/08 v1.5 LaTeX kernel commands for general use (HO)] + [2010/04/16 v1.6 LaTeX kernel commands for general use (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -361,6 +361,43 @@ \let\LTXcmds@SpaceToken= #1% }% \x{ } +\ltx@IfUndefined{quitvmode}{% + \ltx@IfUndefined{leavevmode}{% + \ltx@IfUndefined{voidb@x}{% + \ltx@IfUndefined{newbox}{% + \def\ltx@leavevmode{% + \begingroup + \setbox\ltx@zero=\hbox{}% + \begingroup + \setbox\ltx@zero=\hbox{\box\ltx@zero}% + \endgroup + \unhbox\ltx@zero + \endgroup + }% + }{% + \csname newbox\endcsname\LTXcmds@VoidBox + \ifvoid\LTXcmds@VoidBox + \else + \setbox\LTXcmds@VoidBox=\hbox{}% + \begingroup + \setbox\LTXcmds@VoidBox=\hbox{\box\LTXcmds@VoidBox}% + \endgroup + \fi + \def\ltx@leavevmode{\unhbox\LTXcmds@VoidBox}% + }% + }{% + \def\ltx@leavevmode{\unhbox\voidb@x}% + }% + }{% + \let\ltx@leavevmode\leavevmode + }% +}{% + \let\ltx@leavevmode\quitvmode +} +\def\ltx@mbox{% + \ltx@leavevmode + \hbox +} \LTXcmds@AtEnd \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 0171a6e6ae7..4e2de272a5e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/04/08 v2.10 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi}% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index 9367101c343..6ff9ea65221 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -35,11 +35,11 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2010/04/08 v2.10 Module base for zref (HO)]% + [2010/04/17 v2.12 Module base for zref (HO)]% \RequirePackage{ltxcmds}[2010/03/01] \def\ZREF@name{zref} \def\ZREF@UpdatePdfTeX{Update pdfTeX.} @@ -213,6 +213,7 @@ \global\@namedef{Z@D@\ZREF@P}{#1}% \global\expandafter\let\csname Z@X@\ZREF@P\endcsname\ZREF@X \expandafter\ZREF@@@newprop\csname\ZREF@P\endcsname + \expandafter\gdef\csname Z@C@\ZREF@P\endcsname{}% \zref@setcurrent\ZREF@P } \def\ZREF@@@newprop#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index dd96d69dd0f..3ad669191a2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/04/08 v2.10 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@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 ec57ac6fde0..c200ecce6d5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -35,14 +35,14 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/04/08 v2.10 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2010/04/08] +\RequirePackage{zref-savepos}[2010/04/17] \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 4ac1421e9aa..c85417f994a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/04/08 v2.10 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{anchor}[]{% \ltx@ifundefined{@currentHref}{}{\@currentHref}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index c88db209024..cac3ed6e9ec 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -35,13 +35,13 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/04/08 v2.10 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] -\RequirePackage{zref-abspage}[2010/04/08] + [2010/04/17 v2.12 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] +\RequirePackage{zref-abspage}[2010/04/17] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newlist{LastPage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty index a07c4a50071..663175d29bc 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2010/04/08 v2.10 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{kvsetkeys}[2009/07/30] \newcommand*{\zref@marks@register}[3][]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index 35667a3bedd..0a7ec65196f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -35,16 +35,16 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/04/08 v2.10 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/04/08] -\RequirePackage{zref-thepage}[2010/04/08] -\RequirePackage{zref-lastpage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] +\RequirePackage{zref-thepage}[2010/04/17] +\RequirePackage{zref-lastpage}[2010/04/17] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index c7a155ee526..0de80d90357 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -35,14 +35,14 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/04/08 v2.10 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] \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 c4127fe525d..146ca1a6508 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -35,11 +35,11 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/04/08 v2.10 Module runs for zref (HO)]% + [2010/04/17 v2.12 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 ec9c1ab8c8c..399023da74e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/04/08 v2.10 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \ltx@IfUndefined{pdfsavepos}{% \PackageError\ZREF@name{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index 8a8ba72354c..b8544f42fa1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -35,15 +35,15 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/04/08 v2.10 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] \zref@newlist{thepage} \zref@addprop{thepage}{page} \AtBeginShipout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index b2403eda426..f715f768c7a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/04/08 v2.10 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] \RequirePackage{keyval} @@ -150,6 +150,43 @@ \ZREF@org@@ssect{#1}{#2}{#3}{#4}{#5}% }% }% + \@ifclassloaded{memoir}{% + \ltx@IfUndefined{ifheadnameref}{}{% + \def\@chapter[#1]#2{% + \ltx@IfUndefined{ch@pt@c}{% + \zref@titleref@setcurrent{#1}% + }{% + \ifx\ch@pt@c\ltx@empty + \zref@titleref@setcurrent{#2}% + \else + \def\NR@temp{#1}% + \ifx\NR@temp\ltx@empty + \expandafter\zref@titleref@setcurrent + \expandafter{\ch@pt@c}% + \else + \ifheadnameref + \zref@titleref@setcurrent{#1}% + \else + \expandafter\zref@titleref@setcurrent + \expandafter{\ch@pt@c}% + \fi + \fi + \fi + }% + \ZREF@org@@chapter[{#1}]{#2}% + }% + \ZREF@patch{M@sect}{% + \def\M@sect#1#2#3#4#5#6[#7][#8]{% + \ifheadnameref + \zref@titleref@setcurrent{#8}% + \else + \zref@titleref@setcurrent{#7}% + \fi + \ZREF@org@M@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]% + }% + }% + }% + }{}% \@ifclassloaded{beamer}{% \ZREF@patch{beamer@section}{% \long\def\beamer@section[#1]{% @@ -199,6 +236,29 @@ }% }% }{}% + \ZREF@patch{@opargbegintheorem}{% + \def\@opargbegintheorem#1#2#3{% + \zref@titleref@setcurrent{#3}% + \ZREF@org@@opargbegintheorem{#1}{#2}{#3}% + }% + }% + \@ifpackageloaded{amsthm}{% + \begingroup + \edef\x{macro:\string#1\string#2[\string#3]}% + \@onelevel@sanitize\x + \def\y#1->#2\@nil{#1}% + \edef\z{\expandafter\y\meaning\@begintheorem->\@nil}% + \@onelevel@sanitize\z + \expandafter\endgroup + \ifx\x\z + \ZREF@patch{@begintheorem}{% + \def\@begintheorem#1#2[#3]{% + \zref@titleref@setcurrent{#3}% + \ZREF@org@@begintheorem{#1}{#2}[{#3}]% + }% + }% + \fi + }{}% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 2670629d327..1c4609a6fd4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -35,15 +35,15 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/04/08 v2.10 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/04/08] -\RequirePackage{zref-lastpage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] +\RequirePackage{zref-lastpage}[2010/04/17] \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 708cfed82b5..978bbc106f3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -35,12 +35,12 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/04/08 v2.10 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \newcommand*\zlabel{% \ifx\label\ltx@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 1fde34c1017..946ba4b5a4a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -35,21 +35,46 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/04/08 v2.10 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} +\RequirePackage{kvoptions}[2010/02/22] \zref@newprop{url}{}% \zref@newprop{externaldocument}{}% \providecommand*{\zref@xr@ext}{% \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}% }% \newif\ifZREF@xr@zreflabel +\SetupKeyvalOptions{% + family=ZREF@XR,% + prefix=ZREF@xr@% +} +\DeclareBoolOption[true]{tozreflabel} +\DeclareBoolOption[false]{toltxlabel} +\DeclareBoolOption{verbose} +\define@key{ZREF@XR}{ext}{% + \def\zref@xr@{#1}% +} +\newcommand*{\zxrsetup}{% + \setkeys{ZREF@XR}% +}% \newcommand*{\zexternaldocument}{% + \zref@ifpropundefined{title}{% + \zref@newprop{title}{}% + }{}% + \zref@ifpropundefined{anchor}{% + \zref@newprop{anchor}{% + \ltx@ifundefined{@currentHref}{}{\@currentHref}% + }% + }{}% + \zref@ifpropundefined{url}{% + \zref@newprop{url}{}% + }{}% \begingroup \csname @safe@actives@true\endcsname \makeatletter @@ -86,15 +111,30 @@ Label \ifZREF@xr@zreflabel (zref) \fi import from `\ZREF@xr@file'% }% \def\ZREF@xr@found{0}% - \def\ZREF@xr@ignored{0}% + \def\ZREF@xr@ignored@empty{0}% + \def\ZREF@xr@ignored@zref{0}% + \def\ZREF@xr@ignored@ltx{0}% \ZREF@xr@processfile \closein\@inputcheck \begingroup \let\on@line\@empty \PackageInfo{zref-xr}{% - Statistics for `\ZREF@xr@file': % - \ZREF@xr@found\space found, % - \ZREF@xr@ignored\space ignored% + Statistics for `\ZREF@xr@file':\MessageBreak + \ZREF@xr@found\space + \ifZREF@xr@zreflabel zref\else LaTeX\fi\space + label(s) found% + \ifnum\ZREF@xr@ignored@empty>0 % + ,\MessageBreak + \ZREF@xr@ignored@empty\space empty label(s) ignored% + \fi + \ifnum\ZREF@xr@ignored@zref>0 % + ,\MessageBreak + \ZREF@xr@ignored@zref\space doublicated zref label(s) ignored% + \fi + \ifnum\ZREF@xr@ignored@ltx>0 % + ,\MessageBreak + \ZREF@xr@ignored@ltx\space doublicated latex label(s) ignored% + \fi }% \endgroup \fi @@ -110,7 +150,7 @@ \expandafter\ZREF@xr@processline\ZREF@xr@line..\ZREF@nil \ifeof\@inputcheck \else - \expandafter\ZREF@xr@procesfile + \expandafter\ZREF@xr@processfile \fi }% \long\def\ZREF@xr@processline#1#2#3\ZREF@nil{% @@ -131,76 +171,146 @@ {\filename@area\the\toks@}% }% \fi - \ifeof\@inputcheck - \else - \expandafter\ZREF@xr@processfile - \fi }% \def\ZREF@xr@process@zreflabel\zref@newlabel#1#2#3\ZREF@nil{% - \def\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% + \edef\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% \edef\ZREF@xr@found{\the\numexpr\ZREF@xr@found+1\relax}% \def\x{#2}% - \@ifundefined{\ZREF@xr@refname}{% - \let\ZREF@xr@list\x - \ifx\ZREF@xr@list\@empty - \PackageWarningNoLine{zref-xr}{% - Label `#1' without properties ignored\MessageBreak - in file `\ZREF@xr@file'% + \edef\ZREF@xr@tempname{$temp$}% + \edef\ZREF@xr@temprefname{Z@R@\ZREF@xr@tempname}% + \let\ZREF@xr@list\x + \ifx\ZREF@xr@list\@empty + \PackageWarningNoLine{zref-xr}{% + Label `#1' without properties ignored\MessageBreak + in file `\ZREF@xr@file'% + }% + \edef\ZREF@xr@ignored@empty{% + \the\numexpr\ZREF@xr@ignored@empty+1\relax + }% + \else + \expandafter\ZREF@xr@checklist\x\ZREF@nil + \expandafter\let\csname\ZREF@xr@temprefname\endcsname\x + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\expandafter\endcsname + \expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile }% - \edef\ZREF@xr@ignored{\the\numexpr\ZREF@xr@ignored+1\relax}% - \else - \expandafter\ZREF@xr@checklist\x\ZREF@nil - \expandafter\global\expandafter\let - \csname \ZREF@xr@refname\endcsname\x - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% - \expandafter\externaldocument\expandafter{% - \ZREF@xr@externalfile - }% + }% + \ZREF@xr@urlcheck\ZREF@xr@tempname + \ifZREF@xr@tozreflabel + \@ifundefined{\ZREF@xr@refname}{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to zref label `\ZREF@xr@tempname#1'% + }% + \fi + \global\expandafter + \let\csname\ZREF@xr@refname\expandafter\endcsname + \csname\ZREF@xr@temprefname\endcsname + }{% + \ZREF@xr@zref@ignorewarning{\ZREF@xr@prefix#1}% }% \fi - \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% - }{% - \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}% - }% + \ifZREF@xr@toltxlabel + \ZREF@xr@tolabel{\ZREF@xr@tempname}{\ZREF@xr@prefix#1}% + \fi + \fi }% \def\ZREF@xr@process@label\newlabel#1#2#3[#4]#5\ZREF@nil{% \def\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% \edef\ZREF@xr@found{\the\numexpr\ZREF@xr@found+1\relax}% \def\x{#2}% - \@ifundefined{\ZREF@xr@refname}{% - \expandafter\ZREF@xr@scanparams - \csname\ZREF@xr@refname\expandafter\endcsname - \x{}{}{}{}{}\ZREF@nil - \ifx\\#4\\% - \else - % ntheorem knows an optional argument at the end of \newlabel - \zref@ifpropundefined{theotype}{% - \zref@newprop{theotype}{}% - }{}% - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\endcsname{\theotype{#4}}% - \fi - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% - \expandafter\externaldocument\expandafter{% - \ZREF@xr@externalfile - }% + \edef\ZREF@xr@tempname{$temp$}% + \edef\ZREF@xr@temprefname{Z@R@\ZREF@xr@tempname}% + \expandafter\ZREF@xr@scanparams + \csname\ZREF@xr@temprefname\expandafter\endcsname + \x{}{}{}{}{}\ZREF@nil + \ifx\\#4\\% + \else + % ntheorem knows an optional argument at the end of \newlabel + \zref@ifpropundefined{theotype}{% + \zref@newprop{theotype}{}% + }{}% + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\endcsname{\theotype{#4}}% + \fi + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\expandafter\endcsname\expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile }% - \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% - }{% - \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}% }% + \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% + \ifZREF@xr@tozreflabel + \@ifundefined{\ZREF@xr@refname}{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to zref label `\ZREF@xr@prefix#1'% + }% + \fi + \global\expandafter + \let\csname\ZREF@xr@refname\expandafter\endcsname + \csname\ZREF@xr@temprefname\endcsname + }{% + \ZREF@xr@zref@ignorewarning{\ZREF@xr@prefix#1}% + }% + \fi + \ifZREF@xr@toltxlabel + \ZREF@xr@tolabel{\ZREF@xr@tempname}{\ZREF@xr@prefix#1}% + \fi } \def\ZREF@xr@zref@newlabel{\zref@newlabel}% \def\ZREF@xr@newlabel{\newlabel}% \def\ZREF@xr@@input{\@input}% -\def\ZREF@xr@ignorewarning#1{% +\def\ZREF@xr@relax{\relax}% +\def\ZREF@xr@tolabel#1#2{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to LaTeX label `#2'% + }% + \fi + \expandafter\xdef\csname r@#2\endcsname{% + {% + \ltx@ifundefined{M@TitleReference}{% + \ltx@ifundefined{TR@TitleReference}{% + \zref@extractdefault{#1}{default}{}% + }{% + \noexpand\TR@TitleReference + {\zref@extractdefault{#1}{default}{}}% + {\zref@extractdefault{#1}{title}{}}% + }% + }{% + \noexpand\M@TitleReference + {\zref@extractdefault{#1}{default}{}}% + {\zref@extractdefault{#1}{title}{}}% + }% + }% + {\zref@extractdefault{#1}{page}{}}% + \ltx@ifpackageloaded{nameref}{% + {\zref@extractdefault{#1}{title}{}}% + {\zref@extractdefault{#1}{anchor}{}}% + {\zref@extractdefault{#1}{url}{}}% + }{}% + }% +} +\def\ZREF@xr@zref@ignorewarning#1{% + \PackageWarningNoLine{zref-xr}{% + Zref label `#1' is already in use\MessageBreak + in file `\ZREF@xr@file'% + }% + \edef\ZREF@xr@ignored@empty{% + \the\numexpr\ZREF@xr@ignored+1% + }% +}% +\def\ZREF@xr@ltx@ignorewarning#1{% \PackageWarningNoLine{zref-xr}{% - Label `#1' is already in use\MessageBreak + LaTeX label `#1' is already in use\MessageBreak in file `\ZREF@xr@file'% }% - \edef\ZREF@xr@ignored{\the\numexpr\ZREF@xr@ignored+1\relax}% + \edef\ZREF@xr@ignored@ltx{% + \the\numexpr\ZREF@xr@ignored@ltx+1% + }% }% \def\ZREF@xr@checklist#1#2#3\ZREF@nil{% \ifx\@undefined#1\relax @@ -208,58 +318,52 @@ \fi \ifx\\#3\\% \else - \@ReturnAfterFi{% + \ltx@ReturnAfterFi{% \ZREF@xr@checklist#3\ZREF@nil }% \fi }% -\long\def\@ReturnAfterFi#1\fi{\fi#1}% \def\ZREF@xr@checkkey#1#2\@nil{% \zref@ifpropundefined{#2}{% \zref@newprop{#2}{}% }{}% }% \def\ZREF@xr@scanparams#1#2#3#4#5#6#7\ZREF@nil{% - \global\let#1\@empty + \let#1\@empty \ZREF@foundfalse \ZREF@xr@scantitleref#1#2\TR@TitleReference{}{}\ZREF@nil \ifZREF@found \else - \g@addto@macro#1{\default{#2}}% + \ltx@LocalAppendToMacro#1{\default{#2}}% \fi % page - \g@addto@macro#1{\page{#3}}% + \ltx@LocalAppendToMacro#1{\page{#3}}% % nameref title \ifZREF@found \else \ifx\\#4\\% \else - \zref@ifpropundefined{title}{% - \zref@newprop{title}{}% - }{}% - \g@addto@macro#1{\title{#4}}% + \def\ZREF@xr@temp{#4}% + \ifx\ZREF@xr@temp\ZREF@xr@relax + \else + \ltx@LocalAppendToMacro#1{\title{#4}}% + \fi \fi \fi % anchor \ifx\\#5\\% \else - \zref@ifpropundefined{anchor}{% - \zref@newprop{anchor}{}% - }{}% - \g@addto@macro#1{\anchor{#5}}% + \ltx@LocalAppendToMacro#1{\anchor{#5}}% \fi \ifx\\#6\\% \else - \zref@ifpropundefined{url}{% - \zref@newprop{url}{}% - }{}% - \g@addto@macro#1{\url{#6}}% + \ltx@LocalAppendToMacro#1{\url{#6}}% \fi }% \def\ZREF@xr@scantitleref#1#2\TR@TitleReference#3#4#5\ZREF@nil{% \ifx\\#5\\% \else - \g@addto@macro#1{% + \ltx@LocalAppendToMacro#1{% \default{#3}% \title{#4}% }% @@ -270,7 +374,8 @@ \zref@ifrefcontainsprop{#1}{anchor}{% \zref@ifrefcontainsprop{#1}{url}{% }{% - \expandafter\g@addto@macro\csname Z@R@#1\expandafter\endcsname + \expandafter + \ltx@LocalAppendToMacro\csname Z@R@#1\expandafter\endcsname \expandafter{% \expandafter\url\expandafter{\ZREF@xr@url}% }% @@ -278,12 +383,6 @@ }{% }% }% -\define@key{ZREF@XR}{ext}{% - \def\zref@xr@ext{#1}% -}% -\newcommand*{\zxrsetup}{% - \setkeys{ZREF@XR}% -}% \endinput %% %% End of file `zref-xr.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index 5a5eb83051e..4548e50a71a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -35,17 +35,17 @@ %% 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. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/04/08]% + \RequirePackage{zref-#1}[2010/04/17]% }% }% } |