summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-23 00:33:14 +0000
committerKarl Berry <karl@freefriends.org>2010-04-23 00:33:14 +0000
commitc0e1259ef738f3dc6e27246d797cf81a05836f97 (patch)
tree0b8a4267bd51f86fbf251d565d110e018e00dea6
parent7ec0cd0175d99a635a9298554e4fb6f0e56599d1 (diff)
oberdiek update (22apr10)
git-svn-id: svn://tug.org/texlive/trunk@17966 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/accsupp.pdfbin382246 -> 382246 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdfbin309001 -> 309001 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/askinclude.pdfbin919162 -> 919162 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdfbin287340 -> 287341 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/auxhook.pdfbin307504 -> 307504 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdfbin829860 -> 829859 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/bitset.pdfbin1048941 -> 1048941 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdfbin819560 -> 819560 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/bookmark.pdfbin648485 -> 648485 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/catchfile.pdfbin368000 -> 368000 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/centernot.pdfbin283240 -> 283241 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/chemarr.pdfbin304587 -> 304588 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/classlist.pdfbin299872 -> 299872 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/colonequals.pdfbin302350 -> 302350 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdfbin290159 -> 290158 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/engord.pdfbin380601 -> 380599 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdfbin358766 -> 358766 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/flags.pdfbin307451 -> 307450 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdfbin399423 -> 399423 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/grfext.pdfbin384909 -> 384909 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/grffile.pdfbin389234 -> 389233 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hologo.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdfbin336787 -> 336787 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdfbin322534 -> 322535 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypcap.pdfbin316606 -> 316606 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdfbin355738 -> 355738 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdfbin386633 -> 386633 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdfbin310174 -> 310173 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdfbin358897 -> 358896 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdfbin285539 -> 285538 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/iflang.pdfbin435356 -> 435355 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdfbin342093 -> 342093 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdfbin358899 -> 358898 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdfbin347321 -> 347320 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf3
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/inputenx.pdfbin2138174 -> 2138174 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/intcalc.pdfbin773443 -> 773444 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdfbin331212 -> 331213 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdfbin697913 -> 697913 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdfbin346126 -> 346124 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdfbin406981 -> 406981 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/luacolor.pdfbin346419 -> 346419 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/luatex.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/magicnum.pdfbin377326 -> 377326 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/makerobust.pdfbin276010 -> 276009 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdfbin1044370 -> 1044976 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdfbin382897 -> 382898 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pagesel.pdfbin364915 -> 364915 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdfbin388072 -> 388072 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdfbin323131 -> 323131 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf3
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdfbin372842 -> 372842 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdfbin384603 -> 384603 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdfbin375978 -> 375978 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/picture.pdfbin334553 -> 334553 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/refcount.pdfbin314189 -> 314189 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdfbin385467 -> 385467 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/resizegather.pdfbin581290 -> 581290 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/scrindex.pdfbin325899 -> 325899 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/selinput.pdfbin635969 -> 635969 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdfbin409754 -> 409752 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/settobox.pdfbin337930 -> 337930 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/stackrel.pdfbin295693 -> 295693 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdfbin297217 -> 297217 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/stringenc.pdfbin1350302 -> 1350302 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/tabularht.pdfbin404386 -> 404386 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdfbin266516 -> 266515 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/telprint.pdfbin374817 -> 374816 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/zref-test-base.tex92
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex5
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex5
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex5
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/transparent.pdfbin284268 -> 284268 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/twoopt.pdfbin301364 -> 301363 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdfbin380007 -> 380007 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/zref-example-lastpage.tex9
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/zref-example-nextpage.tex5
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/zref-example.tex3
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/zref.pdfbin827614 -> 841774 bytes
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/zref.dtx443
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-base.sty149
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty13
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty13
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty5
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty20
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty11
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-user.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty41
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref.sty9
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
115 files changed, 601 insertions, 343 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf
index eb728ad68b8..fdd7e31f34b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
index 57c2e3da668..043e01c4791 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf
index 0845c071eea..3f9f988d489 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf
@@ -4787,7 +4787,7 @@ xref
0000488196 00000 n
0000488259 00000 n
trailer
-<</Root 1 0 R/ID[(S'`m\r'>)(g*Muc}G@)]/Compress<</SpecO/1.4/LengthO 571278>>/Info 6 0 R/Size 1137>>
+<</Root 1 0 R/ID[(S'`m\r'>)(0ѶvQe9)]/Compress<</SpecO/1.4/LengthO 571278>>/Info 6 0 R/Size 1137>>
startxref
488323
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf b/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf
index 83c06f40335..9797e32b0fe 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf
index c326f6f8812..e4b818c0dc4 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf
@@ -5398,7 +5398,7 @@ xref
0000511403 00000 n
0000511467 00000 n
trailer
-<</Root 1 0 R/ID[(BW=5wƶ)(5&[tr)]/Compress<</SpecO/1.4/LengthO 616473>>/Info 6 0 R/Size 1368>>
+<</Root 1 0 R/ID[(BW=5wƶ)( KP镑 )]/Compress<</SpecO/1.4/LengthO 616473>>/Info 6 0 R/Size 1368>>
startxref
511531
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf
index 9e159824e24..aa65baf1f43 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf
index 8680cac5164..98faa7cbde9 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf
@@ -5415,7 +5415,7 @@ xref
0000506528 00000 n
0000506591 00000 n
trailer
-<</Root 1 0 R/ID[(GGAh"..E)(8j:
+<</Root 1 0 R/ID[(GGAh"..E)(|{P5wrR4^E)]/Compress<</SpecO/1.4/LengthO 617567>>/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 87cf25023e0..a3c1c98ab0e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/atveryend.pdf
@@ -4016,7 +4016,7 @@ xref
0000432829 00000 n
0000432892 00000 n
trailer
-<</Root 1 0 R/ID[(\r+ay,H׌)(lgf3e4ز)]/Compress<</SpecO/1.4/LengthO 501960>>/Info 6 0 R/Size 950>>
+<</Root 1 0 R/ID[(\r+ay,H׌)(uN;)]/Compress<</SpecO/1.4/LengthO 501960>>/Info 6 0 R/Size 950>>
startxref
432955
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf
index f80dd4db31c..6396bbd4982 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf b/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf
index b681b473bc6..44f5c789046 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf b/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf
index 98c69e6aab7..ecfcfc2e794 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
index 7b8da3a103c..1caafe9df67 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf
index 7a90d8e5c5f..f899ece8206 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf
index ff9b9d5aaeb..d907390938f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
index d7fe26563a5..df0eb491a08 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
index 8a844de5720..846d7ac99de 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
index 7ee59532293..c08ac51a4ab 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
index 56fae685cba..03ce08970c6 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
index df6e04483bc..fdac2a3dd2b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf
index df6bfc77865..85867749f3b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf
@@ -5217,7 +5217,7 @@ xref
0000505403 00000 n
0000505467 00000 n
trailer
-<</Root 1 0 R/ID[(OW??)(U\r#/{P$k''M)]/Compress<</SpecO/1.4/LengthO 606852>>/Info 6 0 R/Size 1312>>
+<</Root 1 0 R/ID[(OW??)(On6L_/cKc)]/Compress<</SpecO/1.4/LengthO 606852>>/Info 6 0 R/Size 1312>>
startxref
505531
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
index 78a5531551b..2636d17f457 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
index c0ed675f0ba..e4b72d35597 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
@@ -4006,7 +4006,7 @@ xref
0000423839 00000 n
0000423902 00000 n
trailer
-<</Root 1 0 R/ID[({"! "y7-Z)( qrBeg܆ޗ)]/Compress<</SpecO/1.4/LengthO 489290>>/Info 6 0 R/Size 935>>
+<</Root 1 0 R/ID[({"! "y7-Z)(o"libU.j)]/Compress<</SpecO/1.4/LengthO 489290>>/Info 6 0 R/Size 935>>
startxref
423965
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf
index 5dde4d44198..56f4487fccc 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
index 356892862d9..825aa27d745 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf b/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf
index 9bbf843e6df..10621d7b77f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/gettitlestring.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf b/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf
index 70211c97c72..e3c646f2333 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf
index 0c45c5a4e12..5f4f41a122b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hologo.pdf b/Master/texmf-dist/doc/latex/oberdiek/hologo.pdf
index dd348488b07..3c3891955a4 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hologo.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hologo.pdf
@@ -4680,7 +4680,7 @@ xref
0000454200 00000 n
trailer
<</Root 1 0 R/ID[(C#
-<ȁ)(MZѓbd)]/Compress<</SpecO/1.4/LengthO 542604>>/Info 6 0 R/Size 1149>>
+<ȁ)(IX%I2J)]/Compress<</SpecO/1.4/LengthO 542604>>/Info 6 0 R/Size 1149>>
startxref
454264
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
index 6c17fdea1d8..659765fc7f8 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf
index 91a0d70e6d7..e0d81d8b5f0 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf
@@ -5995,7 +5995,7 @@ xref
0000550912 00000 n
0000550975 00000 n
trailer
-<</Root 1 0 R/ID[(ÝlUH`r 9c)(.LXϻ||;G)]/Compress<</SpecO/1.4/LengthO 671914>>/Info 6 0 R/Size 1521>>
+<</Root 1 0 R/ID[(ÝlUH`r 9c)(^o7zybLt\r)]/Compress<</SpecO/1.4/LengthO 671914>>/Info 6 0 R/Size 1521>>
startxref
551039
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
index 58b88623656..335ae5e6570 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf
index b21f13a4bef..486a6e008fb 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf
index 87e23e2211b..45128b9408c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf
index c0fa1fd8bfd..4734fac6cbb 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf
index e21c1412aba..a998ff152d5 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf
index 7b8f91da062..3a15b90d454 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
index 966a3e88ec9..725e76daede 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
index 0d191135692..b9f5ceddea0 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf
index 0d9281e0ddb..f8ed3f7e570 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
index 0d1b0e00e37..6cdc63ee522 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf
index 5761927bb31..eec517d0f11 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf
index 7007e209680..35de0313b08 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf
@@ -3474,7 +3474,8 @@ xref
0000379676 00000 n
0000379739 00000 n
trailer
-<</Root 1 0 R/ID[( 4˚/gKrS)(;nfi*b)]/Compress<</SpecO/1.4/LengthO 437942>>/Info 6 0 R/Size 789>>
+<</Root 1 0 R/ID[( 4˚/gKrS)(WZ=H|~
+)]/Compress<</SpecO/1.4/LengthO 437942>>/Info 6 0 R/Size 789>>
startxref
379802
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf
index 9f5aef6c1f4..65483217b17 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf b/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf
index 146676a507e..8d88663ad1b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf
index 6366a461724..5af2994c776 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/kvdefinekeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf
index 9132bd32f14..f489e81143c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf
index fc0507c6ca9..089aa68de33 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf
@@ -4866,7 +4866,7 @@ xref
0000479793 00000 n
0000479857 00000 n
trailer
-<</Root 1 0 R/ID[(5У $&ߦ)(56œh)]/Compress<</SpecO/1.4/LengthO 570108>>/Info 6 0 R/Size 1201>>
+<</Root 1 0 R/ID[(5У $&ߦ)(WI7gC>%Uy_)]/Compress<</SpecO/1.4/LengthO 570108>>/Info 6 0 R/Size 1201>>
startxref
479921
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf
index ca6b708a10b..1fe52ce2b55 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf
@@ -3499,7 +3499,7 @@ xref
0000375569 00000 n
0000375632 00000 n
trailer
-<</Root 1 0 R/ID[(KG|/{i)(+Rt)]/Compress<</SpecO/1.4/LengthO 438014>>/Info 6 0 R/Size 832>>
+<</Root 1 0 R/ID[(KG|/{i)(5Հo}Sh)]/Compress<</SpecO/1.4/LengthO 438014>>/Info 6 0 R/Size 832>>
startxref
375695
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf
index a2ccb7cde7d..be489d05aef 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf
index 7f24fc79571..610d3b6cfb0 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ltxcmds.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf b/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf
index bbc8869341e..6cec298abb5 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf
index 816436a8f70..ef9c573e9cd 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf
@@ -5186,7 +5186,7 @@ xref
0000490374 00000 n
0000490438 00000 n
trailer
-<</Root 1 0 R/ID[(# UMz~6T)(sU71+6 AK)]/Compress<</SpecO/1.4/LengthO 588261>>/Info 6 0 R/Size 1288>>
+<</Root 1 0 R/ID[(# UMz~6T)(wˆ#9<Vl^)]/Compress<</SpecO/1.4/LengthO 588261>>/Info 6 0 R/Size 1288>>
startxref
490502
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf b/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf
index 0a64448ca4e..47ae27fb366 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf
index 376c085a177..9eb3193ccd6 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
index 0051c34c6a7..eaec3ae0358 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf b/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf
index ef5c8846985..8df3575c2f1 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pagegrid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf
index 3ec7125e446..ce7ce25b3b0 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf
index c17056344ac..d35e91eab93 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf
index 19bcd989789..55ddb0e40a1 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf
index d610b2fec1e..de848b927e5 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf
@@ -3900,7 +3900,7 @@ xref
0000395726 00000 n
0000395789 00000 n
trailer
-<</Root 1 0 R/ID[( Y +N9)(`j“OX^W>)]/Compress<</SpecO/1.4/LengthO 465955>>/Info 6 0 R/Size 944>>
+<</Root 1 0 R/ID[( Y +N9)(ٵL0KGr<)]/Compress<</SpecO/1.4/LengthO 465955>>/Info 6 0 R/Size 944>>
startxref
395852
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf
index ecbda1814fb..e2ade11c1ff 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf
@@ -3780,7 +3780,8 @@ xref
0000409189 00000 n
0000409252 00000 n
trailer
-<</Root 1 0 R/ID[(A @ccGSj)(tǩ6Y')]/Compress<</SpecO/1.4/LengthO 472569>>/Info 6 0 R/Size 856>>
+<</Root 1 0 R/ID[(A @ccGSj)(]
+D1Z0@ )]/Compress<</SpecO/1.4/LengthO 472569>>/Info 6 0 R/Size 856>>
startxref
409315
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf
index 4419407c72f..9bb1a018758 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
index 0de3af57617..3a831766ec1 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf
index d34103eb7d7..bba6850f886 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf
@@ -5817,7 +5817,7 @@ xref
0000526921 00000 n
0000526985 00000 n
trailer
-<</Root 1 0 R/ID[(ZaEQpO-?)(y *Z%y߯}b)]/Compress<</SpecO/1.4/LengthO 647819>>/Info 6 0 R/Size 1536>>
+<</Root 1 0 R/ID[(ZaEQpO-?)( Ӂ`zR[ڪyo9)]/Compress<</SpecO/1.4/LengthO 647819>>/Info 6 0 R/Size 1536>>
startxref
527049
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf
index 933668c009a..73d3c75663c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf
index 4c2bef0be91..3bded861f71 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfrender.pdf
@@ -4938,7 +4938,7 @@ xref
0000489841 00000 n
0000489905 00000 n
trailer
-<</Root 1 0 R/ID[(@M4Oa~CZk)(RU &Qa-Z]U)]/Compress<</SpecO/1.4/LengthO 584189>>/Info 6 0 R/Size 1209>>
+<</Root 1 0 R/ID[(@M4Oa~CZk)(ZIfOn'.h)]/Compress<</SpecO/1.4/LengthO 584189>>/Info 6 0 R/Size 1209>>
startxref
489969
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf
index 1b347bfd72b..25eda8dc482 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf
@@ -3892,7 +3892,7 @@ xref
0000417874 00000 n
0000417937 00000 n
trailer
-<</Root 1 0 R/ID[(\\ń
+<</Root 1 0 R/ID[(\\ń
startxref
418000
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf
index c4a156c5294..3f229137cb9 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf
index 58aef6bc3a2..4a99734b128 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf
@@ -4313,7 +4313,7 @@ xref
0000415780 00000 n
0000415844 00000 n
trailer
-<</Root 1 0 R/ID[(p{?T0ҲzxlWD)('
+<</Root 1 0 R/ID[(p{?T0ҲzxlWD)(/j^I̎{ )]/Compress<</SpecO/1.4/LengthO 493256>>/Info 6 0 R/Size 1047>>
startxref
415908
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf
index 8975bb1a2e4..3d54d20262f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf b/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf
index ac5ae5bba47..df00c89666e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf b/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf
index 160d4caf44c..8fb4ea472e1 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf b/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf
index 34b0e388258..02993c0a73a 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf b/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf
index 2e054c9677f..9ac7f8ef867 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
index 6eee27f5b42..54af63827d4 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
index 76ae8f19e27..2a6b8ac9ffe 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf
index 30b227ee338..a6f156226f4 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf
@@ -6296,7 +6296,7 @@ xref
0000557169 00000 n
0000557233 00000 n
trailer
-<</Root 1 0 R/ID[(|QT3s\\\\="@U)(W>q'?=R)]/Compress<</SpecO/1.4/LengthO 692778>>/Info 6 0 R/Size 1673>>
+<</Root 1 0 R/ID[(|QT3s\\\\="@U)(͠g2Bnw)]/Compress<</SpecO/1.4/LengthO 692778>>/Info 6 0 R/Size 1673>>
startxref
557297
%%EOF
diff --git a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
index 615a10def8b..f8642907c27 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf b/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf
index 0c9c6ebffc1..bf62653a4a5 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf b/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf
index 890a5724107..18e942dfa3a 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
index 44af5378b93..4b77bc212ee 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
index 286659632b9..b85ed78443e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf
index fc8dd40b90a..ed81e5b3a2e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-base.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-base.tex
new file mode 100644
index 00000000000..aaff43b7c4e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-base.tex
@@ -0,0 +1,92 @@
+%%
+%% This is file `zref-test-base.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% zref.dtx (with options: `test-base')
+%%
+%% 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-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{article}
+\usepackage{zref-base,zref-titleref}[2010/04/22]
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{log}{*}{*}
+
+\makeatletter
+\newcommand*{\DefExpand}[2]{%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{#2}%
+ \@onelevel@sanitize#1%
+}
+\newcommand*{\Test}[3]{%
+ \Expect{#2}*{#1}%
+ \zref@wrapper@unexpanded{%
+ \Expect*{#3}*{#1}%
+ }%
+ \DefExpand\x{#1}%
+ \Expect*{#3}*{\x}%
+}
+\makeatother
+
+\begin{document}
+\section{Hello \textbf{World}}
+\label{sec:hello}
+\makeatletter
+\zref@newprop{foo}[D\@empty efault]{V\@empty alue}
+\begin{qstest}{getcurrent}{getcurrent}
+ \Test{\zref@getcurrent{foo}}{Value}{V\noexpand\@empty alue}%
+ \Test{\zref@getcurrent{xy}}{}{}%
+\end{qstest}
+\begin{qstest}{extract}{extract}
+ \def\textbf#1{<#1>}%
+ \Test{\zref@extractdefault{xy}{page}{D\@empty efault}}%
+ {Default}{D\noexpand\@empty efault}%
+ \Test{\zref@extractdefault{sec:hello}{foo}{A\@empty B}}%
+ {AB}{A\noexpand\@empty B}%
+ \Test{\zref@extract{sec:hello}{foo}}%
+ {Default}{D\noexpand\@empty efault}%
+ \zref@ifrefundefined{sec:hello}{%
+ }{%
+ \Test{\zref@extract{sec:hello}{default}}{1}{1}%
+ \Test{\zref@extract{sec:hello}{title}}%
+ {Hello <World>}{Hello \noexpand\textbf{World}}%
+ }%
+\end{qstest}
+\end{document}
+\endinput
+%%
+%% End of file `zref-test-base.tex'.
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 3c791c0201e..cffeab7413f 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,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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\documentclass{article}
-\usepackage{zref-runs}[2010/04/17]
+\usepackage{zref-runs}[2010/04/22]
\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
index 744f735074e..2aeec96f5ec 100644
--- 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
@@ -35,11 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\documentclass{memoir}
-\usepackage{zref-titleref}[2010/04/17]
+\usepackage{zref-titleref}[2010/04/22]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex
index df8296c7c74..741ee852b99 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,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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\nofiles
\documentclass{article}
-\usepackage{zref-base}[2010/04/17]
+\usepackage{zref-base}[2010/04/22]
\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
index e5b449907d2..2e2c7e64f38 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
index 1aadc9793bf..630dfa733e8 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf b/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf
index a1c58c883ac..bcfdb8b385f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/uniquecounter.pdf
Binary files differ
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 4811073e2bd..99eb15cab87 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,8 @@
%% 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.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\documentclass{report}
@@ -43,15 +44,13 @@
\newcounter{foo}
\renewcommand*{\thefoo}{\Alph{foo}}
-\usepackage{zref-lastpage,zref-user}[2010/04/17]
+\usepackage{zref-lastpage,zref-user}[2010/04/22]
\makeatletter
\zref@newprop{thefoo}{\thefoo}
\zref@newprop{valuefoo}{\the\value{foo}}
\zref@newprop{chapter}{\thechapter}
-\zref@addprop{LastPage}{thefoo}
-\zref@addprop{LastPage}{valuefoo}
-\zref@addprop{LastPage}{chapter}
+\zref@addprop{LastPage}{thefoo,valuefoo,chapter}
\makeatother
\newcommand*{\foo}{%
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 7833c595305..7554f450567 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,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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\documentclass{book}
-\usepackage{zref-nextpage}[2010/04/17]
+\usepackage{zref-nextpage}[2010/04/22]
\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 1ee5fab7273..b3cbd9ab66b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/zref-example.tex
@@ -35,7 +35,8 @@
%% 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.
+%% zref-test-base.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
index 286bdb5b741..7ddc774e0c5 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 0215cb16e6c..b96894248c9 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/18
+% 2010/04/22
%
% 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 f517e7ba021..a4b87171592 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/18}
+\newcommand*{\Date}{2010/04/22}
% Copyright (C) 2006-2010 by
% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -334,7 +334,7 @@
[\entrysep]
\entry{uniquecounter}{2009/12/18}{1.1}{Provides unlimited unique counter}%
[\entrysep]
-\entry{zref}{2010/04/17}{2.12}{New reference scheme for \LaTeXe{}}%
+\entry{zref}{2010/04/22}{2.14}{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 9a632a0c32a..050ffd5cf0b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
@@ -27,7 +27,8 @@
% 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.
+% zref-test-base.tex, zref-test-runs.tex,
+% zref-test-titleref-memoir.tex.
%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/zref.dtx
@@ -82,6 +83,7 @@
% TDS:doc/latex/oberdiek/zref-example-lastpage.tex
% TDS:doc/latex/oberdiek/zref-example-nextpage.tex
% TDS:doc/latex/oberdiek/test/zref-test1.tex
+% TDS:doc/latex/oberdiek/test/zref-test-base.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
@@ -101,7 +103,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: zref 2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)}
+\Msg{* Package: zref 2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -139,7 +141,8 @@ 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-titleref-memoir.tex.
+ zref-test-base.tex, zref-test-runs.tex,
+ zref-test-titleref-memoir.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -171,6 +174,7 @@ and the derived files
\file{zref-example-nextpage.tex}{\from{zref.dtx}{example-nextpage}}%
\usedir{doc/latex/oberdiek/test}%
\file{zref-test1.tex}{\from{zref.dtx}{test1}}%
+ \file{zref-test-base.tex}{\from{zref.dtx}{test-base}}%
\file{zref-test-runs.tex}{\from{zref.dtx}{test-runs}}%
\file{zref-test-titleref-memoir.tex}{\from{zref.dtx}{test-titleref-memoir}}%
}
@@ -208,7 +212,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{zref.drv}%
- [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]%
+ [2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -217,7 +221,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{2292}
+% \CheckSum{2351}
%
% \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
@@ -238,7 +242,7 @@ and the derived files
% \GetFileInfo{zref.drv}
%
% \title{The \xpackage{zref} package}
-% \date{2010/04/17 v2.12}
+% \date{2010/04/22 v2.14}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -261,6 +265,10 @@ and the derived files
% \textsuperscript{exp}^^A
% \space
% }
+% \newcommand{\markexptwo}{^^A
+% \textsuperscript{exp2}^^A
+% \space
+% }
% \newcommand{\markrobust}{^^A
% \textsuperscript{robust}^^A
% \space
@@ -416,7 +424,9 @@ and the derived files
% \subsection{Property list}
%
% \markexp means that the implementation of the
-% marked macro is expandable.
+% marked macro is expandable. \markexptwo goes a step further
+% and marks the macro expandable in exact two expansion steps
+% except inside \cs{zref@wrapper@unexpanded}.
%
% \begin{declcs}{zref@newlist}
% \M{listname}
@@ -424,13 +434,17 @@ and the derived files
% Declares a new empty property list.
%
% \begin{declcs}{zref@addprop}
-% \M{listname} \M{propname}
+% \M{listname} \M{propname list}
% \end{declcs}
-% Adds the property \meta{propname} to the property list \meta{listname}.
+% Adds the properties of \meta{propname list} (comma separated)
+% to the property list \meta{listname}.
% The property and list must exist.
+% A \meta{propname list} can be given since 2010/04/19 v2.13.
+% Before this version only one property name could be added in one call
+% of \cs{zref@addprop}.
%
% \begin{declcs}{zref@localaddprop}
-% \M{listname} \M{propname}
+% \M{listname} \M{propname list}
% \end{declcs}
% Local variant of \cs{zref@addprop}.
%
@@ -477,13 +491,18 @@ and the derived files
% This sets the current value of the property \meta{propname}.
% It is a generalization of setting \LaTeX's \cs{currentlabel}.
%
-% \begin{declcs}{zref@getcurrent}
-% \M{propname} \M{value}
+% \begin{declcs}{zref@getcurrent}\markexptwo
+% \M{propname}
% \end{declcs}
% This returns the current value of the property \meta{propname}.
% The value may not be correct, especially if the property
% is bound to a page (start form of \cs{zref@newprop}) and the
% right value is only known at shipout time (e.g. property `page').
+% In case of errors (e.g. unknown property) the empty string is
+% returned.
+%
+% Since version 2010/04/22 v2.14 \cs{zref@getcurrent} supports
+% \cs{zref@wrapper@unexpanded}.
%
% \begin{declcs}{zref@propexists}
% \M{propname} \M{then}
@@ -528,7 +547,7 @@ and the derived files
%
% \subsection{Data extraction}
%
-% \begin{declcs}{zref@extractdefault}\markexp
+% \begin{declcs}{zref@extractdefault}\markexptwo
% \M{refname} \M{propname} \M{default}
% \end{declcs}
% This is the basic command that refernces the value of a
@@ -536,7 +555,7 @@ and the derived files
% In case of errors such as undefined reference the \meta{default}
% is used instead.
%
-% \begin{declcs}{zref@extract}\markexp
+% \begin{declcs}{zref@extract}\markexptwo
% \M{refname} \M{propname}
% \end{declcs}
% The command is an abbreviation for \cs{zref@extractdefault}.
@@ -671,8 +690,8 @@ and the derived files
% This (theoretical?) problem can be solved by this wrapper:
% \begin{quote}
%\begin{verbatim}
-%\edef\foo{%
-% \zref@wrapper@unexpanded{%
+%\zref@wrapper@unexpanded{%
+% \edef\foo{%
% \zref@extract{someref}{bar}%
% }%
%}
@@ -681,7 +700,8 @@ and the derived files
% The \cs{edef} forces the expansion of \cs{zref@extract},
% but the extraction of the value is prevented by
% the wrapper that uses \eTeX'\ \cs{unexpanded} for this
-% purpose.
+% purpose. Supported macros are \cs{zref@extract}, \cs{zref@extractdefault}
+% and since version 2010/04/22 v2.14 macro \cs{zref@getcurrent}.
%
% \subsection{Counter for unique names}
%
@@ -718,7 +738,9 @@ and the derived files
% \markexp\unskip & Expandable version:\\
% & \textbullet\ robust,
% unless the extracted values are fragile,\\
-% & \textbullet\ no babel shorthand suport.
+% & \textbullet\ no babel shorthand suport.\\
+% \markexptwo\unskip & Expandable like \markexp and:\\
+% & \textbullet\ expandable in exact two steps.\\
% \end{tabular}
% \end{quote}
%
@@ -834,15 +856,13 @@ and the derived files
\newcounter{foo}
\renewcommand*{\thefoo}{\Alph{foo}}
-\usepackage{zref-lastpage,zref-user}[2010/04/17]
+\usepackage{zref-lastpage,zref-user}[2010/04/22]
\makeatletter
\zref@newprop{thefoo}{\thefoo}
\zref@newprop{valuefoo}{\the\value{foo}}
\zref@newprop{chapter}{\thechapter}
-\zref@addprop{LastPage}{thefoo}
-\zref@addprop{LastPage}{valuefoo}
-\zref@addprop{LastPage}{chapter}
+\zref@addprop{LastPage}{thefoo,valuefoo,chapter}
\makeatother
\newcommand*{\foo}{%
@@ -950,7 +970,7 @@ and the derived files
%<<END_EXAMPLE
\documentclass{book}
-\usepackage{zref-nextpage}[2010/04/17]
+\usepackage{zref-nextpage}[2010/04/22]
\znextpagesetup
{\thepage}% next page is unknown
{\thepage\ (#1)}% this page is last page
@@ -1437,13 +1457,13 @@ the height difference of the two baselines is
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref}
- [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]%
+ [2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)]%
% \end{macrocode}
%
% \subsubsection{Load basic module}
%
% \begin{macrocode}
-\RequirePackage{zref-base}[2010/04/17]
+\RequirePackage{zref-base}[2010/04/22]
% \end{macrocode}
% Abort package loading if \xpackage{zref-base} could not be
% loaded successfully.
@@ -1458,7 +1478,7 @@ the height difference of the two baselines is
\def\ZREF@temp#1{%
\DeclareOption{#1}{%
\AtEndOfPackage{%
- \RequirePackage{zref-#1}[2010/04/17]%
+ \RequirePackage{zref-#1}[2010/04/22]%
}%
}%
}
@@ -1518,13 +1538,14 @@ the height difference of the two baselines is
%<*base>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-base}%
- [2010/04/17 v2.12 Module base for zref (HO)]%
+ [2010/04/22 v2.14 Module base for zref (HO)]%
% \end{macrocode}
%
% \subsubsection{Utilities}
%
% \begin{macrocode}
\RequirePackage{ltxcmds}[2010/03/01]
+\RequirePackage{kvsetkeys}[2010/03/01]
% \end{macrocode}
%
% \begin{macro}{\ZREF@name}
@@ -1555,14 +1576,13 @@ the height difference of the two baselines is
% the command and safes it.
% \begin{macrocode}
\def\ZREF@patch#1{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1\endcsname\relax
- \expandafter\ltx@gobble
- \else
+ \ltx@IfUndefined{#1}{%
+ \ltx@gobble
+ }{%
\expandafter\let\csname ZREF@org@#1\expandafter\endcsname
\csname #1\endcsname
- \expandafter\ltx@firstofone
- \fi
+ \ltx@firstofone
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -1657,11 +1677,7 @@ the height difference of the two baselines is
% then \verb|#2| is executed and \verb|#3| otherwise.
% \begin{macrocode}
\def\zref@iflistundefined#1{%
- \expandafter\ifx\csname Z@L@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@L@#1}%
}
% \end{macrocode}
% \end{macro}
@@ -1685,7 +1701,11 @@ the height difference of the two baselines is
% already present in a property list \verb|#1|.
% \begin{macrocode}
\def\zref@iflistcontainsprop#1{%
- \expandafter\ZREF@iflistcontainsprop\csname Z@L@#1\endcsname
+ \zref@iflistundefined{#1}{%
+ \expandafter\ltx@secondoftwo\@gobble
+ }{%
+ \expandafter\ZREF@iflistcontainsprop\csname Z@L@#1\endcsname
+ }%
}
\def\ZREF@iflistcontainsprop#1#2{%
\begingroup
@@ -1730,16 +1750,19 @@ the height difference of the two baselines is
% \begin{macrocode}
\def\zref@addprop#1#2{%
\zref@listexists{#1}{%
- \zref@propexists{#2}{%
- \zref@iflistcontainsprop{#1}{#2}{%
- \PackageWarning\ZREF@name{%
- Property `#2' is already in list `#1'%
+ \comma@parse{#2}{%
+ \zref@propexists\comma@entry{%
+ \zref@iflistcontainsprop{#1}\comma@entry{%
+ \PackageWarning\ZREF@name{%
+ Property `\comma@entry' is already in list `#1'%
+ }%
+ }{%
+ \edef\comma@entry{\comma@entry}%
+ \expandafter\g@addto@macro\csname Z@L@#1\expandafter\endcsname
+ \expandafter{\expandafter{\comma@entry}}%
}%
- }{%
- \edef\ZREF@temp{#2}%
- \expandafter\g@addto@macro\csname Z@L@#1\expandafter\endcsname
- \expandafter{\expandafter{\ZREF@temp}}%
}%
+ \ltx@gobble
}%
}%
}
@@ -1750,36 +1773,25 @@ the height difference of the two baselines is
% \begin{macrocode}
\def\zref@localaddprop#1#2{%
\zref@listexists{#1}{%
- \zref@propexists{#2}{%
- \zref@iflistcontainsprop{#1}{#2}{%
- \PackageWarning\ZREF@name{%
- Property `#2' is already in list `#1'%
+ \comma@parse{#2}{%
+ \zref@propexists\comma@entry{%
+ \zref@iflistcontainsprop{#1}\comma@entry{%
+ \PackageWarning\ZREF@name{%
+ Property `\comma@entry' is already in list `#1'%
+ }%
+ }{%
+ \edef\comma@entry{\comma@entry}%
+ \expandafter\ltx@LocalAppendToMacro
+ \csname Z@L@#1\expandafter\endcsname
+ \expandafter{\expandafter{\comma@entry}}%
}%
- }{%
- \expandafter\ZREF@l@addto@macro\csname Z@L@#1\endcsname{{#2}}%
}%
+ \ltx@gobble
}%
}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\ZREF@l@addto@macro}
-% \begin{macrocode}
-\ifetex@unexpanded
- \def\ZREF@l@addto@macro#1#2{%
- \global\let\ZREF@gtemp#1%
- \g@addto@macro\ZREF@gtemp{#2}%
- \let#1\ZREF@gtemp
- }%
-\else
- \def\ZREF@l@addto@macro#1#2{%
- \edef#1{%
- \etex@unexpanded\expandafter{#1#2}%
- }%
- }%
-\fi
-% \end{macrocode}
-% \end{macro}
%
% \subsubsection{Properties}
%
@@ -1789,11 +1801,7 @@ the height difference of the two baselines is
% then \verb|#2| is executed and \verb|#3| otherwise.
% \begin{macrocode}
\def\zref@ifpropundefined#1{%
- \expandafter\ifx\csname Z@E@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@E@#1}%
}
% \end{macrocode}
% \end{macro}
@@ -1862,8 +1870,10 @@ the height difference of the two baselines is
% \begin{macro}{\zref@setcurrent}
% \cs{zref@setcurrent} sets the current value for a property.
% \begin{macrocode}
-\def\zref@setcurrent#1{%
- \expandafter\def\csname Z@C@#1\endcsname
+\def\zref@setcurrent#1#2{%
+ \zref@propexists{#1}{%
+ \expandafter\def\csname Z@C@#1\endcsname{#2}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -1872,7 +1882,34 @@ the height difference of the two baselines is
% \cs{zref@getcurrent} gets the current value for a property.
% \begin{macrocode}
\def\zref@getcurrent#1{%
- \csname Z@C@#1\endcsname
+ \romannumeral0%
+ \ltx@ifundefined{Z@C@#1}{%
+ \ltx@space
+ }{%
+ \expandafter\expandafter\expandafter
+ \ZREF@@unexpanded\expandafter\expandafter\expandafter{%
+ \csname Z@C@#1\endcsname
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@@unexpanded}
+% \begin{macrocode}
+\def\ZREF@@unexpanded#1{%
+ \ifx\ZREF@unexpanded\ltx@firstofone
+ \expandafter\ltx@firstoftwo
+ \else
+ \expandafter\ltx@secondoftwo
+ \fi
+ {%
+ \ltx@space
+ #1%
+ }{%
+ \ltx@space
+ \ZREF@unexpanded{#1}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -2023,11 +2060,7 @@ the height difference of the two baselines is
% \cs{zref@ifrefundefined} calls \verb|#2| and \verb|#3| otherwise.
% \begin{macrocode}
\def\zref@ifrefundefined#1{%
- \expandafter\ifx\csname Z@R@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@R@#1}%
}
% \end{macrocode}
% \end{macro}
@@ -2081,12 +2114,18 @@ the height difference of the two baselines is
% value.
% \begin{macrocode}
\def\zref@extract#1#2{%
- \expandafter\expandafter\expandafter\ZREF@extract
- \expandafter\expandafter\expandafter{%
- \csname Z@D@#2\endcsname
- }{#1}{#2}%
+ \romannumeral0%
+ \ltx@ifundefined{Z@D@#2}{%
+ \expandafter\ltx@space\zref@default
+ }{%
+ \expandafter\expandafter\expandafter\ZREF@extract
+ \expandafter\expandafter\expandafter{%
+ \csname Z@D@#2\endcsname
+ }{#1}{#2}%
+ }%
}
\def\ZREF@extract#1#2#3{%
+ \expandafter\expandafter\expandafter\ltx@space
\zref@extractdefault{#2}{#3}{#1}%
}
% \end{macrocode}
@@ -2127,11 +2166,14 @@ the height difference of the two baselines is
% the default value in \verb|#3| in case for problems.
% \begin{macrocode}
\def\zref@extractdefault#1#2#3{%
- \zref@ifrefundefined{#1}{%
- \ZREF@unexpanded{#3}%
+ \romannumeral0%
+ \zref@ifrefundefined{#1}\ltx@firstoftwo{%
+ \zref@ifpropundefined{#2}\ltx@firstoftwo\ltx@secondoftwo
}{%
- \expandafter\expandafter\expandafter\ZREF@unexpanded
- \expandafter\expandafter\expandafter{%
+ \ZREF@@unexpanded{#3}%
+ }{%
+ \expandafter\expandafter\expandafter
+ \ZREF@@unexpanded\expandafter\expandafter\expandafter{%
\csname Z@E@#2\expandafter\expandafter\expandafter\endcsname
\csname Z@R@#1\expandafter\endcsname
\csname#2\endcsname{#3}\ZREF@nil
@@ -2281,8 +2323,7 @@ the height difference of the two baselines is
% \begin{macrocode}
\zref@newprop{default}{\@currentlabel}
\zref@newprop*{page}{\thepage}
-\zref@addprop\ZREF@mainlist{default}
-\zref@addprop\ZREF@mainlist{page}
+\zref@addprop\ZREF@mainlist{default,page}
% \end{macrocode}
%
% \paragraph{Mark successful loading}
@@ -2299,8 +2340,8 @@ the height difference of the two baselines is
%<*user>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-user}%
- [2010/04/17 v2.12 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2374,8 +2415,8 @@ the height difference of the two baselines is
%<*abspage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspage}%
- [2010/04/17 v2.12 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2419,8 +2460,8 @@ the height difference of the two baselines is
%<*counter>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-counter}%
- [2010/04/17 v2.12 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2456,9 +2497,9 @@ the height difference of the two baselines is
%<*lastpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-lastpage}%
- [2010/04/17 v2.12 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
-\RequirePackage{zref-abspage}[2010/04/17]
+ [2010/04/22 v2.14 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
+\RequirePackage{zref-abspage}[2010/04/22]
\RequirePackage{atveryend}[2009/12/07]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
@@ -2525,14 +2566,14 @@ the height difference of the two baselines is
%<*thepage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-thepage}%
- [2010/04/17 v2.12 Module thepage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module thepage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
% \begin{macrocode}
\RequirePackage{atbegshi}
-\RequirePackage{zref-abspage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
% \end{macrocode}
% \begin{macrocode}
\zref@newlist{thepage}
@@ -2585,15 +2626,15 @@ the height difference of the two baselines is
%<*nextpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-nextpage}%
- [2010/04/17 v2.12 Module nextpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module nextpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2010/04/17]
-\RequirePackage{zref-thepage}[2010/04/17]
-\RequirePackage{zref-lastpage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
+\RequirePackage{zref-thepage}[2010/04/22]
+\RequirePackage{zref-lastpage}[2010/04/22]
\RequirePackage{uniquecounter}[2009/12/18]
% \end{macrocode}
% \begin{macrocode}
@@ -2686,16 +2727,16 @@ the height difference of the two baselines is
%<*totpages>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-totpages}%
- [2010/04/17 v2.12 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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/17]
-\RequirePackage{zref-lastpage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
+\RequirePackage{zref-lastpage}[2010/04/22]
% \end{macrocode}
%
% \begin{macro}{\ztotpages}
@@ -2725,8 +2766,8 @@ the height difference of the two baselines is
%<*marks>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-marks}%
- [2010/04/17 v2.12 Module marks for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module marks for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2829,7 +2870,7 @@ the height difference of the two baselines is
%<*runs>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-runs}%
- [2010/04/17 v2.12 Module runs for zref (HO)]%
+ [2010/04/22 v2.14 Module runs for zref (HO)]%
% \end{macrocode}
%
% \begin{macro}{\zruns}
@@ -2861,8 +2902,8 @@ the height difference of the two baselines is
%<*perpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-perpage}%
- [2010/04/17 v2.12 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2874,7 +2915,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/17]
+\RequirePackage{zref-abspage}[2010/04/22]
% \end{macrocode}
%
% We group the properties for the needed references
@@ -2883,9 +2924,7 @@ the height difference of the two baselines is
% \begin{macrocode}
\zref@newprop*{pagevalue}[0]{\number\c@page}
\zref@newlist{perpage}
-\zref@addprop{perpage}{abspage}
-\zref@addprop{perpage}{page}
-\zref@addprop{perpage}{pagevalue}
+\zref@addprop{perpage}{abspage,page,pagevalue}
% \end{macrocode}
% The page value, known by the reference mechanism, will be
% stored in counter |zpage|.
@@ -3018,8 +3057,8 @@ the height difference of the two baselines is
%<*titleref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-titleref}%
- [2010/04/17 v2.12 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\RequirePackage{gettitlestring}[2009/12/08]
% \end{macrocode}
@@ -3414,8 +3453,8 @@ the height difference of the two baselines is
%<*xr>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-xr}%
- [2010/04/17 v2.12 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
% \begin{macrocode}
@@ -3723,28 +3762,30 @@ the height difference of the two baselines is
Import to LaTeX label `#2'%
}%
\fi
- \expandafter\xdef\csname r@#2\endcsname{%
- {%
- \ltx@ifundefined{M@TitleReference}{%
- \ltx@ifundefined{TR@TitleReference}{%
- \zref@extractdefault{#1}{default}{}%
+ \zref@wrapper@unexpanded{%
+ \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\TR@TitleReference
+ \noexpand\M@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}{}}%
+ }{}%
}%
- {\zref@extractdefault{#1}{page}{}}%
- \ltx@ifpackageloaded{nameref}{%
- {\zref@extractdefault{#1}{title}{}}%
- {\zref@extractdefault{#1}{anchor}{}}%
- {\zref@extractdefault{#1}{url}{}}%
- }{}%
}%
}
% \end{macrocode}
@@ -3882,8 +3923,8 @@ the height difference of the two baselines is
%<*hyperref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-hyperref}%
- [2010/04/17 v2.12 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -3911,8 +3952,8 @@ the height difference of the two baselines is
%<*savepos>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-savepos}%
- [2010/04/17 v2.12 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -3936,17 +3977,17 @@ the height difference of the two baselines is
\RequirePackage{ifpdf}
\ifpdf
\else
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdftexversion\endcsname\relax
- \else
+ \ltx@IfUndefined{pdftexversion}{%
+ }{%
\ifnum\pdftexversion<140 %
\PackageError\ZREF@name{%
- \string\pdfsavepos\space is not supported in DVI mode\MessageBreak
+ \string\pdfsavepos\space is not supported in DVI mode%
+ \MessageBreak
of this pdfTeX version%
}\ZREF@UpdatePdfTeX
\expandafter\expandafter\expandafter\endinput
\fi
- \fi
+ }%
\fi
% \end{macrocode}
%
@@ -3956,8 +3997,7 @@ the height difference of the two baselines is
\zref@newlist{savepos}
\zref@newprop*{posx}[0]{\the\pdflastxpos}
\zref@newprop*{posy}[0]{\the\pdflastypos}
-\zref@addprop{savepos}{posx}
-\zref@addprop{savepos}{posy}
+\zref@addprop{savepos}{posx,posy}
% \end{macrocode}
%
% \subsubsection{User macros}
@@ -4014,15 +4054,15 @@ the height difference of the two baselines is
%<*dotfill>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-dotfill}%
- [2010/04/17 v2.12 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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/17]
+\RequirePackage{zref-savepos}[2010/04/22]
% \end{macrocode}
% For automatically generated label names we use the unique
% counter of module \xmodule{base}.
@@ -4111,7 +4151,7 @@ the height difference of the two baselines is
\NeedsTeXFormat{LaTeX2e}
\nofiles
\documentclass{article}
-\usepackage{zref-base}[2010/04/17]
+\usepackage{zref-base}[2010/04/22]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -4135,13 +4175,69 @@ the height difference of the two baselines is
%</test1>
% \end{macrocode}
%
+% \subsection{Module \xmodule{base}}
+%
+% \begin{macrocode}
+%<*test-base>
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{article}
+\usepackage{zref-base,zref-titleref}[2010/04/22]
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{log}{*}{*}
+
+\makeatletter
+\newcommand*{\DefExpand}[2]{%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{#2}%
+ \@onelevel@sanitize#1%
+}
+\newcommand*{\Test}[3]{%
+ \Expect{#2}*{#1}%
+ \zref@wrapper@unexpanded{%
+ \Expect*{#3}*{#1}%
+ }%
+ \DefExpand\x{#1}%
+ \Expect*{#3}*{\x}%
+}
+\makeatother
+
+\begin{document}
+\section{Hello \textbf{World}}
+\label{sec:hello}
+\makeatletter
+\zref@newprop{foo}[D\@empty efault]{V\@empty alue}
+\begin{qstest}{getcurrent}{getcurrent}
+ \Test{\zref@getcurrent{foo}}{Value}{V\noexpand\@empty alue}%
+ \Test{\zref@getcurrent{xy}}{}{}%
+\end{qstest}
+\begin{qstest}{extract}{extract}
+ \def\textbf#1{<#1>}%
+ \Test{\zref@extractdefault{xy}{page}{D\@empty efault}}%
+ {Default}{D\noexpand\@empty efault}%
+ \Test{\zref@extractdefault{sec:hello}{foo}{A\@empty B}}%
+ {AB}{A\noexpand\@empty B}%
+ \Test{\zref@extract{sec:hello}{foo}}%
+ {Default}{D\noexpand\@empty efault}%
+ \zref@ifrefundefined{sec:hello}{%
+ }{%
+ \Test{\zref@extract{sec:hello}{default}}{1}{1}%
+ \Test{\zref@extract{sec:hello}{title}}%
+ {Hello <World>}{Hello \noexpand\textbf{World}}%
+ }%
+\end{qstest}
+\end{document}
+%</test-base>
+% \end{macrocode}
+%
% \subsection{Module \xmodule{runs}}
%
% \begin{macrocode}
%<*test-runs>
\NeedsTeXFormat{LaTeX2e}
\documentclass{article}
-\usepackage{zref-runs}[2010/04/17]
+\usepackage{zref-runs}[2010/04/22]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -4170,7 +4266,7 @@ the height difference of the two baselines is
%<*test-titleref-memoir>
\NeedsTeXFormat{LaTeX2e}
\documentclass{memoir}
-\usepackage{zref-titleref}[2010/04/17]
+\usepackage{zref-titleref}[2010/04/22]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -4308,6 +4404,7 @@ the height difference of the two baselines is
% zref-example-lastpage.tex & doc/latex/oberdiek/zref-example-lastpage.tex\\
% zref-example-nextpage.tex & doc/latex/oberdiek/zref-example-nextpage.tex\\
% test/zref-test1.tex & doc/latex/oberdiek/test/zref-test1.tex\\
+% test/zref-test-base.tex & doc/latex/oberdiek/test/zref-test-base.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\\
@@ -4596,6 +4693,32 @@ the height difference of the two baselines is
% Module \xmodule{xr}: Setup options \xoption{tozreflabel}
% and \xoption{toltxlabel} added.
% \end{Version}
+% \begin{Version}{2010/04/19 v2.13}
+% \item
+% \cs{zref@setcurrent} throws an error if the property
+% does not exist (Florent Chervet).
+% \item
+% \cs{zref@getcurrent} the documentation is fixed (Florent Chervet).
+% Also it returns the empty string in case of errors.
+% \item
+% \cs{zref@addprop} and \cs{zref@localaddprop} now take a list of
+% property names (feature request of Florent Chervet).
+% \item
+% Example for \cs{zref@wrapper@unexpanded} corrected (Florent Chervet).
+% \end{Version}
+% \begin{Version}{2010/04/22 v2.14}
+% \item
+% Bug fix for \cs{zref@getcurrent} second argument wasn't eaten in
+% case of unknown property.
+% \item
+% \cs{zref@getcurrent} supports \cs{zref@wrapper@unexpanded}.
+% \item
+% \cs{zref@wrapper@unexpanded} added for \cs{ZREF@xr@tolabel}.
+% \item
+% \cs{zref@extract}, \cs{zref@extractdefault}, \cs{zref@getcurrent}
+% are expandable in exact two steps
+% except inside \cs{zref@wrapper@unexpanded}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
index 4e2de272a5e..a0e1c14d5cd 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspage}%
- [2010/04/17 v2.12 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 6ff9ea65221..ba6218b938f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -35,24 +35,25 @@
%% 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.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-base}%
- [2010/04/17 v2.12 Module base for zref (HO)]%
+ [2010/04/22 v2.14 Module base for zref (HO)]%
\RequirePackage{ltxcmds}[2010/03/01]
+\RequirePackage{kvsetkeys}[2010/03/01]
\def\ZREF@name{zref}
\def\ZREF@UpdatePdfTeX{Update pdfTeX.}
\newif\ifZREF@found
\def\ZREF@patch#1{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1\endcsname\relax
- \expandafter\ltx@gobble
- \else
+ \ltx@IfUndefined{#1}{%
+ \ltx@gobble
+ }{%
\expandafter\let\csname ZREF@org@#1\expandafter\endcsname
\csname #1\endcsname
- \expandafter\ltx@firstofone
- \fi
+ \ltx@firstofone
+ }%
}
\ltx@IfUndefined{eTeXversion}{%
\PackageError\ZREF@name{%
@@ -96,11 +97,7 @@
}%
}
\def\zref@iflistundefined#1{%
- \expandafter\ifx\csname Z@L@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@L@#1}%
}
\def\zref@listexists#1{%
\zref@iflistundefined{#1}{%
@@ -110,7 +107,11 @@
}%
}
\def\zref@iflistcontainsprop#1{%
- \expandafter\ZREF@iflistcontainsprop\csname Z@L@#1\endcsname
+ \zref@iflistundefined{#1}{%
+ \expandafter\ltx@secondoftwo\@gobble
+ }{%
+ \expandafter\ZREF@iflistcontainsprop\csname Z@L@#1\endcsname
+ }%
}
\def\ZREF@iflistcontainsprop#1#2{%
\begingroup
@@ -142,51 +143,43 @@
}
\def\zref@addprop#1#2{%
\zref@listexists{#1}{%
- \zref@propexists{#2}{%
- \zref@iflistcontainsprop{#1}{#2}{%
- \PackageWarning\ZREF@name{%
- Property `#2' is already in list `#1'%
+ \comma@parse{#2}{%
+ \zref@propexists\comma@entry{%
+ \zref@iflistcontainsprop{#1}\comma@entry{%
+ \PackageWarning\ZREF@name{%
+ Property `\comma@entry' is already in list `#1'%
+ }%
+ }{%
+ \edef\comma@entry{\comma@entry}%
+ \expandafter\g@addto@macro\csname Z@L@#1\expandafter\endcsname
+ \expandafter{\expandafter{\comma@entry}}%
}%
- }{%
- \edef\ZREF@temp{#2}%
- \expandafter\g@addto@macro\csname Z@L@#1\expandafter\endcsname
- \expandafter{\expandafter{\ZREF@temp}}%
}%
+ \ltx@gobble
}%
}%
}
\def\zref@localaddprop#1#2{%
\zref@listexists{#1}{%
- \zref@propexists{#2}{%
- \zref@iflistcontainsprop{#1}{#2}{%
- \PackageWarning\ZREF@name{%
- Property `#2' is already in list `#1'%
+ \comma@parse{#2}{%
+ \zref@propexists\comma@entry{%
+ \zref@iflistcontainsprop{#1}\comma@entry{%
+ \PackageWarning\ZREF@name{%
+ Property `\comma@entry' is already in list `#1'%
+ }%
+ }{%
+ \edef\comma@entry{\comma@entry}%
+ \expandafter\ltx@LocalAppendToMacro
+ \csname Z@L@#1\expandafter\endcsname
+ \expandafter{\expandafter{\comma@entry}}%
}%
- }{%
- \expandafter\ZREF@l@addto@macro\csname Z@L@#1\endcsname{{#2}}%
}%
+ \ltx@gobble
}%
}%
}
-\ifetex@unexpanded
- \def\ZREF@l@addto@macro#1#2{%
- \global\let\ZREF@gtemp#1%
- \g@addto@macro\ZREF@gtemp{#2}%
- \let#1\ZREF@gtemp
- }%
-\else
- \def\ZREF@l@addto@macro#1#2{%
- \edef#1{%
- \etex@unexpanded\expandafter{#1#2}%
- }%
- }%
-\fi
\def\zref@ifpropundefined#1{%
- \expandafter\ifx\csname Z@E@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@E@#1}%
}
\def\zref@propexists#1{%
\zref@ifpropundefined{#1}{%
@@ -219,11 +212,35 @@
\def\ZREF@@@newprop#1{%
\expandafter\gdef\csname Z@E@\ZREF@P\endcsname##1#1##2##3\ZREF@nil{##2}%
}
-\def\zref@setcurrent#1{%
- \expandafter\def\csname Z@C@#1\endcsname
+\def\zref@setcurrent#1#2{%
+ \zref@propexists{#1}{%
+ \expandafter\def\csname Z@C@#1\endcsname{#2}%
+ }%
}
\def\zref@getcurrent#1{%
- \csname Z@C@#1\endcsname
+ \romannumeral0%
+ \ltx@ifundefined{Z@C@#1}{%
+ \ltx@space
+ }{%
+ \expandafter\expandafter\expandafter
+ \ZREF@@unexpanded\expandafter\expandafter\expandafter{%
+ \csname Z@C@#1\endcsname
+ }%
+ }%
+}
+\def\ZREF@@unexpanded#1{%
+ \ifx\ZREF@unexpanded\ltx@firstofone
+ \expandafter\ltx@firstoftwo
+ \else
+ \expandafter\ltx@secondoftwo
+ \fi
+ {%
+ \ltx@space
+ #1%
+ }{%
+ \ltx@space
+ \ZREF@unexpanded{#1}%
+ }%
}
\def\zref@label#1{%
\zref@labelbylist{#1}\ZREF@mainlist
@@ -304,11 +321,7 @@
}%
}
\def\zref@ifrefundefined#1{%
- \expandafter\ifx\csname Z@R@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@R@#1}%
}
\newcommand*{\zifrefundefined}[1]{%
\zref@wrapper@babel\ZREF@ifrefundefined{#1}%
@@ -329,12 +342,18 @@
}{}%
}
\def\zref@extract#1#2{%
- \expandafter\expandafter\expandafter\ZREF@extract
- \expandafter\expandafter\expandafter{%
- \csname Z@D@#2\endcsname
- }{#1}{#2}%
+ \romannumeral0%
+ \ltx@ifundefined{Z@D@#2}{%
+ \expandafter\ltx@space\zref@default
+ }{%
+ \expandafter\expandafter\expandafter\ZREF@extract
+ \expandafter\expandafter\expandafter{%
+ \csname Z@D@#2\endcsname
+ }{#1}{#2}%
+ }%
}
\def\ZREF@extract#1#2#3{%
+ \expandafter\expandafter\expandafter\ltx@space
\zref@extractdefault{#2}{#3}{#1}%
}
\def\zref@ifrefcontainsprop#1#2{%
@@ -359,11 +378,14 @@
}
\def\ZREF@novalue{\ZREF@NOVALUE}
\def\zref@extractdefault#1#2#3{%
- \zref@ifrefundefined{#1}{%
- \ZREF@unexpanded{#3}%
+ \romannumeral0%
+ \zref@ifrefundefined{#1}\ltx@firstoftwo{%
+ \zref@ifpropundefined{#2}\ltx@firstoftwo\ltx@secondoftwo
}{%
- \expandafter\expandafter\expandafter\ZREF@unexpanded
- \expandafter\expandafter\expandafter{%
+ \ZREF@@unexpanded{#3}%
+ }{%
+ \expandafter\expandafter\expandafter
+ \ZREF@@unexpanded\expandafter\expandafter\expandafter{%
\csname Z@E@#2\expandafter\expandafter\expandafter\endcsname
\csname Z@R@#1\expandafter\endcsname
\csname#2\endcsname{#3}\ZREF@nil
@@ -431,8 +453,7 @@
\zref@newlist\ZREF@mainlist
\zref@newprop{default}{\@currentlabel}
\zref@newprop*{page}{\thepage}
-\zref@addprop\ZREF@mainlist{default}
-\zref@addprop\ZREF@mainlist{page}
+\zref@addprop\ZREF@mainlist{default,page}
\let\ZREF@baseok\@empty
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
index 3ad669191a2..4392f8d0dfb 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-counter}%
- [2010/04/17 v2.12 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 c200ecce6d5..45d22dfea89 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
@@ -35,14 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-dotfill}%
- [2010/04/17 v2.12 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-savepos}[2010/04/17]
+\RequirePackage{zref-savepos}[2010/04/22]
\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 c85417f994a..4fee192a7e1 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-hyperref}%
- [2010/04/17 v2.12 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 cac3ed6e9ec..dedde01256b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
@@ -35,13 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-lastpage}%
- [2010/04/17 v2.12 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
-\RequirePackage{zref-abspage}[2010/04/17]
+ [2010/04/22 v2.14 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
+\RequirePackage{zref-abspage}[2010/04/22]
\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 663175d29bc..78095d4f77f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-marks}%
- [2010/04/17 v2.12 Module marks for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module marks for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 0a7ec65196f..c0512275e52 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
@@ -35,16 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-nextpage}%
- [2010/04/17 v2.12 Module nextpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module nextpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/17]
-\RequirePackage{zref-thepage}[2010/04/17]
-\RequirePackage{zref-lastpage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
+\RequirePackage{zref-thepage}[2010/04/22]
+\RequirePackage{zref-lastpage}[2010/04/22]
\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 0de80d90357..d5babfb2e94 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -35,19 +35,18 @@
%% 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.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-perpage}%
- [2010/04/17 v2.12 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
\zref@newprop*{pagevalue}[0]{\number\c@page}
\zref@newlist{perpage}
-\zref@addprop{perpage}{abspage}
-\zref@addprop{perpage}{page}
-\zref@addprop{perpage}{pagevalue}
+\zref@addprop{perpage}{abspage,page,pagevalue}
\newcounter{zpage}
\zref@require@unique
\let\ZREF@org@stepcounter\stepcounter
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
index 146ca1a6508..dde1b56f3cc 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
@@ -35,11 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-runs}%
- [2010/04/17 v2.12 Module runs for zref (HO)]%
+ [2010/04/22 v2.14 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 399023da74e..4ff928fa351 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-savepos}%
- [2010/04/17 v2.12 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\ltx@IfUndefined{pdfsavepos}{%
\PackageError\ZREF@name{%
@@ -52,23 +53,22 @@
\RequirePackage{ifpdf}
\ifpdf
\else
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdftexversion\endcsname\relax
- \else
+ \ltx@IfUndefined{pdftexversion}{%
+ }{%
\ifnum\pdftexversion<140 %
\PackageError\ZREF@name{%
- \string\pdfsavepos\space is not supported in DVI mode\MessageBreak
+ \string\pdfsavepos\space is not supported in DVI mode%
+ \MessageBreak
of this pdfTeX version%
}\ZREF@UpdatePdfTeX
\expandafter\expandafter\expandafter\endinput
\fi
- \fi
+ }%
\fi
\zref@newlist{savepos}
\zref@newprop*{posx}[0]{\the\pdflastxpos}
\zref@newprop*{posy}[0]{\the\pdflastypos}
-\zref@addprop{savepos}{posx}
-\zref@addprop{savepos}{posy}
+\zref@addprop{savepos}{posx,posy}
\def\zsavepos#1{%
\@bsphack
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
index b8544f42fa1..d9268b0a4b8 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
@@ -35,15 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-thepage}%
- [2010/04/17 v2.12 Module thepage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module thepage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\RequirePackage{atbegshi}
-\RequirePackage{zref-abspage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
\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 f715f768c7a..29187976f10 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-titleref}%
- [2010/04/17 v2.12 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\RequirePackage{gettitlestring}[2009/12/08]
\RequirePackage{keyval}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
index 1c4609a6fd4..e4c96af5142 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
@@ -35,15 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-totpages}%
- [2010/04/17 v2.12 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/17]
-\RequirePackage{zref-lastpage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
+\RequirePackage{zref-lastpage}[2010/04/22]
\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 978bbc106f3..a2368e4a978 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-user}%
- [2010/04/17 v2.12 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 946ba4b5a4a..d3c4a9bc3c6 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
@@ -35,12 +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-titleref-memoir.tex.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-xr}%
- [2010/04/17 v2.12 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\RequirePackage{keyval}
\RequirePackage{kvoptions}[2010/02/22]
@@ -270,28 +271,30 @@
Import to LaTeX label `#2'%
}%
\fi
- \expandafter\xdef\csname r@#2\endcsname{%
- {%
- \ltx@ifundefined{M@TitleReference}{%
- \ltx@ifundefined{TR@TitleReference}{%
- \zref@extractdefault{#1}{default}{}%
+ \zref@wrapper@unexpanded{%
+ \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\TR@TitleReference
+ \noexpand\M@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}{}}%
+ }{}%
}%
- {\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{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
index 4548e50a71a..957291c4e88 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
@@ -35,17 +35,18 @@
%% 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.
+%% zref-test-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref}
- [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\def\ZREF@temp#1{%
\DeclareOption{#1}{%
\AtEndOfPackage{%
- \RequirePackage{zref-#1}[2010/04/17]%
+ \RequirePackage{zref-#1}[2010/04/22]%
}%
}%
}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 69f9ec7cdf5..52bc15eb552 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -946,6 +946,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'revtex', '\.sty|\.cls|\.rtx',
'rlepsf', 'rlepsf.tex',
'rsfs', 'scrload\.tex|' . $standardtex,
+ 'sansmath', '^..[^s].*\.sty', # not miscdoc.sty
'seminar', '\.bug|\.bg2|\.cls|\.sty|2up.tex',
'shade', 'shade\.tex', # not description.tex
'shadethm', '\.sth|' . $standardtex,