summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/accsupp.dtx67
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx80
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/alphalph.dtx165
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/askinclude.dtx235
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx490
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx69
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx125
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/atveryend.dtx194
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/auxhook.dtx71
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx90
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bitset.dtx80
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx104
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bookmark.dtx136
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/accsupp.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/aliascnt.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/alphalph.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/askinclude.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/atbegshi.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/atenddvi.xml26
-rwxr-xr-xMaster/texmf-dist/source/latex/oberdiek/catalogue/attachfile2.xml28
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/atveryend.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/auxhook.xml22
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/bigintcalc.xml22
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/bitset.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/bmpsize.xml31
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/bookmark.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/catchfile.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/centernot.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/chemarr.xml28
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/classlist.xml32
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/colonequals.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/dvipscol.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/embedfile.xml28
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/engord.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/eolgrab.xml28
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/epstopdf-pkg.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/etexcmds.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/flags.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/gettitlestring.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/grfext.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/grffile.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hobsub.xml32
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hologo.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/holtxdoc.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hopatch.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hycolor.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hypbmsec.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hypcap.xml29
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hypdestopt.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hypgotoe.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/hyphsubst.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/ifdraft.xml32
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/iflang.xml22
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/ifluatex.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/ifpdf.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/ifvtex.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/infwarerr.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/inputenx.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/intcalc.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/kvdefinekeys.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/kvoptions.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/kvsetkeys.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/letltxmacro.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/listingsutf8.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/ltxcmds.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml22
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml31
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/magicnum.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/makerobust.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/mleftright.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pagegrid.xml28
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pagesel.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcol.xml28
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolfoot.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolmk.xml29
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparallel.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparcolumns.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcrypt.xml31
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfescape.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdflscape.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdfrender.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pdftexcmds.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/picture.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/pmboxdraw.xml22
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/protecteddef.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/refcount.xml37
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/rerunfilecheck.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/resizegather.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/rotchiffre.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/scrindex.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/selinput.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/setouterhbox.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/settobox.xml30
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/soulutf8.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/stackrel.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/stampinclude.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/stringenc.xml25
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/tabularht.xml33
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/tabularkv.xml26
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/telprint.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/transparent.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/twoopt.xml23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/uniquecounter.xml24
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catalogue/zref.xml27
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catchfile.dtx74
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/centernot.dtx95
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/chemarr.dtx79
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/classlist.dtx97
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/colonequals.dtx71
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx73
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/embedfile.dtx87
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/engord.dtx72
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/enparen.dtx980
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx85
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx68
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx80
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/fibnum.dtx1172
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/flags.dtx74
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx76
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/grfext.dtx74
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/grffile.dtx156
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hobsub.dtx157
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hologo.dtx3729
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx125
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hopatch.dtx134
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hycolor.dtx71
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx66
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypcap.dtx78
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx135
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx96
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx72
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx70
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx81
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/iflang.dtx73
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx68
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx71
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx75
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx74
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/inputenx.dtx571
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/intcalc.dtx77
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx77
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx174
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx497
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx69
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx132
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx367
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/luacolor.dtx118
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/luatex.dtx74
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/magicnum.dtx69
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/makerobust.dtx70
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/mleftright.dtx87
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex195
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx71
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pagesel.dtx70
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx77
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx95
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx78
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx77
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx77
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx82
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx138
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx69
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx79
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx339
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/picture.dtx67
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx73
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx75
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/refcount.dtx224
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx62
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/resizegather.dtx85
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx94
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/scrindex.dtx73
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/selinput.dtx78
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx84
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/settobox.dtx79
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx84
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/stackrel.dtx69
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx78
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/stringenc.dtx186
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/tabularht.dtx86
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx73
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/telprint.dtx74
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx1590
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/transparent.dtx71
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/twoopt.dtx66
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx75
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/zref.dtx1096
190 files changed, 18529 insertions, 2704 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
index fd1c8370651..2e6efda5cbd 100644
--- a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: accsupp.dtx
% Version: 2010/01/16 v0.3
-%
+% Info: Accessibility support by marked content
+%
% Copyright (C) 2007, 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
@@ -15,22 +16,22 @@
% 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 accsupp.dtx
% and the derived files
% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
% accsupp-example1.tex, accsupp-example2.tex,
% accsupp-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/accsupp.dtx
% CTAN:macros/latex/contrib/oberdiek/accsupp.pdf
-%
+%
% Unpacking:
% (a) If accsupp.ins is present:
% tex accsupp.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{accsupp.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If accsupp.drv is present:
% latex accsupp.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex accsupp.dtx
% makeindex -s gind.ist accsupp.idx
% pdflatex accsupp.dtx
% makeindex -s gind.ist accsupp.idx
% pdflatex accsupp.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/accsupp.sty
% TDS:tex/latex/oberdiek/accsupp-pdftex.def
@@ -137,6 +138,10 @@ and the derived files
\file{accsupp-example2.tex}{\from{accsupp.dtx}{example2}}%
\usedir{doc/latex/oberdiek/test}%
\file{accsupp-test1.tex}{\from{accsupp.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{accsupp.xml}{\from{accsupp.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -166,7 +171,7 @@ and the derived files
\ProvidesFile{accsupp.drv}%
[2010/01/16 v0.3 Accessibility support by marked content (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{accsupp.dtx}%
\end{document}
@@ -1087,12 +1092,48 @@ A\notparallel B
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{accsupp.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='accsupp'>
+ <name>accsupp</name>
+ <caption>Better accessibility support for PDF files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010'/>
+ <license type='lppl1.3'/>
+ <version number='0.3'/>
+ <description>
+ Since PDF 1.5 portions of a page can be marked for better accessibility
+ support. For example, replacement texts or expansions of abbreviations can
+ be provided. This package starts with providing a minimal low-level
+ interface for programmers; its status is experimental.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/accsupp.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/accsupp.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{pdfspec}
% Adobe Systems Incorporated,
% \textit{PDF Reference}, 6th edition, 2006.
% \url{http://www.adobe.com/devnet/acrobat/pdfs/pdf_reference.pdf}
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
index a8de27e7081..e7dec6f56ed 100644
--- a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: aliascnt.dtx
% Version: 2009/09/08 v1.3
-%
+% Info: Alias counters
+%
% Copyright (C) 2006, 2009 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
@@ -15,19 +16,19 @@
% 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 aliascnt.dtx
% and the derived files
% aliascnt.sty, aliascnt.pdf, aliascnt.ins, aliascnt.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/aliascnt.dtx
% CTAN:macros/latex/contrib/oberdiek/aliascnt.pdf
-%
+%
% Unpacking:
% (a) If aliascnt.ins is present:
% tex aliascnt.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{aliascnt.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If aliascnt.drv is present:
% latex aliascnt.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex aliascnt.dtx
% makeindex -s gind.ist aliascnt.idx
% pdflatex aliascnt.dtx
% makeindex -s gind.ist aliascnt.idx
% pdflatex aliascnt.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/aliascnt.sty
% TDS:doc/latex/oberdiek/aliascnt.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: aliascnt 2009/09/08 v1.3 Alias counter (HO)}
+\Msg{* Package: aliascnt 2009/09/08 v1.3 Alias counters (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{aliascnt.drv}{\from{aliascnt.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{aliascnt.sty}{\from{aliascnt.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{aliascnt.xml}{\from{aliascnt.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,9 +148,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{aliascnt.drv}%
- [2009/09/08 v1.3 Alias counter (HO)]%
+ [2009/09/08 v1.3 Alias counters (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{aliascnt.dtx}%
\end{document}
@@ -253,7 +258,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{aliascnt}%
- [2009/09/08 v1.3 Alias counter (HO)]%
+ [2009/09/08 v1.3 Alias counters (HO)]%
% \end{macrocode}
%
% \subsection{Create new alias counter}
@@ -539,31 +544,66 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{aliascnt.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='aliascnt'>
+ <name>aliascnt</name>
+ <caption>Alias counters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package introduces aliases for counters, that
+ share the same counter register and clear list.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/aliascnt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/aliascnt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
-%
+%
% \begin{description}
% \item[Ulrich Schwarz:] The package is based on his draft for
% ``Die \TeX nische Kom\"odie'', see \cite{schwarz}.
% \end{description}
%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{schwarz}
% Ulrich Schwarz:
% \textit{Was hinten herauskommt z\"ahlt: Counter Aliasing in \LaTeX},
% \textit{Die \TeX nische Kom\"odie}, 3/2006, pages 8--14, Juli 2006.
-%
+%
% \bibitem{remreset}
% David Carlisle: \textit{The \xpackage{remreset} package};
% 1997/09/28;
% \CTAN{macros/latex/contrib/carlisle/remreset.sty}.
-%
+%
% \bibitem{hyperref}
% Sebastian Rahtz, Heiko Oberdiek:
% \textit{The \xpackage{hyperref} package};
% 2006/08/16 v6.75c;
% \CTAN{macros/latex/contrib/hyperref/}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
index 587dc417e1b..27718341b62 100644
--- a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: alphalph.dtx
-% Version: 2010/04/18 v2.3
-%
-% Copyright (C) 1999, 2006-2008, 2010 by
+% Version: 2011/05/13 v2.4
+% Info: Convert numbers to letters
+%
+% Copyright (C) 1999, 2006-2008, 2010, 2011 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file alphalph.dtx
% and the derived files
% alphalph.sty, alphalph.pdf, alphalph.ins, alphalph.drv,
% alphalph-test1.tex, alphalph-test2.tex, alphalph-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/alphalph.dtx
% CTAN:macros/latex/contrib/oberdiek/alphalph.pdf
-%
+%
% Unpacking:
% (a) If alphalph.ins is present:
% tex alphalph.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{alphalph.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If alphalph.drv is present:
% latex alphalph.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex alphalph.dtx
% makeindex -s gind.ist alphalph.idx
% pdflatex alphalph.dtx
% makeindex -s gind.ist alphalph.idx
% pdflatex alphalph.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/alphalph.sty
% TDS:doc/latex/oberdiek/alphalph.pdf
@@ -81,7 +82,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: alphalph 2010/04/18 v2.3 Converting numbers to letters (HO)}
+\Msg{* Package: alphalph 2011/05/13 v2.4 Convert numbers to letters (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -93,9 +94,9 @@
This is a generated file.
Project: alphalph
-Version: 2010/04/18 v2.3
+Version: 2011/05/13 v2.4
-Copyright (C) 1999, 2006-2008, 2010 by
+Copyright (C) 1999, 2006-2008, 2010, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -132,6 +133,10 @@ and the derived files
\file{alphalph-test1.tex}{\from{alphalph.dtx}{test1}}%
\file{alphalph-test2.tex}{\from{alphalph.dtx}{test2,etex}}%
\file{alphalph-test3.tex}{\from{alphalph.dtx}{test2,noetex}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{alphalph.xml}{\from{alphalph.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -158,10 +163,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{alphalph.drv}%
- [2010/04/18 v2.3 Converting numbers to letters (HO)]%
+ [2011/05/13 v2.4 Convert numbers to letters (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
-\usepackage{alphalph}[2010/04/18]
+\usepackage{alphalph}[2011/05/13]
\makeatletter
\newalphalph{\fnsymbolwrap}[wrap]{\@fnsymbol}{}
\newcommand*{\fnsymbolsingle}[1]{%
@@ -187,13 +191,14 @@ and the derived files
\mathrel{\mathop{:}}=%
}%
}
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{alphalph.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1213}
+% \CheckSum{1218}
%
% \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
@@ -214,14 +219,14 @@ and the derived files
% \GetFileInfo{alphalph.drv}
%
% \title{The \xpackage{alphalph} package}
-% \date{2010/04/18 v2.3}
+% \date{2011/05/13 v2.4}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
%
% \begin{abstract}
% The package provides methods to represent numbers with a limited
-% set of symbols. Both \LaTeX\ and \plainTeX are supported.
+% set of symbols. Both \hologo{LaTeX} and \hologo{plainTeX} are supported.
% \end{abstract}
%
% \tableofcontents
@@ -229,7 +234,7 @@ and the derived files
% \section{Documentation}
%
% \subsection{Introduction}
-% \LaTeX\ counter can be represented in different ways
+% \hologo{LaTeX} counters can be represented in different ways
% by using presentation commands:
% \begin{quote}
% \cs{arabic}, \cs{roman}, \cs{Roman},\\
@@ -237,7 +242,7 @@ and the derived files
% \end{quote}
% The ranges of supported counter values are more or less
% restricted. Only \cs{arabic} can be used with any counter
-% value \TeX\ supports.
+% value \hologo{TeX} supports.
% \begin{quote}
% \catcode`\|=12 %
% \begin{tabular}{@{}l|l|l|l@{}}
@@ -300,7 +305,7 @@ and the derived files
%
% Nine footnote symbols are quite a few.
% Too soon the symbols are consumed
-% and \LaTeX\ complains with the error ``Counter too large''.
+% and \hologo{LaTeX} complains with the error ``Counter too large''.
% However, it could be acceptable to start again with the symbols
% from the beginning, especially if there are less than nine symbols
% on a page.
@@ -329,7 +334,7 @@ and the derived files
%
% \subsubsection{Multiple symbols}
%
-% \LaTeX's standard set of footnote symbols contains doubled
+% \Hologo{LaTeX}'s standard set of footnote symbols contains doubled
% symbols at the higher positions. Could this principle
% be generalized?
% Yes, but first we need a clean footnote symbol list without
@@ -398,17 +403,17 @@ and the derived files
%
% \begin{description}
% \item[Counter presentation command] is a macro that
-% expects a \LaTeX\ counter name as argument.
+% expects a \hologo{LaTeX} counter name as argument.
% Numbers cannot be used. Examples:
% \cs{arabic}, \cs{alph}, \cs{fnsymbol}.
% \item[Number presentation command] is a macro that
% expects a number as argument. A number is anything
-% that \TeX\ accepts as number including \cs{value}.
+% that \hologo{TeX} accepts as number including \cs{value}.
% Examples: \cs{alphalph}, \cs{AlphAlph}, \cs{alphalph@alph}
%
% However, \cs{alph} or \cs{fnsymbol} are not number
% presentation commands because they expect a counter
-% name as argument. Happily \LaTeX\ counter presentation
+% name as argument. Happily \hologo{LaTeX} counter presentation
% commands internally uses number presentation commands
% with the same name, but prefixed by `@'. Thus
% \cs{@alph}, \cs{@fnsymbol} are number presentation commands.
@@ -424,11 +429,11 @@ and the derived files
%
% \subsection{Package usage}
%
-% The package \Package{alphalph} can be used with both \plainTeX\
-% and \LaTeX:
+% The package \Package{alphalph} can be used with both \hologo{plainTeX}
+% and \hologo{LaTeX}:
% \begin{description}
-% \item[\plainTeX:] |\input alphalph.sty|
-% \item[\LaTeXe:] |\usepackage{alphalph}|\\
+% \item[\hologo{plainTeX}:] |\input alphalph.sty|
+% \item[\hologo{LaTeX2e}:] |\usepackage{alphalph}|\\
% There aren't any options.
% \end{description}
%
@@ -438,7 +443,7 @@ and the derived files
% \cs{alphalph} \M{number}
% \end{declcs}
% Both macros are number presentation commands that
-% expects a number as argument. \LaTeX\ counters
+% expects a number as argument. \hologo{LaTeX} counters
% are used with \cs{value}.
%
% The macros represents a number by letters.
@@ -490,7 +495,7 @@ and the derived files
%
% The last argument is the number of symbols.
% If the argument is empty, then \cs{newalphalph} tries
-% to find this number itself. \LaTeX's number presentation
+% to find this number itself. \hologo{LaTeX}'s number presentation
% commands throw an error message, if the number is too large.
% This error message is put in a macro \cs{@ctrerr}.
% Thus \cs{newalphalph} calls the symbol provider and tests
@@ -511,7 +516,7 @@ and the derived files
% \end{declcs}
% They are basically the same as \cs{@Alph} and \cs{@alph}.
% Some languages of package \xpackage{babel} redefine
-% \LaTeX's macros to include some font setup that
+% \hologo{LaTeX}'s macros to include some font setup that
% breaks expandibility. Therefore \cs{AlphAlph} and \cs{alphalph}
% are based on \cs{alphalph@Alph} and \cs{alphalph@alph} to get
% the letters. The behaviour of these symbol providers for numbers
@@ -528,22 +533,22 @@ and the derived files
% \item They are fully expandable. This means that they can safely
% \begin{itemize}
% \item be written to a file,
-% \item used in moving arguments (\LaTeX: they are \emph{robust}),
+% \item used in moving arguments (\hologo{LaTeX}: they are \emph{robust}),
% \item used in a \cmd{\csname}-\cmd{\endcsname} pair.
% \end{itemize}
% \item If the argument is zero or negative, the commands expand
% to nothing like \cmd{\romannumeral}.
-% \item The argument is a \TeX\ number. Anything that would be
+% \item The argument is a \hologo{TeX} number. Anything that would be
% accepted by \cmd{\number} is a valid argument:
% \begin{itemize}
% \item explicite constants,
% \item macros that expand to a number,
-% \item count registers, \LaTeX\ counter can used
+% \item count registers, \hologo{LaTeX} counter can used
% via \cmd{\value}, e.\,g.:\\
% |\alphalph{\value{page}}|
% \item \dots
% \end{itemize}
-% \item \eTeX's numeric expressions are supported, if \eTeX\ is
+% \item \hologo{eTeX}'s numeric expressions are supported, if \hologo{eTeX} is
% available. Then \cs{numexpr} is applied to the argument.
% Package \cs{calc}'s expressions are not supported.
% That would violate the expandibility.
@@ -552,12 +557,12 @@ and the derived files
% \subsubsection{General usability}
%
% \begin{description}
-% \item[\TeX\ format:]
-% The package does not depend on \LaTeX, it can also be used
-% by \plainTeX, for example.
-% \item[\eTeX:] \eTeX is supported, the macros are shorter and
+% \item[\hologo{TeX} format:]
+% The package does not depend on \hologo{LaTeX}, it can also be used
+% by \hologo{plainTeX}, for example.
+% \item[\hologo{eTeX}:] \eTeX is supported, the macros are shorter and
% faster. But \eTeX's extensions are not requirements.
-% Without \eTeX, just the implementation changes. The properties
+% Without \hologo{eTeX}, just the implementation changes. The properties
% remain unchanged.
% \end{description}
%
@@ -640,7 +645,7 @@ and the derived files
\fi
\expandafter\x\csname ver@alphalph.sty\endcsname
\ProvidesPackage{alphalph}%
- [2010/04/18 v2.3 Converting numbers to letters (HO)]%
+ [2011/05/13 v2.4 Convert numbers to letters (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -709,7 +714,7 @@ and the derived files
\fi
% \end{macrocode}
%
-% \subsection{\eTeX\ detection}
+% \subsection{\hologo{eTeX} detection}
%
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -766,7 +771,7 @@ and the derived files
% \begin{macro}{\@ReturnAfterFi}
% The following commands moves the `then' and `else' part respectively
% behind the |\if|-construct. This prevents a too deep |\if|-nesting
-% and so a \TeX\ capacity error because of a limited input stack size.
+% and so a \hologo{TeX} capacity error because of a limited input stack size.
% I use this trick in several packages, so I don't prefix these internal
% commands in order not to have the same macros with different names.
% (It saves memory.)
@@ -778,8 +783,8 @@ and the derived files
% \end{macro}
%
% \begin{macro}{\@gobblefour}
-% \LaTeX\ defines commands for eating arguments.
-% Define \cs{@gobblefour} if it is not defined (\plainTeX).
+% \Hologo{LaTeX} defines commands for eating arguments.
+% Define \cs{@gobblefour} if it is not defined (\hologo{plainTeX}).
% \begin{macrocode}
\expandafter\ifx\csname @gobblefour\endcsname\relax
\long\def\@gobblefour#1#2#3#4{}%
@@ -822,7 +827,7 @@ and the derived files
% The output of \cs{alphalph} and \cs{AlphAlph} should be
% usable as part of command names (see \cs{@namedef}, \cs{csname}, \dots).
% Unhappily some languages of package \xpackage{babel}
-% redefine \LaTeX's \cs{@alph} and \cs{@Alph} in a manner that
+% redefine \hologo{LaTeX}'s \cs{@alph} and \cs{@Alph} in a manner that
% they cannot be used in expandable context any more.
% Therefore package \xpackage{alphalph} provides its own
% commands.
@@ -1418,7 +1423,7 @@ and the derived files
}
\DisableNumexpr
%</noetex>
-\usepackage{alphalph}[2010/04/18]
+\usepackage{alphalph}[2011/05/13]
%<noetex>\RestoreNumexpr
\usepackage{qstest}
\IncludeTests{*}
@@ -1821,6 +1826,45 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{alphalph.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='alphalph'>
+ <name>alphalph</name>
+ <caption>Convert numbers to letters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2006-2008,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.4'/>
+ <description>
+ Provides commands <tt>\alphalph</tt> and <tt>\AlphAlph.</tt> They
+ are like <tt>\number</tt> but the expansion consists of lowercase
+ and uppercase letters respectively (1 to a, 26 to z, 27 to aa, 52
+ to zz, 53 to ba, 702 to zz, 703 to aaa, etc.). Can be used as a
+ replacement for LaTeX's <tt>\@alph</tt> and <tt>\@Alph</tt>
+ macros.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/alphalph.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/alphalph.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1999/03/19 v0.1}
% \item
@@ -1843,7 +1887,7 @@ and the derived files
% \item
% Documentation added in dtx format.
% \item
-% \eTeX\ support added.
+% \hologo{eTeX} support added.
% \end{Version}
% \begin{Version}{1999/04/13 v1.1}
% \item
@@ -1859,7 +1903,7 @@ and the derived files
% \end{Version}
% \begin{Version}{2006/02/20 v1.3}
% \item
-% Reload check (for \plainTeX)
+% Reload check (for \hologo{plainTeX})
% \item
% New DTX framework.
% \item
@@ -1876,7 +1920,7 @@ and the derived files
% \begin{Version}{2007/09/09 v2.0}
% \item
% New implementation that uses package \cs{intcalc}.
-% This removes the dependency on \eTeX.
+% This removes the dependency on \hologo{eTeX}.
% \item
% \cs{newalphalph} is extended to support new methods `wrap' and 'multi'.
% \item
@@ -1891,12 +1935,19 @@ and the derived files
% \end{Version}
% \begin{Version}{2010/03/01 v2.2}
% \item
-% Compatibility with \iniTeX.
+% Compatibility with \hologo{iniTeX}.
% \end{Version}
% \begin{Version}{2010/04/18 v2.3}
% \item
% Documentation fixes (Martin M\"unch).
% \end{Version}
+% \begin{Version}{2011/05/13 v2.4}
+% \item
+% Documentation fixes (Jim Diamond) and using package
+% \xpackage{hologo} for the documentation.
+% \item
+% Catalogue file added.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx
index f653c8142b3..6b286f2b8d5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx
@@ -1,12 +1,13 @@
% \iffalse meta-comment
-%
+%
% File: askinclude.dtx
-% Version: 2008/08/11 v2.1
-%
+% Version: 2011/12/02 v2.2
+% Info: Interactive asking of included files
+%
% Copyright (C) 1991-1994 by Pablo A. Straub
-% Copyright (C) 2007, 2008 by
+% Copyright (C) 2007, 2008, 2011 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
@@ -16,32 +17,33 @@
% 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 askinclude.dtx
% and the derived files
% askinclude.sty, askinclude.pdf, askinclude.ins, askinclude.drv,
-% askinclude-a.tex, askinclude-b.tex, askinclude-c.tex,
-% askinclude-test1.tex, askinclude-test2.tex,
-% askinclude-test3.tex, askinclude-test4.tex,
-% askinclude-test5.tex, askinclude-test6.tex,
-% askinclude-test7.tex, askinclude-test8.tex,
-% askinclude-test9.tex, askinclude-test10.tex,
-% askinclude-test11.tex, askinclude-test12.tex,
-% askinclude-test13.tex, askinclude-test14.tex,
-% askinclude-test15.tex, askinclude-test16.tex,
-% askinclude-test17.tex, askinclude-test18.tex,
-% askinclude-test19.tex, askinclude-test20.tex,
-% askinclude-test21.tex, askinclude-test22.tex,
-% askinclude-test23.tex, askinclude-test24.tex.
-%
+% askinclude.bib, askinclude-a.tex, askinclude-b.tex,
+% askinclude-c.tex, askinclude-test1.tex,
+% askinclude-test2.tex, askinclude-test3.tex,
+% askinclude-test4.tex, askinclude-test5.tex,
+% askinclude-test6.tex, askinclude-test7.tex,
+% askinclude-test8.tex, askinclude-test9.tex,
+% askinclude-test10.tex, askinclude-test11.tex,
+% askinclude-test12.tex, askinclude-test13.tex,
+% askinclude-test14.tex, askinclude-test15.tex,
+% askinclude-test16.tex, askinclude-test17.tex,
+% askinclude-test18.tex, askinclude-test19.tex,
+% askinclude-test20.tex, askinclude-test21.tex,
+% askinclude-test22.tex, askinclude-test23.tex,
+% askinclude-test24.tex.
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/askinclude.dtx
% CTAN:macros/latex/contrib/oberdiek/askinclude.pdf
-%
+%
% Unpacking:
% (a) If askinclude.ins is present:
% tex askinclude.ins
@@ -50,7 +52,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{askinclude.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If askinclude.drv is present:
% latex askinclude.drv
@@ -60,14 +62,15 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex askinclude.dtx
+% bibtex askinclude.aux
% makeindex -s gind.ist askinclude.idx
% pdflatex askinclude.dtx
% makeindex -s gind.ist askinclude.idx
% pdflatex askinclude.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/askinclude.sty
% TDS:doc/latex/oberdiek/askinclude.pdf
@@ -115,7 +118,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: askinclude 2008/08/11 v2.1 Interactive asking of included files}
+\Msg{* Package: askinclude 2011/12/02 v2.2 Interactive asking of included files}
\Msg{************************************************************************}
\keepsilent
@@ -127,10 +130,10 @@
This is a generated file.
Project: askinclude
-Version: 2008/08/11 v2.1
+Version: 2011/12/02 v2.2
Copyright (C) 1991-1994 by Pablo A. Straub
-Copyright (C) 2007, 2008 by
+Copyright (C) 2007, 2008, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -150,19 +153,20 @@ This Current Maintainer of this work is Heiko Oberdiek.
This work consists of the main source file askinclude.dtx
and the derived files
askinclude.sty, askinclude.pdf, askinclude.ins, askinclude.drv,
- askinclude-a.tex, askinclude-b.tex, askinclude-c.tex,
- askinclude-test1.tex, askinclude-test2.tex,
- askinclude-test3.tex, askinclude-test4.tex,
- askinclude-test5.tex, askinclude-test6.tex,
- askinclude-test7.tex, askinclude-test8.tex,
- askinclude-test9.tex, askinclude-test10.tex,
- askinclude-test11.tex, askinclude-test12.tex,
- askinclude-test13.tex, askinclude-test14.tex,
- askinclude-test15.tex, askinclude-test16.tex,
- askinclude-test17.tex, askinclude-test18.tex,
- askinclude-test19.tex, askinclude-test20.tex,
- askinclude-test21.tex, askinclude-test22.tex,
- askinclude-test23.tex, askinclude-test24.tex.
+ askinclude.bib, askinclude-a.tex, askinclude-b.tex,
+ askinclude-c.tex, askinclude-test1.tex,
+ askinclude-test2.tex, askinclude-test3.tex,
+ askinclude-test4.tex, askinclude-test5.tex,
+ askinclude-test6.tex, askinclude-test7.tex,
+ askinclude-test8.tex, askinclude-test9.tex,
+ askinclude-test10.tex, askinclude-test11.tex,
+ askinclude-test12.tex, askinclude-test13.tex,
+ askinclude-test14.tex, askinclude-test15.tex,
+ askinclude-test16.tex, askinclude-test17.tex,
+ askinclude-test18.tex, askinclude-test19.tex,
+ askinclude-test20.tex, askinclude-test21.tex,
+ askinclude-test22.tex, askinclude-test23.tex,
+ askinclude-test24.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -170,6 +174,11 @@ and the derived files
\generate{%
\file{askinclude.ins}{\from{askinclude.dtx}{install}}%
\file{askinclude.drv}{\from{askinclude.dtx}{driver}}%
+ \nopreamble
+ \nopostamble
+ \file{askinclude.bib}{\from{askinclude.dtx}{bib}}%
+ \usepreamble\defaultpreamble
+ \usepostamble\defaultpostamble
\usedir{tex/latex/oberdiek}%
\file{askinclude.sty}{\from{askinclude.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
@@ -200,6 +209,10 @@ and the derived files
\file{askinclude-test22.tex}{\from{askinclude.dtx}{test0,test22}}%
\file{askinclude-test23.tex}{\from{askinclude.dtx}{test0,test23}}%
\file{askinclude-test24.tex}{\from{askinclude.dtx}{test0,test24}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{askinclude.xml}{\from{askinclude.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -220,24 +233,68 @@ and the derived files
\endbatchfile
%</install>
+%<*bib>
+@online{texlive,
+ author={Fairbairns, Robin},
+ title={[tex-live] licence on includeonly.sty},
+ date={2007-10-13},
+ url={http://www.tug.org/pipermail/tex-live/2007-October/014928.html},
+ urldate={2011-12-02},
+}
+@online{newsthread,
+ author={Vo{\ss}, Herbert},
+ title={askinclude.sty},
+ note={Thread in newsgroup {\xnewsgroup{comp.text.tex}};
+ Message-ID: {\texttt{fev72m\$b35\$02\$2@news.t-online.com}}},
+ date={2007-10-15},
+ url={http://groups.google.com/group/comp.text.tex/browse_thread/thread/728a3e73c04c6789/349e31865c40d00c},
+ urldate={2011-12-02},
+}
+@manual{makematch,
+ author={Kastrup, David},
+ title={makematch.sty: Pattern matching with wildcards},
+ date={2007-02-23},
+ version={1.7925},
+ url={http://mirror.ctan.org/macros/latex/contrib/qstest/makematch.pdf},
+ urldate={2011-12-02},
+}
+@manual{excludeonly,
+ author={Luecking, Daniel H. and Arseneau, Donald},
+ title={The excludeonly package},
+ date={2003-03-14},
+ url={http://mirror.ctan.org/macros/latex/contrib/excludeonly/excludeonly.pdf},
+ urldate={2011-12-02},
+}
+%</bib>
%<*ignore>
\fi
%</ignore>
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{askinclude.drv}%
- [2008/08/11 v2.1 Interactive asking of included files]%
+ [2011/12/02 v2.2 Interactive asking of included files]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{ifluatex}
+\ifluatex
+\else
+ \usepackage[T1]{fontenc}%
+ \usepackage{lmodern}%
+\fi
+\usepackage{csquotes}
+\usepackage[
+ bibencoding=ascii,
+ alldates=iso8601,
+]{biblatex}[2011/11/13]
+\bibliography{oberdiek-source}
+\bibliography{askinclude}
\begin{document}
\DocInput{askinclude.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{2076}
+% \CheckSum{2078}
%
% \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
@@ -258,7 +315,7 @@ and the derived files
% \GetFileInfo{askinclude.drv}
%
% \title{The \xpackage{askinclude} package}
-% \date{2008/08/11 v2.1}
+% \date{2011/12/02 v2.2}
% \author{
% Pablo A. Straub\\[1ex]
% Heiko Oberdiek (maintainer)\\\xemail{heiko.oberdiek at googlemail.com}
@@ -644,7 +701,7 @@ and the derived files
\TMP@EnsureCode{96}{12}% `
\edef\AskInc@AtEnd{\AskInc@AtEnd\noexpand\endinput}
\ProvidesPackage{askinclude}%
- [2008/08/11 v2.1 Interactive asking of included files]%
+ [2011/12/02 v2.2 Interactive asking of included files]%
% \end{macrocode}
%
% \subsection{Delay action after preamble}
@@ -1688,11 +1745,11 @@ and the derived files
%<*!test1>
\ifx\AtBeginDocumentMode Y%
\AtBeginDocument{%
- \usepackage{askinclude}[2008/08/11]%
+ \usepackage{askinclude}[2011/12/02]%
}%
\else
%</!test1>
- \usepackage{askinclude}[2008/08/11]%
+ \usepackage{askinclude}[2011/12/02]%
%<*!test1>
\fi
%</!test1>
@@ -2784,6 +2841,7 @@ and the derived files
% \begin{quote}
%\begin{verbatim}
%pdflatex askinclude.dtx
+%bibtex askinclude.aux
%makeindex -s gind.ist askinclude.idx
%pdflatex askinclude.dtx
%makeindex -s gind.ist askinclude.idx
@@ -2791,8 +2849,45 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{askinclude.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='askinclude'>
+ <name>askinclude</name>
+ <caption>Interactive use of \includeonly</caption>
+ <authorref id='auth:straub'/>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner="Pablo A. Straub" year='1991-1994'/>
+ <copyright owner="Heiko Oberdiek" year='2007,2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.2'/>
+ <description>
+ The package asks the user which files to put in a \includeonly
+ command. There is provision for answering &#x201C;same as last
+ time&#x201D; or &#x201C;all files&#x201D;.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/askinclude.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/askinclude.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
-%
+%
% \begin{description}
% \item[Tom Scavo]
% suggested saving the include file list
@@ -2800,35 +2895,9 @@ and the derived files
% \item[Joseph Wright] suggested questions for each \cs{include}.
% \end{description}
%
-% \begin{thebibliography}{9}
-% \bibitem{texlive}
-% Posting in mailing list \verb|texlive@tug.org|\\
-% From: Robin Fairbairns\\
-% Subject: licence on includeonly.sty\\
-% Date: Sat Oct 13 13:28:47 CEST 2007\\
-% \url{http://www.tug.org/pipermail/tex-live/2007-October/014928.html}
-%
-% \bibitem{newsthread}
-% Thread in newsgroup \xnewsgroup{comp.text.tex}\\
-% From: Herbert Voss\\
-% Subject: askinclude.sty\\
-% Date: Mon, 15 Oct 2007 10:06:45 +0200\\
-% Message-ID: \verb|fev72m$b35$02$2@news.t-online.com|\\
-% \url{http://groups.google.com/group/comp.text.tex/browse_thread/thread/728a3e73c04c6789/349e31865c40d00c?\#349e31865c40d00c}
-%
-% \bibitem{makematch}
-% David Kastrup:
-% \textit{makematch.sty: Pattern matching with wildcards};
-% 2007/02/23;
-% \CTAN{macros/latex/contrib/qstest/makematch.dtx}.
-%
-% \bibitem{excludeonly}
-% Daniel H. Luecking, Donald Arsenau:
-% \textit{excludeonly.sty: eponymous command opposite to \cs{includeonly}};
-% 2003/03/14;
-% \CTAN{macros/latex/contrib/misc/excludeonly.sty}.
-%
-% \end{thebibliography}
+% \printbibliography[
+% heading=bibnumbered,
+% ]
%
% \begin{History}
% \begin{Version}{1991/11/05 v0.95}
@@ -2887,6 +2956,10 @@ and the derived files
% \item
% URLs updated.
% \end{Version}
+% \begin{Version}{2011/12/02 v2.2}
+% \item
+% Bibliography rewritten for biblatex.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
index 28cf960e580..6d19ab58da6 100644
--- a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: atbegshi.dtx
-% Version: 2011/01/30 v1.15
-%
+% Version: 2011/10/05 v1.16
+% Info: At begin shipout hook
+%
% Copyright (C) 2007-2011 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file atbegshi.dtx
% and the derived files
% atbegshi.sty, atbegshi.pdf, atbegshi.ins, atbegshi.drv,
% atbegshi-example1.tex, atbegshi-example2.tex,
% atbegshi-test1.tex, atbegshi-test2.tex, atbegshi-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/atbegshi.dtx
% CTAN:macros/latex/contrib/oberdiek/atbegshi.pdf
-%
+%
% Unpacking:
% (a) If atbegshi.ins is present:
% tex atbegshi.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{atbegshi.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If atbegshi.drv is present:
% latex atbegshi.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex atbegshi.dtx
% makeindex -s gind.ist atbegshi.idx
% pdflatex atbegshi.dtx
% makeindex -s gind.ist atbegshi.idx
% pdflatex atbegshi.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/atbegshi.sty
% TDS:doc/latex/oberdiek/atbegshi.pdf
@@ -84,7 +85,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: atbegshi 2011/01/30 v1.15 At begin shipout hook (HO)}
+\Msg{* Package: atbegshi 2011/10/05 v1.16 At begin shipout hook (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -96,7 +97,7 @@
This is a generated file.
Project: atbegshi
-Version: 2011/01/30 v1.15
+Version: 2011/10/05 v1.16
Copyright (C) 2007-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -139,6 +140,10 @@ and the derived files
\file{atbegshi-test1.tex}{\from{atbegshi.dtx}{test1}}%
\file{atbegshi-test2.tex}{\from{atbegshi.dtx}{test2}}%
\file{atbegshi-test3.tex}{\from{atbegshi.dtx}{test3}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{atbegshi.xml}{\from{atbegshi.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -165,16 +170,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atbegshi.drv}%
- [2011/01/30 v1.15 At begin shipout hook (HO)]%
+ [2011/10/05 v1.16 At begin shipout hook (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{atbegshi.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1524}
+% \CheckSum{1889}
%
% \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
@@ -195,7 +200,7 @@ and the derived files
% \GetFileInfo{atbegshi.drv}
%
% \title{The \xpackage{atbegshi} package}
-% \date{2011/01/30 v1.15}
+% \date{2011/10/05 v1.16}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -225,7 +230,8 @@ and the derived files
% The hooks are executed in this order. The following three macros
% provide the user interface for adding code to these hooks:
%
-% \begin{declcs}{AtBeginShipout} \M{code}
+% \begin{declcs}{AtBeginShipout} \M{code}\\
+% \cs{AtBeginShipoutBox}
% \end{declcs}
% Execute the \meta{code} for every page.
% The page contents is held in box register \cs{AtBeginShipoutBox}
@@ -290,6 +296,26 @@ and the derived files
% \cs{AtBeginShipoutInit} forces the immediate redefinition
% of \cs{shipout}.
%
+% \begin{declcs}{AtBeginShipoutAddToBox} \M{stuff}\\
+% \cs{AtBeginShipoutAddToBoxForeground} \M{stuff}
+% \end{declcs}
+% A quite common use case is the addition of \cs{special}
+% or other whatsits to the page output box. Macro
+% \cs{AtBeginShipoutAddToBox} puts \meta{stuff} in a
+% box with zeroed dimensions. The box with the \meta{stuff}
+% is put in the upper left corner of the shipout box
+% \cs{AtBeginShipoutBox}. Macro \cs{AtBeginShipoutAddToBox}
+% puts the \meta{stuff} in the background, the other macro
+% \cs{AtBeginShipoutAddToBoxForeground} in the foreground
+% after the original shipout box contents is set.
+%
+% A void shipout box (that means a discarded page)
+% remains void that means \meta{stuff} is ignored in this case.
+% The box type of \cs{AtBeginShipoutBox} is preserved.
+% Also the box nesting level for the original contents
+% of \cs{AtBeginShipoutBox} remains, for example, to avoid trouble
+% with links across pages in case of \hologo{pdfTeX}.
+%
% \begin{declcs}{AtBeginShipoutUpperLeft} \M{background material}
% \end{declcs}
% This is a macro that puts material in the background of
@@ -318,11 +344,27 @@ and the derived files
% See \cs{AtBeginShipoutUpperLeft}. The difference is that the material
% is put in the foreground.
%
-% \begin{declcs}{AtBeginShipoutOriginalShipout} \M{box}
+% \begin{declcs}{AtBeginShipoutOriginalShipout} \meta{box}
% \end{declcs}
% It stores the meaning of \cs{shipout} at the time this package
% is loaded.
%
+% \begin{declcs}{AtBeginShipoutBoxWidth}\\
+% \cs{AtBeginShipoutBoxHeight}\\
+% \cs{AtBeginShipoutBoxDepth}\\
+% \end{declcs}
+% These macros store the dimensions of the output box \cs{AtBeginShipoutBox}
+% before the original shipout is called. If \cs{shipout} is not
+% redefined before the package loading or the box dimensions
+% are not changed by the redefined \cs{shipout}, these macros
+% contain the dimensions of the shipout box. These values can be
+% remembered by \cs{label} and \cs{ref}. For example, this is done
+% by the package module \xpackage{zref-pagelayout} of project \xpackage{zref}.
+% The dimensions of the shipout page can be used in some \hologo{TeX}
+% engines (\hologo{pdfTeX} in PDF mode, \hologo{XeTeX}) to calculate
+% the media size of the shipout page if \cs{pdfpagewidth} and
+% \cs{pdfpageheight} are not set.
+%
% \subsection{Examples}
%
% \subsubsection{Example: circle in background}
@@ -877,7 +919,7 @@ The last page.
\fi
\expandafter\x\csname ver@atbegshi.sty\endcsname
\ProvidesPackage{atbegshi}%
- [2011/01/30 v1.15 At begin shipout hook (HO)]%
+ [2011/10/05 v1.16 At begin shipout hook (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -975,9 +1017,11 @@ The last page.
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ifAtBegShi@Discarded}
% \begin{macrocode}
\ltx@newif\ifAtBegShi@Discarded
% \end{macrocode}
+% \end{macro}
% \begin{macro}{\AtBeginShipoutDiscard}
% \begin{macrocode}
\AtBegShi@CheckDefinable\AtBeginShipoutDiscard
@@ -1050,6 +1094,11 @@ X \endgroup
\else
\AtBegShi@First
\let\protect\AtBegShi@OrgProtect
+ \AtBegShi@GetBoxSize\AtBeginShipoutBox
+ \ltx@ifundefined{AtNextShipout}{%
+ }{%
+ \AtNextShipout{\AtBegShi@GetBoxSize\@cclv}%
+ }%
\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox
\fi
\fi
@@ -1057,6 +1106,31 @@ X \endgroup
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\AtBegShi@GetBoxSize}
+% \begin{macrocode}
+\def\AtBegShi@GetBoxSize#1{%
+ \xdef\AtBeginShipoutBoxWidth{\the\wd#1}%
+ \xdef\AtBeginShipoutBoxHeight{\the\ht#1}%
+ \xdef\AtBeginShipoutBoxDepth{\the\dp#1}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\AtBeginShipoutBoxWidth}
+% \begin{macrocode}
+\def\AtBeginShipoutBoxWidth{0pt}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\AtBeginShipoutBoxHeight}
+% \begin{macrocode}
+\def\AtBeginShipoutBoxHeight{0pt}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\AtBeginShipoutBoxDepth}
+% \begin{macrocode}
+\def\AtBeginShipoutBoxDepth{0pt}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
\catcode`\X=11 %
\catcode`\E=11 %
@@ -1065,29 +1139,12 @@ X \endgroup
% \begin{macro}{\AtBegShi@First}
% \begin{macrocode}
\def\AtBegShi@First{%
- \begingroup
- \def\@empty{}%
- \ifx\AtBegShi@HookFirst\@empty
- \else
- \setbox\ltx@zero=\vbox{%
- \begingroup
- \AtBegShi@HookFirst
- \endgroup
- }%
- \wd\ltx@zero=0pt %
- \ht\ltx@zero=0pt %
- \dp\ltx@zero=0pt %
- \global\setbox\AtBeginShipoutBox=\vbox{%
- \baselineskip 0pt\relax
- \lineskip 0pt\relax
- \lineskiplimit 0pt\relax
- \copy\ltx@zero
- \copy\AtBeginShipoutBox
- }%
- \fi
- \global\let\AtBegShi@First\@empty
- \global\let\AtBeginShipoutFirst\AtBegShi@FirstDisabled
- \endgroup
+ \ifx\AtBegShi@HookFirst\ltx@empty
+ \else
+ \AtBeginShipoutAddToBox{\AtBegShi@HookFirst}%
+ \fi
+ \global\let\AtBegShi@First\ltx@empty
+ \global\let\AtBeginShipoutFirst\AtBegShi@FirstDisabled
}
% \end{macrocode}
% \end{macro}
@@ -1215,14 +1272,153 @@ X \endgroup
\fi
% \end{macrocode}
%
+% \subsection{Additions to the shipout box}
+%
+% \begin{macro}{\AtBeginShipoutAddToBox}
+% \begin{macrocode}
+\def\AtBeginShipoutAddToBox#1{%
+ \ifhbox\AtBeginShipoutBox
+ \edef\AtBegShi@restore{%
+ \hfuzz=\the\hfuzz\relax
+ \hbadness=\the\hbadness\relax
+ }%
+ \hfuzz=1073741823sp\relax
+ \hbadness=2147483647\relax
+ \setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{%
+ \setbox\ltx@zero=\hbox{%
+ \begingroup
+ \AtBegShi@restore
+ #1%
+ \endgroup
+ }%
+ \wd\ltx@zero=0pt\relax
+ \ht\ltx@zero=0pt\relax
+ \dp\ltx@zero=0pt\relax
+ \raise\ht\AtBeginShipoutBox\copy\ltx@zero
+ \unhcopy\AtBeginShipoutBox
+ }%
+ \AtBegShi@restore
+ \else
+ \ifvbox\AtBeginShipoutBox
+ \edef\AtBegShi@restore{%
+ \vfuzz=\the\vfuzz\relax
+ \vbadness=\the\vbadness\relax
+ \dimen\ltx@zero=\the\dimen\ltx@zero\relax
+ }%
+ \edef\AtBegShi@restorebox{%
+ \ht\AtBeginShipoutBox=\the\ht\AtBeginShipoutBox\relax
+ \dp\AtBeginShipoutBox=\the\dp\AtBeginShipoutBox\relax
+ }%
+ \vfuzz=1073741823sp\relax
+ \vbadness=2147483647\relax
+ \dimen\ltx@zero=\ht\AtBeginShipoutBox
+ \advance\dimen\ltx@zero by \dp\AtBeginShipoutBox
+ \setbox\AtBeginShipoutBox=\vbox to \dimen\ltx@zero{%
+ \setbox\ltx@zero=\hbox{%
+ \begingroup
+ \AtBegShi@restore
+ #1%
+ \endgroup
+ }%
+ \wd\ltx@zero=0pt\relax
+ \ht\ltx@zero=0pt\relax
+ \dp\ltx@zero=0pt\relax
+ \baselineskip=0pt\relax
+ \lineskip=0pt\relax
+ \lineskiplimit=0pt\relax
+ \copy\ltx@zero
+ \unvbox\AtBeginShipoutBox
+ \kern0pt%
+ }%
+ \AtBegShi@restore
+ \AtBegShi@restorebox
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\AtBeginShipoutAddToBoxForeground}
+% \begin{macrocode}
+\def\AtBeginShipoutAddToBoxForeground#1{%
+ \ifhbox\AtBeginShipoutBox
+ \edef\AtBegShi@restore{%
+ \hfuzz=\the\hfuzz\relax
+ \hbadness=\the\hbadness\relax
+ }%
+ \hfuzz=1073741823sp\relax
+ \hbadness=2147483647\relax
+ \setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{%
+ \unhcopy\AtBeginShipoutBox
+ \kern-\wd\AtBeginShipoutBox
+ \setbox\ltx@zero=\hbox{%
+ \begingroup
+ \AtBegShi@restore
+ #1%
+ \endgroup
+ }%
+ \wd\ltx@zero=0pt\relax
+ \ht\ltx@zero=0pt\relax
+ \dp\ltx@zero=0pt\relax
+ \raise\ht\AtBeginShipoutBox\copy\ltx@zero
+ \kern\wd\AtBeginShipoutBox
+ }%
+ \AtBegShi@restore
+ \else
+ \ifvbox\AtBeginShipoutBox
+ \edef\AtBegShi@restore{%
+ \vfuzz=\the\vfuzz\relax
+ \vbadness=\the\vbadness\relax
+ \dimen\ltx@zero=\the\dimen\ltx@zero\relax
+ }%
+ \edef\AtBegShi@restorebox{%
+ \ht\AtBeginShipoutBox=\the\ht\AtBeginShipoutBox\relax
+ \dp\AtBeginShipoutBox=\the\dp\AtBeginShipoutBox\relax
+ }%
+ \vfuzz=1073741823sp\relax
+ \vbadness=2147483647\relax
+ \dimen\ltx@zero=\ht\AtBeginShipoutBox
+ \advance\dimen\ltx@zero by \dp\AtBeginShipoutBox
+ \setbox\AtBeginShipoutBox=\vbox to \dimen\ltx@zero{%
+ \setbox\ltx@zero=\hbox{%
+ \begingroup
+ \AtBegShi@restore
+ #1%
+ \endgroup
+ }%
+ \wd\ltx@zero=0pt\relax
+ \ht\ltx@zero=0pt\relax
+ \dp\ltx@zero=0pt\relax
+ \baselineskip=0pt\relax
+ \lineskip=0pt\relax
+ \lineskiplimit=0pt\relax
+ \unvbox\AtBeginShipoutBox
+ \kern-\dimen\ltx@zero
+ \copy\ltx@zero
+ \kern\dimen\ltx@zero
+ }%
+ \AtBegShi@restore
+ \AtBegShi@restorebox
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Positioning}
%
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
- \input ifpdf.sty\relax
+ \def\TMP@RequirePackage#1[#2]{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname ver@#1.sty\endcsname\relax
+ \input #1.sty\relax
+ \fi
+ }%
+ \TMP@RequirePackage{ifpdf}[2011/01/30]%
\else
- \RequirePackage{ifpdf}\relax
+ \RequirePackage{ifpdf}[2011/01/30]%
\fi
% \end{macrocode}
%
@@ -1280,46 +1476,41 @@ X \endgroup
\fi
% \end{macrocode}
%
+% \begin{macro}{\AtBeginShipoutUpperLeft}
+% A surrounding \cs{rlap} is not necessary, because
+% the stuff is put in an \cs{hbox} with zero width.
% \begin{macrocode}
\def\AtBeginShipoutUpperLeft#1{%
- \global\setbox\AtBeginShipoutBox=\hbox{%
- \rlap{%
- \kern-\AtBegShi@horigin\relax
- \vbox to 0pt{%
- \kern-\AtBegShi@vorigin\relax
- \kern-\ht\AtBeginShipoutBox
- \AtBegShi@BeginPicture
- #1%
- \AtBegShi@EndPicture
- \vss
- }%
+ \AtBeginShipoutAddToBox{%
+ \kern-\AtBegShi@horigin\relax
+ \vbox to 0pt{%
+ \kern-\AtBegShi@vorigin\relax
+ \AtBegShi@BeginPicture
+ #1%
+ \AtBegShi@EndPicture
+ \vss
}%
- \box\AtBeginShipoutBox
}%
}
% \end{macrocode}
+% \end{macro}
%
+% \begin{macro}{\AtBeginShipoutUpperLeftForeground}
% \begin{macrocode}
\def\AtBeginShipoutUpperLeftForeground#1{%
- \global\setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{%
- \rlap{%
- \copy\AtBeginShipoutBox
- }%
- \rlap{%
- \kern-\AtBegShi@horigin\relax
- \vbox to 0pt{%
- \kern-\AtBegShi@vorigin\relax
- \kern-\ht\AtBeginShipoutBox
- \AtBegShi@BeginPicture
- #1%
- \AtBegShi@EndPicture
- \vss
- }%
+ \AtBeginShipoutAddToBoxForeground{%
+ \kern-\AtBegShi@horigin\relax
+ \vbox to 0pt{%
+ \kern-\AtBegShi@vorigin\relax
+ \AtBegShi@BeginPicture
+ #1%
+ \AtBegShi@EndPicture
+ \vss
}%
- \hss
}%
}
% \end{macrocode}
+% \end{macro}
%
% \subsection{Patches}
%
@@ -1412,6 +1603,7 @@ X \endgroup
\setbox\AtBeginShipoutBox=\vbox{%
\CROP@shiplist
}%
+ \AtBegShi@GetBoxSize\AtBeginShipoutBox
\expandafter\CROP@shipout
\expandafter\box
\expandafter\AtBeginShipoutBox
@@ -1540,16 +1732,81 @@ X \endgroup
}%
\fi
}%
+ \def\AtBegShi@Memoir@PatchAB{%
+ \ifvoid\AtBeginShipoutBox
+ \else
+ \setbox\AtBeginShipoutBox=\vbox{%
+ \trimmarks
+ \ifvbox\AtBeginShipoutBox
+ \unvbox\AtBeginShipoutBox
+ \else
+ \box\AtBeginShipoutBox
+ \fi
+ }%
+ \AtBegShi@GetBoxSize\AtBeginShipoutBox
+ \expandafter\mem@oldshipout
+ \expandafter\box
+ \expandafter\AtBeginShipoutBox
+ \fi
+ }%
+ \def\AtBegShi@Memoir@shipiiC{% 2008/08/07 v1.6180339a
+ \ifvoid\@cclv
+ \mem@oldshipout\box\@cclv
+ \else
+ \ifshowtrims
+ \mem@oldshipout\vbox{\trimmarks\unvbox\@cclv}%
+ \else
+ \mem@oldshipout\box\@cclv
+ \fi
+ \fi
+ }%
+ \def\AtBegShi@Memoir@shipiiD{% 2011/03/06 v3.6j
+ \ifvoid\@cclv
+ \mem@oldshipout\box\@cclv
+ \else
+ \ifshowtrims
+ \mem@oldshipout\vbox{%
+ \trimmarks
+ \nointerlineskip
+ \box\@cclv
+ }%
+ \else
+ \mem@oldshipout\box\@cclv
+ \fi
+ \fi
+ }%
+ \def\AtBegShi@Memoir@PatchCD{%
+ \ifvoid\AtBeginShipoutBox
+ \else
+ \ifshowtrims
+ \setbox\AtBeginShipoutBox=\vbox{%
+ \trimmarks
+ \nointerlineskip
+ \box\AtBeginShipoutBox
+ }%
+ \fi
+ \AtBegShi@GetBoxSize\AtBeginShipoutBox
+ \expandafter\mem@oldshipout
+ \expandafter\box
+ \expandafter\AtBeginShipoutBox
+ \fi
+ }%
\ifx\AtBegShi@Memoir@shipi\mem@shipi
- \ifcase\ifx\AtBegShi@Memoir@shipiiA\mem@shipii
- \ltx@zero
- \else
- \ifx\AtBegShi@Memoir@shipiiB\mem@shipii
- \ltx@zero
- \else
- \ltx@one
- \fi
- \fi
+ \let\AtBegShi@found\ltx@one
+ \ifx\AtBegShi@Memoir@shipiiA\mem@shipii
+ \let\AtBegShi@found\ltx@zero
+ \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchAB
+ \else\ifx\AtBegShi@Memoir@shipiiB\mem@shipii
+ \let\AtBegShi@found\ltx@zero
+ \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchAB
+ \else\ifx\AtBegShi@Memoir@shipiiC\mem@shipii
+ \let\AtBegShi@found\ltx@zero
+ \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchCD
+ \else\ifx\AtBegShi@Memoir@shipiiD\mem@shipii
+ \let\AtBegShi@found\ltx@zero
+ \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchCD
+ \fi\fi\fi\fi
+ \ifcase\AtBegShi@found
\let\AtBegShi@found\relax
\ifx\shipout\AtBegShi@Memoir@shipout
\def\AtBegShi@found{\shipout}%
@@ -1579,22 +1836,7 @@ X \endgroup
\fi
\mem@shipii
}%
- \def\mem@shipii{%
- \ifvoid\AtBeginShipoutBox
- \else
- \setbox\AtBeginShipoutBox=\vbox{%
- \trimmarks
- \ifvbox\AtBeginShipoutBox
- \unvbox\AtBeginShipoutBox
- \else
- \box\AtBeginShipoutBox
- \fi
- }%
- \expandafter\mem@oldshipout
- \expandafter\box
- \expandafter\AtBeginShipoutBox
- \fi
- }%
+ \let\mem@shipii\AtBegShi@Memoir@PatchX
\@PackageInfoNoLine{atbegshi}{Class `memoir' patched}%
\begingroup
\fi
@@ -1729,7 +1971,7 @@ X \endgroup
%<*test2>
\input atbegshi.sty\relax
\def\msg#{\immediate\write16}
-\msg{File: atbegshi-test2.tex 2011/01/30 v1.15 Test file for plain-TeX}
+\msg{File: atbegshi-test2.tex 2011/10/05 v1.16 Test file for plain-TeX}
\def\testmsg#1#2{%
\msg{}%
\msg{*** Test with box (#1), expected page output [#2]}% hash-ok
@@ -1826,7 +2068,7 @@ Hello World
% \begin{macrocode}
%<*test3>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{atbegshi-test3.tex}[2011/01/30 v1.15 Test file for LaTeX]
+\ProvidesFile{atbegshi-test3.tex}[2011/10/05 v1.16 Test file for LaTeX]
\RequirePackage{color}
\pagecolor{yellow}
\documentclass[a5paper,showtrims]{memoir}
@@ -2065,6 +2307,43 @@ Hello World
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{atbegshi.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='atbegshi'>
+ <name>atbegshi</name>
+ <caption>Execute stuff at \shipout time.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.16'/>
+ <description>
+ This package is a modern reimplementation of package
+ <xref refid='everyshi'>everyshi</xref>, providing various commands
+ to be executed before a <tt>\shipout</tt> command. It makes use of
+ e-TeX&#x2019;s facilities if they are available. The package may
+ be used either with LaTeX or with plain TeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/atbegshi.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/atbegshi.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/04/17 v1.0}
% \item
@@ -2149,6 +2428,15 @@ Hello World
% \item
% Already loaded package files are not input in \hologo{plainTeX}.
% \end{Version}
+% \begin{Version}{2011/10/05 v1.16}
+% \item
+% \cs{AtBeginShipoutAddToBox}, \cs{AtBeginShipoutAddToBoxForeground} added.
+% \item
+% \cs{AtBeginShipoutBoxWidth}, \cs{AtBeginShipoutBoxHeight},
+% \cs{AtBeginShipoutBoxDepth} added.
+% \item
+% Updates for patches of class \xclass{memoir}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
index 2ceacbaf26b..35318586021 100644
--- a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: atenddvi.dtx
% Version: 2007/04/17 v1.1
-%
+% Info: At end DVI hook
+%
% Copyright (C) 2007 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
@@ -15,19 +16,19 @@
% 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 atenddvi.dtx
% and the derived files
% atenddvi.sty, atenddvi.pdf, atenddvi.ins, atenddvi.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/atenddvi.dtx
% CTAN:macros/latex/contrib/oberdiek/atenddvi.pdf
-%
+%
% Unpacking:
% (a) If atenddvi.ins is present:
% tex atenddvi.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{atenddvi.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If atenddvi.drv is present:
% latex atenddvi.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex atenddvi.dtx
% makeindex -s gind.ist atenddvi.idx
% pdflatex atenddvi.dtx
% makeindex -s gind.ist atenddvi.idx
% pdflatex atenddvi.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/atenddvi.sty
% TDS:doc/latex/oberdiek/atenddvi.pdf
@@ -117,6 +118,10 @@ and the derived files
\file{atenddvi.drv}{\from{atenddvi.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{atenddvi.sty}{\from{atenddvi.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{atenddvi.xml}{\from{atenddvi.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -145,14 +150,14 @@ and the derived files
\ProvidesFile{atenddvi.drv}%
[2007/04/17 v1.1 At end DVI hook (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{atenddvi.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{97}
+% \CheckSum{103}
%
% \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
@@ -557,6 +562,44 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{atenddvi.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='atenddvi'>
+ <name>atenddvi</name>
+ <caption>Provides the \AtEndDvi command.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ LaTeX offers <tt>\AtBeginDvi</tt>. This package provides the
+ counterpart <tt>\AtEndDvi</tt>. The execution of its argument is
+ delayed to the end of the document at the end of the last page.
+ At this point <tt>\special</tt> and <tt>\write</tt> remain
+ effective, because they are put into the last page. This is the
+ main difference from the LaTeX command <tt>\AtEndDocument</tt>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/atenddvi.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/atenddvi.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/03/20 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
index f7fad293898..85d77f3634a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: attachfile2.dtx
-% Version: 2010/09/27 v2.6
-%
-% Copyright (C) 2005-2010 by
+% Version: 2012/04/18 v2.7
+% Info: Attach files into PDF
+%
+% Copyright (C) 2005-2010, 2012 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
@@ -15,21 +16,21 @@
% 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 attachfile2.dtx
% and the derived files
% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv,
% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def,
% pdfatfi.pl.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/attachfile2.dtx
% CTAN:macros/latex/contrib/oberdiek/attachfile2.pdf
-%
+%
% Unpacking:
% (a) If attachfile2.ins is present:
% tex attachfile2.ins
@@ -38,7 +39,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{attachfile2.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If attachfile2.drv is present:
% latex attachfile2.drv
@@ -48,14 +49,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex attachfile2.dtx
% makeindex -s gind.ist attachfile2.idx
% pdflatex attachfile2.dtx
% makeindex -s gind.ist attachfile2.idx
% pdflatex attachfile2.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/attachfile2.sty
% TDS:tex/latex/oberdiek/atfi-dvips.def
@@ -80,7 +81,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: attachfile2 2010/09/27 v2.6 attach files into PDF (HO)}
+\Msg{* Package: attachfile2 2012/04/18 v2.7 Attach files into PDF (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -92,9 +93,9 @@
This is a generated file.
Project: attachfile2
-Version: 2010/09/27 v2.6
+Version: 2012/04/18 v2.7
-Copyright (C) 2005-2010 by
+Copyright (C) 2005-2010, 2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -133,6 +134,8 @@ and the derived files
\usedir{scripts/oberdiek}%
\csname execfiletrue\endcsname
\file{pdfatfi.pl}{\from{attachfile2.dtx}{pdfatfi}}%
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{attachfile2.xml}{\from{attachfile2.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -164,9 +167,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{attachfile2.drv}%
- [2010/09/27 v2.6 attach files into PDF (HO)]%
+ [2012/04/18 v2.7 Attach files into PDF (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{attachfile2.dtx}%
\end{document}
@@ -194,7 +197,7 @@ and the derived files
% \GetFileInfo{attachfile2.drv}
%
% \title{The \xpackage{attachfile2} package}
-% \date{2010/09/27 v2.6}
+% \date{2012/04/18 v2.7}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -421,7 +424,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{attachfile2}%
- [2010/09/27 v2.6 attach files into PDF (HO)]%
+ [2012/04/18 v2.7 Attach files into PDF (HO)]%
% \end{macrocode}
%
% \subsubsection{Loading of packages}
@@ -1604,7 +1607,7 @@ and the derived files
%<*pdftex>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atfi-pdftex.def}%
- [2010/09/27 v2.6 attachfile2 driver for pdfTeX (HO)]%
+ [2012/04/18 v2.7 attachfile2 driver for pdfTeX (HO)]%
% \end{macrocode}
%
% \paragraph{\LuaTeX}
@@ -1826,7 +1829,7 @@ and the derived files
%<*dvips>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atfi-dvips.def}%
- [2010/09/27 v2.6 attachfile2 driver for dvips (HO)]%
+ [2012/04/18 v2.7 attachfile2 driver for dvips (HO)]%
% \end{macrocode}
%
% \paragraph{Macros for graphics data}
@@ -2401,7 +2404,7 @@ and the derived files
%<*dvipdfmx>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atfi-dvipdfmx.def}%
- [2010/09/27 v2.6 attachfile2 driver for dvipdfmx/XeTeX (HO)]%
+ [2012/04/18 v2.7 attachfile2 driver for dvipdfmx/XeTeX (HO)]%
% \end{macrocode}
%
% \paragraph{Macros for graphics data}
@@ -2645,7 +2648,7 @@ $^W=1; # turn warning on
#
# pdfatfi.pl
#
-# Copyright (C) 2005-2010 Heiko Oberdiek.
+# Copyright (C) 2005-2010, 2012 Heiko Oberdiek.
#
# This work may be distributed and/or modified under the
# conditions of the LaTeX Project Public License, either
@@ -2667,17 +2670,19 @@ $^W=1; # turn warning on
# This file "pdfatfi.pl" may be renamed to "pdfatfi"
# for installation purposes.
#
-my $file = "pdfatfi.pl";
+my $prj = 'pdfatfi';
+my $file = "$prj.pl";
my $program = uc($&) if $file =~ /^\w+/;
-my $version = "2.6";
-my $date = "2010/09/27";
+my $version = "2.7";
+my $date = "2012/04/18";
my $author = "Heiko Oberdiek";
-my $copyright = "Copyright (c) 2005-2010 by $author.";
+my $copyright = "Copyright (c) 2005-2010, 2012 by $author.";
#
# History:
# 2005/05/21 v1.0: First release.
# 2006/08/16 v2.2: Included in DTX file of attachfile2.dtx.
# 2010/09/27 v2.6: Keys ModDateTZ and CreationDateTZ added.
+# 2012/04/18 v2.7: Option --version added.
#
use POSIX qw(strftime); # %z is used (GNU)
@@ -2698,12 +2703,14 @@ $::opt_help = 0;
$::opt_quiet = 0;
$::opt_debug = 0;
$::opt_verbose = 0;
+$::opt_version = 0;
my $usage = <<"END_OF_USAGE";
${title}Syntax: \L$program\E [options] <file[.atfi]>
Function: Help program for LaTeX package "attachfile2".
Options: (defaults:)
--help print usage
+ --version print version number
--(no)quiet suppress messages ($bool[$::opt_quiet])
--(no)verbose verbose printing ($bool[$::opt_verbose])
--(no)debug debug informations ($bool[$::opt_debug])
@@ -2714,11 +2721,16 @@ my @OrgArgv = @ARGV;
use Getopt::Long;
GetOptions(
"help!",
+ "version!",
"quiet!",
"debug!",
"verbose!",
) or die $usage;
!$::opt_help or die $usage;
+if ($::opt_version) {
+ print "$prj $date v$version\n";
+ exit(0);
+}
@ARGV == 1 or die "$usage$Error Missing jobname!\n";
$::opt_quiet = 0 if $::opt_verbose;
@@ -3002,7 +3014,6 @@ __END__
%\end{verbatim}
% \end{quote}
%
-
%
% \subsection{Some details for the interested}
%
@@ -3051,33 +3062,73 @@ __END__
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{attachfile2.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='attachfile2'>
+ <name>attachfile2</name>
+ <caption>Attach files into PDF.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005-2010,2012'/>
+ <license type='lppl1.3'/>
+ <version number='2.7'/>
+ <description>
+ This package can be used to attach files to a PDF document.
+ It is a further development of Scott Pakin&#x2019;s package
+ <xref refid='attachfile'>attachfile</xref> for
+ <xref refid='pdftex'>pdfTeX</xref>. Apart from bug fixes,
+ this package adds support for dvips,
+ some new options, and gets and writes meta information data about
+ the attached files.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/attachfile2.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/attachfile2.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{attachfile}
% Scott Pakin: \textit{The \xpackage{attachfile} package};
% 2005/02/20 v1.2;
% \CTAN{macros/latex/contrib/attachfile/}.
-%
+%
% \bibitem{embedfile}
% Heiko Oberdiek: \textit{The \xpackage{embedfile} package};
% 2006/08/16 v1.0;
% \CTAN{macros/latex/contrib/oberdiek/embedfile.pdf}.
-%
+%
% \bibitem{pdfspec}
% Adobe Systems Incorporated:
% \href{http://partners.adobe.com/public/developer/en/pdf/PDFReference16.pdf}%
% {\textit{PDF Reference, Fifth Edition, Version 1.6}},%
% November 2004;
% \url{http://partners.adobe.com/public/developer/pdf/index_reference.html}.
-%
+%
% \bibitem{mime}
% Network Working Group: RFC 2046, \textit{Multipurpose Internet Mail Extensions (MIME) Part Two:
% Media Types}, November 1996; \url{http://www.rfc-editor.org/}.
-%
+%
% \bibitem{types}
% IANA (Internet Assigned Numbers Authority):
% \textit{MIME Media Types}, May 2006;
% \url{http://www.iana.org/assignments/media-types/}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -3150,10 +3201,14 @@ __END__
% Bug fix: \cs{textattachfile} now adds an entry into
% the \xext{atfi} file.
% \item
-% Program pdfatfi.pl sets modification and creation time with
+% Program \xfile{pdfatfi.pl} sets modification and creation time with
% time zone, because the time zone offset might differ with
% the file date.
% \end{Version}
+% \begin{Version}{2012/04/18 v2.7}
+% \item
+% Program \xfile{pdfatfi.pl}: Option \xoption{version} added.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx
index 1479518f2be..0338c827444 100644
--- a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: atveryend.dtx
-% Version: 2011/04/23 v1.7
-%
+% Version: 2011/06/30 v1.8
+% Info: Hooks at the very end of document
+%
% Copyright (C) 2009-2011 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
@@ -15,20 +16,20 @@
% 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 atveryend.dtx
% and the derived files
% atveryend.sty, atveryend.pdf, atveryend.ins, atveryend.drv,
% atveryend-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/atveryend.dtx
% CTAN:macros/latex/contrib/oberdiek/atveryend.pdf
-%
+%
% Unpacking:
% (a) If atveryend.ins is present:
% tex atveryend.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{atveryend.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If atveryend.drv is present:
% latex atveryend.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex atveryend.dtx
% makeindex -s gind.ist atveryend.idx
% pdflatex atveryend.dtx
% makeindex -s gind.ist atveryend.idx
% pdflatex atveryend.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/atveryend.sty
% TDS:doc/latex/oberdiek/atveryend.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: atveryend 2011/04/23 v1.7 Hooks at very end of document (HO)}
+\Msg{* Package: atveryend 2011/06/30 v1.8 Hooks at the very end of document (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -88,7 +89,7 @@
This is a generated file.
Project: atveryend
-Version: 2011/04/23 v1.7
+Version: 2011/06/30 v1.8
Copyright (C) 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -122,6 +123,10 @@ and the derived files
\file{atveryend.sty}{\from{atveryend.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{atveryend-test1.tex}{\from{atveryend.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{atveryend.xml}{\from{atveryend.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,16 +153,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atveryend.drv}%
- [2011/04/23 v1.7 Hooks at very end of document (HO)]%
+ [2011/06/30 v1.8 Hooks at the very end of document (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{atveryend.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1084}
+% \CheckSum{1203}
%
% \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
@@ -178,7 +183,7 @@ and the derived files
% \GetFileInfo{atveryend.drv}
%
% \title{The \xpackage{atveryend} package}
-% \date{2011/04/23 v1.7}
+% \date{2011/06/30 v1.8}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -268,7 +273,7 @@ and the derived files
% \item Hooks that are provided by others are used (package
% \xpackage{scrlfile} or class \xclass{revtex4-1}.
% \item It redefines \cs{@checkend} and \cs{@dofilelist} to insert
-% the hooks similar to package{scrlfile}.
+% the hooks similar to package \xpackage{scrlfile}.
% \item The hook execution is wrapped in a macro that
% is redefined by its first call to prevent calling the hook
% more than once.
@@ -334,7 +339,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{atveryend}%
- [2011/04/23 v1.7 Hooks at very end of document (HO)]
+ [2011/06/30 v1.8 Hooks at the very end of document (HO)]
% \end{macrocode}
%
% \subsection{Tools}
@@ -589,6 +594,94 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{\LaTeX\ kernel 2011/06/27}
+%
+% The \hologo{LaTeX2e} release 2011/06/27 has changed \cs{enddocument}
+% (\cs{input} is replaced by \cs{@@input}).
+% \begin{macro}{\AtVeryEnd@test@standard20110627}
+% \begin{macrocode}
+\expandafter\def\csname AtVeryEnd@test@standard20110627\endcsname{%
+ \let\AtEndDocument\@firstofone
+ \@enddocumenthook
+ \@checkend{document}%
+ \clearpage
+ \begingroup
+ \if@filesw
+ \immediate\closeout\@mainaux
+ \let\@setckpt\@gobbletwo
+ \let\@newl@bel\@testdef
+ \@tempswafalse
+ \makeatletter
+ \@@input\jobname.aux %
+ \fi
+ \@dofilelist
+ \ifdim \font@submax >\fontsubfuzz\relax
+ \@font@warning{Size substitutions with differences\MessageBreak
+ up to \font@submax\space have occurred.\@gobbletwo}%
+ \fi
+ \@defaultsubs
+ \@refundefined
+ \if@filesw
+ \ifx \@multiplelabels \relax
+ \if@tempswa
+ \@latex@warning@no@line{Label(s) may have changed. %
+ Rerun to get cross-references right}%
+ \fi
+ \else
+ \@multiplelabels
+ \fi
+ \fi
+ \endgroup
+ \deadcycles\z@
+ \@@end
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\AtVeryEnd@enddocument@standard20110627}
+% \begin{macrocode}
+\expandafter\def\csname AtVeryEnd@enddocument@standard20110627\endcsname{%
+ \let\AtEndDocument\@firstofone
+ \@enddocumenthook
+ \@checkend{document}%
+ \Call@BeforeClearDocument
+ \clearpage
+ \Call@AfterLastShipout
+ \begingroup
+ \if@filesw
+ \immediate\closeout\@mainaux
+ \let\@setckpt\@gobbletwo
+ \let\@newl@bel\@testdef
+ \@tempswafalse
+ \makeatletter
+ \@@input\jobname.aux %
+ \fi
+ \Call@AtVeryEndDocument
+ \@dofilelist
+ \Call@AtEndAfterFileList
+ \ifdim \font@submax >\fontsubfuzz\relax
+ \@font@warning{Size substitutions with differences\MessageBreak
+ up to \font@submax\space have occurred.\@gobbletwo}%
+ \fi
+ \@defaultsubs
+ \@refundefined
+ \if@filesw
+ \ifx \@multiplelabels \relax
+ \if@tempswa
+ \@latex@warning@no@line{Label(s) may have changed. %
+ Rerun to get cross-references right}%
+ \fi
+ \else
+ \@multiplelabels
+ \fi
+ \fi
+ \endgroup
+ \deadcycles\z@
+ \Call@AtVeryVeryEnd
+ \@@end
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{Package \xpackage{booklet}, file \xpackage{2up.tex}}
%
% \begin{macro}{\AtVeryEnd@test@booklet}
@@ -866,6 +959,7 @@ and the derived files
\def\AtVeryEnd@RedefEndDocument#1{%
\ifx#1\@undefined
\else
+ \AtVeryEnd@Test#1{standard20110627}%
\AtVeryEnd@Test#1{standard}%
\AtVeryEnd@Test#1{booklet}%
\AtVeryEnd@Test#1{dinbrief}%
@@ -1378,8 +1472,46 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{atveryend.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='atveryend'>
+ <name>atveryend</name>
+ <caption>Hooks at the very end of a document.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ This LaTeX packages provides two hooks for <tt>\end{document}</tt>
+ that are executed after the hook of <tt>\AtEndDocument</tt>:
+ <tt>\AfterLastShipout</tt> can be used for code that is to be executed
+ right after the last <tt>\clearpage</tt> before the `<tt>.aux</tt>' file
+ is closed. <tt>\AtVeryEndDocument</tt> is used for code after closing
+ and final reading of the `<tt>.aux</tt>' file.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/atveryend.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/atveryend.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
-%
+%
% \begin{description}
% \item[Arthur Ogawa:] He proposed the new API with \cs{AfterLastShipout}
% and gave me much feedback, comprehensive class/package lists, many
@@ -1387,49 +1519,49 @@ and the derived files
% \end{description}
%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{clsguide}
% The \LaTeX3 Project:
% \textit{\LaTeX2e\ for class and package writers}
% 2006/02/15;
% \CTAN{macros/latex/doc/clsguide.pdf}.
-%
+%
% \bibitem{endfloat}
% James Darrell McCauley, Jeff Goldberg:
% \textit{The \xpackage{endfloat} package};
% 1995/10/11 v2.4i;
% \CTAN{macros/latex/contrib/endfloat/endfloat.pdf}.
-%
+%
% \bibitem{etoolbox}
% Philipp Lehmann:
% \textit{The \xpackage{etoolbox} package};
% 2009/08/06 v1.8;
% \CTAN{macros/latex/contrib/etoolbox/etoolbox.pdf}.
-%
+%
% \bibitem{hyperref}
% Sebastian Rahtz, Heiko Oberdiek:
% \textit{The \xpackage{hyperref} package};
% 2009/12/05 v6.79l;
% \CTAN{macros/latex/contrib/hyperref/}.
-%
+%
% \bibitem{koma}
% Markus Kohm:
% \textit{KOMA-Script};
% 2009/07/24 v3.04a;
% \url{http://www.komascript.de/}.
-%
+%
% \bibitem{lastpage}
% Jeff Goldberg:
% \textit{The \xpackage{lastpage} package};
% 1994/07/20 v0.1b;
% \CTAN{macros/latex/contrib/lastpage/lastpage.pdf}.
-%
+%
% \bibitem{revtex}
% APS, AIP, Arthur Orgawa;
% ReVTeX 4.1;
% 2009/10/13 v4.1;
% \url{http://authors.aps.org/revtex4/}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -1473,6 +1605,10 @@ and the derived files
% to avoid error because of undefined control sequence
% in some circumstances (thanks to D.P. Story for bug report).
% \end{Version}
+% \begin{Version}{2011/06/30 v1.8}
+% \item
+% Support of changed \cs{enddocument} of \hologo{LaTeX2e} 2011/06/27.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
index 36607b802bf..59bf8d1119d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: auxhook.dtx
% Version: 2011/03/04 v1.3
-%
+% Info: Hooks for auxiliary files
+%
% Copyright (C) 2006, 2007, 2009, 2011 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
@@ -15,19 +16,19 @@
% 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 auxhook.dtx
% and the derived files
% auxhook.sty, auxhook.pdf, auxhook.ins, auxhook.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/auxhook.dtx
% CTAN:macros/latex/contrib/oberdiek/auxhook.pdf
-%
+%
% Unpacking:
% (a) If auxhook.ins is present:
% tex auxhook.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{auxhook.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If auxhook.drv is present:
% latex auxhook.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex auxhook.dtx
% makeindex -s gind.ist auxhook.idx
% pdflatex auxhook.dtx
% makeindex -s gind.ist auxhook.idx
% pdflatex auxhook.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/auxhook.sty
% TDS:doc/latex/oberdiek/auxhook.pdf
@@ -117,6 +118,10 @@ and the derived files
\file{auxhook.drv}{\from{auxhook.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{auxhook.sty}{\from{auxhook.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{auxhook.xml}{\from{auxhook.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -145,7 +150,7 @@ and the derived files
\ProvidesFile{auxhook.drv}%
[2011/03/04 v1.3 Hooks for auxiliary files (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{auxhook.dtx}%
\end{document}
@@ -585,24 +590,58 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{auxhook.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='auxhook'>
+ <name>auxhook</name>
+ <caption>Hooks for auxiliary files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007,2009,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package auxhook provides hooks for adding stuff at
+ the begin of <tt>.aux</tt> files.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/auxhook.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/auxhook.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{hypdestopt}
% Heiko Oberdiek: \textit{The \xpackage{hypdestopt} package};
% 2006/05/30 v1.0;
% \CTAN{macros/latex/contrib/oberdiek/hypdestopt.pdf}.
-%
+%
% \bibitem{hyperref}
% Sebastian Rahtz, Heiko Oberdiek:
% \textit{The \xpackage{hyperref} package};
% 2006/08/16 v6.75c;
% \CTAN{macros/latex/contrib/hyperref/}.
-%
+%
% \bibitem{zref}
% Heiko Oberdiek: \textit{The \xpackage{zref} package};
% 2006/05/25 v1.2;
% \CTAN{macros/latex/contrib/oberdiek/zref.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
index 7466dbd34ba..239d2d99f2c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: bigintcalc.dtx
-% Version: 2011/01/30 v1.2
-%
-% Copyright (C) 2007, 2011 by
+% Version: 2012/04/08 v1.3
+% Info: Expandable calculations on big integers
+%
+% Copyright (C) 2007, 2011, 2012 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file bigintcalc.dtx
% and the derived files
% bigintcalc.sty, bigintcalc.pdf, bigintcalc.ins, bigintcalc.drv,
% bigintcalc-test1.tex, bigintcalc-test2.tex,
% bigintcalc-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/bigintcalc.dtx
% CTAN:macros/latex/contrib/oberdiek/bigintcalc.pdf
-%
+%
% Unpacking:
% (a) If bigintcalc.ins is present:
% tex bigintcalc.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{bigintcalc.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If bigintcalc.drv is present:
% latex bigintcalc.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex bigintcalc.dtx
% makeindex -s gind.ist bigintcalc.idx
% pdflatex bigintcalc.dtx
% makeindex -s gind.ist bigintcalc.idx
% pdflatex bigintcalc.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/bigintcalc.sty
% TDS:doc/latex/oberdiek/bigintcalc.pdf
@@ -82,7 +83,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: bigintcalc 2011/01/30 v1.2 Expandable big integer calculations (HO)}
+\Msg{* Package: bigintcalc 2012/04/08 v1.3 Expandable calculations on big integers (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -94,9 +95,9 @@
This is a generated file.
Project: bigintcalc
-Version: 2011/01/30 v1.2
+Version: 2012/04/08 v1.3
-Copyright (C) 2007, 2011 by
+Copyright (C) 2007, 2011, 2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -134,6 +135,10 @@ and the derived files
\file{bigintcalc-test1.tex}{\from{bigintcalc.dtx}{test1}}%
\file{bigintcalc-test2.tex}{\from{bigintcalc.dtx}{test2,etex}}%
\file{bigintcalc-test3.tex}{\from{bigintcalc.dtx}{test2,noetex}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{bigintcalc.xml}{\from{bigintcalc.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -160,9 +165,8 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bigintcalc.drv}%
- [2011/01/30 v1.2 Expandable big integer calculations (HO)]%
+ [2012/04/08 v1.3 Expandable calculations on big integers (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
\usepackage{wasysym}
\let\iint\relax
\let\iiint\relax
@@ -198,13 +202,14 @@ and the derived files
\newcommand*{\op}[1]{%
\textsf{#1}%
}
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{bigintcalc.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{3722}
+% \CheckSum{3723}
%
% \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
@@ -225,7 +230,7 @@ and the derived files
% \GetFileInfo{bigintcalc.drv}
%
% \title{The \xpackage{bigintcalc} package}
-% \date{2011/01/30 v1.2}
+% \date{2012/04/08 v1.3}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -704,7 +709,7 @@ and the derived files
\fi
\expandafter\x\csname ver@bigintcalc.sty\endcsname
\ProvidesPackage{bigintcalc}%
- [2011/01/30 v1.2 Expandable big integer calculations (HO)]%
+ [2012/04/08 v1.3 Expandable calculations on big integers (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -824,6 +829,7 @@ and the derived files
}%
\TMP@RequirePackage{pdftexcmds}[2007/11/11]%
\else
+ \RequirePackage{pdftexcmds}[2007/11/11]%
\fi
% \end{macrocode}
%
@@ -3506,7 +3512,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
\makeatletter
\chardef\BIC@TestMode=1 %
\makeatother
-\usepackage{bigintcalc}[2011/01/30]
+\usepackage{bigintcalc}[2012/04/08]
%<noetex>\let\numexpr\SavedNumexpr
\usepackage{qstest}
\IncludeTests{*}
@@ -4490,6 +4496,40 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{bigintcalc.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bigintcalc'>
+ <name>bigintcalc</name>
+ <caption>Integer calculations on very large numbers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2011,2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package provides expandable arithmetic operations
+ with big integers that can exceed TeX's number limits.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bigintcalc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bigintcalc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/09/27 v1.0}
% \item
@@ -4503,6 +4543,10 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
% \item
% Already loaded package files are not input in \hologo{plainTeX}.
% \end{Version}
+% \begin{Version}{2012/04/08 v1.3}
+% \item
+% Fix: \xpackage{pdftexcmds} wasn't loaded in case of \hologo{LaTeX}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
index 38da87716e5..c7441d36a34 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: bitset.dtx
% Version: 2011/01/30 v1.1
-%
+% Info: Handle bit-vector datatype
+%
% Copyright (C) 2007, 2011 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file bitset.dtx
% and the derived files
% bitset.sty, bitset.pdf, bitset.ins, bitset.drv, bitset-test1.tex,
% bitset-test2.tex, bitset-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/bitset.dtx
% CTAN:macros/latex/contrib/oberdiek/bitset.pdf
-%
+%
% Unpacking:
% (a) If bitset.ins is present:
% tex bitset.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{bitset.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If bitset.drv is present:
% latex bitset.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex bitset.dtx
% makeindex -s gind.ist bitset.idx
% pdflatex bitset.dtx
% makeindex -s gind.ist bitset.idx
% pdflatex bitset.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/bitset.sty
% TDS:doc/latex/oberdiek/bitset.pdf
@@ -81,7 +82,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: bitset 2011/01/30 v1.1 Data type bit set (HO)}
+\Msg{* Package: bitset 2011/01/30 v1.1 Handle bit-vector datatype (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -132,6 +133,10 @@ and the derived files
\file{bitset-test1.tex}{\from{bitset.dtx}{test1}}%
\file{bitset-test2.tex}{\from{bitset.dtx}{test2,etex}}%
\file{bitset-test3.tex}{\from{bitset.dtx}{test2,noetex}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{bitset.xml}{\from{bitset.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -158,12 +163,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bitset.drv}%
- [2011/01/30 v1.1 Data type bit set (HO)]%
+ [2011/01/30 v1.1 Handle bit-vector datatype (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{amstext}
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
+\usepackage{ifluatex}
+\ifluatex
+\else
+ \usepackage[T1]{fontenc}%
+ \usepackage{lmodern}%
+\fi
\begin{document}
\DocInput{bitset.dtx}%
\end{document}
@@ -740,7 +749,7 @@ and the derived files
\fi
\expandafter\x\csname ver@bitset.sty\endcsname
\ProvidesPackage{bitset}%
- [2011/01/30 v1.1 Data type bit set (HO)]%
+ [2011/01/30 v1.1 Handle bit-vector datatype (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -4182,6 +4191,41 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{bitset.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bitset'>
+ <name>bitset</name>
+ <caption>Handle bit-vector datatype.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package defines and implements the data type bit set,
+ a vector of bits. The size of the vector may grow dynamically.
+ Individual bits can be manipulated.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bitset.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bitset.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/09/28 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
index 987694f515b..770addda305 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: bmpsize.dtx
% Version: 2009/09/04 v1.6
-%
+% Info: Extract size/resolution from bitmap files
+%
% Copyright (C) 2006-2009 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
@@ -15,21 +16,21 @@
% 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 bmpsize.dtx
% and the derived files
% bmpsize.sty, bmpsize.pdf, bmpsize.ins, bmpsize.drv,
% bmpsize-base.sty, bmpsize-test.tex, bmpsize-dvips.def,
% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/bmpsize.dtx
% CTAN:macros/latex/contrib/oberdiek/bmpsize.pdf
-%
+%
% Unpacking:
% (a) If bmpsize.ins is present:
% tex bmpsize.ins
@@ -38,7 +39,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{bmpsize.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If bmpsize.drv is present:
% latex bmpsize.drv
@@ -48,14 +49,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex bmpsize.dtx
% makeindex -s gind.ist bmpsize.idx
% pdflatex bmpsize.dtx
% makeindex -s gind.ist bmpsize.idx
% pdflatex bmpsize.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/bmpsize.sty
% TDS:tex/latex/oberdiek/bmpsize-base.sty
@@ -81,7 +82,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: bmpsize 2009/09/04 v1.6 Extract size and resolution data from bitmap files (HO)}
+\Msg{* Package: bmpsize 2009/09/04 v1.6 Extract size/resolution from bitmap files (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -131,6 +132,10 @@ and the derived files
\file{bmpsize-dvips.def}{\from{bmpsize.dtx}{dvips}}%
\file{bmpsize-dvipdfm.def}{\from{bmpsize.dtx}{dvipdfm}}%
\file{bmpsize-dvipdfmx.def}{\from{bmpsize.dtx}{dvipdfmx}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{bmpsize.xml}{\from{bmpsize.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -159,9 +164,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bmpsize.drv}%
- [2009/09/04 v1.6 Extract size and resolution data from bitmap files (HO)]%
+ [2009/09/04 v1.6 Extract size/resolution from bitmap files (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{bmpsize.dtx}%
\end{document}
@@ -3088,7 +3093,7 @@ and the derived files
% \begin{macrocode}
%<*package>
\ProvidesPackage{bmpsize}%
- [2009/09/04 v1.6 Extract size and resolution data from bitmap files (HO)]%
+ [2009/09/04 v1.6 Extract size/resolution from bitmap files (HO)]%
\RequirePackage{ifpdf}
\ifpdf
\PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}%
@@ -3915,32 +3920,75 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{bmpsize.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bmpsize'>
+ <name>bmpsize</name>
+ <caption>Extract size and resolution data from bitmap files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.6'/>
+ <description>
+ This package analyzes bitmap images to extract size and resolution
+ data. It adds this feature to the graphics package so it is no
+ longer necessary to provide a separate bounding box files for
+ bitmap images. dditionally the implementation for the inclusion
+ of bitmap images in some drivers of package
+ <xref refid='graphicx'>graphicx</xref> are rewritten to support
+ options viewport, trim and clip. The package requires
+ <xref refid='pdftex'>pdfTeX</xref> version 1.30.0 or later (the
+ relevant pdfTeX primitive operates in both DVI and PDF output
+ modes).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bmpsize.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bmpsize.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{grfguide}
% D.\,P.\,Carlisle, The \LaTeX\ Project:
% \textit{Packages in the `graphics' bundle},
% 2005/11/14;
% \CTAN{macros/latex/required/graphics/grfguide.pdf}.
-%
+%
% \subsection{URLs for bitmap format descriptions}
-%
+%
% \subsubsection{JPEG}
% \begin{itemize}
% \item \url{http://www.w3.org/Graphics/JPEG/jfif3.pdf}
% \item \url{http://exif.org/Exif2-2.PDF}
% \end{itemize}
-%
+%
% \subsubsection{PNG}
% \begin{itemize}
% \item \url{http://en.wikipedia.org/wiki/PNG}
% \item \url{http://www.w3.org/TR/PNG/}
% \end{itemize}
-%
+%
% \subsubsection{GIF}
% \begin{itemize}
% \item \url{http://www.w3.org/Graphics/GIF/spec-gif89a.txt}
% \end{itemize}
-%
+%
% \subsubsection{BMP}
% \begin{itemize}
% \item \url{http://en.wikipedia.org/wiki/Windows_bitmap}
@@ -3948,51 +3996,51 @@ and the derived files
% \item \url{http://msdn.microsoft.com/en-us/library/ms532311.aspx}
% \item \url{http://msdn.microsoft.com/en-us/library/ms532321.aspx}
% \end{itemize}
-%
+%
% \subsubsection{PCX}
% \begin{itemize}
% \item \url{http://en.wikipedia.org/wiki/PCX}
% \item \url{http://de.wikipedia.org/wiki/PCX}
% \item \url{http://www.qzx.com/pc-gpe/pcx.txt}
% \end{itemize}
-%
+%
% \subsubsection{MSP}
% \begin{itemize}
% \item \url{http://en.wikipedia.org/wiki/Microsoft_Paint}
% \item Sources of \xpackage{dvips}.
% \end{itemize}
-%
+%
% \subsubsection{TIFF}
% \begin{itemize}
% \item \url{http://en.wikipedia.org/wiki/TIFF}
% \item \url{http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf}
% \end{itemize}
-%
+%
% \subsubsection{TGA}
% \begin{itemize}
% \item \url{http://de.wikipedia.org/wiki/Targa_Image_File}
% \item \url{http://en.wikipedia.org/wiki/Truevision_TGA}
% \item \url{http://www.dca.fee.unicamp.br/~martino/disciplinas/ea978/tgaffs.pdf}
% \end{itemize}
-%
+%
% \subsubsection{SGI}
% \begin{itemize}
% \item \url{http://en.wikipedia.org/wiki/Silicon_Graphics_Image}
% \item \url{ftp://ftp.sgi.com/graphics/SGIIMAGESPEC}
% \end{itemize}
-%
+%
% \subsubsection{WMF}
% \begin{itemize}
% \item \url{http://www.fileformat.info/format/wmf/}
% \end{itemize}
-%
+%
% \subsubsection{XPM}
% \begin{itemize}
% \item \url{http://en.wikipedia.org/wiki/XPM_%28image_format%29}
% \item \url{http://de.wikipedia.org/wiki/Xpm}
% \item \url{http://koala.ilog.fr/ftp/pub/xpm/xpm-README.html}
% \end{itemize}
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
index e4603494c7e..d808bc07946 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: bookmark.dtx
-% Version: 2011/04/21 v1.21
-%
+% Version: 2011/12/02 v1.24
+% Info: PDF bookmarks
+%
% Copyright (C) 2007-2011 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
@@ -15,22 +16,22 @@
% 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 bookmark.dtx
% and the derived files
% bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,
% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def,
% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def,
% bookmark-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/bookmark.dtx
% CTAN:macros/latex/contrib/oberdiek/bookmark.pdf
-%
+%
% Unpacking:
% (a) If bookmark.ins is present:
% tex bookmark.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{bookmark.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If bookmark.drv is present:
% latex bookmark.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex bookmark.dtx
% makeindex -s gind.ist bookmark.idx
% pdflatex bookmark.dtx
% makeindex -s gind.ist bookmark.idx
% pdflatex bookmark.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/bookmark.sty
% TDS:tex/latex/oberdiek/bkm-dvipdfm.def
@@ -84,7 +85,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: bookmark 2011/04/21 v1.21 PDF bookmarks (HO)}
+\Msg{* Package: bookmark 2011/12/02 v1.24 PDF bookmarks (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -96,7 +97,7 @@
This is a generated file.
Project: bookmark
-Version: 2011/04/21 v1.21
+Version: 2011/12/02 v1.24
Copyright (C) 2007-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -138,6 +139,10 @@ and the derived files
\file{bkm-vtex.def}{\from{bookmark.dtx}{vtex}}%
\usedir{doc/latex/oberdiek}%
\file{bookmark-example.tex}{\from{bookmark.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{bookmark.xml}{\from{bookmark.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -166,16 +171,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bookmark.drv}%
- [2011/04/21 v1.21 PDF bookmarks (HO)]%
+ [2011/12/02 v1.24 PDF bookmarks (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{bookmark.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{2323}
+% \CheckSum{2326}
%
% \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
@@ -196,7 +201,7 @@ and the derived files
% \GetFileInfo{bookmark.drv}
%
% \title{The \xpackage{bookmark} package}
-% \date{2011/04/21 v1.21}
+% \date{2011/12/02 v1.24}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -268,8 +273,7 @@ and the derived files
% If a \LaTeX\ file is compiled several times, then a little
% time can be saved, if option \xoption{draft} is used to
% disable the bookmark stuff of this package. Default is
-% \xoption{final}. If \cs{pdfdraftmode} is available, then
-% the default is {draft} if draft mode is enabled.
+% \xoption{final}.
% Both options are boolean options, without
% value the value |true| is used. |draft=true| is the same
% as |final=false|.
@@ -656,7 +660,7 @@ and the derived files
open,
openlevel=2,
atend
-]{bookmark}[2011/04/21]
+]{bookmark}[2011/12/02]
\bookmarksetup{color=blue}
@@ -759,7 +763,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bookmark}%
- [2011/04/21 v1.21 PDF bookmarks (HO)]%
+ [2011/12/02 v1.24 PDF bookmarks (HO)]%
% \end{macrocode}
%
% \subsubsection{Requirements}
@@ -929,7 +933,6 @@ and the derived files
% \begin{macrocode}
\DeclareBoolOption{draft}
\DeclareComplementaryOption{final}{draft}
-\pdf@ifdraftmode\BKM@drafttrue{}
% \end{macrocode}
% \begin{macro}{\BKM@DisableOptions}
% \begin{macrocode}
@@ -1708,7 +1711,8 @@ and the derived files
\let\BookmarkAtEnd\ltx@gobble
\let\bookmarkdefinestyle\ltx@gobbletwo
\let\bookmarkget\ltx@gobble
- \renewcommand*{\pdfbookmark}[3][]{}%
+ \let\pdfbookmark\ltx@undefined
+ \newcommand*{\pdfbookmark}[3][]{}%
\let\currentpdfbookmark\ltx@gobbletwo
\let\subpdfbookmark\ltx@gobbletwo
\let\belowpdfbookmark\ltx@gobbletwo
@@ -1805,7 +1809,8 @@ and the derived files
%
% \begin{macro}{\pdfbookmark}
% \begin{macrocode}
-\renewcommand*{\pdfbookmark}[3][0]{%
+\let\pdfbookmark\ltx@undefined
+\newcommand*{\pdfbookmark}[3][0]{%
\bookmark[level=#1,dest={#3.#1}]{#2}%
\hyper@anchorstart{#3.#1}\hyper@anchorend
}
@@ -1813,14 +1818,14 @@ and the derived files
% \end{macro}
% \begin{macro}{\currentpdfbookmark}
% \begin{macrocode}
-\renewcommand*{\currentpdfbookmark}{%
+\def\currentpdfbookmark{%
\pdfbookmark[\BKM@currentlevel]%
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\subpdfbookmark}
% \begin{macrocode}
-\renewcommand*{\subpdfbookmark}{%
+\def\subpdfbookmark{%
\BKM@CalcExpr\BKM@CalcResult\BKM@currentlevel+1%
\expandafter\pdfbookmark\expandafter[\BKM@CalcResult]%
}
@@ -1828,7 +1833,7 @@ and the derived files
% \end{macro}
% \begin{macro}{\belowpdfbookmark}
% \begin{macrocode}
-\renewcommand*{\belowpdfbookmark}[2]{%
+\def\belowpdfbookmark#1#2{%
\xdef\BKM@gtemp{\number\BKM@currentlevel}%
\subpdfbookmark{#1}{#2}%
\global\let\BKM@currentlevel\BKM@gtemp
@@ -1839,7 +1844,7 @@ and the derived files
% Section number, text, label, level, file
% \begin{macro}{\Hy@writebookmark}
% \begin{macrocode}
-\renewcommand*{\Hy@writebookmark}[5]{%
+\def\Hy@writebookmark#1#2#3#4#5{%
\ifnum#4>\BKM@depth\relax
\else
\def\BKM@type{#5}%
@@ -1880,7 +1885,7 @@ and the derived files
%<*dvipdfm>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-dvipdfm.def}%
- [2011/04/21 v1.21 bookmark driver for dvipdfm (HO)]%
+ [2011/12/02 v1.24 bookmark driver for dvipdfm (HO)]%
% \end{macrocode}
%
% \begin{macro}{\BKM@id}
@@ -2055,7 +2060,7 @@ and the derived files
%<*vtex>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-vtex.def}%
- [2011/04/21 v1.21 bookmark driver for VTeX (HO)]%
+ [2011/12/02 v1.24 bookmark driver for VTeX (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -2263,7 +2268,7 @@ and the derived files
% \begin{macro}{\BKM@toHexDigit}
% \begin{macrocode}
\def\BKM@toHexDigit#1{%
- \expandafter\ifcase\expandafter\@firstofone\expandafter{\number#1} %
+ \ifcase\expandafter\@firstofone\expandafter{\number#1} %
0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or
8\or 9\or A\or B\or C\or D\or E\or F%
\fi
@@ -2386,7 +2391,7 @@ and the derived files
%<*pdftex>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-pdftex.def}%
- [2011/04/21 v1.21 bookmark driver for pdfTeX (HO)]%
+ [2011/12/02 v1.24 bookmark driver for pdfTeX (HO)]%
% \end{macrocode}
%
% \begin{macro}{\BKM@DO@entry}
@@ -2542,7 +2547,7 @@ and the derived files
%<*dvips>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-dvips.def}%
- [2011/04/21 v1.21 bookmark driver for dvips (HO)]%
+ [2011/12/02 v1.24 bookmark driver for dvips (HO)]%
% \end{macrocode}
% \begin{macro}{\BKM@PSHeaderFile}
% \begin{macrocode}
@@ -2561,7 +2566,7 @@ and the derived files
%<*dvipsone>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-dvipsone.def}%
- [2011/04/21 v1.21 bookmark driver for dvipsone (HO)]%
+ [2011/12/02 v1.24 bookmark driver for dvipsone (HO)]%
% \end{macrocode}
% \begin{macro}{\BKM@PSHeaderFile}
% \begin{macrocode}
@@ -2580,7 +2585,7 @@ and the derived files
%<*textures>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-textures.def}%
- [2011/04/21 v1.21 bookmark driver for textures (HO)]%
+ [2011/12/02 v1.24 bookmark driver for textures (HO)]%
% \end{macrocode}
% \begin{macro}{\BKM@PSHeaderFile}
% \begin{macrocode}
@@ -3248,20 +3253,59 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{bookmark.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bookmark'>
+ <name>bookmark</name>
+ <caption>A new bookmark (outline) organization for hyperref.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.24'/>
+ <description>
+ This package implements a new bookmark (outline) organization for
+ package <xref refid='hyperref'>hyperref</xref>. Bookmark properties such
+ as style and color can now be set. Other action types
+ are available (URI, GoToR, Named). The bookmarks are
+ generated in the first compile run. Package
+ <xref refid='hyperref'>hyperref</xref> uses two runs.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bookmark.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bookmark.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{hyperref}
% Sebastian Rahtz, Heiko Oberdiek:
% \textit{The \xpackage{hyperref} package};
% 2011/04/17 v6.82g;
% \CTAN{macros/latex/contrib/hyperref/}
-%
+%
% \bibitem{currfile}
% Martin Scharrer:
% \textit{The \xpackage{currfile} package};
% 2011/01/09 v0.4.
% \CTAN{macros/latex/contrib/currfile/}
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -3439,6 +3483,20 @@ and the derived files
% Some support for file name and line number in error messages
% at end of document (pdfTeX and pdfmark based drivers).
% \end{Version}
+% \begin{Version}{2011/05/13 v1.22}
+% \item
+% Change of version 2010/11/05 v1.18 reverted, because otherwise
+% draftmode disables some \xext{aux} file entries.
+% \end{Version}
+% \begin{Version}{2011/09/19 v1.23}
+% \item
+% Some \cs{renewcommand}s changed to \cs{def} to avoid trouble
+% if the commands are not defined, because hyperref stopped early.
+% \end{Version}
+% \begin{Version}{2011/12/02 v1.24}
+% \item
+% Small optimization in \cs{BKM@toHexDigit}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/accsupp.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/accsupp.xml
new file mode 100644
index 00000000000..ff1c44da8e2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/accsupp.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='accsupp'>
+ <name>accsupp</name>
+ <caption>Better accessibility support for PDF files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010'/>
+ <license type='lppl1.3'/>
+ <version number='0.3'/>
+ <description>
+ Since PDF 1.5 portions of a page can be marked for better accessibility
+ support. For example, replacement texts or expansions of abbreviations can
+ be provided. This package starts with providing a minimal low-level
+ interface for programmers; its status is experimental.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/accsupp.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/accsupp.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/aliascnt.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/aliascnt.xml
new file mode 100644
index 00000000000..c3b7909b5a8
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/aliascnt.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='aliascnt'>
+ <name>aliascnt</name>
+ <caption>Alias counters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package introduces aliases for counters, that
+ share the same counter register and clear list.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/aliascnt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/aliascnt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/alphalph.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/alphalph.xml
new file mode 100644
index 00000000000..64930e4887c
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/alphalph.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='alphalph'>
+ <name>alphalph</name>
+ <caption>Convert numbers to letters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2006-2008,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.4'/>
+ <description>
+ Provides commands <tt>\alphalph</tt> and <tt>\AlphAlph.</tt> They
+ are like <tt>\number</tt> but the expansion consists of lowercase
+ and uppercase letters respectively (1 to a, 26 to z, 27 to aa, 52
+ to zz, 53 to ba, 702 to zz, 703 to aaa, etc.). Can be used as a
+ replacement for LaTeX's <tt>\@alph</tt> and <tt>\@Alph</tt>
+ macros.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/alphalph.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/alphalph.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/askinclude.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/askinclude.xml
new file mode 100644
index 00000000000..0260a66823d
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/askinclude.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='askinclude'>
+ <name>askinclude</name>
+ <caption>Interactive use of \includeonly</caption>
+ <authorref id='auth:straub'/>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner="Pablo A. Straub" year='1991-1994'/>
+ <copyright owner="Heiko Oberdiek" year='2007,2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.2'/>
+ <description>
+ The package asks the user which files to put in a \includeonly
+ command. There is provision for answering &#x201C;same as last
+ time&#x201D; or &#x201C;all files&#x201D;.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/askinclude.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/askinclude.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/atbegshi.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/atbegshi.xml
new file mode 100644
index 00000000000..6d81374be77
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/atbegshi.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='atbegshi'>
+ <name>atbegshi</name>
+ <caption>Execute stuff at \shipout time.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.16'/>
+ <description>
+ This package is a modern reimplementation of package
+ <xref refid='everyshi'>everyshi</xref>, providing various commands
+ to be executed before a <tt>\shipout</tt> command. It makes use of
+ e-TeX&#x2019;s facilities if they are available. The package may
+ be used either with LaTeX or with plain TeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/atbegshi.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/atbegshi.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/atenddvi.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/atenddvi.xml
new file mode 100644
index 00000000000..17090b961dd
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/atenddvi.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='atenddvi'>
+ <name>atenddvi</name>
+ <caption>Provides the \AtEndDvi command.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ LaTeX offers <tt>\AtBeginDvi</tt>. This package provides the
+ counterpart <tt>\AtEndDvi</tt>. The execution of its argument is
+ delayed to the end of the document at the end of the last page.
+ At this point <tt>\special</tt> and <tt>\write</tt> remain
+ effective, because they are put into the last page. This is the
+ main difference from the LaTeX command <tt>\AtEndDocument</tt>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/atenddvi.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/atenddvi.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/attachfile2.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/attachfile2.xml
new file mode 100755
index 00000000000..b04722d99a8
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/attachfile2.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='attachfile2'>
+ <name>attachfile2</name>
+ <caption>Attach files into PDF.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005-2010,2012'/>
+ <license type='lppl1.3'/>
+ <version number='2.7'/>
+ <description>
+ This package can be used to attach files to a PDF document.
+ It is a further development of Scott Pakin&#x2019;s package
+ <xref refid='attachfile'>attachfile</xref> for
+ <xref refid='pdftex'>pdfTeX</xref>. Apart from bug fixes,
+ this package adds support for dvips,
+ some new options, and gets and writes meta information data about
+ the attached files.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/attachfile2.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/attachfile2.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/atveryend.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/atveryend.xml
new file mode 100644
index 00000000000..1ab55735134
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/atveryend.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='atveryend'>
+ <name>atveryend</name>
+ <caption>Hooks at the very end of a document.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ This LaTeX packages provides two hooks for <tt>\end{document}</tt>
+ that are executed after the hook of <tt>\AtEndDocument</tt>:
+ <tt>\AfterLastShipout</tt> can be used for code that is to be executed
+ right after the last <tt>\clearpage</tt> before the `<tt>.aux</tt>' file
+ is closed. <tt>\AtVeryEndDocument</tt> is used for code after closing
+ and final reading of the `<tt>.aux</tt>' file.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/atveryend.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/atveryend.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/auxhook.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/auxhook.xml
new file mode 100644
index 00000000000..bc409691299
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/auxhook.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='auxhook'>
+ <name>auxhook</name>
+ <caption>Hooks for auxiliary files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007,2009,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package auxhook provides hooks for adding stuff at
+ the begin of <tt>.aux</tt> files.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/auxhook.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/auxhook.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/bigintcalc.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/bigintcalc.xml
new file mode 100644
index 00000000000..660c4bb694e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/bigintcalc.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bigintcalc'>
+ <name>bigintcalc</name>
+ <caption>Integer calculations on very large numbers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2011,2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package provides expandable arithmetic operations
+ with big integers that can exceed TeX's number limits.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bigintcalc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bigintcalc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/bitset.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/bitset.xml
new file mode 100644
index 00000000000..599c410e44b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/bitset.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bitset'>
+ <name>bitset</name>
+ <caption>Handle bit-vector datatype.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package defines and implements the data type bit set,
+ a vector of bits. The size of the vector may grow dynamically.
+ Individual bits can be manipulated.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bitset.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bitset.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/bmpsize.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/bmpsize.xml
new file mode 100644
index 00000000000..33fbeaa2b78
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/bmpsize.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bmpsize'>
+ <name>bmpsize</name>
+ <caption>Extract size and resolution data from bitmap files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.6'/>
+ <description>
+ This package analyzes bitmap images to extract size and resolution
+ data. It adds this feature to the graphics package so it is no
+ longer necessary to provide a separate bounding box files for
+ bitmap images. dditionally the implementation for the inclusion
+ of bitmap images in some drivers of package
+ <xref refid='graphicx'>graphicx</xref> are rewritten to support
+ options viewport, trim and clip. The package requires
+ <xref refid='pdftex'>pdfTeX</xref> version 1.30.0 or later (the
+ relevant pdfTeX primitive operates in both DVI and PDF output
+ modes).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bmpsize.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bmpsize.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/bookmark.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/bookmark.xml
new file mode 100644
index 00000000000..423dcb8e58a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/bookmark.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='bookmark'>
+ <name>bookmark</name>
+ <caption>A new bookmark (outline) organization for hyperref.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.24'/>
+ <description>
+ This package implements a new bookmark (outline) organization for
+ package <xref refid='hyperref'>hyperref</xref>. Bookmark properties such
+ as style and color can now be set. Other action types
+ are available (URI, GoToR, Named). The bookmarks are
+ generated in the first compile run. Package
+ <xref refid='hyperref'>hyperref</xref> uses two runs.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/bookmark.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/bookmark.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/catchfile.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/catchfile.xml
new file mode 100644
index 00000000000..690b90a570f
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/catchfile.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='catchfile'>
+ <name>catchfile</name>
+ <caption>Catch an external file into a macro.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.6'/>
+ <description>
+ This package catches the contents of a file and puts it in a macro.
+ It requires <xref refid='etex'>e-TeX</xref>. Both
+ <xref refid='latex'>LaTeX</xref> and
+ <xref refid='plain'>plain TeX</xref> are supported.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/catchfile.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/catchfile.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/centernot.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/centernot.xml
new file mode 100644
index 00000000000..a2356581c5a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/centernot.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='centernot'>
+ <name>centernot</name>
+ <caption>Centred \not command.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package provides <tt>\centernot</tt> that prints the symbol
+ <tt>\not</tt> on the following argument. Unlike the default
+ <tt>\not</tt> command, the symbol is horizontally centered.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/centernot.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/centernot.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/chemarr.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/chemarr.xml
new file mode 100644
index 00000000000..26a6b9d8948
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/chemarr.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='chemarr'>
+ <name>chemarr</name>
+ <caption>Arrows for chemists.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Very often chemists need a longer version of reaction arrows
+ (<tt>\rightleftharpoons</tt>) with the possibility to put text
+ above and below. Analogous to <xref refid='amsmath'>amsmath</xref>'s
+ <tt>\xrightarrow</tt> and <tt>\xleftarrow</tt> this package
+ provides the macro <tt>\xrightleftharpoons</tt>. The package
+ requires amsmath. To use it, <tt>\usepackage{chemarr}</tt>,
+ then <tt>\xrightleftharpoons[below]{above}</tt> .
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/chemarr.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/chemarr.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/classlist.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/classlist.xml
new file mode 100644
index 00000000000..fa2568bf341
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/classlist.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='classlist'>
+ <name>classlist</name>
+ <caption>Record classes used in a document.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005,2006,2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ Load this package before \documentclass:
+ <p/>
+ &nbsp;&nbsp;<tt>\RequirePackage{classlist}</tt><br/>
+ &nbsp;&nbsp;<tt>\documentclass[some,options]{whatever}</tt>
+ <p/>
+ After doing this, <tt>\MainClass</tt> contains the name of the
+ first loaded class, <tt>\ClassList</tt> contains a set of triples
+ &lt;class name&gt;, &lt;options directly requested&gt;, and
+ &lt;version requested&gt;. (The package may also be loaded after
+ <tt>\documentclass</tt>, in which case some information is not
+ available.)
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/classlist.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/classlist.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/colonequals.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/colonequals.xml
new file mode 100644
index 00000000000..f65e0807604
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/colonequals.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='colonequals'>
+ <name>colonequals</name>
+ <caption>Colon equals symbols.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package defines poor man&#x2018;s symbols for mathematical
+ relation symbols such as &#x201C;colon equals&#x201D;.
+ The colon is centered around the horizontal math axis.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/colonequals.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/colonequals.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/dvipscol.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/dvipscol.xml
new file mode 100644
index 00000000000..41ef2492694
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/dvipscol.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='dvipscol'>
+ <name>dvipscol</name>
+ <caption>Alter the usage of the dvips colour stack.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2006,2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ The package modifies <tt>\color</tt> (and related commands) to
+ deal with the occasional dvips error: &#x201C;! out of color
+ stack space&#x201D;
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/dvipscol.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/dvipscol.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/embedfile.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/embedfile.xml
new file mode 100644
index 00000000000..3433edbc221
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/embedfile.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='embedfile'>
+ <name>embedfile</name>
+ <caption>Embed files into PDF.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.6'/>
+ <description>
+ This package embeds files in a PDF document, using the PDF
+ format's embedding operation (note the contrast with the attach
+ operation used by the <xref refid='attachfile'>attachfile</xref>
+ and <xref refid='attachfile2'>attachfile2</xref> packages).
+ Currently only <xref refid='pdftex'>pdfTeX</xref> &gt;=1.30, in
+ PDF mode, is supported.
+
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/embedfile.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/embedfile.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/engord.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/engord.xml
new file mode 100644
index 00000000000..0e7c4c3aeed
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/engord.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='engord'>
+ <name>engord</name>
+ <caption>Converts numbers to English ordinal numbers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2003,2006-2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ Defines <tt>\engord</tt> (used like <tt>\arabic</tt>,
+ <tt>\roman</tt>, etc.), and <tt>\engordnumber</tt> (which formats
+ a &#x201C;TeX number&#x201D;).
+ <p/>
+ So <tt>\pagenumbering{engord}</tt> gives page numbers <tt>1st,
+ 2nd, 3rd, ...</tt>
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/engord.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/engord.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/eolgrab.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/eolgrab.xml
new file mode 100644
index 00000000000..047da119639
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/eolgrab.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='eolgrab'>
+ <name>eolgrab</name>
+ <caption>Catch arguments delimited by end of line.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines the command <tt>\eolgrab</tt> that reads an
+ string terminated by end of line, and then calls a macro with that
+ string as argument. Thus
+ <pre>\eolgrab\section My title</pre> is equivalent to
+ <pre>\section{My title}</pre>
+ <p/>
+ A second command <tt>\eolgrabopt</tt> provides the string as an
+ optional argument (which is useful for <tt>\item</tt>, for example).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/eolgrab.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/eolgrab.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/epstopdf-pkg.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/epstopdf-pkg.xml
new file mode 100644
index 00000000000..87e64d07a16
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/epstopdf-pkg.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='epstopdf-pkg'>
+ <name>epstopdf-pkg</name>
+ <caption>Call epstopdf "on the fly"</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006-2010'/>
+ <license type='lppl1.3'/>
+ <version number='2.5'/>
+ <description>
+ The package adds support for EPS files in the
+ <xref refid='graphicx'>graphicx</xref> package when running under
+ PDFTeX. If an EPS graphic is detected, the package spawns a
+ process to convert the EPS to PDF, using the script
+ <xref refid='epstopdf'>epstopdf</xref>. This of course requires
+ that shell escape is enabled for the PDFTeX run.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/epstopdf.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/epstopdf.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/etexcmds.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/etexcmds.xml
new file mode 100644
index 00000000000..6696f1b39fd
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/etexcmds.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='etexcmds'>
+ <name>etexcmds</name>
+ <caption>Avoid name clashes with e-TeX commands.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ New primitive commands are introduced in e-TeX; sometimes the
+ names collide with existing macros. This package solves the
+ name clashes by adding a prefix to e-TeX&#x2019;s commands. For
+ example, eTeX&#x2019;s <tt>\unexpanded</tt> is provided as
+ <tt>\etex@unexpanded</tt>.
+
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/etexcmds.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/etexcmds.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/flags.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/flags.xml
new file mode 100644
index 00000000000..d5b7c754b45
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/flags.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='flags'>
+ <name>flags</name>
+ <caption>Setting and clearing of flags in bit fields.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='0.4'/>
+ <description>
+ This package allows the setting and clearing
+ of flags in bit fields and converts the bit field into a
+ decimal number. Currently the bit field is limited to 31 bits.
+ <p/>
+ It is now deprecated because of new more powerful
+ package <xref refid='bitset'>bitset</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/flags.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/flags.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/gettitlestring.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/gettitlestring.xml
new file mode 100644
index 00000000000..e2babe33383
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/gettitlestring.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='gettitlestring'>
+ <name>gettitlestring</name>
+ <caption>Clean up title references.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ Cleans up the title string (removing <tt>\label</tt> commands) for
+ packages (such as <xref refid='nameref'>nameref</xref>) that
+ typeset such strings.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/gettitlestring.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/gettitlestring.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/grfext.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/grfext.xml
new file mode 100644
index 00000000000..0a54a182002
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/grfext.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='grfext'>
+ <name>grfext</name>
+ <caption>Manipulate the graphics package's list of extensions.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package provides macros for adding to, and reordering the list of
+ graphics file extensions recognised by package
+ <xref refid='graphics'>graphics</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/grfext.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/grfext.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/grffile.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/grffile.xml
new file mode 100644
index 00000000000..67c9f439c97
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/grffile.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='grffile'>
+ <name>grffile</name>
+ <caption>Extended file name support for graphics.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.16'/>
+ <description>
+ The package extends the file name processing of package
+ <xref refid='graphics'>graphics</xref> to support a larger range
+ of file names. For example, the file name may contain several dots.
+
+ Or in case of <xref refid='pdftex'>pdfTeX</xref> in PDF mode the
+ file name may contain spaces.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/grffile.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/grffile.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hobsub.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hobsub.xml
new file mode 100644
index 00000000000..3c4be6572a2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hobsub.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hobsub'>
+ <name>hobsub</name>
+ <caption>Construct package bundles</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011,2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.12'/>
+ <description>
+ The package offers a means of loading a bundle of (other) packages
+ &#x201C;at once&#x201D;, offering a means of reducing the amount of log output
+ as the packages are loaded, and an aide-memoire for complicated
+ requirements. In some ways, loading a package via hobsub behaves
+ much like loading the package in the normal way; for example,
+ reloads are suppressed, as in LaTeX proper, and correct
+ <tt>\listfiles</tt> output is produced.
+ <p/>
+ Examples provided are a &#x2018;generic&#x2019; bundle (comprising the author&#x2019;s
+ packages that can be used with Plain TeX) and a &#x2018;hyperref&#x2019; bundle
+ (comprising packages useful when generating hypertext output with
+ LaTeX).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hobsub.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hobsub.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hologo.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hologo.xml
new file mode 100644
index 00000000000..19ace2e38f5
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hologo.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hologo'>
+ <name>hologo</name>
+ <caption>A collection of logos with bookmark support.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010-2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ The package defines a single command <tt>\hologo</tt>, whose
+ argument is the usual case-confused ASCII version of the logo.
+ The command is bookmark-enabled, so that every logo becomes
+ available in bookmarks without further work.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hologo.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hologo.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/holtxdoc.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/holtxdoc.xml
new file mode 100644
index 00000000000..8999a448a26
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/holtxdoc.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='holtxdoc'>
+ <name>holtxdoc</name>
+ <caption>Documentation macros for oberdiek bundle, etc.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999-2012'/>
+ <license type='lppl1.3'/>
+ <version number='0.24'/>
+ <description>
+ These are personal macros, which are not necessarily useful to
+ other authors (they are provided as part off the source of others
+ of the author's packages). Macros that may be of use to other
+ authors are available separately, in package
+ <xref refid='hypdoc'>hypdoc</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/holtxdoc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/holtxdoc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hopatch.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hopatch.xml
new file mode 100644
index 00000000000..11c10195dd5
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hopatch.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hopatch'>
+ <name>hopatch</name>
+ <caption>Load patches for packages.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ The hopatch package provides a command with which the user may
+ register a piece of patch code for a particular package. Hopatch
+ will apply the patch immediately, if the relevant package has
+ already been loaded; otherwise it will store the patch until the
+ package appears.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hopatch.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hopatch.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hycolor.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hycolor.xml
new file mode 100644
index 00000000000..2269eadcccb
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hycolor.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hycolor'>
+ <name>hycolor</name>
+ <caption>Implements colour for packages hyperref and bookmark.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.7'/>
+ <description>
+ This package provides the code for the color option
+ that is used by packages <xref refid='hyperref'>hyperref</xref>
+ and <xref refid='bookmark'>bookmark</xref>.
+ It is not intended as package for the user.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hycolor.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hycolor.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hypbmsec.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypbmsec.xml
new file mode 100644
index 00000000000..4c457726263
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypbmsec.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypbmsec'>
+ <name>hypbmsec</name>
+ <caption>Hypertext bookmarks in sectioning commands.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1998-2000,2006,2007'/>
+ <license type='lppl1.3'/>
+ <version number='2.4'/>
+ <description>
+ Bookmark entries can be given as another argument to the LaTeX
+ sectioning commands. The <xref refid='hyperref'>hyperref</xref>
+ package is required to get the bookmarks, but the syntax
+ works without it.
+ <p/>
+ This package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypbmsec.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypbmsec.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hypcap.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypcap.xml
new file mode 100644
index 00000000000..5db5f187e5f
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypcap.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypcap'>
+ <name>hypcap</name>
+ <caption>Adjusting the anchors of captions.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999-2001,2006-2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.11'/>
+ <description>
+ The package offers a solution to the problem that when you link to
+ a float using <xref refid='hyperref'>hyperref</xref>, the link
+ anchors to below the float's caption, rather than the beginning of
+ the float.
+ <p/>
+ Hypcap defines a separate \capstart command, which you put where
+ you want links to end; you should have a \capstart command for each
+ \caption command. Package options can be used to auto-insert a
+ \capstart at the start of a float environment.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypcap.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypcap.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdestopt.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdestopt.xml
new file mode 100644
index 00000000000..a648fbd55d8
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdestopt.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypdestopt'>
+ <name>hypdestopt</name>
+ <caption>Hyperref destination optimizer.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.3'/>
+ <description>
+ This package supports <xref refid='hyperref'>hyperref</xref>'s
+ pdftex driver. It removes unnecessary destinations
+ and shortens the destination names or uses numbered destinations
+ to get smaller PDF files.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypdestopt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypdestopt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml
new file mode 100644
index 00000000000..d00dba7248d
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypdoc'>
+ <name>hypdoc</name>
+ <caption>Hyper extensions for doc.sty.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2002,2006,2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.11'/>
+ <description>
+ This package adds hypertext features to the package
+ <xref refid='doc'>doc</xref> that is used in the documentation
+ system of <xref refid='latex'>LaTeX2e</xref>. Bookmarks are added
+ and references are linked as far as possible.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypdoc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypdoc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hypgotoe.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypgotoe.xml
new file mode 100644
index 00000000000..d887a6d3d60
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypgotoe.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypgotoe'>
+ <name>hypgotoe</name>
+ <caption>Links to embedded files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='0.1'/>
+ <description>
+ This experimental package is a first experiment for links to embedded
+ files. It is named after the PDF action name <tt>/GoToE</tt>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypgotoe.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypgotoe.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hyphsubst.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hyphsubst.xml
new file mode 100644
index 00000000000..efa1bc63187
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hyphsubst.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hyphsubst'>
+ <name>hyphsubst</name>
+ <caption>Substitute hyphenation patterns.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008'/>
+ <license type='lppl1.3'/>
+ <version number='0.2'/>
+ <description>
+ A TeX format file may include alternative hyphenation patterns
+ for a language with a different name. If the naming convention
+ follows <xref refid='babel'>babel&#x2019;s</xref> rules, then the
+ hyphenation patterns
+ for a language can be replaced by the alternative hyphenation patterns,
+ provided in the format file.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hyphsubst.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hyphsubst.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/ifdraft.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifdraft.xml
new file mode 100644
index 00000000000..e8e68b31c6e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifdraft.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifdraft'>
+ <name>ifdraft</name>
+ <caption>Detect "draft" and "final" class options.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2005,2006,2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package defines commands that switch according to the
+ prevailing &#x2018;draft&#x2019; or &#x2018;final&#x2019;
+ options; each command takes two arguments, the first for the
+ &#x2018;true&#x2019;, the second for the &#x2018;false&#x2019;
+ case. Commands are:<br/>
+ &#x2014; <tt>\ifdraft</tt> determines whether we're operating in
+ draft (&#x2018;true&#x2019;) or final mode;<br/>
+
+ &#x2014; <tt>\ifoptiondraft</tt> determines whether a
+ &#x2018;draft&#x2019; option has been given; and<br/>
+ &#x2014; <tt>\ifoptionfinal</tt> determines whether a
+ &#x2018;final&#x2019; option has been given.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifdraft.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifdraft.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/iflang.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/iflang.xml
new file mode 100644
index 00000000000..4a7c78376f9
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/iflang.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='iflang'>
+ <name>iflang</name>
+ <caption>Expandable checks for the current language.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ This package provides expandable checks for the current language
+ based on macro <tt>\languagename</tt> or hyphenation patterns.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/iflang.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/iflang.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/ifluatex.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifluatex.xml
new file mode 100644
index 00000000000..19245b71934
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifluatex.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifluatex'>
+ <name>ifluatex</name>
+ <caption>Provides the \ifluatex switch.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package looks for LuaTeX regardless of its mode and provides
+ the switch <tt>\ifluatex</tt>; it works with Plain TeX or LaTeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifluatex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifluatex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='ifluatex'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/ifpdf.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifpdf.xml
new file mode 100644
index 00000000000..0302ae13301
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifpdf.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifpdf'>
+ <name>ifpdf</name>
+ <caption>Provides the \ifpdf conditional.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2005-2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.3'/>
+ <description>
+ This package looks for pdfTeX in pdf mode and implements and
+ sets the switch <tt>\ifpdf</tt>. The detection is based on the
+ value of <tt>\pdfoutput</tt> (which the package will not
+ change). The package works with plain or LaTeX formats. To use
+ it with LaTeX simply <tt>\usepackage{ifpdf}</tt>. Then use
+ <tt>\ifpdf ... \else ... \fi</tt>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifpdf.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifpdf.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/ifvtex.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifvtex.xml
new file mode 100644
index 00000000000..c9ffbfb8a84
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/ifvtex.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifvtex'>
+ <name>ifvtex</name>
+ <caption>Detects use of VTeX and its facilities.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006-2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ The package looks for VTeX and sets the switch <tt>\ifvtex</tt>.
+ In the presence of VTeX, the mode switches <tt>\ifvtexdvi</tt>,
+ <tt>\ifvtexpdf</tt> and <tt>\ifvtexps</tt> are set;
+ <tt>\ifvtexgex</tt> tells you whether GeX is operating.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifvtex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifvtex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/infwarerr.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/infwarerr.xml
new file mode 100644
index 00000000000..147c35f8034
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/infwarerr.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='infwarerr'>
+ <name>infwarerr</name>
+ <caption>Complete set of information/warning/error messages.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package provides a complete set of macros for information,
+ warning and error messages. Under LaTeX, the commands are
+ wrappers for the corresponding LaTeX commands; under Plain TeX
+ they are also available as complete implementations.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/infwarerr.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/infwarerr.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/inputenx.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/inputenx.xml
new file mode 100644
index 00000000000..18ca3f2433e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/inputenx.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='inputenx'>
+ <name>inputenx</name>
+ <caption>Enhanced input encoding handling.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ This package deals with input encodings. The first stage
+ provides input encodings using
+ standard mappings and covers nearly all slots. Thus it
+ serves as more uptodate replacement for package
+ <xref refid='inputenc'>inputenc</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/inputenx.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/inputenx.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/intcalc.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/intcalc.xml
new file mode 100644
index 00000000000..2b2ca66b990
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/intcalc.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='intcalc'>
+ <name>intcalc</name>
+ <caption>Expandable arithmetic operations with integers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package provides expandable arithmetic operations
+ with integers, using the e-TeX extension <tt>\numexpr</tt> if it
+ is available.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/intcalc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/intcalc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/kvdefinekeys.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/kvdefinekeys.xml
new file mode 100644
index 00000000000..ec0a60fa17f
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/kvdefinekeys.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='kvdefinekeys'>
+ <name>kvdefinekeys</name>
+ <caption>Define keys for use in the kvsetkeys package.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package provides a macro <tt>\kv@define@key</tt> (analogous to
+ <xref refid='keyval'>keyval&#x2019;s</xref> <tt>\define@key</tt>, to
+ define keys for use by <xref refid='kvsetkeys'>kvsetkeys</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/kvdefinekeys.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/kvdefinekeys.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/kvoptions.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/kvoptions.xml
new file mode 100644
index 00000000000..b41d057c9fb
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/kvoptions.xml
@@ -0,0 +1,25 @@
+%% No we don't need the option 'color'.
+%% With color support option 'emphcolor' will dynamically
+%% change the color of \emph statements.
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='kvoptions'>
+ <name>kvoptions</name>
+ <caption>Key value format for package options.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2004,2006,2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='3.11'/>
+ <description>
+ This package offers support for package authors who want to
+ use options in key-value format for their package options.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/kvoptions.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/kvoptions.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/kvsetkeys.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/kvsetkeys.xml
new file mode 100644
index 00000000000..6d467172902
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/kvsetkeys.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='kvsetkeys'>
+ <name>kvsetkeys</name>
+ <caption>Key value parser with default handler support.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007,2009-2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.16'/>
+ <description>
+ This package provides \kvsetkeys, a variant of package
+ <xref refid='keyval'>keyval</xref>'s <tt>\setkeys</tt>. It allows
+ the user to specify a handler that deals with unknown options.
+ Active commas and equal signs may be used (e.g. see
+ <xref refid='babel'>babel</xref>'s shorthands) and only one level
+ of curly braces are removed from the values.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/kvsetkeys.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/kvsetkeys.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/letltxmacro.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/letltxmacro.xml
new file mode 100644
index 00000000000..a56fb723f45
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/letltxmacro.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='letltxmacro'>
+ <name>letltxmacro</name>
+ <caption>Let assignment for LaTeX macros.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ TeX&#x2019;s <tt>\let</tt> assignment does not work for LaTeX macros
+ with optional arguments or for macros that are defined
+ as robust macros by <tt>\DeclareRobustCommand</tt>. This package
+ defines <tt>\LetLtxMacro</tt> that also takes care of the involved
+ internal macros.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/letltxmacro.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/letltxmacro.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/listingsutf8.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/listingsutf8.xml
new file mode 100644
index 00000000000..f4dd19f46c1
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/listingsutf8.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='listingsutf8'>
+ <name>listingsutf8</name>
+ <caption>Allow UTF-8 in listings input.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Package <xref refid='listings'>listings</xref> does not support files
+ with multi-byte encodings such as UTF-8. In the case of
+ <tt>\lstinputlisting</tt>, a simple workaround is possible if a
+ one-byte encoding exists that the file can be converted to. The
+ package requires the e-TeX extensions under pdfTeX (in either PDF
+ or DVI output mode).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/listingsutf8.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/listingsutf8.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/ltxcmds.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/ltxcmds.xml
new file mode 100644
index 00000000000..56a964db4e1
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/ltxcmds.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ltxcmds'>
+ <name>ltxcmds</name>
+ <caption>Some LaTeX kernel commands for general use.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.22'/>
+ <description>
+ This package exports some utility macros
+ from the LaTeX kernel into a separate namespace and
+ also makes them available for other formats such as plain TeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ltxcmds.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ltxcmds.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml
new file mode 100644
index 00000000000..6a0a082be37
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='luacolor'>
+ <name>luacolor</name>
+ <caption>Color support based on LuaTeX's node attributes.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ This package implements color support based on LuaTeX's node
+ attributes.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/luacolor.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/luacolor.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml
new file mode 100644
index 00000000000..2ec6e643b97
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='luatex'>
+ <name>luatex</name>
+ <caption>The LuaTeX engine.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='0.4'/>
+ <description>
+ LuaTeX is an extended version of pdfTeX using Lua as an embedded
+ scripting language. The LuaTeX project&#x2019;s main objective
+ is to provide an open and configurable variant of TeX while at the
+ same time offering downward compatibility.
+ <p/>
+ LuaTeX uses Unicode (as UTF-8) as its default input encoding, and
+ is able to use modern (OpenType) fonts (for both text and mathematics).
+ <p/>
+ It should be noted that LuaTeX is still under development; its
+ specification has been declared stable, but absolute stability
+ may not in practice be assumed.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/luatex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/luatex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/magicnum.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/magicnum.xml
new file mode 100644
index 00000000000..1da2527c9e4
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/magicnum.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='magicnum'>
+ <name>magicnum</name>
+ <caption>Access TeX systems' "magic numbers".</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ This package allows access to the various parameter values in
+ TeX (catcode values), e-TeX (group, if and node types, and
+ interaction mode), and LuaTeX (pdfliteral mode) by a hierarchical
+ name system.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/magicnum.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/magicnum.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/makerobust.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/makerobust.xml
new file mode 100644
index 00000000000..e7ce5e8758e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/makerobust.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='makerobust'>
+ <name>makerobust</name>
+ <caption>Making a macro robust.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package provides the command MakeRobustCommand
+ that converts an existing macro to a robust one.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/makerobust.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/makerobust.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/mleftright.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/mleftright.xml
new file mode 100644
index 00000000000..2ee36a2f5a5
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/mleftright.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='mleftright'>
+ <name>mleftright</name>
+ <caption>Variants of delimiters that act as maths open/close.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines variants <tt>\mleft</tt> and <tt>\mright</tt>
+ of <tt>\left</tt> and <tt>\right</tt>, that make the delimiters
+ act as <tt>\mathopen</tt> and <tt>\mathclose</tt>. These commands
+ address spacing difficulties in subformulas.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/mleftright.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/mleftright.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pagegrid.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pagegrid.xml
new file mode 100644
index 00000000000..2f10fa2aa0a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pagegrid.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pagegrid'>
+ <name>pagegrid</name>
+ <caption>Print page grid in background.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ This package puts a grid on the paper. It was written for
+ developers of a class or package
+ who have to put elements on definite locations on a page
+ (e.g. letter class). The grid allows a faster optical check,
+ whether the positions are correct. If the previewer already
+ offers features for measuring, the package might be unnecessary.
+ Otherwise it saves the developer from printing the page and
+ measuring by hand.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pagegrid.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pagegrid.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pagesel.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pagesel.xml
new file mode 100644
index 00000000000..5bbcba73c49
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pagesel.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pagesel'>
+ <name>pagesel</name>
+ <caption>Select pages of a document for output.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2003,2006-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ Selects single pages, ranges of pages, odd pages or even pages
+ for output.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pagesel.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pagesel.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcol.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcol.xml
new file mode 100644
index 00000000000..fd7ebc8aaef
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcol.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcol'>
+ <name>pdfcol</name>
+ <caption>Defines macros fpr maintaining color stacks under pdfTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Since version 1.40 pdfTeX supports color stacks.
+ The driver file <tt>pdftex.def</tt> for package
+ <xref refid='color'>color</xref> defines and uses a main color
+ stack since version v0.04b.
+ <p/>
+ This package is intended for package writers.
+ It defines macros for setting and maintaining new color stacks.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcol.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcol.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolfoot.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolfoot.xml
new file mode 100644
index 00000000000..06e5a1095b0
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolfoot.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolfoot'>
+ <name>pdfcolfoot</name>
+ <caption>Separate color stack for footnotes with pdfTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Since version 1.40 <xref refid='pdftex'>pdfTeX</xref> supports
+ several colour stacks. This package uses a separate colour stack
+ for footnotes that can break across pages.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolfoot.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolfoot.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolmk.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolmk.xml
new file mode 100644
index 00000000000..92a182caef2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolmk.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolmk'>
+ <name>pdfcolmk</name>
+ <caption>Improving colour support under pdftex.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2005-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ The package provides macros that emulate the &#x2018;colour stack&#x2019;
+ functionality of dvips. The colour stack deals with colour
+ manipulations when asynchronous events (like page-breaking) occur;
+ pdftex does not (yet) have such a stack, but dvips does, and the
+ <xref refid='color'>color</xref> package makes extensive use of
+ it.
+ <p/>
+ This package is an experimental solution to the problem, and works
+ best with pdf-e-tex.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolmk.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolmk.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparallel.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparallel.xml
new file mode 100644
index 00000000000..36b3b09fa2c
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparallel.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolparallel'>
+ <name>pdfcolparallel</name>
+ <caption>Fix colour problems in package 'parallel'.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ Since version 1.40 pdfTeX supports colour stacks.
+ This package uses them to fix colour problems in
+ package <xref refid='parallel'>parallel</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolparallel.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolparallel.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparcolumns.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparcolumns.xml
new file mode 100644
index 00000000000..35f3521eb3c
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcolparcolumns.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolparcolumns'>
+ <name>pdfcolparcolumns</name>
+ <caption>Fix colour problems in package 'parcolumns'.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ Since version 1.40 pdfTeX supports colour stacks.
+ This package uses them to fix colour problems in
+ package <xref refid='parcolumns'>parcolumns</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcrypt.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcrypt.xml
new file mode 100644
index 00000000000..e388c41540b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfcrypt.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcrypt'>
+ <name>pdfcrypt</name>
+ <caption>Allows the setting of pdf encryption.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006,2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ Allows the setting of pdf encryption options for VTeX and some
+ older versions of pdfTeX. The options can be set as package
+ options or in the command <tt>\pdfcryptsetup</tt>. Options
+ include <tt>owner=OwnerPassword</tt>, <tt>user=UserPassword,
+ print</tt>, <tt>copy</tt>, <tt>edit</tt>, <tt>annotate=true,
+ false all, none</tt>. The encryption is set at
+ <tt>\begin{document}</tt> by default, but this can be forced for
+ an earlier time by option &#x2018;set&#x2019;.
+ <p/>
+ Example:
+ <tt>\usepackage[owner=Donald,user=Knuth,print=false]{pdfcrypt}</tt>
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcrypt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcrypt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfescape.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfescape.xml
new file mode 100644
index 00000000000..1eca170b0f9
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfescape.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfescape'>
+ <name>pdfescape</name>
+ <caption>Implements pdfTeX's escape features using TeX or e-TeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.13'/>
+ <description>
+ This package implements <xref refid='pdftex'>pdfTeX</xref>'s
+ escape features (<tt>\pdfescapehex</tt>, <tt>\pdfunescapehex</tt>,
+ <tt>\pdfescapename</tt>, <tt>\pdfescapestring</tt>) using TeX or
+ e-TeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfescape.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfescape.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdflscape.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdflscape.xml
new file mode 100644
index 00000000000..fe0c9d65fab
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdflscape.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdflscape'>
+ <name>pdflscape</name>
+ <caption>Make landscape pages display as landscape.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2004,2006-2008'/>
+ <license type='lppl1.3'/>
+ <version number='0.10'/>
+ <description>
+ The package adds PDF support to the landscape environment of
+ package <xref refid='lscape'>lscape</xref>, by setting the PDF
+ <tt>/Rotate</tt> page attribute. Pages with this attribute will be
+ displayed in landscape orientation by conforming PDF viewers.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdflscape.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdflscape.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfrender.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfrender.xml
new file mode 100644
index 00000000000..a37b36994d9
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdfrender.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfrender'>
+ <name>pdfrender</name>
+ <caption>Control rendering parameters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ The package provides interfaces for the user to control PDF
+ parameters, such as line width or text rendering mode. The
+ control operations work in a manner very similar to that of the
+ <xref refid='color'>color</xref> package.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfrender.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfrender.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pdftexcmds.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdftexcmds.xml
new file mode 100644
index 00000000000..847a5d0030b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pdftexcmds.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdftexcmds'>
+ <name>pdftexcmds</name>
+ <caption>LuaTeX support for pdfTeX utility functions.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='0.20'/>
+ <description>
+ LuaTeX provides most of the commands of
+ <xref refid='pdftex'>pdfTeX</xref> 1.40. However, a number of
+ utility functions are not available. This package tries to fill
+ the gap and implements some of the missing primitives using Lua.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdftexcmds.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdftexcmds.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/picture.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/picture.xml
new file mode 100644
index 00000000000..dedb0ad56bc
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/picture.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='picture'>
+ <name>picture</name>
+ <caption>Dimens for picture macros.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ There are macro and environment arguments that expect numbers
+ that will internally be multiplied by <tt>\unitlength</tt>.
+ This package extends the syntax of these arguments, so that
+ dimensions with calculation support may be used for these arguments.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/picture.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/picture.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/pmboxdraw.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/pmboxdraw.xml
new file mode 100644
index 00000000000..d17c78ead74
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/pmboxdraw.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pmboxdraw'>
+ <name>pmboxdraw</name>
+ <caption>Poor man's box drawing characters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package declares box drawing characters of
+ old code pages, e.g. cp437. It uses rules instead of using a font.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pmboxdraw.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pmboxdraw.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/protecteddef.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/protecteddef.xml
new file mode 100644
index 00000000000..33866396600
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/protecteddef.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='protecteddef'>
+ <name>protecteddef</name>
+ <caption>Define protected commands.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines a command <tt>\ProtectedDef</tt> that will
+ create LaTeX &#x2018;robust&#x2019; command or an e-TeX
+ &#x2018;protected&#x2019; command as appropriate
+ to its environment.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/protecteddef.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/protecteddef.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/refcount.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/refcount.xml
new file mode 100644
index 00000000000..5764b28eebb
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/refcount.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='refcount'>
+ <name>refcount</name>
+ <caption>Counter operations with label references.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1998,2000,2006,2008,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='3.4'/>
+ <description>
+ Provides commands <tt>\setcounterref</tt> and
+ <tt>\addtocounterref</tt> which use the section (or whatever)
+ number from the reference as the value to put into the counter, as
+ in:
+
+ <pre>
+ ...\label{sec:foo}
+ ...
+ \setcounterref{foonum}{sec:foo}
+ </pre>
+ Commands <tt>\setcounterpageref</tt> and
+ <tt>\addtocounterpageref</tt> do the corresponding thing with the
+ page reference of the label.
+ <p/>
+ No <tt>.ins</tt> file is distributed; process the
+ <tt>.dtx</tt> with plain TeX to create one.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/refcount.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/refcount.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/rerunfilecheck.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/rerunfilecheck.xml
new file mode 100644
index 00000000000..facfed3904b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/rerunfilecheck.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='rerunfilecheck'>
+ <name>rerunfilecheck</name>
+ <caption>Checksum based rerun checks on auxiliary files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.7'/>
+ <description>
+ The package provides additional rerun warnings if some
+ auxiliary files have changed. It is based on MD5 checksum,
+ provided by pdfTeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/rerunfilecheck.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/rerunfilecheck.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/resizegather.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/resizegather.xml
new file mode 100644
index 00000000000..1a06e52e23d
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/resizegather.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='resizegather'>
+ <name>resizegather</name>
+ <caption>Automatically resize overly large equations.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Equations that are too large are resized to fit the available
+ space. The environment &#x2018;gather&#x2019; of package
+ <xref refid='amsmath'>amsmath</xref> is supported. Also the
+ environments &#x2018;equation&#x2019; and
+ &#x2018;displaymath&#x2019; are redefined using
+ &#x2018;gather&#x2019; and its starred version.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/resizegather.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/resizegather.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/rotchiffre.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/rotchiffre.xml
new file mode 100644
index 00000000000..8dc7bcf38b1
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/rotchiffre.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='rotchiffre'>
+ <name>rotchiffre</name>
+ <caption>Perform simple rotation cyphers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines a command <tt>\EdefRot</tt> that defines a
+ macro (whose name is given as an argument) to the rotation of the
+ given string. Available rotations are <tt>ROT13</tt> (for
+ letters), <tt>ROT5</tt> (for digits), <tt>ROT18</tt> (for digits
+ and letters together) and <tt>ROT47</tt> (for all ASCII
+ characters).
+ <p/>
+ The package is part of the
+ <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/rotchiffre.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/rotchiffre.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/scrindex.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/scrindex.xml
new file mode 100644
index 00000000000..55320303269
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/scrindex.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='scrindex'>
+ <name>scrindex</name>
+ <caption>Make index package work with Koma-script classes.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package redefines environment `theindex' of package `index',
+ if a class from <xref refid='koma-script'>KOMA-Script</xref> is loaded.
+ Also option `idxtotoc' is supported. Index preambles can be given
+ either by means of package `index' or via the interface provided
+ by <xref refid='koma-script'>KOMA-Script</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/scrindex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/scrindex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/selinput.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/selinput.xml
new file mode 100644
index 00000000000..ae1a48d0f8c
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/selinput.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='selinput'>
+ <name>selinput</name>
+ <caption>Semi-automatic detection of input encoding.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ This package selects the input encoding by specifying pairs
+ of input characters and their glyph names.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/selinput.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/selinput.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/setouterhbox.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/setouterhbox.xml
new file mode 100644
index 00000000000..5cde75ab799
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/setouterhbox.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='setouterhbox'>
+ <name>setouterhbox</name>
+ <caption>Set hbox in outer horizontal mode.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005-2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.7'/>
+ <description>
+ If math stuff is set in an <tt>\hbox</tt>, then TeX
+ performs some optimization and omits the implicit
+ penalties <tt>\binoppenalty</tt> and <tt>\relpenalty</tt>.
+ This packages tries to put stuff into an <tt>\hbox</tt>
+ without losing those penalties.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/setouterhbox.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/setouterhbox.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/settobox.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/settobox.xml
new file mode 100644
index 00000000000..a22dda02e08
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/settobox.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='settobox'>
+ <name>settobox</name>
+ <caption>Assigning dimensions of a box to a length register.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2006-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ Commands to assist the reuse of boxes (set up by <tt>\sbox</tt> or
+ by the <tt>lrbox</tt> environment); the <tt>\settobox...</tt>
+ commands behave similarly to the <tt>\settowidth</tt> (etc.)
+ commands. For example:
+ <pre>
+ \newsavebox{\mybox}
+ \newlength{\mylength}
+ \sbox{\mybox}{Hello World}
+ \settoboxwidth{\mylength}{\mybox}
+ </pre>
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/settobox.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/settobox.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/soulutf8.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/soulutf8.xml
new file mode 100644
index 00000000000..def76e1e4a6
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/soulutf8.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='soulutf8'>
+ <name>soulutf8</name>
+ <caption>Permit use of UTF-8 characters in soul.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package extends package <xref refid='soul'>soul</xref> and adds
+ some support for UTF-8. Namely the input encodings in
+ &#x2018;<tt>utf8.def</tt>&#x2019; from package
+ <xref refid='inputenc'>inputenc</xref> and
+ &#x2018;<tt>utf8x.def</tt>&#x2019; from package
+ <xref refid='unicode'>ucs</xref> are supported.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/soulutf8.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/soulutf8.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/stackrel.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/stackrel.xml
new file mode 100644
index 00000000000..c45459a7bd0
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/stackrel.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='stackrel'>
+ <name>stackrel</name>
+ <caption>Enhancement to the \stackrel command.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ This package adds an optional argument to <tt>\stackrel</tt> for
+ putting something below the relational symbol and defines
+ <tt>\stackbin</tt> for binary symbols.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/stackrel.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/stackrel.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/stampinclude.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/stampinclude.xml
new file mode 100644
index 00000000000..5cf6aae6315
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/stampinclude.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='stampinclude'>
+ <name>stampinclude</name>
+ <caption>Inclusion based on .aux file date stamps.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package replaces <tt>\includeonly</tt> and selects the files for
+ <tt>\include</tt> by inspecting the timestamp of the <tt>.aux</tt> file.
+ The file is selected for inclusion if the <tt>.aux</tt> file does
+ not yet exist or is older than the corresponding <tt>.tex</tt> file.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/stampinclude.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/stampinclude.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/stringenc.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/stringenc.xml
new file mode 100644
index 00000000000..e9b14b76f1a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/stringenc.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='stringenc'>
+ <name>stringenc</name>
+ <caption>Converting a string between different encodings.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ This package provides <tt>\StringEncodingConvert</tt> for converting
+ a string between different encodings.
+ Both <xref refid='latex'>LaTeX</xref> and
+ <xref refid='plain'>plain-TeX</xref> are supported.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/stringenc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/stringenc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/tabularht.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/tabularht.xml
new file mode 100644
index 00000000000..6f5525211b2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/tabularht.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='tabularht'>
+ <name>tabularht</name>
+ <caption>Tabular environments with height specified.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005-2007'/>
+ <license type='lppl1.3'/>
+ <version number='2.5'/>
+ <description>
+ The tabularht package defines some environments that add a height
+ specification to tabular and array environments. The default set
+ of new environments take a value for their height in the first
+ argument: defined environments are: <tt>tabularht</tt>,
+ <tt>tabularht*</tt> and <tt>arrayht</tt>. If package
+ <xref refid='tabularx'>tabularx</xref> is also loaded,
+ the package also defines environments <tt>tabularxht</tt> and
+ <tt>tabularxht*</tt>.
+ <p/>
+ The places where stretching is to happen are signalled by<br/>
+ <tt>\noalign{\vfill}</tt><br/>
+ immediately after the <tt>\\</tt> that ends a row of the table or
+ array.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/tabularht.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/tabularht.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/tabularkv.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/tabularkv.xml
new file mode 100644
index 00000000000..2bec5259a27
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/tabularkv.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='tabularkv'>
+ <name>tabularkv</name>
+ <caption>Tabular environments with key-value interface.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005,2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ The tabularkv package creates an environment <tt>tabularkv</tt>, whose
+ arguments are specified in key-value form. The arguments chosen
+ determine which other type of tabular is to be used (whether
+ standard LaTeX ones, or environments from the
+ <xref refid='tabularx'>tabularx</xref> or the
+ <xref refid='tabularht'>tabularx</xref> package).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/tabularkv.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/tabularkv.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/telprint.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/telprint.xml
new file mode 100644
index 00000000000..2b42ef0b557
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/telprint.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='telprint'>
+ <name>telprint</name>
+ <caption>Format German phone numbers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1996,1997,2004-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ The package provides a command <tt>\telprint</tt> for formatting
+ German telephone numbers.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/telprint.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/telprint.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/transparent.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/transparent.xml
new file mode 100644
index 00000000000..cdf02558f3a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/transparent.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='transparent'>
+ <name>transparent</name>
+ <caption>Using a color stack for transparency with pdfTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ Since version 1.40 <xref refid='pdftex'>pdfTeX</xref> supports
+ several color stacks. This package shows how a separate colour stack
+ can be used for transparency, a property other than colour.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/transparent.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/transparent.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/twoopt.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/twoopt.xml
new file mode 100644
index 00000000000..65683a2d7a2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/twoopt.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='twoopt'>
+ <name>twoopt</name>
+ <caption>Definitions with two optional arguments.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2006,2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ Variants of <tt>\newcommand</tt>, <tt>\renewcommand</tt> and
+ <tt>\providecommand</tt> are provided.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/twoopt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/twoopt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/uniquecounter.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/uniquecounter.xml
new file mode 100644
index 00000000000..5fdd6ebcb7a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/uniquecounter.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='uniquecounter'>
+ <name>uniquecounter</name>
+ <caption>Provides unlimited unique counter.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ This package provides a kind of counter that provides unique
+ number values. Several counters can be created with different names.
+ The numeric values are not limited.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/uniquecounter.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/uniquecounter.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/zref.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/zref.xml
new file mode 100644
index 00000000000..d777d469f85
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/zref.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='zref'>
+ <name>zref</name>
+ <caption>A new reference scheme for LaTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2012'/>
+ <license type='lppl1.3'/>
+ <version number='2.24'/>
+ <description>
+ This package offers a means to remove the limitation, of only two
+ properties, that is inherent in the way LaTeX&#x2019;s reference system
+ works. The package implements an extensible referencing system,
+ where properties are handled in a more flexible way. It provides
+ an interface for macro programmers to access the new reference
+ scheme and some applications that use it.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/zref.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/zref.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
diff --git a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
index 9d56e3e5d99..64c89370ec5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: catchfile.dtx
% Version: 2011/03/01 v1.6
-%
+% Info: Catch the contents of a file
+%
% Copyright (C) 2007, 2010, 2011 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file catchfile.dtx
% and the derived files
% catchfile.sty, catchfile.pdf, catchfile.ins, catchfile.drv,
% catchfile-test1.tex, catchfile-test2.tex,
% catchfile-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/catchfile.dtx
% CTAN:macros/latex/contrib/oberdiek/catchfile.pdf
-%
+%
% Unpacking:
% (a) If catchfile.ins is present:
% tex catchfile.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{catchfile.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If catchfile.drv is present:
% latex catchfile.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex catchfile.dtx
% makeindex -s gind.ist catchfile.idx
% pdflatex catchfile.dtx
% makeindex -s gind.ist catchfile.idx
% pdflatex catchfile.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/catchfile.sty
% TDS:doc/latex/oberdiek/catchfile.pdf
@@ -82,7 +83,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: catchfile 2011/03/01 v1.6 Catches the contents of a file (HO)}
+\Msg{* Package: catchfile 2011/03/01 v1.6 Catch the contents of a file (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -134,6 +135,10 @@ and the derived files
\file{catchfile-test1.tex}{\from{catchfile.dtx}{test1}}%
\file{catchfile-test2.tex}{\from{catchfile.dtx}{test2}}%
\file{catchfile-test3.tex}{\from{catchfile.dtx}{test3}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{catchfile.xml}{\from{catchfile.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -160,9 +165,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{catchfile.drv}%
- [2011/03/01 v1.6 Catches the contents of a file (HO)]%
+ [2011/03/01 v1.6 Catch the contents of a file (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{catchfile.dtx}%
\end{document}
@@ -299,7 +304,7 @@ and the derived files
\fi
\expandafter\x\csname ver@catchfile.sty\endcsname
\ProvidesPackage{catchfile}%
- [2011/03/01 v1.6 Catches the contents of a file (HO)]%
+ [2011/03/01 v1.6 Catch the contents of a file (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1061,6 +1066,43 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{catchfile.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='catchfile'>
+ <name>catchfile</name>
+ <caption>Catch an external file into a macro.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.6'/>
+ <description>
+ This package catches the contents of a file and puts it in a macro.
+ It requires <xref refid='etex'>e-TeX</xref>. Both
+ <xref refid='latex'>LaTeX</xref> and
+ <xref refid='plain'>plain TeX</xref> are supported.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/catchfile.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/catchfile.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/05/30 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
index 2cf8a945ab9..3e46c1910f2 100644
--- a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: centernot.dtx
-% Version: 2010/03/29 v1.2
-%
-% Copyright (C) 2006, 2007, 2010 by
+% Version: 2011/07/11 v1.3
+% Info: Centers the not symbol horizontally
+%
+% Copyright (C) 2006, 2007, 2010, 2011 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
@@ -15,19 +16,19 @@
% 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 centernot.dtx
% and the derived files
% centernot.sty, centernot.pdf, centernot.ins, centernot.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/centernot.dtx
% CTAN:macros/latex/contrib/oberdiek/centernot.pdf
-%
+%
% Unpacking:
% (a) If centernot.ins is present:
% tex centernot.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{centernot.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If centernot.drv is present:
% latex centernot.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex centernot.dtx
% makeindex -s gind.ist centernot.idx
% pdflatex centernot.dtx
% makeindex -s gind.ist centernot.idx
% pdflatex centernot.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/centernot.sty
% TDS:doc/latex/oberdiek/centernot.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: centernot 2010/03/29 v1.2 Centers the not symbol horizontally (HO)}
+\Msg{* Package: centernot 2011/07/11 v1.3 Centers the not symbol horizontally (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -86,9 +87,9 @@
This is a generated file.
Project: centernot
-Version: 2010/03/29 v1.2
+Version: 2011/07/11 v1.3
-Copyright (C) 2006, 2007, 2010 by
+Copyright (C) 2006, 2007, 2010, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -117,6 +118,10 @@ and the derived files
\file{centernot.drv}{\from{centernot.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{centernot.sty}{\from{centernot.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{centernot.xml}{\from{centernot.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,10 +148,15 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{centernot.drv}%
- [2010/03/29 v1.2 Centers the not symbol horizontally (HO)]%
+ [2011/07/11 v1.3 Centers the not symbol horizontally (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
-\usepackage{centernot}
+\makeatletter
+%\@namedef{ver@fontspec.sty}{}
+\@namedef{ver@unicode-math.sty}{}
+\def\setmathfont#1{}
+\makeatother
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{centernot}[2011/07/11]
\usepackage{amssymb}
\DeclareFontFamily{U}{matha}{\hyphenchar\font45}
\DeclareFontShape{U}{matha}{m}{n}{%
@@ -162,7 +172,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{23}
+% \CheckSum{26}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -183,7 +193,7 @@ and the derived files
% \GetFileInfo{centernot.drv}
%
% \title{The \xpackage{centernot} package}
-% \date{2010/03/29 v1.2}
+% \date{2011/07/11 v1.3}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -255,7 +265,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{centernot}
- [2010/03/29 v1.2 Centers the not symbol horizontally (HO)]%
+ [2011/07/11 v1.3 Centers the not symbol horizontally (HO)]%
% \end{macrocode}
%
% \noindent
@@ -305,7 +315,6 @@ and the derived files
{#2}%
}%
}
-\makeatother
% \end{macrocode}
% \end{macro}
%
@@ -494,6 +503,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{centernot.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='centernot'>
+ <name>centernot</name>
+ <caption>Centred \not command.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package provides <tt>\centernot</tt> that prints the symbol
+ <tt>\not</tt> on the following argument. Unlike the default
+ <tt>\not</tt> command, the symbol is horizontally centered.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/centernot.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/centernot.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2006/12/02 v1.0}
% \item
@@ -507,6 +552,10 @@ and the derived files
% \item
% Documentation fix: `negotiated' to `negated' (Hartmut Henkel).
% \end{Version}
+% \begin{Version}{2011/07/11 v1.3}
+% \item
+% Superfluous \cs{makeatother} removed (Martin M\"unch).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
index de57d21cdc0..b0e3eb9ac41 100644
--- a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: chemarr.dtx
% Version: 2006/02/20 v1.2
-%
+% Info: Arrows for chemical reactions
+%
% Copyright (C) 2001, 2006 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
@@ -15,20 +16,20 @@
% 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 chemarr.dtx
% and the derived files
% chemarr.sty, chemarr.pdf, chemarr.ins, chemarr.drv,
% chemarr-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/chemarr.dtx
% CTAN:macros/latex/contrib/oberdiek/chemarr.pdf
-%
+%
% Unpacking:
% (a) If chemarr.ins is present:
% tex chemarr.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{chemarr.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If chemarr.drv is present:
% latex chemarr.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex chemarr.dtx
% makeindex -s gind.ist chemarr.idx
% pdflatex chemarr.dtx
% makeindex -s gind.ist chemarr.idx
% pdflatex chemarr.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/chemarr.sty
% TDS:doc/latex/oberdiek/chemarr.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: chemarr 2006/02/20 v1.2 Chemical reaction arrows (HO)}
+\Msg{* Package: chemarr 2006/02/20 v1.2 Arrows for chemical reactions (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{chemarr.sty}{\from{chemarr.dtx}{package}}%
\usedir{doc/latex/oberdiek}%
\file{chemarr-example.tex}{\from{chemarr.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{chemarr.xml}{\from{chemarr.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,17 +153,17 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{chemarr.drv}%
- [2006/02/20 v1.2 Chemical reaction arrows (HO)]%
+ [2006/02/20 v1.2 Arrows for chemical reactions (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
-\usepackage{chemarr}
+\usepackage{chemarr}[2006/02/20]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{chemarr.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{48}
+% \CheckSum{54}
%
% \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
@@ -250,7 +255,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{chemarr}%
- [2006/02/20 v1.2 Chemical reaction arrows (HO)]
+ [2006/02/20 v1.2 Arrows for chemical reactions (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -494,6 +499,46 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{chemarr.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='chemarr'>
+ <name>chemarr</name>
+ <caption>Arrows for chemists.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Very often chemists need a longer version of reaction arrows
+ (<tt>\rightleftharpoons</tt>) with the possibility to put text
+ above and below. Analogous to <xref refid='amsmath'>amsmath</xref>'s
+ <tt>\xrightarrow</tt> and <tt>\xleftarrow</tt> this package
+ provides the macro <tt>\xrightleftharpoons</tt>. The package
+ requires amsmath. To use it, <tt>\usepackage{chemarr}</tt>,
+ then <tt>\xrightleftharpoons[below]{above}</tt> .
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/chemarr.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/chemarr.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2001/06/21 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
index 836f2e3b38b..38edbd29182 100644
--- a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: classlist.dtx
-% Version: 2008/08/11 v1.3
-%
-% Copyright (C) 2005, 2006, 2008 by
+% Version: 2011/10/17 v1.4
+% Info: Record classes used in a document
+%
+% Copyright (C) 2005, 2006, 2008, 2011 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
@@ -15,19 +16,19 @@
% 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 classlist.dtx
% and the derived files
% classlist.sty, classlist.pdf, classlist.ins, classlist.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/classlist.dtx
% CTAN:macros/latex/contrib/oberdiek/classlist.pdf
-%
+%
% Unpacking:
% (a) If classlist.ins is present:
% tex classlist.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{classlist.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If classlist.drv is present:
% latex classlist.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex classlist.dtx
% makeindex -s gind.ist classlist.idx
% pdflatex classlist.dtx
% makeindex -s gind.ist classlist.idx
% pdflatex classlist.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/classlist.sty
% TDS:doc/latex/oberdiek/classlist.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: classlist 2008/08/11 v1.3 Record loaded classes (HO)}
+\Msg{* Package: classlist 2011/10/17 v1.4 Record classes used in a document (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -86,9 +87,9 @@
This is a generated file.
Project: classlist
-Version: 2008/08/11 v1.3
+Version: 2011/10/17 v1.4
-Copyright (C) 2005, 2006, 2008 by
+Copyright (C) 2005, 2006, 2008, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -117,6 +118,10 @@ and the derived files
\file{classlist.drv}{\from{classlist.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{classlist.sty}{\from{classlist.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{classlist.xml}{\from{classlist.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{classlist.drv}%
- [2008/08/11 v1.3 Record loaded classes (HO)]%
+ [2011/10/17 v1.4 Record classes used in a document (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{classlist.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{162}
+% \CheckSum{168}
%
% \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
@@ -173,7 +178,7 @@ and the derived files
% \GetFileInfo{classlist.drv}
%
% \title{The \xpackage{classlist} package}
-% \date{2008/08/11 v1.3}
+% \date{2011/10/17 v1.4}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -218,7 +223,7 @@ and the derived files
% longer available here.
%
% \begin{description}
-% \item[\cs{MainClass}] contains the first loaded class.
+% \item[\cs{MainClassName}] contains the first loaded class.
% \item[\cs{ClassList}] stores the class entries, eg.
% \begin{quote}
% \begin{tabular}{@{}l@{ }l@{}}
@@ -254,7 +259,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{classlist}%
- [2008/08/11 v1.3 Record loaded classes (HO)]
+ [2011/10/17 v1.4 Record classes used in a document (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -582,6 +587,50 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{classlist.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='classlist'>
+ <name>classlist</name>
+ <caption>Record classes used in a document.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005,2006,2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ Load this package before \documentclass:
+ <p/>
+ &nbsp;&nbsp;<tt>\RequirePackage{classlist}</tt><br/>
+ &nbsp;&nbsp;<tt>\documentclass[some,options]{whatever}</tt>
+ <p/>
+ After doing this, <tt>\MainClass</tt> contains the name of the
+ first loaded class, <tt>\ClassList</tt> contains a set of triples
+ &lt;class name&gt;, &lt;options directly requested&gt;, and
+ &lt;version requested&gt;. (The package may also be loaded after
+ <tt>\documentclass</tt>, in which case some information is not
+ available.)
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/classlist.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/classlist.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2005/06/19 v1.0}
% \item
@@ -606,6 +655,10 @@ and the derived files
% \item
% URLs updated.
% \end{Version}
+% \begin{Version}{2011/10/17 v1.4}
+% \item
+% Documentation fix: \cs{MainClass} $\rightarrow$ \cs{MainClassName}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
index 4e81397d8ca..0552911a082 100644
--- a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: colonequals.dtx
% Version: 2006/08/01 v1.0
-%
+% Info: Colon equals symbols
+%
% Copyright (C) 2006 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
@@ -15,19 +16,19 @@
% 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 colonequals.dtx
% and the derived files
% colonequals.sty, colonequals.pdf, colonequals.ins, colonequals.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/colonequals.dtx
% CTAN:macros/latex/contrib/oberdiek/colonequals.pdf
-%
+%
% Unpacking:
% (a) If colonequals.ins is present:
% tex colonequals.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{colonequals.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If colonequals.drv is present:
% latex colonequals.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex colonequals.dtx
% makeindex -s gind.ist colonequals.idx
% pdflatex colonequals.dtx
% makeindex -s gind.ist colonequals.idx
% pdflatex colonequals.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/colonequals.sty
% TDS:doc/latex/oberdiek/colonequals.pdf
@@ -117,6 +118,10 @@ and the derived files
\file{colonequals.drv}{\from{colonequals.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{colonequals.sty}{\from{colonequals.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{colonequals.xml}{\from{colonequals.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -145,7 +150,7 @@ and the derived files
\ProvidesFile{colonequals.drv}%
[2006/08/01 v1.0 Colon equals symbols (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{colonequals}
\usepackage{array}
\usepackage{capt-of}
@@ -606,18 +611,54 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{colonequals.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='colonequals'>
+ <name>colonequals</name>
+ <caption>Colon equals symbols.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package defines poor man&#x2018;s symbols for mathematical
+ relation symbols such as &#x201C;colon equals&#x201D;.
+ The colon is centered around the horizontal math axis.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/colonequals.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/colonequals.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{txfonts}
% Young Ryu: \textit{The TX Fonts};
% 2000/12/15;
% \CTAN{fonts/txfonts/}.
-%
+%
% \bibitem{mathabx}
% Anthony Phan: \textit{Mathabx font series};
% 2005/05/16;
% \CTAN{fonts/mathabx/}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
index 3e5b999b581..f793fbbbe06 100644
--- a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: dvipscol.dtx
% Version: 2008/08/11 v1.2
-%
+% Info: Alter the usage of the dvips color stack
+%
% Copyright (C) 2000, 2006, 2008 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
@@ -15,19 +16,19 @@
% 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 dvipscol.dtx
% and the derived files
% dvipscol.sty, dvipscol.pdf, dvipscol.ins, dvipscol.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/dvipscol.dtx
% CTAN:macros/latex/contrib/oberdiek/dvipscol.pdf
-%
+%
% Unpacking:
% (a) If dvipscol.ins is present:
% tex dvipscol.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{dvipscol.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If dvipscol.drv is present:
% latex dvipscol.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex dvipscol.dtx
% makeindex -s gind.ist dvipscol.idx
% pdflatex dvipscol.dtx
% makeindex -s gind.ist dvipscol.idx
% pdflatex dvipscol.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/dvipscol.sty
% TDS:doc/latex/oberdiek/dvipscol.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: dvipscol 2008/08/11 v1.2 Fix for dvips.def (HO)}
+\Msg{* Package: dvipscol 2008/08/11 v1.2 Alter the usage of the dvips color stack (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{dvipscol.drv}{\from{dvipscol.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{dvipscol.sty}{\from{dvipscol.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{dvipscol.xml}{\from{dvipscol.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{dvipscol.drv}%
- [2008/08/11 v1.2 Fix for dvips.def (HO)]%
+ [2008/08/11 v1.2 Alter the usage of the dvips color stack (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{dvipscol.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{49}
+% \CheckSum{50}
%
% \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
@@ -254,7 +259,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{dvipscol}%
- [2008/08/11 v1.2 Fix for dvips.def (HO)]
+ [2008/08/11 v1.2 Alter the usage of the dvips color stack (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -491,6 +496,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{dvipscol.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='dvipscol'>
+ <name>dvipscol</name>
+ <caption>Alter the usage of the dvips colour stack.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2006,2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ The package modifies <tt>\color</tt> (and related commands) to
+ deal with the occasional dvips error: &#x201C;! out of color
+ stack space&#x201D;
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/dvipscol.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/dvipscol.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2000/08/31 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
index a3d6a338752..50ef3ec7ae0 100644
--- a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: embedfile.dtx
% Version: 2011/04/13 v2.6
-%
+% Info: Embed files into PDF
+%
% Copyright (C) 2006-2011 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
@@ -15,14 +16,14 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file embedfile.dtx
% and the derived files
% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv,
@@ -30,11 +31,11 @@
% embedfile-example-collection.tex, embedfile-test1.tex,
% embedfile-test2.tex, embedfile-test3.tex,
% embedfile-test4.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/embedfile.dtx
% CTAN:macros/latex/contrib/oberdiek/embedfile.pdf
-%
+%
% Unpacking:
% (a) If embedfile.ins is present:
% tex embedfile.ins
@@ -43,7 +44,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{embedfile.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If embedfile.drv is present:
% latex embedfile.drv
@@ -53,14 +54,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex embedfile.dtx
% makeindex -s gind.ist embedfile.idx
% pdflatex embedfile.dtx
% makeindex -s gind.ist embedfile.idx
% pdflatex embedfile.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/embedfile.sty
% TDS:tex/generic/oberdiek/dtx-attach.sty
@@ -88,7 +89,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: embedfile 2011/04/13 v2.6 embed files into PDF (HO)}
+\Msg{* Package: embedfile 2011/04/13 v2.6 Embed files into PDF (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -148,6 +149,10 @@ and the derived files
\file{embedfile-test2.tex}{\from{embedfile.dtx}{test2}}%
\file{embedfile-test3.tex}{\from{embedfile.dtx}{test3}}%
\file{embedfile-test4.tex}{\from{embedfile.dtx}{test4}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{embedfile.xml}{\from{embedfile.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -174,9 +179,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{embedfile.drv}%
- [2011/04/13 v2.6 embed files into PDF (HO)]%
+ [2011/04/13 v2.6 Embed files into PDF (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{embedfile.dtx}%
\end{document}
@@ -721,7 +726,7 @@ You need Acrobat Reader 8 or higher.
\fi
\expandafter\x\csname ver@embedfile.sty\endcsname
\ProvidesPackage{embedfile}%
- [2011/04/13 v2.6 embed files into PDF (HO)]%
+ [2011/04/13 v2.6 Embed files into PDF (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -2029,33 +2034,73 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{embedfile.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='embedfile'>
+ <name>embedfile</name>
+ <caption>Embed files into PDF.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.6'/>
+ <description>
+ This package embeds files in a PDF document, using the PDF
+ format's embedding operation (note the contrast with the attach
+ operation used by the <xref refid='attachfile'>attachfile</xref>
+ and <xref refid='attachfile2'>attachfile2</xref> packages).
+ Currently only <xref refid='pdftex'>pdfTeX</xref> &gt;=1.30, in
+ PDF mode, is supported.
+
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/embedfile.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/embedfile.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{attachfile}
% Scott Pakin: \textit{The \xpackage{attachfile} package};
% 2005/02/20 v1.2;
% \CTAN{macros/latex/contrib/attachfile/}.
-%
+%
% \bibitem{attachfile2}
% Heiko Oberdiek: \textit{The \xpackage{attachfile2} package};
% 2006/08/16 v2.2;
% \CTAN{macros/latex/contrib/oberdiek/attachfile2.pdf}.
-%
+%
% \bibitem{pdfspec}
% Adobe Systems Incorporated:
% \href{http://www.adobe.com/devnet/acrobat/pdfs/pdf_reference.pdf}%
% {\textit{PDF Reference, Sixth Edition, Version 1.7}},%
% Oktober 2006;
% \url{http://www.adobe.com/devnet/pdf/pdf_reference.html}.
-%
+%
% \bibitem{mime}
% Network Working Group: RFC 2046, \textit{Multipurpose Internet Mail Extensions (MIME) Part Two:
% Media Types}, November 1996; \url{http://www.rfc-editor.org/}.
-%
+%
% \bibitem{types}
% IANA (Internet Assigned Numbers Authority):
% \textit{MIME Media Types}, May 2006;
% \url{http://www.iana.org/assignments/media-types/}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/engord.dtx b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
index 3504739111f..1021074773c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/engord.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: engord.dtx
% Version: 2010/03/01 v1.8
-%
+% Info: Provides English ordinal numbers
+%
% Copyright (C) 2000, 2003, 2006-2008, 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
@@ -15,22 +16,22 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file engord.dtx
% and the derived files
% engord.sty, engord.pdf, engord.ins, engord.drv, engord-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/engord.dtx
% CTAN:macros/latex/contrib/oberdiek/engord.pdf
-%
+%
% Unpacking:
% (a) If engord.ins is present:
% tex engord.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{engord.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If engord.drv is present:
% latex engord.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex engord.dtx
% makeindex -s gind.ist engord.idx
% pdflatex engord.dtx
% makeindex -s gind.ist engord.idx
% pdflatex engord.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/engord.sty
% TDS:doc/latex/oberdiek/engord.pdf
@@ -126,6 +127,10 @@ and the derived files
\file{engord.sty}{\from{engord.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{engord-test1.tex}{\from{engord.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{engord.xml}{\from{engord.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -154,14 +159,14 @@ and the derived files
\ProvidesFile{engord.drv}%
[2010/03/01 v1.8 Provides English ordinal numbers (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{engord.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{552}
+% \CheckSum{557}
%
% \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
@@ -935,6 +940,45 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{engord.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='engord'>
+ <name>engord</name>
+ <caption>Converts numbers to English ordinal numbers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2003,2006-2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ Defines <tt>\engord</tt> (used like <tt>\arabic</tt>,
+ <tt>\roman</tt>, etc.), and <tt>\engordnumber</tt> (which formats
+ a &#x201C;TeX number&#x201D;).
+ <p/>
+ So <tt>\pagenumbering{engord}</tt> gives page numbers <tt>1st,
+ 2nd, 3rd, ...</tt>
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/engord.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/engord.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2000/05/23 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/enparen.dtx b/Master/texmf-dist/source/latex/oberdiek/enparen.dtx
new file mode 100644
index 00000000000..2ca0c38ad95
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/enparen.dtx
@@ -0,0 +1,980 @@
+% \iffalse meta-comment
+%
+% File: enparen.dtx
+% Version: 2012/01/07 v1.0
+% Info: Parentheses nesting
+%
+% Copyright (C) 2012 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 enparen.dtx
+% and the derived files
+% enparen.sty, enparen.pdf, enparen.ins, enparen.drv.
+%
+% Distribution:
+% CTAN:macros/latex/contrib/oberdiek/enparen.dtx
+% CTAN:macros/latex/contrib/oberdiek/enparen.pdf
+%
+% Unpacking:
+% (a) If enparen.ins is present:
+% tex enparen.ins
+% (b) Without enparen.ins:
+% tex enparen.dtx
+% (c) If you insist on using LaTeX
+% latex \let\install=y\input{enparen.dtx}
+% (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+% (a) If enparen.drv is present:
+% latex enparen.drv
+% (b) Without enparen.drv:
+% latex enparen.dtx; ...
+% The class ltxdoc loads the configuration file ltxdoc.cfg
+% if available. Here you can specify further options, e.g.
+% use A4 as paper format:
+% \PassOptionsToClass{a4paper}{article}
+%
+% Programm calls to get the documentation (example):
+% pdflatex enparen.dtx
+% makeindex -s gind.ist enparen.idx
+% pdflatex enparen.dtx
+% makeindex -s gind.ist enparen.idx
+% pdflatex enparen.dtx
+%
+% Installation:
+% TDS:tex/latex/oberdiek/enparen.sty
+% TDS:doc/latex/oberdiek/enparen.pdf
+% TDS:source/latex/oberdiek/enparen.dtx
+%
+%<*ignore>
+\begingroup
+ \catcode123=1 %
+ \catcode125=2 %
+ \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+ \ifx\csname processbatchFile\endcsname\relax\else1\fi
+ \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: enparen 2012/01/07 v1.0 Parentheses nesting (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\let\MetaPrefix\relax
+\preamble
+
+This is a generated file.
+
+Project: enparen
+Version: 2012/01/07 v1.0
+
+Copyright (C) 2012 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 enparen.dtx
+and the derived files
+ enparen.sty, enparen.pdf, enparen.ins, enparen.drv.
+
+\endpreamble
+\let\MetaPrefix\DoubleperCent
+
+\generate{%
+ \file{enparen.ins}{\from{enparen.dtx}{install}}%
+ \file{enparen.drv}{\from{enparen.dtx}{driver}}%
+ \usedir{tex/latex/oberdiek}%
+ \file{enparen.sty}{\from{enparen.dtx}{package}}%
+}
+
+\catcode32=13\relax% active space
+\let =\space%
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* enparen.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `enparen.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{enparen.drv}%
+ [2012/01/07 v1.0 Parentheses nesting (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{enparen}[2012/01/07]
+\begin{document}
+ \DocInput{enparen.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{339}
+%
+% \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
+% Lower-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
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+% \GetFileInfo{enparen.drv}
+%
+% \title{The \xpackage{enparen} package}
+% \date{2012/01/07 v1.0}
+% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% The package defines macros to set parentheses that automatically
+% change the symbols from inner to outer fences.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% The \hologo{LaTeX} package provides macros for automatically changed
+% parentheses symbols depending on the fence order.
+% The innermost parentheses are always using the same
+% parentheses. The symbols changes for the outer fences.
+%
+% Example:
+% \begin{quote}
+% \enparen{a \enparen{b} \enparen{c \enparen{d}} \enparen{e}}
+% \end{quote}
+% is generated by
+%\begin{quote}
+%\begin{verbatim}
+%\documentclass{article}
+%\usepackage{enparen}
+%\begin{document}
+% \enparen{a \enparen{b} \enparen{c \enparen{d}} \enparen{e}}
+%\end{document}
+%\end{verbatim}
+%\end{quote}
+%
+% The package is the result of a newsgroup thread. Dan gives
+% the following specification \cite{dan}:
+% \begin{quote}
+% ``On the other hand, the rules for fences are usually the reverse:
+% innermost fences are always |()|, next outer are |[]|, etc. This means
+% the opening fence has to wait until all the fences between it and
+% the matching close have been detected before it can decide whether
+% to be |(| or |[| or |{|.''
+% \end{quote}
+%
+% The fence level counting starts from innermost parentheses with one.
+% For the next outer fences the level is increased by one.
+% The example above with level indexes:
+% \begin{quote}
+% \def\1{\ensuremath{_{1}}}
+% \def\2{\ensuremath{_{2}}}
+% \def\3{\ensuremath{_{3}}}
+% \enparen{\3a \enparen{\1b}\1 \enparen{\2c \enparen{\1d}\1}\2 \enparen{e}}\3
+% \end{quote}
+% The correct level is only known at the closing symbol. Therefore the
+% correct value is remembered in the main \xext{aux} file and used
+% in the second \hologo{LaTeX} run.
+%
+% \subsection{User macros}
+%
+% \begin{declcs}{enparen} \M{text}
+% \end{declcs}
+% The macro \cs{enparen} puts its argument \meta{text} in parentheses.
+% If the macro is nested, the used fence symbols change for the
+% outer fences.
+%
+% \begin{declcs}{enparenLeft}\\
+% \cs{enparenRight}
+% \end{declcs}
+% Instead of |\enparen{text}| the left and right symbol can be
+% used separately, but in pairs:
+% \begin{quote}
+% |\enparenLeft text\enparenRight|
+% \end{quote}
+% \cs{enparenLeft} and \cs{enparenRight} may be used at different
+% group levels, but they must be properly nested.
+%
+% \begin{declcs}{enparenSetSymbols} \M{level} \M{opening symbol} \M{closing symbol}
+% \end{declcs}
+% Macro \cs{enparenSetSymbols} configures the \meta{opening symbol} and
+% \meta{closing symbol} for the \meta{level}. The \meta{level}
+% is a number and the counting starts with one. Level zero is used,
+% if the correct level is not known (e.g. in the first \hologo{LaTeX} run).
+% The package defines the following sets:
+%\begin{quote}
+%\begin{verbatim}
+%\enparenSetSymbols{0}{(}{)}
+%\enparenSetSymbols{1}{(}{)}
+%\enparenSetSymbols{2}{[}{]}
+%\enparenSetSymbols{3}{\{}{\}}
+%\end{verbatim}
+%\end{quote}
+% Example for changing the third and adding a fourth level:
+%\begin{quote}
+%\begin{verbatim}
+%\enparenSetSymbols{3}{\ensuremath{\langle}}{\ensuremath{\rangle}}
+%\enparenSetSymbols{4}{\{}{\}}
+%\end{verbatim}
+%\end{quote}
+%
+% \begin{declcs}{enparenUnsetSymbols} \M{level}
+% \end{declcs}
+% The symbols for level \meta{level} are removed.
+% Example scenario: Only two nesting levels must be used,
+% the package defines more, then the third level can be
+% disabled by |\enparenUnsetSymbols{3}| and the user
+% gets warnings if parentheses at level 3 are needed.
+%
+% \subsection{Contexts}
+%
+% \begin{declcs}{enparenBeginContext} \M{name}\\
+% \cs{enparenEndContext} \M{name}
+% \end{declcs}
+% If the current text is interrupted by footnotes, floats
+% with captions, then the parentheses inside the text of footnotes,
+% captions, \dots should restart from scratch. This can be achieved
+% by embedding the text inside macros \cs{enparenBeginContext}
+% and \cs{enparenEndContext}. These macros must be properly nested.
+% The \meta{name} for the begin and end macro must be the same.
+% It is a help for debugging problems, because the warning messages
+% show the context name. But it is not necessary that the
+% begin\slash end pairs have different names. Example:
+%\begin{quote}
+%\begin{verbatim}
+%\enparenLeft text before table ...
+%\begin{table}
+% \caption{Table caption}
+% \enparenBegin{Context}{table}
+% Other text \enparen{foobar}.
+% \enparenEnd{Context}{table}
+%\end{table}
+%text after table ...
+%\enparenRight
+%\end{verbatim}
+%\end{quote}
+% The parentheses inside the table environment and context `table'
+% are not nested inside other parentheses: \enparen{foobar}.
+% In case of captions and footnotes the contexts are automatically
+% added, see next section about options.
+%
+% \subsection{Options}
+%
+% \begin{declcs}{enparenSetup} \M{key value list}
+% \end{declcs}
+% Some options (currently all) can also be set after the
+% package is loaded. They can be set in the argument
+% \meta{key value list} of \cs{enparenSetup}. Options are disabled
+% after they are used the last time. Currently all options are boolean
+% options and are disabled in |\begin{document}|.
+%
+% \begin{description}
+% \item[\xoption{caption}:] The caption text is put in a
+% context |caption|.
+% \item[\xoption{footnote}:] The footnote text is put in a
+% context |footnote|.
+% \end{description}
+%
+% Example for disabling the two options at different places:
+%\begin{quote}
+%\begin{verbatim}
+%\usepackage[caption=false]{enparen}
+%\enparenSetup{footnote=false}
+%\end{verbatim}
+%\end{quote}
+%
+% \subsection{Notes}
+%
+% \begin{description}
+% \item[Implicite kerning:]
+% Unexpandable stuff might affect the implicite kerning.
+% The package cannot avoid this, because it need to define
+% and redefine macros at the occurence of each symbol.
+% This is done before the opening and after the closing
+% symbol, thus that the implicite kerning inside
+% is not affected.
+% \end{description}
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+% \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{enparen}
+ [2012/01/07 v1.0 Parentheses nesting (HO)]%
+% \end{macrocode}
+%
+% \subsection{Resources}
+%
+% \begin{macrocode}
+\RequirePackage{ltxcmds}[2011/11/09]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ltx@IfUndefined{numexpr}{%
+ \PackageError{enparen}{%
+ Missing e-TeX's \ltx@backslashchar numexpr.\MessageBreak
+ The package will continue with emergency definitions%
+ }\@ehc
+ \def\enparenLeft{(}%
+ \def\enparenRight{)}%
+ \long\def\enparen#1{\enparenLeft#1\enparenRight}%
+ \let\enparenSetup\ltx@gobble
+ \let\enparenSetSymbols\ltx@gobblethree
+ \let\enparenUnsetSymbols\ltx@gobble
+ \endinput
+}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\RequirePackage{protecteddef}[2011/01/31]
+\RequirePackage{atveryend}[2011/06/30]
+\RequirePackage{uniquecounter}[2011/01/30]
+\RequirePackage{zref-base}[2011/03/18]
+\RequirePackage{kvoptions}[2011/06/30]
+\RequirePackage{kvsetkeys}[2011/10/18]
+% \end{macrocode}
+%
+% \begin{macro}{\zref@wrapper@mainaux}
+% \begin{macrocode}
+\providecommand{\zref@wrapper@mainaux}[1]{%
+ \ifx\@auxout\@mainaux
+ #1%
+ \else
+ \begingroup
+ \let\@auxout\@mainaux
+ #1%
+ \endgroup
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\UniqueCounterNew{enparen}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\zref@newprop{enparen}[0]{}
+% \end{macrocode}
+%
+% \subsection{Contexts}
+%
+% \begin{macro}{\enparenContextDefault}
+% \begin{macrocode}
+\def\enparenContextDefault{main}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparen@ctx}
+% \begin{macrocode}
+\let\enparen@ctx\ltx@empty
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparen@stack}
+% \begin{macrocode}
+\let\enparen@stack\ltx@empty
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Stack for contexts}
+%
+% \begin{macro}{\enparen@CtxStack}
+% \begin{macrocode}
+\global\let\enparen@CtxStack\ltx@empty
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparen@CtxStackPush}
+% \begin{macrocode}
+\def\enparen@CtxStackPush#1{%
+ \xdef\enparen@CtxStack{%
+ {\enparen@ctx}{\enparen@stack}%
+ \enparen@CtxStack
+ }%
+ \xdef\enparen@ctx{#1}%
+ \global\let\enparen@stack\ltx@empty
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparen@CtxStackPop}
+% \begin{macrocode}
+\def\enparen@CtxStackPop{%
+ \ifx\enparen@CtxStack\ltx@empty
+ \PackageWarning{enparen}{%
+ Pop request for empty context stack%
+ }%
+ \global\let\enparen@ctx\enparenContextDefault
+ \global\let\enparen@stack\ltx@empty
+ \else
+ \xdef\enparen@ctx{%
+ \expandafter\ltx@car\enparen@CtxStack\@nil
+ }%
+ \xdef\enparen@stack{%
+ \expandafter\ltx@carsecond\enparen@CtxStack\@nil
+ }%
+ \xdef\enparen@CtxStack{%
+ \expandafter\ltx@cdrtwo\enparen@CtxStack\@nil
+ }%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Context user macros}
+%
+% \begin{macro}{\enparenBeginContext}
+% \begin{macrocode}
+\ProtectedDef*{\enparenBeginContext}[1]{%
+ \enparen@CtxStackPush{#1}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\enparenEndContext}
+% \begin{macrocode}
+\ProtectedDef*{\enparenEndContext}[1]{%
+ \edef\enparen@temp{#1}%
+ \ifx\enparen@temp\enparen@ctx
+ \else
+ \PackageWarning{enparen}{%
+ Context mismatch in end request.\MessageBreak
+ `#1' should be ended, but current context\MessageBreak
+ is `\enparen@ctx'%
+ }%
+ \fi
+ \enparenCheckEmptyStack
+ \enparen@CtxStackPop
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparenCheckEmptyStack}
+% \begin{macrocode}
+\ProtectedDef*{\enparenCheckEmptyStack}[0]{%
+ \ifx\enparen@stack\ltx@empty
+ \else
+ \PackageWarning{enparen}{%
+ Ending non-empty stack `\enparen@ctx':\MessageBreak
+ \enparen@PrintStack\MessageBreak
+ }%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparen@PrintStack}
+% \begin{macrocode}
+\def\enparen@PrintStack{%
+ \expandafter\enparen@PrintStackAux
+ \enparen@stack\ltx@empty\ltx@empty
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\enparen@PrintStackAux}
+% \begin{macrocode}
+\def\enparen@PrintStackAux#1#2{%
+ \ifx\ltx@empty#1%
+ \else
+ {#1:#2}%
+ \expandafter\enparen@PrintStackAux
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Symbols}
+%
+% \begin{macro}{\enparenSetSymbols}
+% \begin{macrocode}
+\ProtectedDef*{\enparenSetSymbols}[3]{%
+ \expandafter
+ \def\csname enparen@symbol\the\numexpr#1L\endcsname{#2}%
+ \expandafter
+ \def\csname enparen@symbol\the\numexpr#1R\endcsname{#3}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\enparenUnsetSymbols}
+% \begin{macrocode}
+\ProtectedDef*{\enparenUnsetSymbols}[1]{%
+ \expandafter
+ \let\csname enparen@symbol\the\numexpr#1L\endcsname\ltx@undefined
+ \expandafter
+ \let\csname enparen@symbol\the\numexpr#1R\endcsname\ltx@undefined
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\enparenSetSymbols{0}{(}{)}
+\enparenSetSymbols{1}{(}{)}
+\enparenSetSymbols{2}{[}{]}
+\enparenSetSymbols{3}{\{}{\}}
+\enparenSetSymbols{4}{\ensuremath{\langle}}{\ensuremath{\rangle}}
+% \end{macrocode}
+%
+% \subsection{Main user macros}
+%
+% \begin{macro}{\enparen}
+% \begin{macrocode}
+\ProtectedDef{\enparen}[1]{%
+ \enparenLeft#1\enparenRight
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparenLeft}
+% \begin{macrocode}
+\ProtectedDef*{\enparenLeft}[0]{%
+ \UniqueCounterCall{enparen}\enparen@Left
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\enparen@Left}
+% \begin{macrocode}
+\def\enparen@Left#1{%
+ \xdef\enparen@stack{%
+ {#1}{1}%
+ \expandafter\enparen@Inc\expandafter2\expandafter!%
+ \enparen@stack\ltx@empty\ltx@empty
+ }%
+ \edef\enparen@tmp{\zref@extract{enparen#1}{enparen}}%
+ \ltx@IfUndefined{enparen@symbol\enparen@tmp L}{%
+ \PackageWarning{enparen}{%
+ Undefined symbols for level \enparen@tmp
+ }%
+ \csname enparen@symbol0L\endcsname
+ }{%
+ \csname enparen@symbol\enparen@tmp L\endcsname
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\enparen@Inc}
+% \begin{macrocode}
+\def\enparen@Inc#1!#2#3{%
+ \ifx\ltx@empty#2%
+ \else
+ \ifnum#3<#1 %
+ {#2}{#1}%
+ \expandafter\enparen@Inc
+ \the\numexpr#1+1\expandafter\expandafter\expandafter!%
+ \else
+ {#2}{#3}%
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparenRight}
+% \begin{macrocode}
+\ProtectedDef*{\enparenRight}[0]{%
+ \ifx\enparen@stack\ltx@empty
+ \PackageWarning{enparen}{%
+ Missing left symbol for right symbol%
+ }%
+ \csname enparen@symbol0R\endcsname
+ \else
+ \expandafter\enparen@Right\enparen@stack\@nil
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparen@Right}
+% \begin{macrocode}
+\def\enparen@Right#1#2#3\@nil{%
+ \ltx@IfUndefined{%
+ enparen@symbol%
+ \zref@extract{enparen#1}{enparen}%
+ R%
+ }{%
+ \csname enparen@symbol0R\endcsname
+ }{%
+ \csname
+ enparen@symbol%
+ \zref@extract{enparen#1}{enparen}%
+ R%
+ \endcsname
+ }%
+ \zref@wrapper@mainaux{%
+ \zref@setcurrent{enparen}{#2}%
+ \zref@labelbyprops{enparen#1}{enparen}%
+ }%
+ \xdef\enparen@stack{#3}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Options}
+%
+% \begin{macrocode}
+\SetupKeyvalOptions{%
+ family=enparen,%
+ prefix=enparen@,%
+}
+% \end{macrocode}
+%
+% \begin{macro}{\enparenSetup}
+% \begin{macrocode}
+\ProtectedDef*{\enparenSetup}[0]{%
+ \kvsetkeys{enparen}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\DeclareBoolOption[true]{footnote}
+\DeclareBoolOption[true]{caption}
+\ProcessKeyvalOptions*
+% \end{macrocode}
+%
+% \subsection{Context settings}
+%
+% \begin{macro}{\enparen@AtBegin}
+% \begin{macrocode}
+\def\enparen@AtBegin{%
+ \ifenparen@footnote
+ \let\enparen@org@makefntext\@makefntext
+ \long\def\@makefntext##1{%
+ \enparen@org@makefntext{%
+ \enparenBeginContext{footnote}%
+ ##1%
+ \enparenEndContext{footnote}%
+ }%
+ }%
+ \fi
+ \enparen@Disable{footnote}%
+ \ifenparen@caption
+ \let\enparen@org@makecaption\@makecaption
+ \long\def\@makecaption##1##2{%
+ \enparen@org@makecaption{##1}{%
+ \enparenBeginContext{caption}%
+ ##2%
+ \enparenEndContext{caption}%
+ }%
+ }%
+ \fi
+ \enparen@Disable{caption}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\enparen@Disable}
+% \begin{macrocode}
+\def\enparen@Disable#1{%
+ \DisableKeyvalOption[%
+ action=warning,%
+ package=enparen,%
+ ]{enparen}{#1}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\AtBeginDocument{\enparen@AtBegin}
+% \end{macrocode}
+%
+% \subsection{At end of document}
+%
+% \begin{macro}{\enparen@AtEnd}
+% \begin{macrocode}
+\def\enparen@AtEnd{%
+ \enparenCheckEmptyStack
+ \ifx\enparen@CtxStack\ltx@empty
+ \else
+ \PackageWarningNoLine{enparen}{%
+ Context stack is not empty at end of document.\MessageBreak
+ Current stack and contents of context stack:\MessageBreak
+ [\enparen@ctx]:[\enparen@PrintStack]%
+ \expandafter
+ \enparen@PrintContextStack\enparen@CtxStack\relax\relax
+ }%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\enparen@PrintContextStack}
+% \begin{macrocode}
+\def\enparen@PrintContextStack#1#2{%
+ \ifx\relax#1\ltx@empty
+ \else
+ \MessageBreak
+ [#1]:[\enparen@PrintStackAux#2\ltx@empty\ltx@empty]% hash-ok
+ \expandafter\enparen@PrintContextStack
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+\AtVeryEndDocument{\enparen@AtEnd}
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
+%
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/enparen.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/enparen.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \end{description}
+% \emph{TDS} refers to the standard ``A Directory Structure
+% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
+% with \xfile{texmf} in their name are usually organized this way.
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+% |unzip oberdiek.tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+% \verb|tex enparen.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \def\t{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
+% enparen.sty & tex/latex/oberdiek/enparen.sty\\
+% enparen.pdf & doc/latex/oberdiek/enparen.pdf\\
+% enparen.dtx & source/latex/oberdiek/enparen.dtx\\
+% \end{tabular}^^A
+% }^^A
+% \sbox0{\t}^^A
+% \ifdim\wd0>\linewidth
+% \begingroup
+% \advance\linewidth by\leftmargin
+% \advance\linewidth by\rightmargin
+% \edef\x{\endgroup
+% \def\noexpand\lw{\the\linewidth}^^A
+% }\x
+% \def\lwbox{^^A
+% \leavevmode
+% \hbox to \linewidth{^^A
+% \kern-\leftmargin\relax
+% \hss
+% \usebox0
+% \hss
+% \kern-\rightmargin\relax
+% }^^A
+% }^^A
+% \ifdim\wd0>\lw
+% \sbox0{\small\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\footnotesize\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\scriptsize\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\tiny\t}^^A
+% \ifdim\wd0>\linewidth
+% \lwbox
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+% \verb|pdftk enparen.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+% \verb|latex \let\install=y\input{enparen.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+% \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex enparen.dtx
+%makeindex -s gind.ist enparen.idx
+%pdflatex enparen.dtx
+%makeindex -s gind.ist enparen.idx
+%pdflatex enparen.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \begin{thebibliography}{9}
+% \raggedright
+% \bibitem{dan}
+% Dan Luecking: \textit{Re: bracket order};
+% newsgroup \xnewsgroup{comp.text.tex};
+% message id \texttt{\small$\langle$9b07c9c8-ff92-4cbf-b3a9-84efecfeb506@l24g2000yqm.googlegroups.com$\rangle$}
+% 2012-01-05.
+% \url{http://groups.google.com/group/comp.text.tex/msg/8774519da31c2352}
+% \end{thebibliography}
+%
+% \begin{History}
+% \begin{Version}{2012/01/07 v1.0}
+% \item
+% First version.
+% \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx b/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx
index 538044d4f77..a1d105f8d36 100644
--- a/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: eolgrab.dtx
% Version: 2011/01/12 v1.0
-%
+% Info: Catch arguments delimited by end of line
+%
% Copyright (C) 2011 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
@@ -15,25 +16,25 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file eolgrab.dtx
% and the derived files
% eolgrab.sty, eolgrab.pdf, eolgrab.ins, eolgrab.drv,
% eolgrab-example-ltx.tex, eolgrab-example-env.tex,
% eolgrab-example-sec.tex, eolgrab-test1.tex,
% eolgrab-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/eolgrab.dtx
% CTAN:macros/latex/contrib/oberdiek/eolgrab.pdf
-%
+%
% Unpacking:
% (a) If eolgrab.ins is present:
% tex eolgrab.ins
@@ -42,7 +43,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{eolgrab.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If eolgrab.drv is present:
% latex eolgrab.drv
@@ -52,14 +53,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex eolgrab.dtx
% makeindex -s gind.ist eolgrab.idx
% pdflatex eolgrab.dtx
% makeindex -s gind.ist eolgrab.idx
% pdflatex eolgrab.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/eolgrab.sty
% TDS:doc/latex/oberdiek/eolgrab.pdf
@@ -85,7 +86,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: eolgrab 2011/01/12 v1.0 Grab line end delimited argument (HO)}
+\Msg{* Package: eolgrab 2011/01/12 v1.0 Catch arguments delimited by end of line (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -141,6 +142,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{eolgrab-test1.tex}{\from{eolgrab.dtx}{test1}}%
\file{eolgrab-test2.tex}{\from{eolgrab.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{eolgrab.xml}{\from{eolgrab.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -167,16 +172,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{eolgrab.drv}%
- [2011/01/12 v1.0 Grab line end delimited argument (HO)]%
+ [2011/01/12 v1.0 Catch arguments delimited by end of line (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{eolgrab.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{472}
+% \CheckSum{478}
%
% \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
@@ -514,7 +519,7 @@ and the derived files
\fi
\expandafter\x\csname ver@eolgrab.sty\endcsname
\ProvidesPackage{eolgrab}%
- [2011/01/12 v1.0 Grab line end delimited argument (HO)]%
+ [2011/01/12 v1.0 Catch arguments delimited by end of line (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1006,6 +1011,46 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{eolgrab.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='eolgrab'>
+ <name>eolgrab</name>
+ <caption>Catch arguments delimited by end of line.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines the command <tt>\eolgrab</tt> that reads an
+ string terminated by end of line, and then calls a macro with that
+ string as argument. Thus
+ <pre>\eolgrab\section My title</pre> is equivalent to
+ <pre>\section{My title}</pre>
+ <p/>
+ A second command <tt>\eolgrabopt</tt> provides the string as an
+ optional argument (which is useful for <tt>\item</tt>, for example).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/eolgrab.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/eolgrab.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \raggedright
% \bibitem{trautmann-request}
@@ -1014,21 +1059,21 @@ and the derived files
% mailing list \texttt{texthax@tug.org},
% 2011-01-06;
% \url{http://tug.org/pipermail/texhax/2011-January/016517.html}.
-%
+%
% \bibitem{taylor}
% Philip Taylor,
% \textit{Re: [texhax] read argument until EOL};
% mailing list \texttt{texhax@tug.org},
% 2011-01-06;
% \url{http://tug.org/pipermail/texhax/2011-January/016519.html}.
-%
+%
% \bibitem{oberdiek-eolgrab}
% Heiko Oberdiek,
% \textit{Re: [texhax] read argument until EOL};
% mailing list \texttt{texhax@tug.org},
% 2011-01-06;
% \url{http://tug.org/pipermail/texhax/2011-January/016526.html}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
index 029925d3700..816322e684f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: epstopdf.dtx
% Version: 2010/02/09 v2.5
-%
+% Info: Conversion with epstopdf on the fly
+%
% Copyright (C) 2001, 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
@@ -15,20 +16,20 @@
% 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 epstopdf.dtx
% and the derived files
% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv,
% epstopdf-base.sty, epstopdf-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/epstopdf.dtx
% CTAN:macros/latex/contrib/oberdiek/epstopdf.pdf
-%
+%
% Unpacking:
% (a) If epstopdf.ins is present:
% tex epstopdf.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{epstopdf.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If epstopdf.drv is present:
% latex epstopdf.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex epstopdf.dtx
% makeindex -s gind.ist epstopdf.idx
% pdflatex epstopdf.dtx
% makeindex -s gind.ist epstopdf.idx
% pdflatex epstopdf.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/epstopdf.sty
% TDS:tex/latex/oberdiek/epstopdf-base.sty
@@ -124,6 +125,10 @@ and the derived files
\file{epstopdf-base.sty}{\from{epstopdf.dtx}{base}}%
\usedir{doc/latex/oberdiek/test}%
\file{epstopdf-test1.tex}{\from{epstopdf.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{epstopdf-pkg.xml}{\from{epstopdf.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -152,7 +157,7 @@ and the derived files
\ProvidesFile{epstopdf.drv}%
[2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{epstopdf.dtx}%
\end{document}
@@ -1478,6 +1483,45 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{epstopdf-pkg.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='epstopdf-pkg'>
+ <name>epstopdf-pkg</name>
+ <caption>Call epstopdf "on the fly"</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006-2010'/>
+ <license type='lppl1.3'/>
+ <version number='2.5'/>
+ <description>
+ The package adds support for EPS files in the
+ <xref refid='graphicx'>graphicx</xref> package when running under
+ PDFTeX. If an EPS graphic is detected, the package spawns a
+ process to convert the EPS to PDF, using the script
+ <xref refid='epstopdf'>epstopdf</xref>. This of course requires
+ that shell escape is enabled for the PDFTeX run.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/epstopdf.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/epstopdf.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2001/01/06 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
index 5892a6a8b30..7cfc2662c3d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: etexcmds.dtx
% Version: 2011/02/16 v1.5
-%
+% Info: Avoid name clashes with e-TeX commands
+%
% Copyright (C) 2007, 2010, 2011 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file etexcmds.dtx
% and the derived files
% etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex,
% etexcmds-test4.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/etexcmds.dtx
% CTAN:macros/latex/contrib/oberdiek/etexcmds.pdf
-%
+%
% Unpacking:
% (a) If etexcmds.ins is present:
% tex etexcmds.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{etexcmds.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If etexcmds.drv is present:
% latex etexcmds.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex etexcmds.dtx
% makeindex -s gind.ist etexcmds.idx
% pdflatex etexcmds.dtx
% makeindex -s gind.ist etexcmds.idx
% pdflatex etexcmds.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/etexcmds.sty
% TDS:doc/latex/oberdiek/etexcmds.pdf
@@ -83,7 +84,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: etexcmds 2011/02/16 v1.5 Prefix for e-TeX command names (HO)}
+\Msg{* Package: etexcmds 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -136,6 +137,10 @@ and the derived files
\file{etexcmds-test2.tex}{\from{etexcmds.dtx}{test2}}%
\file{etexcmds-test3.tex}{\from{etexcmds.dtx}{test3}}%
\file{etexcmds-test4.tex}{\from{etexcmds.dtx}{test4}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{etexcmds.xml}{\from{etexcmds.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -162,16 +167,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{etexcmds.drv}%
- [2011/02/16 v1.5 Prefix for e-TeX command names (HO)]%
+ [2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{etexcmds.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{656}
+% \CheckSum{658}
%
% \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
@@ -231,7 +236,7 @@ and the derived files
%
% \subsection{\cs{expanded}}
%
-% Probably \cs{expanded} will be added in \pdfTeX\ 1.50.4 and
+% Probably \cs{expanded} will be added in \pdfTeX\ 1.50 and
% \LuaTeX. Again Con\TeX t defines this as macro.
% Therefore version 1.2 of this packages also provides
% \cs{etex@expanded} and \cs{ifetex@unexpanded}.
@@ -317,7 +322,7 @@ and the derived files
\fi
\expandafter\x\csname ver@etexcmds.sty\endcsname
\ProvidesPackage{etexcmds}%
- [2011/02/16 v1.5 Prefix for e-TeX command names (HO)]%
+ [2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -900,6 +905,45 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{etexcmds.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='etexcmds'>
+ <name>etexcmds</name>
+ <caption>Avoid name clashes with e-TeX commands.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ New primitive commands are introduced in e-TeX; sometimes the
+ names collide with existing macros. This package solves the
+ name clashes by adding a prefix to e-TeX&#x2019;s commands. For
+ example, eTeX&#x2019;s <tt>\unexpanded</tt> is provided as
+ <tt>\etex@unexpanded</tt>.
+
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/etexcmds.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/etexcmds.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/05/06 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
new file mode 100644
index 00000000000..17408f2e4dd
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
@@ -0,0 +1,1172 @@
+% \iffalse meta-comment
+%
+% File: fibnum.dtx
+% Version: 2012/04/08 v1.0
+% Info: Fibonacci numbers
+%
+% Copyright (C) 2012 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.
+%
+% The Base Interpreter refers to any `TeX-Format',
+% because some files are installed in TDS:tex/generic//.
+%
+% This work consists of the main source file fibnum.dtx
+% and the derived files
+% fibnum.sty, fibnum.pdf, fibnum.ins, fibnum.drv, fibnum.bib,
+% fibnum-test1.tex, fibnum-test-calc.tex.
+%
+% Distribution:
+% CTAN:macros/latex/contrib/oberdiek/fibnum.dtx
+% CTAN:macros/latex/contrib/oberdiek/fibnum.pdf
+%
+% Unpacking:
+% (a) If fibnum.ins is present:
+% tex fibnum.ins
+% (b) Without fibnum.ins:
+% tex fibnum.dtx
+% (c) If you insist on using LaTeX
+% latex \let\install=y\input{fibnum.dtx}
+% (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+% (a) If fibnum.drv is present:
+% latex fibnum.drv
+% (b) Without fibnum.drv:
+% latex fibnum.dtx; ...
+% The class ltxdoc loads the configuration file ltxdoc.cfg
+% if available. Here you can specify further options, e.g.
+% use A4 as paper format:
+% \PassOptionsToClass{a4paper}{article}
+%
+% Programm calls to get the documentation (example):
+% pdflatex fibnum.dtx
+% bibtex fibnum.aux
+% makeindex -s gind.ist fibnum.idx
+% pdflatex fibnum.dtx
+% makeindex -s gind.ist fibnum.idx
+% pdflatex fibnum.dtx
+%
+% Installation:
+% TDS:tex/generic/oberdiek/fibnum.sty
+% TDS:doc/latex/oberdiek/fibnum.pdf
+% TDS:doc/latex/oberdiek/test/fibnum-test1.tex
+% TDS:doc/latex/oberdiek/test/fibnum-test-calc.tex
+% TDS:source/latex/oberdiek/fibnum.dtx
+%
+%<*ignore>
+\begingroup
+ \catcode123=1 %
+ \catcode125=2 %
+ \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+ \ifx\csname processbatchFile\endcsname\relax\else1\fi
+ \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: fibnum 2012/04/08 v1.0 Fibonacci numbers (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\let\MetaPrefix\relax
+\preamble
+
+This is a generated file.
+
+Project: fibnum
+Version: 2012/04/08 v1.0
+
+Copyright (C) 2012 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.
+
+The Base Interpreter refers to any `TeX-Format',
+because some files are installed in TDS:tex/generic//.
+
+This work consists of the main source file fibnum.dtx
+and the derived files
+ fibnum.sty, fibnum.pdf, fibnum.ins, fibnum.drv, fibnum.bib,
+ fibnum-test1.tex, fibnum-test-calc.tex.
+
+\endpreamble
+\let\MetaPrefix\DoubleperCent
+
+\generate{%
+ \file{fibnum.ins}{\from{fibnum.dtx}{install}}%
+ \file{fibnum.drv}{\from{fibnum.dtx}{driver}}%
+ \nopreamble
+ \nopostamble
+ \file{fibnum.bib}{\from{fibnum.dtx}{bib}}%
+ \usepreamble\defaultpreamble
+ \usepostamble\defaultpostamble
+ \usedir{tex/generic/oberdiek}%
+ \file{fibnum.sty}{\from{fibnum.dtx}{package}}%
+ \usedir{doc/latex/oberdiek/test}%
+ \file{fibnum-test1.tex}{\from{fibnum.dtx}{test1}}%
+ \file{fibnum-test-calc.tex}{\from{fibnum.dtx}{test-calc}}%
+}
+
+\catcode32=13\relax% active space
+\let =\space%
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* fibnum.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `fibnum.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*bib>
+@online{texhax:abraham,
+ author={Abraham, Jan},
+ title={[texhax] Beginner in TEX MACRO to compute functions},
+ date={2012-04-07},
+ url={http://tug.org/pipermail/texhax/2012-April/019146.html},
+ urldate={2012-04-08},
+}
+@article{knuth:negafibonacci,
+ author={Knuth, Donald E.},
+ title={Negafibonacci Numbers and the Hyperbolic Plane},
+ date={2008-12-11},
+ url={http://research.allacademic.com/meta/p206842_index.html},
+}
+@online{wikipedia:negafibonacci,
+ author={{Wikipedia contributors}},
+ organization={{Wikipedia, The Free Encyclopedia}},
+ title={Fibonacci numbers},
+ language={langenglish},
+ version={486266088},
+ date={2012-04-08},
+ url={http://en.wikipedia.org/w/index.php?title=Fibonacci_number&oldid=486266088},
+ urldate={2012-04-08},
+}
+%</bib>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{fibnum.drv}%
+ [2012/04/08 v1.0 Fibonacci numbers (HO)]%
+\documentclass{ltxdoc}
+\usepackage{amsmath}
+\usepackage{siunitx}
+\usepackage{array}
+\usepackage{tabularx}
+\usepackage{fibnum}[2012/04/08]
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{csquotes}
+\usepackage[
+ bibencoding=ascii,
+ alldates=iso8601,
+]{biblatex}[2011/11/13]
+\bibliography{oberdiek-source}
+\bibliography{fibnum}
+\begin{document}
+ \DocInput{fibnum.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{786}
+%
+% \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
+% Lower-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
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+% \GetFileInfo{fibnum.drv}
+%
+% \title{The \xpackage{fibnum} package}
+% \date{2012/04/08 v1.0}
+% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% The package \xpackage{fibnum} provides expandable fibonacci
+% numbers for both \hologo{LaTeX} and \hologo{plainTeX}.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% In the mailing list \textsf{texhax} Jan Abraham asked the question,
+% how to get Fibonacci numbers in \hologo{TeX} \cite{texhax:abraham}:
+% \begin{quote}
+% Write a Macro in \hologo{TeX} that compute the function |\fib{m}|
+% All fibonacci numbers from 1 to $m$ ($m < 40$).
+% \end{quote}
+% This packages provides an expandable implementation for the
+% calculation of these numbers for a much larger set of indexes.
+% For practical reasons the index is restricted to the same limitations
+% that apply for \hologo{TeX} integer numbers.
+% The range of the Fibonacci numbers, however, are not limited
+% by the algorithm. They are only restricted to memory limitations,
+% if they are hit.
+%
+% The package is loaded as \hologo{LaTeX} package in \hologo{LaTeX}:
+% \begin{quote}
+% |\usepackage{fibnum}|
+% \end{quote}
+% and as file in \hologo{plainTeX}:
+% \begin{quote}
+% |\input fibnum.sty|
+% \end{quote}
+% The package does not know any options and it provides
+% the macros \cs{fibnum} and \cs{fibnumPreCalc}.
+%
+% \begin{declcs}{fibnum} \M{index}
+% \end{declcs}
+% Macro \cs{fibnum} expects a \hologo{TeX} number as \meta{index}
+% in the official \hologo{TeX} number range from $-(2^{31}-1)$ up to
+% $2^{31}-1$. In exact two expansion steps the macro expands to
+% the Fibnoacci number $F_{\text{\meta{index}}}$. In case of a negative
+% \meta{index}, the ``negafibonacci'' number \cite{wikipedia:negafibonacci}
+% is used. Formally the Fibonacci number $F_n$ with integer
+% index~$n$, $n\in\mathbb{Z}$ and
+% $n\in[\num{-2147483647},\num{2147483647}]$ that is returned by macro
+% \cs{fibnum} with numerical argument $n$ is defined the following way:
+% \begin{gather}
+% \label{eq:def}
+% F_n =
+% \begin{cases}
+% 0 & \text{for $n=0$}\\
+% 1 & \text{for $n=1$}\\
+% F_{n-1} + F_{n-2} & \text{for $n>1$}\\
+% (-1)^{n+1}F_n & \text{for $n<0$}
+% \end{cases}
+% \end{gather}
+% Examples:
+% \begin{quote}
+% \makeatletter
+% \def\x#1{\cs{fibnum}\{#1\}&
+% \edef\X{\fibnum{#1}}\edef\Y{\expandafter\ltx@car\X\@nil}^^A
+% \if-\Y
+% \edef\X{\expandafter\ltx@cdr\X\@nil}^^A
+% \noindent
+% \llap{-}\X
+% \else
+% \X
+% \fi
+% \tabularnewline
+% }
+% \def\y{\multicolumn{1}{@{}c@{}}{$\vdots$}\tabularnewline}
+% \DeclareUrlCommand\UrlNum{^^A
+% \urlstyle{tt}^^A
+% \def\UrlBreaks{\do\0\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9}^^A
+% }
+% \begin{tabularx}{\dimexpr\linewidth+5.7pt\relax}{@{}>{\ttfamily}l@{ $\rightarrow$ \hphantom{\ttfamily-}}>{\ttfamily}X@{}}
+% \x{-6}
+% \x{-5}
+% \x{-4}
+% \x{-3}
+% \x{-2}
+% \x{-1}
+% \x{0}
+% \x{1}
+% \x{2}
+% \x{3}
+% \x{4}
+% \x{5}
+% \x{6}
+% \y
+% \x{10}
+% \y
+% \x{46}
+% \y
+% \cs{fibnum}\{100\} & 354224848179261915075
+% \tabularnewline
+% \y
+% \cs{fibnum}\{200\} & 280571172992510140037611932413038677189525
+% \tabularnewline
+% \y
+% \cs{fibnum}\{1000\} &
+% \raggedright
+% \UrlNum{^^A
+% 434665576869374564356885276750406258025646^^A
+% 605173717804024817290895365554179490518904^^A
+% 038798400792551692959225930803226347752096^^A
+% 896232398733224711616429964409065331879382^^A
+% 98969649928516003704476137795166849228875^^A
+% }
+% \tabularnewline
+% \end{tabularx}\kern-5.7pt\mbox{}
+% \end{quote}
+%
+% \begin{declcs}{fibnumPreCalc} \M{index}
+% \end{declcs}
+% The package already provides precalculated Fibonacci numbers up to
+% index~46. That means that calculations are not necessary for
+% Fibonacci numbers that fit into the range of \hologo{TeX}
+% numbers. Because macro \cs{fibnum} is expandable, it cannot
+% store calculated Fibonacci numbers for later use. Macro definitions
+% are forbidden in expandable contexts. If larger Fibonacci numbers
+% are used more than once, than the compilation time can be shortened
+% by calculating and storing the Fibonacci numbers beforehand.
+% The argument \meta{index} is a \hologo{TeX} number and macro
+% \cs{fibnumPreCalc} ensures that the Fibonacci numbers
+% $F_0$ up to $F_{\lvert\text{\meta{index}}\rvert}$ that are not
+% already known are calculated
+% and stored in internal macros. Internally only non-negative
+% Fibonacci numbers are stored. If \meta{index} is negative, then
+% the needed positive Fibonacci numbers are calculated and stored.
+% Example:
+% \begin{quote}
+% \def\x#1{\begingroup\itshape\texttt{\%} #1\endgroup}
+% |\fibnumPreCalc{50}|\\
+% \x{calculates and stores the values for indexes 47..50.}\\
+% \x{(Values for 0..46 are already stored by the package.)}\\
+% |\fibnum{49}| \x{uses the stored value}\\
+% |\fibnum{51}|
+% \x{only calculates $F_{51}$ from stored values $F_{49}$ and $F_{50}$}\\
+% |\fibnumPreCalc{100}|\\
+% \x{calculates and stores the values for indexes 51..100}\\
+% |\fibnum{100}| \x{uses the stored value for $F_{100}$}\\
+% |\fibnum{-100}|
+% \x{uses the stored value for $F_{100}$}\\
+% \x{$F_{-100}=-F_{100}$ according to equation \eqref{eq:def}.}
+% \end{quote}
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+% \subsection{Identification}
+%
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+% Reload check, especially if the package is not used with \LaTeX.
+% \begin{macrocode}
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+ \catcode13=5 % ^^M
+ \endlinechar=13 %
+ \catcode35=6 % #
+ \catcode39=12 % '
+ \catcode44=12 % ,
+ \catcode45=12 % -
+ \catcode46=12 % .
+ \catcode58=12 % :
+ \catcode64=11 % @
+ \catcode123=1 % {
+ \catcode125=2 % }
+ \expandafter\let\expandafter\x\csname ver@fibnum.sty\endcsname
+ \ifx\x\relax % plain-TeX, first loading
+ \else
+ \def\empty{}%
+ \ifx\x\empty % LaTeX, first loading,
+ % variable is initialized, but \ProvidesPackage not yet seen
+ \else
+ \expandafter\ifx\csname PackageInfo\endcsname\relax
+ \def\x#1#2{%
+ \immediate\write-1{Package #1 Info: #2.}%
+ }%
+ \else
+ \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
+ \fi
+ \x{fibnum}{The package is already loaded}%
+ \aftergroup\endinput
+ \fi
+ \fi
+\endgroup%
+% \end{macrocode}
+% Package identification:
+% \begin{macrocode}
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+ \catcode13=5 % ^^M
+ \endlinechar=13 %
+ \catcode35=6 % #
+ \catcode39=12 % '
+ \catcode40=12 % (
+ \catcode41=12 % )
+ \catcode44=12 % ,
+ \catcode45=12 % -
+ \catcode46=12 % .
+ \catcode47=12 % /
+ \catcode58=12 % :
+ \catcode64=11 % @
+ \catcode91=12 % [
+ \catcode93=12 % ]
+ \catcode123=1 % {
+ \catcode125=2 % }
+ \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+ \def\x#1#2#3[#4]{\endgroup
+ \immediate\write-1{Package: #3 #4}%
+ \xdef#1{#4}%
+ }%
+ \else
+ \def\x#1#2[#3]{\endgroup
+ #2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
+ \ifx#1\relax
+ \xdef#1{#3}%
+ \fi
+ }%
+ \fi
+\expandafter\x\csname ver@fibnum.sty\endcsname
+\ProvidesPackage{fibnum}%
+ [2012/04/08 v1.0 Fibonacci numbers (HO)]%
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+ \catcode13=5 % ^^M
+ \endlinechar=13 %
+ \catcode123=1 % {
+ \catcode125=2 % }
+ \catcode64=11 % @
+ \def\x{\endgroup
+ \expandafter\edef\csname FibNum@AtEnd\endcsname{%
+ \endlinechar=\the\endlinechar\relax
+ \catcode13=\the\catcode13\relax
+ \catcode32=\the\catcode32\relax
+ \catcode35=\the\catcode35\relax
+ \catcode61=\the\catcode61\relax
+ \catcode64=\the\catcode64\relax
+ \catcode123=\the\catcode123\relax
+ \catcode125=\the\catcode125\relax
+ }%
+ }%
+\x\catcode61\catcode48\catcode32=10\relax%
+\catcode13=5 % ^^M
+\endlinechar=13 %
+\catcode35=6 % #
+\catcode64=11 % @
+\catcode123=1 % {
+\catcode125=2 % }
+\def\TMP@EnsureCode#1#2{%
+ \edef\FibNum@AtEnd{%
+ \FibNum@AtEnd
+ \catcode#1=\the\catcode#1\relax
+ }%
+ \catcode#1=#2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+%\TMP@EnsureCode{36}{3}% $
+%\TMP@EnsureCode{38}{4}% &
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{91}{12}% [
+%\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{93}{12}% ]
+%\TMP@EnsureCode{94}{12}% ^ (superscript) (!)
+%\TMP@EnsureCode{124}{12}% |
+\edef\FibNum@AtEnd{\FibNum@AtEnd\noexpand\endinput}
+% \end{macrocode}
+%
+% \subsection{Package resources}
+%
+% \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \def\TMP@RequirePackage#1[#2]{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname ver@#1.sty\endcsname\relax
+ \input #1.sty\relax
+ \fi
+ }%
+ \TMP@RequirePackage{ltxcmds}[2011/04/18]%
+ \TMP@RequirePackage{intcalc}[2007/09/27]%
+ \TMP@RequirePackage{bigintcalc}[2007/11/11]%
+\else
+ \RequirePackage{ltxcmds}[2011/04/18]%
+ \RequirePackage{intcalc}[2007/09/27]%
+ \RequirePackage{bigintcalc}[2007/11/11]%
+\fi
+% \end{macrocode}
+%
+% \subsection{Setup precalculated values}
+%
+% \begin{macrocode}
+\def\FibNum@temp#1{%
+ \expandafter\def\csname FibNum@#1\endcsname
+}
+\catcode46=9 % dots are ignored
+\FibNum@temp{0}{0}
+\FibNum@temp{1}{1}
+\FibNum@temp{2}{1}
+\FibNum@temp{3}{2}
+\FibNum@temp{4}{3}
+\FibNum@temp{5}{5}
+\FibNum@temp{6}{8}
+\FibNum@temp{7}{13}
+\FibNum@temp{8}{21}
+\FibNum@temp{9}{34}
+\FibNum@temp{10}{55}
+\FibNum@temp{11}{89}
+\FibNum@temp{12}{144}
+\FibNum@temp{13}{233}
+\FibNum@temp{14}{377}
+\FibNum@temp{15}{610}
+\FibNum@temp{16}{987}
+\FibNum@temp{17}{1.597}
+\FibNum@temp{18}{2.584}
+\FibNum@temp{19}{4.181}
+\FibNum@temp{20}{6.765}
+\FibNum@temp{21}{10.946}
+\FibNum@temp{22}{17.711}
+\FibNum@temp{23}{28.657}
+\FibNum@temp{24}{46.368}
+\FibNum@temp{25}{75.025}
+\FibNum@temp{26}{121.393}
+\FibNum@temp{27}{196.418}
+\FibNum@temp{28}{317.811}
+\FibNum@temp{29}{514.229}
+\FibNum@temp{30}{832.040}
+\FibNum@temp{31}{1.346.269}
+\FibNum@temp{32}{2.178.309}
+\FibNum@temp{33}{3.524.578}
+\FibNum@temp{34}{5.702.887}
+\FibNum@temp{35}{9.227.465}
+\FibNum@temp{36}{14.930.352}
+\FibNum@temp{37}{24.157.817}
+\FibNum@temp{38}{39.088.169}
+\FibNum@temp{39}{63.245.986}
+\FibNum@temp{40}{102.334.155}
+\FibNum@temp{41}{165.580.141}
+\FibNum@temp{42}{267.914.296}
+\FibNum@temp{43}{433.494.437}
+\FibNum@temp{44}{701.408.733}
+\FibNum@temp{45}{1.134.903.170}
+\FibNum@temp{46}{1.836.311.903}
+% \end{macrocode}
+% \begin{macro}{\FibNum@max}
+% \begin{macrocode}
+\def\FibNum@max{46}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Macros for precalculating values}
+%
+% \begin{macro}{\fibnumPreCalc}
+% \begin{macrocode}
+\def\fibnumPreCalc#1{%
+ \expandafter\expandafter\expandafter
+ \FibNum@PreCalc\intcalcNum{#1}/%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\FibNum@PreCalc}
+% \begin{macrocode}
+\def\FibNum@PreCalc#1/{%
+ \ifnum#1<\ltx@zero
+ \expandafter\FibNum@PreCalc\ltx@gobble#1/%
+ \else
+ \ifnum#1>\FibNum@max
+ \begingroup
+ \ltx@LocDimenA=#1sp\relax
+ \countdef\FibNum@i=255\relax
+ \FibNum@i=\FibNum@max\relax
+ \edef\FibNum@temp{%
+ \csname FibNum@\the\FibNum@i\endcsname/%
+ }%
+ \advance\FibNum@i by -1\relax
+ \edef\FibNum@temp{%
+ \FibNum@temp
+ \csname FibNum@\the\FibNum@i\endcsname
+ }%
+ \advance\FibNum@i\ltx@two
+ \iftrue
+ \expandafter\FibNum@PreCalcAux\FibNum@temp
+ \fi
+ \endgroup
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\FibNum@PreCalcAux}
+% \begin{macrocode}
+\def\FibNum@PreCalcAux#1/#2\fi{%
+ \fi
+ \edef\FibNum@temp{\BigIntCalcAdd#1!#2!}%
+ \global\expandafter
+ \let\csname FibNum@\the\FibNum@i\endcsname\FibNum@temp
+ \ifnum\FibNum@i=\ltx@LocDimenA
+ \xdef\FibNum@max{\the\FibNum@i}%
+ \else
+ \advance\FibNum@i\ltx@one
+ \expandafter\FibNum@PreCalcAux\FibNum@temp/#1%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Expandable calculations}
+%
+% \begin{macro}{\fibnum}
+% \begin{macrocode}
+\def\fibnum#1{%
+ \romannumeral
+ \expandafter\expandafter\expandafter\FibNum@Do\intcalcNum{#1}/%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\FibNum@Do}
+% \begin{macrocode}
+\def\FibNum@Do#1/{%
+ \ifnum#1<\ltx@zero
+ \FibNum@ReturnAfterElseFiFi{%
+ \ifodd#1 %
+ \expandafter\expandafter\expandafter\ltx@zero
+ \else
+ \expandafter\expandafter\expandafter\ltx@zero
+ \expandafter\expandafter\expandafter-%
+ \fi
+ \romannumeral
+ \expandafter\FibNum@Do\ltx@gobble#1/%
+ }%
+ \else
+ \ifnum\FibNum@max<#1 %
+ \ltx@ReturnAfterElseFi{%
+ \expandafter
+ \FibNum@ExpCalc\number\expandafter\IntCalcInc\FibNum@max!%
+ \expandafter\expandafter\expandafter/%
+ \csname FibNum@\FibNum@max
+ \expandafter\expandafter\expandafter\endcsname
+ \expandafter\expandafter\expandafter/%
+ \csname FibNum@\expandafter\IntCalcDec\FibNum@max!%
+ \endcsname/%
+ #1%
+ }%
+ \else
+ \expandafter\expandafter\expandafter\ltx@zero
+ \csname FibNum@#1\expandafter\expandafter\expandafter\endcsname
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\FibNum@ReturnAfterElseFiFi}
+% \begin{macrocode}
+\def\FibNum@ReturnAfterElseFiFi#1\else#2\fi\fi{\fi#1}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\FibNum@ExpCalc}
+% \begin{macrocode}
+\def\FibNum@ExpCalc#1/#2/#3/#4\fi{%
+ \fi
+ \ifnum#1=#4 %
+ \ltx@ReturnAfterElseFi{%
+ \expandafter\expandafter\expandafter\ltx@zero
+ \BigIntCalcAdd#2!#3!%
+ }%
+ \else
+ \expandafter\FibNum@ExpCalc
+ \number\IntCalcInc#1!%
+ \expandafter\expandafter\expandafter/%
+ \BigIntCalcAdd#2!#3!/%
+ #2/#4%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\FibNum@AtEnd%
+%</package>
+% \end{macrocode}
+%
+% \section{Test}
+%
+% \subsection{Catcode checks for loading}
+%
+% \begin{macrocode}
+%<*test1>
+% \end{macrocode}
+% \begin{macrocode}
+\catcode`\{=1 %
+\catcode`\}=2 %
+\catcode`\#=6 %
+\catcode`\@=11 %
+\expandafter\ifx\csname count@\endcsname\relax
+ \countdef\count@=255 %
+\fi
+\expandafter\ifx\csname @gobble\endcsname\relax
+ \long\def\@gobble#1{}%
+\fi
+\expandafter\ifx\csname @firstofone\endcsname\relax
+ \long\def\@firstofone#1{#1}%
+\fi
+\expandafter\ifx\csname loop\endcsname\relax
+ \expandafter\@firstofone
+\else
+ \expandafter\@gobble
+\fi
+{%
+ \def\loop#1\repeat{%
+ \def\body{#1}%
+ \iterate
+ }%
+ \def\iterate{%
+ \body
+ \let\next\iterate
+ \else
+ \let\next\relax
+ \fi
+ \next
+ }%
+ \let\repeat=\fi
+}%
+\def\RestoreCatcodes{}
+\count@=0 %
+\loop
+ \edef\RestoreCatcodes{%
+ \RestoreCatcodes
+ \catcode\the\count@=\the\catcode\count@\relax
+ }%
+\ifnum\count@<255 %
+ \advance\count@ 1 %
+\repeat
+
+\def\RangeCatcodeInvalid#1#2{%
+ \count@=#1\relax
+ \loop
+ \catcode\count@=15 %
+ \ifnum\count@<#2\relax
+ \advance\count@ 1 %
+ \repeat
+}
+\def\RangeCatcodeCheck#1#2#3{%
+ \count@=#1\relax
+ \loop
+ \ifnum#3=\catcode\count@
+ \else
+ \errmessage{%
+ Character \the\count@\space
+ with wrong catcode \the\catcode\count@\space
+ instead of \number#3%
+ }%
+ \fi
+ \ifnum\count@<#2\relax
+ \advance\count@ 1 %
+ \repeat
+}
+\def\space{ }
+\expandafter\ifx\csname LoadCommand\endcsname\relax
+ \def\LoadCommand{\input fibnum.sty\relax}%
+\fi
+\def\Test{%
+ \RangeCatcodeInvalid{0}{47}%
+ \RangeCatcodeInvalid{58}{64}%
+ \RangeCatcodeInvalid{91}{96}%
+ \RangeCatcodeInvalid{123}{255}%
+ \catcode`\@=12 %
+ \catcode`\\=0 %
+ \catcode`\%=14 %
+ \LoadCommand
+ \RangeCatcodeCheck{0}{36}{15}%
+ \RangeCatcodeCheck{37}{37}{14}%
+ \RangeCatcodeCheck{38}{47}{15}%
+ \RangeCatcodeCheck{48}{57}{12}%
+ \RangeCatcodeCheck{58}{63}{15}%
+ \RangeCatcodeCheck{64}{64}{12}%
+ \RangeCatcodeCheck{65}{90}{11}%
+ \RangeCatcodeCheck{91}{91}{15}%
+ \RangeCatcodeCheck{92}{92}{0}%
+ \RangeCatcodeCheck{93}{96}{15}%
+ \RangeCatcodeCheck{97}{122}{11}%
+ \RangeCatcodeCheck{123}{255}{15}%
+ \RestoreCatcodes
+}
+\Test
+\csname @@end\endcsname
+\end
+% \end{macrocode}
+% \begin{macrocode}
+%</test1>
+% \end{macrocode}
+%
+% \subsection{Test calculations}
+%
+% \begin{macrocode}
+%<*test-calc>
+\catcode`\{=1 %
+\catcode`\}=2 %
+\catcode`\#=6 %
+\catcode`\@=11 %
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input fibnum.sty\relax
+\else
+ \RequirePackage{fibnum}[2012/04/08]%
+\fi
+\def\TestSet{%
+ \test{0}{0}%
+ \test{1}{1}%
+ \test{2}{1}%
+ \test{3}{2}%
+ \test{4}{3}%
+ \test{5}{5}%
+ \test{6}{8}%
+ \test{7}{13}%
+ \test{8}{21}%
+ \test{9}{34}%
+ \test{10}{55}%
+ \test{11}{89}%
+ \test{12}{144}%
+ \test{13}{233}%
+ \test{14}{377}%
+ \test{15}{610}%
+ \test{16}{987}%
+ \test{17}{1597}%
+ \test{18}{2584}%
+ \test{19}{4181}%
+ \test{20}{6765}%
+ \test{21}{10946}%
+ \test{22}{17711}%
+ \test{23}{28657}%
+ \test{24}{46368}%
+ \test{25}{75025}%
+ \test{26}{121393}%
+ \test{27}{196418}%
+ \test{28}{317811}%
+ \test{29}{514229}%
+ \test{30}{832040}%
+ \test{31}{1346269}%
+ \test{32}{2178309}%
+ \test{33}{3524578}%
+ \test{34}{5702887}%
+ \test{35}{9227465}%
+ \test{36}{14930352}%
+ \test{37}{24157817}%
+ \test{38}{39088169}%
+ \test{39}{63245986}%
+ \test{40}{102334155}%
+ \test{41}{165580141}%
+ \test{42}{267914296}%
+ \test{43}{433494437}%
+ \test{44}{701408733}%
+ \test{45}{1134903170}%
+ \test{46}{1836311903}%
+ \test{47}{2971215073}%
+ \test{48}{4807526976}%
+ \test{49}{7778742049}%
+ \test{50}{12586269025}%
+ \test{51}{20365011074}%
+ \test{52}{32951280099}%
+ \test{53}{53316291173}%
+ \test{54}{86267571272}%
+ \test{55}{139583862445}%
+ \test{56}{225851433717}%
+ \test{57}{365435296162}%
+ \test{58}{591286729879}%
+ \test{59}{956722026041}%
+ \test{60}{1548008755920}%
+ \test{61}{2504730781961}%
+ \test{62}{4052739537881}%
+ \test{63}{6557470319842}%
+ \test{64}{10610209857723}%
+ \test{65}{17167680177565}%
+ \test{66}{27777890035288}%
+ \test{67}{44945570212853}%
+ \test{68}{72723460248141}%
+ \test{69}{117669030460994}%
+ \test{70}{190392490709135}%
+ \test{71}{308061521170129}%
+ \test{72}{498454011879264}%
+ \test{73}{806515533049393}%
+}
+\def\msg#{\immediate\write16}
+\def\test#1#2{%
+ \TestAux{#1}{#2}%
+ \ifnum#1=0 %
+ \else
+ \ifodd#1 %
+ \TestAux{-#1}{#2}%
+ \else
+ \TestAux{-#1}{-#2}%
+ \fi
+ \fi
+}
+\def\TestAux#1#2{%
+ \def\Expected{#2}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\Result
+ \expandafter\expandafter\expandafter{%
+ \fibnum{#1}%
+ }%
+ \ltx@onelevel@sanitize\Result
+ \ifx\Result\Expected
+ \msg{* #1: ok.}%
+ \else
+ \msg{! fib(#1) = #2}%
+ \errmessage{fib(#1) <> \Result}%
+ \fi
+}
+\TestSet
+\setbox0=\hbox{%
+ \msg{* PreCalc{73}}%
+ \fibnumPreCalc{73}%
+}
+\ifdim\wd0=0pt
+\else
+ \errmessage{Unwanted stuff in PreCalc}%
+\fi
+\TestSet
+\csname @@end\endcsname\end
+%</test-calc>
+% \end{macrocode}
+%
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/fibnum.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/fibnum.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \end{description}
+% \emph{TDS} refers to the standard ``A Directory Structure
+% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
+% with \xfile{texmf} in their name are usually organized this way.
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+% |unzip oberdiek.tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+% \verb|tex fibnum.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \def\t{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
+% fibnum.sty & tex/generic/oberdiek/fibnum.sty\\
+% fibnum.pdf & doc/latex/oberdiek/fibnum.pdf\\
+% test/fibnum-test1.tex & doc/latex/oberdiek/test/fibnum-test1.tex\\
+% test/fibnum-test-calc.tex & doc/latex/oberdiek/test/fibnum-test-calc.tex\\
+% fibnum.dtx & source/latex/oberdiek/fibnum.dtx\\
+% \end{tabular}^^A
+% }^^A
+% \sbox0{\t}^^A
+% \ifdim\wd0>\linewidth
+% \begingroup
+% \advance\linewidth by\leftmargin
+% \advance\linewidth by\rightmargin
+% \edef\x{\endgroup
+% \def\noexpand\lw{\the\linewidth}^^A
+% }\x
+% \def\lwbox{^^A
+% \leavevmode
+% \hbox to \linewidth{^^A
+% \kern-\leftmargin\relax
+% \hss
+% \usebox0
+% \hss
+% \kern-\rightmargin\relax
+% }^^A
+% }^^A
+% \ifdim\wd0>\lw
+% \sbox0{\small\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\footnotesize\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\scriptsize\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\tiny\t}^^A
+% \ifdim\wd0>\linewidth
+% \lwbox
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+% \verb|pdftk fibnum.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+% \verb|latex \let\install=y\input{fibnum.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+% \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex fibnum.dtx
+%bibtex fibnum.aux
+%makeindex -s gind.ist fibnum.idx
+%pdflatex fibnum.dtx
+%makeindex -s gind.ist fibnum.idx
+%pdflatex fibnum.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \printbibliography[
+% heading=bibnumbered,
+% ]
+%
+% \begin{History}
+% \begin{Version}{2012/04/08 v1.0}
+% \item
+% First version.
+% \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/flags.dtx b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
index 4e54289f5df..d0f5aaec49c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/flags.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: flags.dtx
% Version: 2007/09/30 v0.4
-%
+% Info: Setting/clearing of flags in bit fields
+%
% Copyright (C) 2007 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
@@ -15,19 +16,19 @@
% 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 flags.dtx
% and the derived files
% flags.sty, flags.pdf, flags.ins, flags.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/flags.dtx
% CTAN:macros/latex/contrib/oberdiek/flags.pdf
-%
+%
% Unpacking:
% (a) If flags.ins is present:
% tex flags.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{flags.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If flags.drv is present:
% latex flags.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex flags.dtx
% makeindex -s gind.ist flags.idx
% pdflatex flags.dtx
% makeindex -s gind.ist flags.idx
% pdflatex flags.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/flags.sty
% TDS:doc/latex/oberdiek/flags.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: flags 2007/09/30 v0.4 Flag setting in bit fields (HO)}
+\Msg{* Package: flags 2007/09/30 v0.4 Setting/clearing of flags in bit fields (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{flags.drv}{\from{flags.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{flags.sty}{\from{flags.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{flags.xml}{\from{flags.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,9 +148,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{flags.drv}%
- [2007/09/30 v0.4 Flag setting in bit fields (HO)]%
+ [2007/09/30 v0.4 Setting/clearing of flags in bit fields (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{flags.dtx}%
\end{document}
@@ -266,7 +271,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{flags}%
- [2007/09/30 v0.4 Flag setting in bit fields (HO)]%
+ [2007/09/30 v0.4 Setting/clearing of flags in bit fields (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -641,6 +646,45 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{flags.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='flags'>
+ <name>flags</name>
+ <caption>Setting and clearing of flags in bit fields.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='0.4'/>
+ <description>
+ This package allows the setting and clearing
+ of flags in bit fields and converts the bit field into a
+ decimal number. Currently the bit field is limited to 31 bits.
+ <p/>
+ It is now deprecated because of new more powerful
+ package <xref refid='bitset'>bitset</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/flags.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/flags.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/02/18 v0.1}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx b/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx
index b3dc8b71a40..35fa26fe5fa 100644
--- a/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: gettitlestring.dtx
% Version: 2010/12/03 v1.4
-%
+% Info: Cleanup title references
+%
% Copyright (C) 2009, 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file gettitlestring.dtx
% and the derived files
% gettitlestring.sty, gettitlestring.pdf, gettitlestring.ins,
% gettitlestring.drv, gettitlestring-test1.tex,
% gettitlestring-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/gettitlestring.dtx
% CTAN:macros/latex/contrib/oberdiek/gettitlestring.pdf
-%
+%
% Unpacking:
% (a) If gettitlestring.ins is present:
% tex gettitlestring.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{gettitlestring.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If gettitlestring.drv is present:
% latex gettitlestring.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex gettitlestring.dtx
% makeindex -s gind.ist gettitlestring.idx
% pdflatex gettitlestring.dtx
% makeindex -s gind.ist gettitlestring.idx
% pdflatex gettitlestring.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/gettitlestring.sty
% TDS:doc/latex/oberdiek/gettitlestring.pdf
@@ -132,6 +133,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{gettitlestring-test1.tex}{\from{gettitlestring.dtx}{test1}}%
\file{gettitlestring-test2.tex}{\from{gettitlestring.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{gettitlestring.xml}{\from{gettitlestring.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -160,14 +165,14 @@ and the derived files
\ProvidesFile{gettitlestring.drv}%
[2010/12/03 v1.4 Cleanup title references (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{gettitlestring.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{720}
+% \CheckSum{721}
%
% \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
@@ -937,26 +942,61 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{gettitlestring.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='gettitlestring'>
+ <name>gettitlestring</name>
+ <caption>Clean up title references.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ Cleans up the title string (removing <tt>\label</tt> commands) for
+ packages (such as <xref refid='nameref'>nameref</xref>) that
+ typeset such strings.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/gettitlestring.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/gettitlestring.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{memoir}
% Peter Wilson, Lars Madsen:
% \textit{The Memoir Class};
% 2009/11/17 v1.61803398c;
% \CTAN{macros/latex/contrib/memoir/}
-%
+%
% \bibitem{titleref}
% Donald Arsenau:
% \textit{Titleref.sty};
% 2001/04/05 ver 3.1;
% \CTAN{macros/latex/contrib/misc/titleref.sty}
-%
+%
% \bibitem{zref}
% Heiko Oberdiek:
% \textit{The \xpackage{zref} package};
% 2009/12/08 v2.7;
% \CTAN{macros/latex/contrib/oberdiek/zref.pdf}
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
index cdfaab57921..9340e902262 100644
--- a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: grfext.dtx
% Version: 2010/08/19 v1.1
-%
+% Info: Manage graphics extensions
+%
% Copyright (C) 2007, 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
@@ -15,20 +16,20 @@
% 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 grfext.dtx
% and the derived files
% grfext.sty, grfext.pdf, grfext.ins, grfext.drv, grfext-test1.tex,
% grfext-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/grfext.dtx
% CTAN:macros/latex/contrib/oberdiek/grfext.pdf
-%
+%
% Unpacking:
% (a) If grfext.ins is present:
% tex grfext.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{grfext.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If grfext.drv is present:
% latex grfext.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex grfext.dtx
% makeindex -s gind.ist grfext.idx
% pdflatex grfext.dtx
% makeindex -s gind.ist grfext.idx
% pdflatex grfext.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/grfext.sty
% TDS:doc/latex/oberdiek/grfext.pdf
@@ -77,7 +78,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: grfext 2010/08/19 v1.1 Managing graphics extensions (HO)}
+\Msg{* Package: grfext 2010/08/19 v1.1 Manage graphics extensions (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -124,6 +125,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{grfext-test1.tex}{\from{grfext.dtx}{test1}}%
\file{grfext-test2.tex}{\from{grfext.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{grfext.xml}{\from{grfext.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -150,9 +155,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{grfext.drv}%
- [2010/08/19 v1.1 Managing graphics extensions (HO)]%
+ [2010/08/19 v1.1 Manage graphics extensions (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{grfext.dtx}%
\end{document}
@@ -377,7 +382,7 @@ and the derived files
\fi
\expandafter\x\csname ver@grfext.sty\endcsname
\ProvidesPackage{grfext}%
- [2010/08/19 v1.1 Managing graphics extensions (HO)]%
+ [2010/08/19 v1.1 Manage graphics extensions (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1108,13 +1113,48 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{grfext.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='grfext'>
+ <name>grfext</name>
+ <caption>Manipulate the graphics package's list of extensions.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package provides macros for adding to, and reordering the list of
+ graphics file extensions recognised by package
+ <xref refid='graphics'>graphics</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/grfext.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/grfext.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{graphics}
% David Carlisle, Sebastian Rahtz: \textit{The \xpackage{graphics} package};
% 2006/02/20 v1.0o;
% \CTAN{macros/latex/required/graphics/graphics.dtx}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
index f2e7e30bc33..fc0e87ae098 100644
--- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: grffile.dtx
-% Version: 2010/12/09 v1.13
-%
-% Copyright (C) 2006-2010 by
+% Version: 2012/04/05 v1.16
+% Info: Extended file name support for graphics
+%
+% Copyright (C) 2006-2012 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
@@ -15,20 +16,20 @@
% 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 grffile.dtx
% and the derived files
% grffile.sty, grffile.pdf, grffile.ins, grffile.drv,
% grffile-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/grffile.dtx
% CTAN:macros/latex/contrib/oberdiek/grffile.pdf
-%
+%
% Unpacking:
% (a) If grffile.ins is present:
% tex grffile.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{grffile.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If grffile.drv is present:
% latex grffile.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex grffile.dtx
% makeindex -s gind.ist grffile.idx
% pdflatex grffile.dtx
% makeindex -s gind.ist grffile.idx
% pdflatex grffile.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/grffile.sty
% TDS:doc/latex/oberdiek/grffile.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: grffile 2010/12/09 v1.13 Extended file name support for graphics (HO)}
+\Msg{* Package: grffile 2012/04/05 v1.16 Extended file name support for graphics (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -88,9 +89,9 @@
This is a generated file.
Project: grffile
-Version: 2010/12/09 v1.13
+Version: 2012/04/05 v1.16
-Copyright (C) 2006-2010 by
+Copyright (C) 2006-2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -122,6 +123,10 @@ and the derived files
\file{grffile.sty}{\from{grffile.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{grffile-test1.tex}{\from{grffile.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{grffile.xml}{\from{grffile.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,16 +153,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{grffile.drv}%
- [2010/12/09 v1.13 Extended file name support for graphics (HO)]%
+ [2012/04/05 v1.16 Extended file name support for graphics (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{grffile.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{803}
+% \CheckSum{868}
%
% \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
@@ -178,7 +183,7 @@ and the derived files
% \GetFileInfo{grffile.drv}
%
% \title{The \xpackage{grffile} package}
-% \date{2010/12/09 v1.13}
+% \date{2012/04/05 v1.16}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -394,7 +399,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{grffile}%
- [2010/12/09 v1.13 Extended file name support for graphics (HO)]%
+ [2012/04/05 v1.16 Extended file name support for graphics (HO)]%
% \end{macrocode}
%
% \subsection{Catcode stuff}
@@ -573,9 +578,10 @@ and the derived files
\fi
\fi
\fi
- \toks@\expandafter{\grffile@filename}%
+% \toks@\expandafter{\grffile@filename}%
\edef\x{\endgroup
- \noexpand\grffile@Ginclude@graphics{\the\toks@}%
+% \noexpand\grffile@Ginclude@graphics{\the\toks@}%
+ \noexpand\grffile@Ginclude@graphics{\grffile@filename}%
}%
\x
}
@@ -650,7 +656,7 @@ and the derived files
\grffile@XeTeX@IfFileExists{\reserved@b#1}{%
\edef\grffile@file@found{\reserved@b#1}%
\let\reserved@a\@firstoftwo
- \@break@tfor
+ \iftrue\@break@tfor\fi
}{}%
}%
\fi
@@ -713,6 +719,48 @@ and the derived files
% \begin{macrocode}
\fi
\fi
+% \end{macrocode}
+% \begin{macro}{\grffile@org@Gread@eps}
+% \begin{macrocode}
+ \let\grffile@org@Gread@eps\Gread@eps
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+ \def\grffile@temp#1\immediate\openin#2 #3\grffile@nil#4\grffile@NIL{%
+ \begingroup
+ \toks@{#2}%
+ \edef\grffile@temp{\the\toks@}%
+ \def\grffile@test{\@inputcheck####1}%
+ \ifx\grffile@temp\grffile@test
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {%
+ \toks@{%
+ #1%
+ \immediate\openin\@inputcheck"##1"\relax
+ #3%
+ }%
+ \expandafter\endgroup
+ \expandafter\def\expandafter\Gread@eps
+ \expandafter##\expandafter1\expandafter{%
+ \the\toks@
+ }%
+ \PackageInfo{grffile}{%
+ \string\Gread@eps\space patched%
+ }%
+ }{%
+ \PackageWarning{grffile}{%
+ Unsupported \string\Gread@eps\space not patched%
+ }%
+ \endgroup
+ }%
+ }%
+ \expandafter\grffile@temp\Gread@eps{#1}\grffile@nil
+ \immediate\openin{} \grffile@nil\grffile@NIL
+% \end{macrocode}
+% \begin{macrocode}
\else
\begingroup
\let\on@line\@empty
@@ -1195,19 +1243,58 @@ showpage
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{grffile.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='grffile'>
+ <name>grffile</name>
+ <caption>Extended file name support for graphics.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.16'/>
+ <description>
+ The package extends the file name processing of package
+ <xref refid='graphics'>graphics</xref> to support a larger range
+ of file names. For example, the file name may contain several dots.
+
+ Or in case of <xref refid='pdftex'>pdfTeX</xref> in PDF mode the
+ file name may contain spaces.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/grffile.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/grffile.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{graphics}
% David Carlisle, Sebastian Rahtz: \textit{The \xpackage{graphics} package};
% 2006/02/20 v1.0o;
% \CTAN{macros/latex/required/graphics/graphics.dtx}.
-%
+%
% \bibitem{graphicx}
% Sebastian Rahtz, Heiko Oberdiek:
% \textit{The \xpackage{graphicx} package};
% 1999/02/16 v1.0f;
% \CTAN{macros/latex/required/graphics/graphicx.dtx}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -1283,6 +1370,21 @@ showpage
% \item
% Option \xoption{space} also supports \hologo{XeTeX}.
% \end{Version}
+% \begin{Version}{2011/10/04 v1.14}
+% \item
+% Fix for option \xoption{space} support of \hologo{XeTeX}
+% for EPS files (\cs{Gread@eps}). (Bug reported by Peter Davis.)
+% \end{Version}
+% \begin{Version}{2011/10/17 v1.15}
+% \item
+% Bug fix for option \xoption{space} support of \hologo{XeTeX}.
+% Wrong usage of \cs{@break@tfor} fixed.
+% (Bug reported by Martin Schr\"oder.)
+% \end{Version}
+% \begin{Version}{2012/04/05 v1.16}
+% \item
+% Some fix for option \xoption{extendedchars}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx b/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx
index bccdae405c9..4b36371f841 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hobsub.dtx
-% Version: 2011/04/23 v1.4
-%
-% Copyright (C) 2011 by
+% Version: 2012/04/25 v1.12
+% Info: Construct package bundles
+%
+% Copyright (C) 2011, 2012 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file hobsub.dtx
% and the derived files
% hobsub.sty, hobsub.pdf, hobsub.ins, hobsub.drv, hobsub-generic.sty,
% hobsub-hyperref.sty, hobsub-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hobsub.dtx
% CTAN:macros/latex/contrib/oberdiek/hobsub.pdf
-%
+%
% Unpacking:
% (a) If hobsub.ins is present:
% tex hobsub.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hobsub.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hobsub.drv is present:
% latex hobsub.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hobsub.dtx
% makeindex -s gind.ist hobsub.idx
% pdflatex hobsub.dtx
% makeindex -s gind.ist hobsub.idx
% pdflatex hobsub.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/hobsub.sty
% TDS:tex/generic/oberdiek/hobsub-generic.sty
@@ -81,7 +82,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hobsub 2011/04/23 v1.4 Subsetting bundle oberdiek (HO)}
+\Msg{* Package: hobsub 2012/04/25 v1.12 Construct package bundles (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -93,9 +94,9 @@
This is a generated file.
Project: hobsub
-Version: 2011/04/23 v1.4
+Version: 2012/04/25 v1.12
-Copyright (C) 2011 by
+Copyright (C) 2011, 2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -130,6 +131,10 @@ and the derived files
\file{hobsub.sty}{\from{hobsub.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{hobsub-test1.tex}{\from{hobsub.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hobsub.xml}{\from{hobsub.dtx}{catalogue}}%
}
\let\hobsubSavedNormalLine\normalLine
\def\hobsubGobble#1{}
@@ -280,9 +285,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hobsub.drv}%
- [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]%
+ [2012/04/25 v1.12 Construct package bundles (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{array}
\usepackage{caption}
\renewcommand*{\bottomfraction}{.5}
@@ -293,7 +298,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{764}
+% \CheckSum{765}
%
% \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
@@ -314,7 +319,7 @@ and the derived files
% \GetFileInfo{hobsub.drv}
%
% \title{The \xpackage{hobsub} package}
-% \date{2011/04/23 v1.4}
+% \date{2012/04/25 v1.12}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -328,28 +333,28 @@ and the derived files
%
% \def\TableGeneric{^^A
% \TableEntry{\xpackage{infwarerr}}{}{2010/04/08 v1.3}^^A
-% \TableEntry{\xpackage{ltxcmds}}{}{2011/04/18 v1.20}^^A
+% \TableEntry{\xpackage{ltxcmds}}{}{2011/11/09 v1.22}^^A
% \TableEntry{\xpackage{ifluatex}}{}{2010/03/01 v1.3}^^A
% \TableEntry{\xpackage{ifvtex}}{}{2010/03/01 v1.5}^^A
% \TableEntry{\xpackage{intcalc}}{}{2007/09/27 v1.1}^^A
% \TableEntry{\xpackage{ifpdf}}{\xpackage{ifluatex}}{2011/01/30 v2.3}^^A
% \TableEntry{\xpackage{etexcmds}}{}{2011/02/16 v1.5}^^A
-% \TableEntry{\xpackage{kvsetkeys}}{}{2011/04/07 v1.13}^^A
+% \TableEntry{\xpackage{kvsetkeys}}{}{2012/04/25 v1.16}^^A
% \TableEntry{\xpackage{kvdefinekeys}}{}{2011/04/07 v1.3}^^A
% \TableEntry{\xpackage{luatex-loader}}{}{2010/03/09 v0.4}^^A
-% \TableEntry{\xpackage{pdftexcmds}}{\xpackage{ifluatex}, \xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}, \xpackage{luatex-loader}}{2011/04/22 v0.16}^^A
-% \TableEntry{\xpackage{pdfescape}}{\xpackage{ltxcmds}, \xpackage{pdftexcmds}}{2011/04/04 v1.12}^^A
-% \TableEntry{\xpackage{bigintcalc}}{\xpackage{pdftexcmds}}{2011/01/30 v1.2}^^A
+% \TableEntry{\xpackage{pdftexcmds}}{\xpackage{ifluatex}, \xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}, \xpackage{luatex-loader}}{2011/11/29 v0.20}^^A
+% \TableEntry{\xpackage{pdfescape}}{\xpackage{ltxcmds}, \xpackage{pdftexcmds}}{2011/11/25 v1.13}^^A
+% \TableEntry{\xpackage{bigintcalc}}{\xpackage{pdftexcmds}}{2012/04/08 v1.3}^^A
% \TableEntry{\xpackage{bitset}}{\xpackage{bigintcalc}, \xpackage{infwarerr}, \xpackage{intcalc}}{2011/01/30 v1.1}^^A
% \TableEntry{\xpackage{uniquecounter}}{\xpackage{bigintcalc}, \xpackage{infwarerr}}{2011/01/30 v1.2}^^A
% }
% \def\TableHyperref{^^A
% \TableEntry{\xpackage{letltxmacro}}{}{2010/09/02 v1.4}^^A
-% \TableEntry{\xpackage{hopatch}}{}{2011/01/30 v1.0}^^A
+% \TableEntry{\xpackage{hopatch}}{}{2011/06/24 v1.1}^^A
% \TableEntry{\xpackage{xcolor-patch}}{}{2011/01/30 v1.7}^^A
-% \TableEntry{\xpackage{atveryend}}{}{2011/04/23 v1.7}^^A
-% \TableEntry{\xpackage{atbegshi}}{\xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}}{2011/01/30 v1.15}^^A
-% \TableEntry{\xpackage{refcount}}{\xpackage{infwarerr}, \xpackage{ltxcmds}}{2010/12/01 v3.2}^^A
+% \TableEntry{\xpackage{atveryend}}{}{2011/06/30 v1.8}^^A
+% \TableEntry{\xpackage{atbegshi}}{\xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}}{2011/10/05 v1.16}^^A
+% \TableEntry{\xpackage{refcount}}{\xpackage{infwarerr}, \xpackage{ltxcmds}}{2011/10/16 v3.4}^^A
% \TableEntry{\xpackage{hycolor}}{\xpackage{xcolor-patch}}{2011/01/30 v1.7}^^A
% }
%
@@ -524,7 +529,7 @@ and the derived files
% using \xpackage{hobsub}:
% \begin{quote}
% \dots\\
-% |\RequirePackage{hobsub}[2011/04/23]|\\
+% |\RequirePackage{hobsub}[2012/04/25]|\\
% \dots\\
% |\hobsub@StartPackage{foo1}|\\
% \textit{\dots\unskip\ package code of \xfile{foo1.sty} \dots}\\
@@ -627,7 +632,7 @@ and the derived files
\fi
\expandafter\x\csname ver@hobsub.sty\endcsname
\ProvidesPackage{hobsub}%
- [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]%
+ [2012/04/25 v1.12 Construct package bundles (HO)]%
% \end{macrocode}
% \begin{macrocode}
%</package>
@@ -709,7 +714,7 @@ and the derived files
\fi
\expandafter\x\csname ver@hobsub-generic.sty\endcsname
\ProvidesPackage{hobsub-generic}%
- [2011/04/23 v1.4 Bundle oberdiek, subset generic (HO)]%
+ [2012/04/25 v1.12 Bundle oberdiek, subset generic (HO)]%
% \end{macrocode}
% \begin{macrocode}
%</generic>
@@ -791,7 +796,7 @@ and the derived files
\fi
\expandafter\x\csname ver@hobsub-hyperref.sty\endcsname
\ProvidesPackage{hobsub-hyperref}%
- [2011/04/23 v1.4 Bundle oberdiek, subset hyperref (HO)]%
+ [2012/04/25 v1.12 Bundle oberdiek, subset hyperref (HO)]%
% \end{macrocode}
% \begin{macrocode}
%</hyperref>
@@ -855,7 +860,7 @@ and the derived files
% \begin{macrocode}
%<*hyperref>
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{hobsub-generic}[2011/04/23]
+\RequirePackage{hobsub-generic}[2012/04/25]
%</hyperref>
% \end{macrocode}
%
@@ -1006,11 +1011,11 @@ and the derived files
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax
\immediate\write-1{%
- Package: hobsub 2011/04/23 v1.4 Subsetting bundle oberdiek (HO)%
+ Package: hobsub 2012/04/25 v1.12 Construct package bundles (HO)%
}%
\else
\ProvidesPackage{hobsub}%
- [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]%
+ [2012/04/25 v1.12 Construct package bundles (HO)]%
\fi
%</preamble>
% \end{macrocode}
@@ -1357,6 +1362,50 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hobsub.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hobsub'>
+ <name>hobsub</name>
+ <caption>Construct package bundles</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011,2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.12'/>
+ <description>
+ The package offers a means of loading a bundle of (other) packages
+ &#x201C;at once&#x201D;, offering a means of reducing the amount of log output
+ as the packages are loaded, and an aide-memoire for complicated
+ requirements. In some ways, loading a package via hobsub behaves
+ much like loading the package in the normal way; for example,
+ reloads are suppressed, as in LaTeX proper, and correct
+ <tt>\listfiles</tt> output is produced.
+ <p/>
+ Examples provided are a &#x2018;generic&#x2019; bundle (comprising the author&#x2019;s
+ packages that can be used with Plain TeX) and a &#x2018;hyperref&#x2019; bundle
+ (comprising packages useful when generating hypertext output with
+ LaTeX).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hobsub.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hobsub.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \raggedright
% \bibitem{lualatex:quiet}
@@ -1365,7 +1414,7 @@ and the derived files
% mailing list \textsf{lualatex-dev at tug.org},
% 2011-01-29;
% \url{http://tug.org/pipermail/lualatex-dev/2011-January/001031.html}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -1390,6 +1439,38 @@ and the derived files
% \item
% Package updates.
% \end{Version}
+% \begin{Version}{2011/06/24 v1.5}
+% \item
+% Package updates.
+% \end{Version}
+% \begin{Version}{2011/06/30 v1.6}
+% \item
+% Package updates.
+% \end{Version}
+% \begin{Version}{2011/07/01 v1.7}
+% \item
+% Package updates.
+% \end{Version}
+% \begin{Version}{2011/07/28 v1.8}
+% \item
+% Package updates.
+% \end{Version}
+% \begin{Version}{2011/08/22 v1.9}
+% \item
+% Package updates.
+% \end{Version}
+% \begin{Version}{2011/10/16 v1.10}
+% \item
+% Package updates.
+% \end{Version}
+% \begin{Version}{2011/11/29 v1.11}
+% \item
+% Package updates.
+% \end{Version}
+% \begin{Version}{2012/04/25 v1.12}
+% \item
+% Package updates.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hologo.dtx b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
index 93eafb54ca8..78d52f74f02 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hologo.dtx
-% Version: 2011/04/21 v1.5
-%
-% Copyright (C) 2010, 2011 by
+% Version: 2012/04/26 v1.10
+% Info: A logo collection with bookmark support
+%
+% Copyright (C) 2010-2012 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
@@ -15,23 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file hologo.dtx
% and the derived files
-% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex,
-% hologo-test-spacefactor.tex.
-%
+% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-example.tex,
+% hologo-test1.tex, hologo-test-spacefactor.tex,
+% hologo-test-list.tex.
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hologo.dtx
% CTAN:macros/latex/contrib/oberdiek/hologo.pdf
-%
+%
% Unpacking:
% (a) If hologo.ins is present:
% tex hologo.ins
@@ -40,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hologo.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hologo.drv is present:
% latex hologo.drv
@@ -50,19 +52,21 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hologo.dtx
% makeindex -s gind.ist hologo.idx
% pdflatex hologo.dtx
% makeindex -s gind.ist hologo.idx
% pdflatex hologo.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/hologo.sty
% TDS:doc/latex/oberdiek/hologo.pdf
+% TDS:doc/latex/oberdiek/example/hologo-example.tex
% TDS:doc/latex/oberdiek/test/hologo-test1.tex
% TDS:doc/latex/oberdiek/test/hologo-test-spacefactor.tex
+% TDS:doc/latex/oberdiek/test/hologo-test-list.tex
% TDS:source/latex/oberdiek/hologo.dtx
%
%<*ignore>
@@ -80,7 +84,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hologo 2011/04/21 v1.5 Logo collection (HO)}
+\Msg{* Package: hologo 2012/04/26 v1.10 A logo collection with bookmark support (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -92,9 +96,9 @@
This is a generated file.
Project: hologo
-Version: 2011/04/21 v1.5
+Version: 2012/04/26 v1.10
-Copyright (C) 2010, 2011 by
+Copyright (C) 2010-2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -116,8 +120,9 @@ because some files are installed in TDS:tex/generic//.
This work consists of the main source file hologo.dtx
and the derived files
- hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex,
- hologo-test-spacefactor.tex.
+ hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-example.tex,
+ hologo-test1.tex, hologo-test-spacefactor.tex,
+ hologo-test-list.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -127,9 +132,16 @@ and the derived files
\file{hologo.drv}{\from{hologo.dtx}{driver}}%
\usedir{tex/generic/oberdiek}%
\file{hologo.sty}{\from{hologo.dtx}{package}}%
+ \usedir{doc/latex/oberdiek/example}%
+ \file{hologo-example.tex}{\from{hologo.dtx}{example}}%
\usedir{doc/latex/oberdiek/test}%
\file{hologo-test1.tex}{\from{hologo.dtx}{test1}}%
\file{hologo-test-spacefactor.tex}{\from{hologo.dtx}{test-spacefactor}}%
+ \file{hologo-test-list.tex}{\from{hologo.dtx}{test-list}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hologo.xml}{\from{hologo.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -156,19 +168,22 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hologo.drv}%
- [2011/04/21 v1.5 Logo collection (HO)]%
+ [2012/04/26 v1.10 A logo collection with bookmark support (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
-\usepackage{hologo}[2011/04/21]
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{hologo}[2012/04/26]
\usepackage{longtable}
\usepackage{array}
+\usepackage{paralist}
+%\usepackage[T1]{fontenc}
+%\usepackage{lmodern}
\begin{document}
\DocInput{hologo.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1330}
+% \CheckSum{2906}
%
% \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
@@ -189,7 +204,7 @@ and the derived files
% \GetFileInfo{hologo.drv}
%
% \title{The \xpackage{hologo} package}
-% \date{2011/04/21 v1.5}
+% \date{2012/04/26 v1.10}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -210,45 +225,24 @@ and the derived files
% Macro \cs{hologo} sets the logo with name \meta{name}.
% The following table shows the supported names.
%
-% \newcommand*{\entry}{}
-% \def\entry#1#2[#3]{^^A
-% #1&#2&\hologoLogoSetup{#1}{variant=#2}\hologo{#1}&#3\tabularnewline
-% }
-% \begin{longtable}{>{\ttfamily}l>{\ttfamily}lll}
-% \rmfamily\bfseries{name} & \rmfamily\bfseries variant
-% & \bfseries logo & \bfseries since\\
-% \hline
-% \endhead
-% \entry{AmSLaTeX}{}[2010/04/16]
-% \entry{AmSTeX}{}[2010/04/16]
-% \entry{ConTeXt}{}[2011/03/25]
-% \entry{ConTeXt}{narrow}[2011/03/25]
-% \entry{ConTeXt}{simple}[2011/03/25]
-% \entry{eTeX}{}[2010/04/08]
-% \entry{iniTeX}{}[2010/11/21]
-% \entry{LaTeX}{}[2010/04/08]
-% \entry{LaTeX2e}{}[2010/04/08]
-% \entry{LaTeX3}{}[2010/04/24]
-% \entry{LaTeXe}{}[2010/04/08]
-% \entry{LuaLaTeX}{}[2010/04/08]
-% \entry{LuaTeX}{}[2010/04/08]
-% \entry{pdfTeX}{}[2010/04/08]
-% \entry{pdfLaTeX}{}[2010/04/08]
-% \entry{plainTeX}{}[2010/04/08]
-% \entry{plainTeX}{space}[2010/04/16]
-% \entry{plainTeX}{hyphen}[2010/04/16]
-% \entry{plainTeX}{runtogether}[2010/04/16]
-% \entry{TeX}{}[2010/04/08]
-% \entry{virTeX}{}[2010/11/21]
-% \entry{VTeX}{}[2010/04/24]
-% \entry{XeLaTeX}{}[2010/04/08]
-% \entry{XeTeX}{}[2010/04/08]
-% \end{longtable}
+% \begingroup
+% \def\hologoEntry#1#2#3{^^A
+% #1&#2&\hologoLogoSetup{#1}{variant=#2}\hologo{#1}&#3\tabularnewline
+% }
+% \begin{longtable}{>{\ttfamily}l>{\ttfamily}lll}
+% \rmfamily\bfseries{name} & \rmfamily\bfseries variant
+% & \bfseries logo & \bfseries since\\
+% \hline
+% \endhead
+% \hologoList
+% \end{longtable}
+% \endgroup
%
% \begin{declcs}{Hologo} \M{name}
% \end{declcs}
% Macro \cs{Hologo} starts the logo \meta{name} with an uppercase
-% letter.
+% letter. As an exception small greek letters are not converted
+% to uppercase. Examples, see \hologo{eTeX} and \hologo{ExTeX}.
%
% \subsection{Setup macros}
%
@@ -304,6 +298,298 @@ and the derived files
% Then ``plain-\TeX'' contains one break point after the hyphen.
% \end{quote}
%
+% \subsection{Driver options}
+%
+% Sometimes graphical operations are needed to construct some
+% glyphs (e.g.\ \hologo{XeTeX}). If package \xpackage{graphics}
+% or package \xpackage{pgf} are found, then the macros are taken
+% from there. Otherwise the packge defines its own operations
+% and therefore needs the driver information. Many drivers are
+% detected automatically (\hologo{pdfTeX}/\hologo{LuaTeX}
+% in PDF mode, \hologo{XeTeX}, \hologo{VTeX}). These have precedence
+% over a driver option. The driver can be given as package option
+% or using \cs{hologoDriverSetup}.
+% The following list contains the recognized driver options:
+% \begin{itemize}
+% \item \xoption{pdftex}, \xoption{luatex}
+% \item \xoption{dvipdfm}, \xoption{dvipdfmx}
+% \item \xoption{dvips}, \xoption{dvipsone}, \xoption{xdvi}
+% \item \xoption{xetex}
+% \item \xoption{vtex}
+% \end{itemize}
+% The left driver of a line is the driver name that is used internally.
+% The following names are aliases for drivers that use the
+% same method. Therefore the entry in the \xext{log} file for
+% the used driver prints the internally used driver name.
+% \begin{description}
+% \item[\xoption{driverfallback}:]
+% This option expects a driver that is used,
+% if the driver could not be detected automatically.
+% \end{description}
+%
+% \begin{declcs}{hologoDriverSetup} \M{driver option}
+% \end{declcs}
+% The driver can also be configured after package loading
+% using \cs{hologoDriverSetup}, also the way for \hologo{plainTeX}
+% to setup the driver.
+%
+% \subsection{Font setup}
+%
+% Some logos require a special font, but should also be usable by
+% \hologo{plainTeX}. Therefore the package provides some ways
+% to influence the font settings. The options below
+% take font settings as values. Both font commands
+% such as \cs{sffamily} and macros that take one argument
+% like \cs{textsf} can be used.
+%
+% \begin{declcs}{hologoFontSetup} \M{key value list}
+% \end{declcs}
+% Macro \cs{hologoFontSetup} sets the fonts for all logos.
+% Supported keys:
+% \begin{description}
+% \def\entry#1{\item[\xoption{#1}:]}
+% \entry{general}
+% This font is used for all logos. The default is empty.
+% That means no special font is used.
+% \entry{bibsf}
+% This font is used for
+% {\hologoLogoSetup{BibTeX}{variant=sf}\hologo{BibTeX}}
+% with variant \xoption{sf}.
+% \entry{rm}
+% This font is a serif font. It is used for \hologo{ExTeX}.
+% \entry{sc}
+% This font specifies a small caps font. It is used for
+% {\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}
+% with variant \xoption{sc}.
+% \entry{sf}
+% This font specifies a sans serif font. The default
+% is \cs{sffamily}, then \cs{sf} is tried. Otherwise
+% a warning is given. It is used by \hologo{KOMAScript}.
+% \entry{sy}
+% This is the font for math symbols (e.g. cmsy).
+% It is used by \hologo{AmS}, \hologo{NTS}, \hologo{ExTeX}.
+% \entry{logo}
+% \hologo{METAFONT} and \hologo{METAPOST} are using that font.
+% In \hologo{LaTeX} \cs{logofamily} is used and
+% the definitions of package \xpackage{mflogo} are used
+% if the package is not loaded.
+% Otherwise the \cs{tenlogo} is used and defined
+% if it does not already exists.
+% \end{description}
+%
+% \begin{declcs}{hologoLogoFontSetup} \M{logo} \M{key value list}
+% \end{declcs}
+% Fonts can also be set for a logo or logo component separately,
+% see the following list.
+% The keys are the same as for \cs{hologoFontSetup}.
+%
+% \begin{longtable}{>{\ttfamily}l>{\sffamily}ll}
+% \meta{logo} & keys & result\\
+% \hline
+% \endhead
+% BibTeX & bibsf & {\hologoLogoSetup{BibTeX}{variant=sf}\hologo{BibTeX}}\\[.5ex]
+% BibTeX & sc & {\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}\\[.5ex]
+% ExTeX & rm & \hologo{ExTeX}\\
+% SliTeX & rm & \hologo{SliTeX}\\[.5ex]
+% AmS & sy & \hologo{AmS}\\
+% ExTeX & sy & \hologo{ExTeX}\\
+% NTS & sy & \hologo{NTS}\\[.5ex]
+% KOMAScript & sf & \hologo{KOMAScript}\\[.5ex]
+% METAFONT & logo & \hologo{METAFONT}\\
+% METAPOST & logo & \hologo{METAPOST}\\[.5ex]
+% SliTeX & sc \hologo{SliTeX}
+% \end{longtable}
+%
+% \subsubsection{Font order}
+%
+% For all logos the font \xoption{general} is applied first.
+% Example:
+%\begin{quote}
+%|\hologoFontSetup{general=\color{red}}|
+%\end{quote}
+% will print red logos.
+% Then if the font uses a special font \xoption{sf}, for example,
+% the font is applied that is setup by \cs{hologoLogoFontSetup}.
+% If this font is not setup, then the common font setup
+% by \cs{hologoFontSetup} is used. Otherwise a warning is given,
+% that there is no font configured.
+%
+% \subsection{Additional user macros}
+%
+% Usually a variant of a logo is configured by using
+% \cs{hologoLogoSetup}, because it is bad style to mix
+% different variants of the same logo in the same text.
+% There the following macros are a convenience for testing.
+%
+% \begin{declcs}{hologoVariant} \M{name} \M{variant}\\
+% \cs{HologoVariant} \M{name} \M{variant}
+% \end{declcs}
+% Logo \meta{name} is set using \meta{variant} that specifies
+% explicitely which variant of the macro is used. If the argument
+% is empty, then the default form of the logo is used
+% (configurable by \cs{hologoLogoSetup}).
+%
+% \cs{HologoVariant} is used if the logo is set in a context
+% that needs an uppercase first letter (beginning of a sentence, \dots).
+%
+% \begin{declcs}{hologoList}\\
+% \cs{hologoEntry} \M{logo} \M{variant} \M{since}
+% \end{declcs}
+% Macro \cs{hologoList} contains all logos that are provided
+% by the package including variants. The list consists of calls
+% of \cs{hologoEntry} with three arguments starting with the
+% logo name \meta{logo} and its variant \meta{variant}. An empty
+% variant means the current default. Argument \meta{since} specifies
+% with version of the package \xpackage{hologo} is needed to get
+% the logo. If the logo is fixed, then the date gets updated.
+% Therefore the date \meta{since} is not exactly the date of
+% the first introduction, but rather the date of the latest fix.
+%
+% Before \cs{hologoList} can be used, macro \cs{hologoEntry} needs
+% a definition. The example file in section \ref{sec:example}
+% shows applications of \cs{hologoList}.
+%
+% \subsection{Supported contexts}
+%
+% Macros \cs{hologo} and friends support special contexts:
+% \begin{itemize}
+% \item \hologo{LaTeX}'s protection mechanism.
+% \item Bookmarks of package \xpackage{hyperref}.
+% \item Package \xpackage{tex4ht}.
+% \item The macros can be used inside \cs{csname} constructs,
+% if \cs{ifincsname} is available (\hologo{pdfTeX}, \hologo{XeTeX},
+% \hologo{LuaTeX}).
+% \end{itemize}
+%
+% \subsection{Example}
+% \label{sec:example}
+%
+% The following example prints the logos in different fonts.
+% \begin{macrocode}
+%<*example>
+%<<verbatim
+\NeedsTeXFormat{LaTeX2e}
+\documentclass[a4paper]{article}
+\usepackage[
+ hmargin=20mm,
+ vmargin=20mm,
+]{geometry}
+\pagestyle{empty}
+\usepackage{hologo}[2012/04/26]
+\usepackage{longtable}
+\usepackage{array}
+\setlength{\extrarowheight}{2pt}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{pdflscape}
+\usepackage[
+ pdfencoding=auto,
+]{hyperref}
+\hypersetup{
+ pdfauthor={Heiko Oberdiek},
+ pdftitle={Example for package `hologo'},
+ pdfsubject={Logos with fonts lmr, lmss, qtm, qpl, qhv},
+}
+\usepackage{bookmark}
+
+% Print the logo list on the console
+
+\begingroup
+ \typeout{}%
+ \typeout{*** Begin of logo list ***}%
+ \newcommand*{\hologoEntry}[3]{%
+ \typeout{#1 \ifx\\#2\\\else(#2) \fi[#3]}%
+ }%
+ \hologoList
+ \typeout{*** End of logo list ***}%
+ \typeout{}%
+\endgroup
+
+\begin{document}
+\begin{landscape}
+
+ \section{Example file for package `hologo'}
+
+ % Table for font names
+
+ \begin{longtable}{>{\bfseries}ll}
+ \textbf{font} & \textbf{Font name}\\
+ \hline
+ lmr & Latin Modern Roman\\
+ lmss & Latin Modern Sans\\
+ qtm & \TeX\ Gyre Termes\\
+ qhv & \TeX\ Gyre Heros\\
+ qpl & \TeX\ Gyre Pagella\\
+ \end{longtable}
+
+ % Logo list with logos in different fonts
+
+ \begingroup
+ \newcommand*{\SetVariant}[2]{%
+ \ifx\\#2\\%
+ \else
+ \hologoLogoSetup{#1}{variant=#2}%
+ \fi
+ }%
+ \newcommand*{\hologoEntry}[3]{%
+ \SetVariant{#1}{#2}%
+ \raisebox{1em}[0pt][0pt]{\hypertarget{#1@#2}{}}%
+ \bookmark[%
+ dest={#1@#2},%
+ ]{%
+ #1\ifx\\#2\\\else\space(#2)\fi: \Hologo{#1}, \hologo{#1} %
+ [Unicode]%
+ }%
+ \hypersetup{unicode=false}%
+ \bookmark[%
+ dest={#1@#2},%
+ ]{%
+ #1\ifx\\#2\\\else\space(#2)\fi: \Hologo{#1}, \hologo{#1} %
+ [PDFDocEncoding]%
+ }%
+ \texttt{#1}%
+ &%
+ \texttt{#2}%
+ &%
+ \Hologo{#1}%
+ &%
+ \SetVariant{#1}{#2}%
+ \hologo{#1}%
+ &%
+ \SetVariant{#1}{#2}%
+ \fontfamily{qtm}\selectfont
+ \hologo{#1}%
+ &%
+ \SetVariant{#1}{#2}%
+ \fontfamily{qpl}\selectfont
+ \hologo{#1}%
+ &%
+ \SetVariant{#1}{#2}%
+ \textsf{\hologo{#1}}%
+ &%
+ \SetVariant{#1}{#2}%
+ \fontfamily{qhv}\selectfont
+ \hologo{#1}%
+ \tabularnewline
+ }%
+ \begin{longtable}{llllllll}%
+ \textbf{\textit{logo}} & \textbf{\textit{variant}} &
+ \texttt{\string\Hologo} &
+ \textbf{lmr} & \textbf{qtm} & \textbf{qpl} &
+ \textbf{lmss} & \textbf{qhv}
+ \tabularnewline
+ \hline
+ \endhead
+ \hologoList
+ \end{longtable}%
+ \endgroup
+
+\end{landscape}
+\end{document}
+%verbatim
+%</example>
+% \end{macrocode}
+%
% \StopEventually{
% }
%
@@ -382,7 +668,7 @@ and the derived files
\fi
\expandafter\x\csname ver@hologo.sty\endcsname
\ProvidesPackage{hologo}%
- [2011/04/21 v1.5 Logo collection (HO)]%
+ [2012/04/26 v1.10 A logo collection with bookmark support (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -420,7 +706,9 @@ and the derived files
}
\TMP@EnsureCode{10}{12}% ^^J
\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{34}{12}% "
\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{38}{4}% &
\TMP@EnsureCode{39}{12}% '
\TMP@EnsureCode{40}{12}% (
\TMP@EnsureCode{41}{12}% )
@@ -449,22 +737,104 @@ and the derived files
\escapechar=92 %
% \end{macrocode}
%
+% \subsection{Logo list}
+%
+% \begin{macro}{\hologoList}
+% \begin{macrocode}
+\def\hologoList{%
+ \hologoEntry{(La)TeX}{}{2011/10/01}%
+ \hologoEntry{AmSLaTeX}{}{2010/04/16}%
+ \hologoEntry{AmSTeX}{}{2010/04/16}%
+ \hologoEntry{biber}{}{2011/10/01}%
+ \hologoEntry{BibTeX}{}{2011/10/01}%
+ \hologoEntry{BibTeX}{sf}{2011/10/01}%
+ \hologoEntry{BibTeX}{sc}{2011/10/01}%
+ \hologoEntry{BibTeX8}{}{2011/11/22}%
+ \hologoEntry{ConTeXt}{}{2011/03/25}%
+ \hologoEntry{ConTeXt}{narrow}{2011/03/25}%
+ \hologoEntry{ConTeXt}{simple}{2011/03/25}%
+ \hologoEntry{emTeX}{}{2010/04/26}%
+ \hologoEntry{eTeX}{}{2010/04/08}%
+ \hologoEntry{ExTeX}{}{2011/10/01}%
+ \hologoEntry{HanTheThanh}{}{2011/11/29}%
+ \hologoEntry{iniTeX}{}{2011/10/01}%
+ \hologoEntry{KOMAScript}{}{2011/10/01}%
+ \hologoEntry{La}{}{2010/05/08}%
+ \hologoEntry{LaTeX}{}{2010/04/08}%
+ \hologoEntry{LaTeX2e}{}{2010/04/08}%
+ \hologoEntry{LaTeX3}{}{2010/04/24}%
+ \hologoEntry{LaTeXe}{}{2010/04/08}%
+ \hologoEntry{LaTeXML}{}{2011/11/22}%
+ \hologoEntry{LaTeXTeX}{}{2011/10/01}%
+ \hologoEntry{LuaLaTeX}{}{2010/04/08}%
+ \hologoEntry{LuaTeX}{}{2010/04/08}%
+ \hologoEntry{LyX}{}{2011/10/01}%
+ \hologoEntry{METAFONT}{}{2011/10/01}%
+ \hologoEntry{MetaFun}{}{2011/10/01}%
+ \hologoEntry{METAPOST}{}{2011/10/01}%
+ \hologoEntry{MetaPost}{}{2011/10/01}%
+ \hologoEntry{MiKTeX}{}{2011/10/01}%
+ \hologoEntry{NTS}{}{2011/10/01}%
+ \hologoEntry{OzMF}{}{2011/10/01}%
+ \hologoEntry{OzMP}{}{2011/10/01}%
+ \hologoEntry{OzTeX}{}{2011/10/01}%
+ \hologoEntry{OzTtH}{}{2011/10/01}%
+ \hologoEntry{PCTeX}{}{2011/10/01}%
+ \hologoEntry{pdfTeX}{}{2011/10/01}%
+ \hologoEntry{pdfLaTeX}{}{2011/10/01}%
+ \hologoEntry{PiC}{}{2011/10/01}%
+ \hologoEntry{PiCTeX}{}{2011/10/01}%
+ \hologoEntry{plainTeX}{}{2010/04/08}%
+ \hologoEntry{plainTeX}{space}{2010/04/16}%
+ \hologoEntry{plainTeX}{hyphen}{2010/04/16}%
+ \hologoEntry{plainTeX}{runtogether}{2010/04/16}%
+ \hologoEntry{SageTeX}{}{2011/11/22}%
+ \hologoEntry{SLiTeX}{}{2011/10/01}%
+ \hologoEntry{SLiTeX}{lift}{2011/10/01}%
+ \hologoEntry{SLiTeX}{narrow}{2011/10/01}%
+ \hologoEntry{SLiTeX}{simple}{2011/10/01}%
+ \hologoEntry{SliTeX}{}{2011/10/01}%
+ \hologoEntry{SliTeX}{narrow}{2011/10/01}%
+ \hologoEntry{SliTeX}{simple}{2011/10/01}%
+ \hologoEntry{SliTeX}{lift}{2011/10/01}%
+ \hologoEntry{teTeX}{}{2011/10/01}%
+ \hologoEntry{TeX}{}{2010/04/08}%
+ \hologoEntry{TeX4ht}{}{2011/11/22}%
+ \hologoEntry{TTH}{}{2011/11/22}%
+ \hologoEntry{virTeX}{}{2011/10/01}%
+ \hologoEntry{VTeX}{}{2010/04/24}%
+ \hologoEntry{Xe}{}{2010/04/08}%
+ \hologoEntry{XeLaTeX}{}{2010/04/08}%
+ \hologoEntry{XeTeX}{}{2010/04/08}%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Load resources}
%
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
- \input ltxcmds.sty\relax
- \input infwarerr.sty\relax
- \input kvsetkeys.sty\relax
- \input kvdefinekeys.sty\relax
- \input pdftexcmds.sty\relax
- \input ifpdf.sty\relax
- \input ifluatex.sty\relax
- \input ifxetex.sty\relax
- \input ifvtex.sty\relax
+ \def\TMP@RequirePackage#1[#2]{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname ver@#1.sty\endcsname\relax
+ \input #1.sty\relax
+ \fi
+ }%
+ \TMP@RequirePackage{ltxcmds}[2011/02/04]%
+ \TMP@RequirePackage{infwarerr}[2010/04/08]%
+ \TMP@RequirePackage{kvsetkeys}[2010/03/01]%
+ \TMP@RequirePackage{kvdefinekeys}[2010/03/01]%
+ \TMP@RequirePackage{pdftexcmds}[2010/04/01]%
+ \TMP@RequirePackage{ifpdf}[2010/01/28]%
+ \TMP@RequirePackage{ifluatex}[2010/03/01]%
+ \ltx@IfUndefined{newif}{%
+ \expandafter\let\csname newif\endcsname\ltx@newif
+ }{}%
+ \TMP@RequirePackage{ifxetex}[2009/01/23]%
+ \TMP@RequirePackage{ifvtex}[2010/03/01]%
\else
- \RequirePackage{ltxcmds}[2010/04/16]%
+ \RequirePackage{ltxcmds}[2011/02/04]%
\RequirePackage{infwarerr}[2010/04/08]%
\RequirePackage{kvsetkeys}[2010/03/01]%
\RequirePackage{kvdefinekeys}[2010/03/01]%
@@ -511,7 +881,7 @@ and the derived files
\@PackageError{hologo}{%
Unknown logo `\HOLOGO@name'%
}\@ehc
- \@gobble
+ \ltx@gobble
}{%
\HOLOGO@Setup
}%
@@ -529,7 +899,7 @@ and the derived files
%
% \subsection{Options}
%
-% \begin{macro}{\HOLOGO@DefineBoolOption}
+% \begin{macro}{\HOLOGO@DeclareBoolOption}
% \begin{macrocode}
\def\HOLOGO@DeclareBoolOption#1{%
\expandafter\chardef\csname HOLOGOOPT@#1\endcsname\ltx@zero
@@ -740,7 +1110,232 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
-% \subsection{\cs{hologo}}
+% \subsection{Font support}
+%
+% \begin{macro}{\HoLogoFont@font}
+% \begin{tabular}{@{}ll@{}}
+% |#1|:& logo name\\
+% |#2|:& font short name\\
+% |#3|:& text
+% \end{tabular}
+% \begin{macrocode}
+\def\HoLogoFont@font#1#2#3{%
+ \begingroup
+ \ltx@IfUndefined{HoLogoFont@logo@#1.#2}{%
+ \ltx@IfUndefined{HoLogoFont@font@#2}{%
+ \@PackageWarning{hologo}{%
+ Missing font `#2' for logo `#1'%
+ }%
+ #3%
+ }{%
+ \csname HoLogoFont@font@#2\endcsname{#3}%
+ }%
+ }{%
+ \csname HoLogoFont@logo@#1.#2\endcsname{#3}%
+ }%
+ \endgroup
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoFont@Def}
+% \begin{macrocode}
+\def\HoLogoFont@Def#1{%
+ \expandafter\def\csname HoLogoFont@font@#1\endcsname
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoFont@LogoDef}
+% \begin{macrocode}
+\def\HoLogoFont@LogoDef#1#2{%
+ \expandafter\def\csname HoLogoFont@logo@#1.#2\endcsname
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Font defaults}
+%
+% \begin{macro}{\HoLogoFont@font@general}
+% \begin{macrocode}
+\HoLogoFont@Def{general}{}%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoFont@font@rm}
+% \begin{macrocode}
+\ltx@IfUndefined{rmfamily}{%
+ \ltx@IfUndefined{rm}{%
+ }{%
+ \HoLogoFont@Def{rm}{\rm}%
+ }%
+}{%
+ \HoLogoFont@Def{rm}{\rmfamily}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoFont@font@sf}
+% \begin{macrocode}
+\ltx@IfUndefined{sffamily}{%
+ \ltx@IfUndefined{sf}{%
+ }{%
+ \HoLogoFont@Def{sf}{\sf}%
+ }%
+}{%
+ \HoLogoFont@Def{sf}{\sffamily}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoFont@font@bibsf}
+% In case of \hologo{plainTeX} the original small caps
+% variant is used as default. In \hologo{LaTeX}
+% the definition of package \xpackage{dtklogos} \cite{dtklogos}
+% is used.
+%\begin{quote}
+%\begin{verbatim}
+%\DeclareRobustCommand{\BibTeX}{%
+% B%
+% \kern-.05em%
+% \hbox{%
+% $\m@th$% %% force math size calculations
+% \csname S@\f@size\endcsname
+% \fontsize\sf@size\z@
+% \math@fontsfalse
+% \selectfont
+% I%
+% \kern-.025em%
+% B
+% }%
+% \kern-.08em%
+% \-%
+% \TeX
+%}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\ltx@IfUndefined{selectfont}{%
+ \ltx@IfUndefined{tensc}{%
+ \font\tensc=cmcsc10\relax
+ }{}%
+ \HoLogoFont@Def{bibsf}{\tensc}%
+}{%
+ \HoLogoFont@Def{bibsf}{%
+ $\mathsurround=0pt$%
+ \csname S@\f@size\endcsname
+ \fontsize\sf@size{0pt}%
+ \math@fontsfalse
+ \selectfont
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoFont@font@sc}
+% \begin{macrocode}
+\ltx@IfUndefined{scshape}{%
+ \ltx@IfUndefined{tensc}{%
+ \font\tensc=cmcsc10\relax
+ }{}%
+ \HoLogoFont@Def{sc}{\tensc}%
+}{%
+ \HoLogoFont@Def{sc}{\scshape}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoFont@font@sy}
+% \begin{macrocode}
+\ltx@IfUndefined{usefont}{%
+ \ltx@IfUndefined{tensy}{%
+ }{%
+ \HoLogoFont@Def{sy}{\tensy}%
+ }%
+}{%
+ \HoLogoFont@Def{sy}{%
+ \usefont{OMS}{cmsy}{m}{n}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoFont@font@logo}
+% \begin{macrocode}
+\begingroup
+ \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifx\fmtname\x
+ \ltx@IfUndefined{logofamily}{%
+ \DeclareRobustCommand\logofamily{%
+ \not@math@alphabet\logofamily\relax
+ \fontencoding{U}%
+ \fontfamily{logo}%
+ \selectfont
+ }%
+ }{}%
+ \ltx@IfUndefined{logofamily}{%
+ }{%
+ \HoLogoFont@Def{logo}{\logofamily}%
+ }%
+\else
+ \ltx@IfUndefined{tenlogo}{%
+ \font\tenlogo=logo10\relax
+ }{}%
+ \HoLogoFont@Def{logo}{\tenlogo}%
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Font setup}
+%
+% \begin{macro}{\hologoFontSetup}
+% \begin{macrocode}
+\def\hologoFontSetup{%
+ \let\HOLOGO@name\relax
+ \HOLOGO@FontSetup
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hologoLogoFontSetup}
+% \begin{macrocode}
+\def\hologoLogoFontSetup#1{%
+ \edef\HOLOGO@name{#1}%
+ \ltx@IfUndefined{HoLogo@\HOLOGO@name}{%
+ \@PackageError{hologo}{%
+ Unknown logo `\HOLOGO@name'%
+ }\@ehc
+ \ltx@gobble
+ }{%
+ \HOLOGO@FontSetup
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HOLOGO@FontSetup}
+% \begin{macrocode}
+\def\HOLOGO@FontSetup{%
+ \kvsetkeys{HoLogoFont}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\def\HOLOGO@temp#1{%
+ \kv@define@key{HoLogoFont}{#1}{%
+ \ifx\HOLOGO@name\relax
+ \HoLogoFont@Def{#1}{##1}%
+ \else
+ \HoLogoFont@LogoDef\HOLOGO@name{#1}{##1}%
+ \fi
+ }%
+}
+\HOLOGO@temp{general}
+\HOLOGO@temp{sf}
+% \end{macrocode}
+%
+% \subsection{Generic logo commands}
%
% \begin{macrocode}
\HOLOGO@IfExists\hologo{%
@@ -750,99 +1345,309 @@ and the derived files
}\@ehc
\HOLOGO@AtEnd
}%
-\HOLOGO@IfExists\hologorobust{%
+\HOLOGO@IfExists\hologoRobust{%
\@PackageError{hologo}{%
- \string\hologorobust\ltx@space is already defined.\MessageBreak
+ \string\hologoRobust\ltx@space is already defined.\MessageBreak
Package loading is aborted%
}\@ehc
\HOLOGO@AtEnd
}%
% \end{macrocode}
%
-% \begin{macro}{\hologorobust}
+% \subsubsection{\cs{hologo} and friends}
+%
+% \begin{macrocode}
+\ifluatex
+ \expandafter\ltx@firstofone
+\else
+ \expandafter\ltx@gobble
+\fi
+{%
+ \ltx@IfUndefined{ifincsname}{%
+ \ifnum\luatexversion<36 %
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \begingroup
+ \ifcase0%
+ \directlua{%
+ if tex.enableprimitives then %
+ tex.enableprimitives('HOLOGO@', {'ifincsname'})%
+ else %
+ tex.print('1')%
+ end%
+ }%
+ \ifx\HOLOGO@ifincsname\@undefined 1\fi%
+ \relax
+ \expandafter\ltx@firstofone
+ \else
+ \endgroup
+ \expandafter\ltx@gobble
+ \fi
+ {%
+ \global\let\ifincsname\HOLOGO@ifincsname
+ }%
+ \HOLOGO@temp
+ }%
+ }{}%
+}
+% \end{macrocode}
+% \begin{macrocode}
+\ltx@IfUndefined{ifincsname}{%
+ \catcode`$=14 %
+}{%
+ \catcode`$=9 %
+}
+% \end{macrocode}
+%
+% \begin{macro}{\hologo}
+% \begin{macrocode}
+\def\hologo#1{%
+$ \ifincsname
+$ \ltx@ifundefined{HoLogoCs@\HOLOGO@Variant{#1}}{%
+$ #1%
+$ }{%
+$ \csname HoLogoCs@\HOLOGO@Variant{#1}\endcsname\ltx@firstoftwo
+$ }%
+$ \else
+ \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
+ {%
+ \hologoRobust{#1}%
+ }{%
+ \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{%
+ \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
+ }{%
+ \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname
+ \ltx@firstoftwo
+ }%
+ }%
+$ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\Hologo}
+% \begin{macrocode}
+\def\Hologo#1{%
+$ \ifincsname
+$ \ltx@ifundefined{HoLogoCs@\HOLOGO@Variant{#1}}{%
+$ #1%
+$ }{%
+$ \csname HoLogoCs@\HOLOGO@Variant{#1}\endcsname\ltx@secondoftwo
+$ }%
+$ \else
+ \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
+ {%
+ \HologoRobust{#1}%
+ }{%
+ \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{%
+ \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
+ }{%
+ \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname
+ \ltx@secondoftwo
+ }%
+ }%
+$ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hologoVariant}
+% \begin{macrocode}
+\def\hologoVariant#1#2{%
+ \ifx\relax#2\relax
+ \hologo{#1}%
+ \else
+$ \ifincsname
+$ \ltx@ifundefined{HoLogoCs@#1@#2}{%
+$ #1%
+$ }{%
+$ \csname HoLogoCs@#1@#2\endcsname\ltx@firstoftwo
+$ }%
+$ \else
+ \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
+ {%
+ \hologoVariantRobust{#1}{#2}%
+ }{%
+ \ltx@ifundefined{HoLogoBkm@#1@#2}{%
+ \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
+ }{%
+ \csname HoLogoBkm@#1@#2\endcsname
+ \ltx@firstoftwo
+ }%
+ }%
+$ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HologoVariant}
+% \begin{macrocode}
+\def\HologoVariant#1#2{%
+ \ifx\relax#2\relax
+ \Hologo{#1}%
+ \else
+$ \ifincsname
+$ \ltx@ifundefined{HoLogoCs@#1@#2}{%
+$ #1%
+$ }{%
+$ \csname HoLogoCs@#1@#2\endcsname\ltx@secondoftwo
+$ }%
+$ \else
+ \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
+ {%
+ \HologoVariantRobust{#1}{#2}%
+ }{%
+ \ltx@ifundefined{HoLogoBkm@#1@#2}{%
+ \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
+ }{%
+ \csname HoLogoBkm@#1@#2\endcsname
+ \ltx@secondoftwo
+ }%
+ }%
+$ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\catcode`\$=3 %
+% \end{macrocode}
+%
+% \subsubsection{\cs{hologoRobust} and friends}
+%
+% \begin{macro}{\hologoRobust}
% \begin{macrocode}
\ltx@IfUndefined{protected}{%
\ltx@IfUndefined{DeclareRobustCommand}{%
- \def\hologorobust#1%
+ \def\hologoRobust#1%
}{%
- \DeclareRobustCommand*\hologorobust[1]%
+ \DeclareRobustCommand*\hologoRobust[1]%
}%
}{%
- \protected\def\hologorobust#1%
+ \protected\def\hologoRobust#1%
}%
{%
\edef\HOLOGO@name{#1}%
- \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{%
+ \ltx@IfUndefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{%
\@PackageError{hologo}{%
Unknown logo `\HOLOGO@name'%
}\@ehc
?\HOLOGO@name?%
}{%
- \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@firstoftwo
- }%
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\hologo}
-% \begin{macrocode}
-\def\hologo#1{%
- \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
- {%
- \hologorobust{#1}%
- }{%
- \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{%
- \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
+ \ltx@IfUndefined{ver@tex4ht.sty}{%
+ \HoLogoFont@font\HOLOGO@name{general}{%
+ \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname
+ \ltx@firstoftwo
+ }%
}{%
- \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@firstoftwo
+ \ltx@IfUndefined{HoLogoHtml@\HOLOGO@Variant\HOLOGO@name}{%
+ \HOLOGO@name
+ }{%
+ \csname HoLogoHtml@\HOLOGO@Variant\HOLOGO@name\endcsname
+ \ltx@firstoftwo
+ }%
}%
}%
}
% \end{macrocode}
% \end{macro}
-%
-% \begin{macro}{\Hologorobust}
+% \begin{macro}{\HologoRobust}
% \begin{macrocode}
\ltx@IfUndefined{protected}{%
\ltx@IfUndefined{DeclareRobustCommand}{%
- \def\Hologorobust#1%
+ \def\HologoRobust#1%
}{%
- \DeclareRobustCommand*\Hologorobust[1]%
+ \DeclareRobustCommand*\HologoRobust[1]%
}%
}{%
- \protected\def\Hologorobust#1%
+ \protected\def\HologoRobust#1%
}%
{%
\edef\HOLOGO@name{#1}%
- \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{%
+ \ltx@IfUndefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{%
\@PackageError{hologo}{%
Unknown logo `\HOLOGO@name'%
}\@ehc
?\HOLOGO@name?%
}{%
- \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@secondoftwo
+ \ltx@IfUndefined{ver@tex4ht.sty}{%
+ \HoLogoFont@font\HOLOGO@name{general}{%
+ \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname
+ \ltx@secondoftwo
+ }%
+ }{%
+ \ltx@IfUndefined{HoLogoHtml@\HOLOGO@Variant\HOLOGO@name}{%
+ \expandafter\HOLOGO@Uppercase\HOLOGO@name
+ }{%
+ \csname HoLogoHtml@\HOLOGO@Variant\HOLOGO@name\endcsname
+ \ltx@secondoftwo
+ }%
+ }%
}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\Hologo}
+% \begin{macro}{\hologoVariantRobust}
% \begin{macrocode}
-\def\Hologo#1{%
- \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
- {%
- \Hologorobust{#1}%
+\ltx@IfUndefined{protected}{%
+ \ltx@IfUndefined{DeclareRobustCommand}{%
+ \def\hologoVariantRobust#1#2%
}{%
- \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{%
- \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
- }{%
- \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@secondoftwo
- }%
+ \DeclareRobustCommand*\hologoVariantRobust[2]%
}%
+}{%
+ \protected\def\hologoVariantRobust#1#2%
+}%
+{%
+ \begingroup
+ \hologoLogoSetup{#1}{variant={#2}}%
+ \hologoRobust{#1}%
+ \endgroup
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HologoVariantRobust}
+% \begin{macrocode}
+\ltx@IfUndefined{protected}{%
+ \ltx@IfUndefined{DeclareRobustCommand}{%
+ \def\HologoVariantRobust#1#2%
+ }{%
+ \DeclareRobustCommand*\HologoVariantRobust[2]%
+ }%
+}{%
+ \protected\def\HologoVariantRobust#1#2%
+}%
+{%
+ \begingroup
+ \hologoLogoSetup{#1}{variant={#2}}%
+ \HologoRobust{#1}%
+ \endgroup
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hologorobust}
+% Macro \cs{hologorobust} is only defined for compatibility.
+% Its use is deprecated.
+% \begin{macrocode}
+\def\hologorobust{\hologoRobust}
+% \end{macrocode}
+% \end{macro}
%
% \subsection{Helpers}
%
+% \begin{macro}{\HOLOGO@Uppercase}
+% Macro \cs{HOLOGO@Uppercase} is restricted to \cs{uppercase},
+% because \hologo{plainTeX} or \hologo{iniTeX} do not provide
+% \cs{MakeUppercase}.
+% \begin{macrocode}
+\def\HOLOGO@Uppercase#1{\uppercase{#1}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\HOLOGO@PdfdocUnicode}
% \begin{macrocode}
\def\HOLOGO@PdfdocUnicode{%
@@ -910,6 +1715,51 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\HOLOGO@Span}
+% \begin{macrocode}
+\def\HOLOGO@Span#1#2{%
+ \HCode{<span class="HoLogo-#1">}%
+ #2%
+ \HCode{</span>}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Text subscript}
+%
+% \begin{macro}{\HOLOGO@SubScript}%
+% \begin{macrocode}
+\def\HOLOGO@SubScript#1{%
+ \ltx@IfUndefined{textsubscript}{%
+ \ltx@IfUndefined{text}{%
+ \ltx@mbox{%
+ \mathsurround=0pt\relax
+ $%
+ _{%
+ \ltx@IfUndefined{sf@size}{%
+ \mathrm{#1}%
+ }{%
+ \mbox{%
+ \fontsize\sf@size{0pt}\selectfont
+ #1%
+ }%
+ }%
+ }%
+ $%
+ }%
+ }{%
+ \ltx@mbox{%
+ \mathsurround=0pt\relax
+ $_{\text{#1}}$%
+ }%
+ }%
+ }{%
+ \textsubscript{#1}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{\hologo{TeX} and friends}
%
% \subsubsection{\hologo{TeX}}
@@ -922,6 +1772,40 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@TeX}
+% \begin{macrocode}
+\def\HoLogoHtml@TeX#1{%
+ \HoLogoCss@TeX
+ \HOLOGO@Span{TeX}{%
+ T%
+ \HOLOGO@Span{e}{%
+ E%
+ }%
+ X%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@TeX}
+% \begin{macrocode}
+\def\HoLogoCss@TeX{%
+ \Css{%
+ span.HoLogo-TeX span.HoLogo-e{%
+ position:relative;%
+ top:.5ex;%
+ margin-left:-.1667em;%
+ margin-right:-.125em;%
+ }%
+ }%
+ \Css{%
+ a span.HoLogo-TeX span.HoLogo-e{%
+ text-decoration:none;%
+ }%
+ }%
+ \global\let\HoLogoCss@TeX\relax
+}
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{plainTeX}}
%
@@ -933,6 +1817,11 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@plainTeX@space}
+% \begin{macrocode}
+\def\HoLogoCs@plainTeX@space#1{#1{p}{P}lain TeX}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\HoLogoBkm@plainTeX@space}
% \begin{macrocode}
\def\HoLogoBkm@plainTeX@space#1{%
@@ -940,6 +1829,13 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@plainTeX@space}
+% \begin{macrocode}
+\def\HoLogoHtml@plainTeX@space#1{%
+ #1{p}{P}lain \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\HoLogo@plainTeX@hyphen}
% \begin{macrocode}
@@ -948,6 +1844,11 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@plainTeX@hyphen}
+% \begin{macrocode}
+\def\HoLogoCs@plainTeX@hyphen#1{#1{p}{P}lain-TeX}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\HoLogoBkm@plainTeX@hyphen}
% \begin{macrocode}
\def\HoLogoBkm@plainTeX@hyphen#1{%
@@ -955,6 +1856,13 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@plainTeX@hyphen}
+% \begin{macrocode}
+\def\HoLogoHtml@plainTeX@hyphen#1{%
+ #1{p}{P}lain-\hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\HoLogo@plainTeX@runtogether}
% \begin{macrocode}
@@ -963,6 +1871,11 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@plainTeX@runtogether}
+% \begin{macrocode}
+\def\HoLogoCs@plainTeX@runtogether#1{#1{p}{P}lainTeX}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\HoLogoBkm@plainTeX@runtogether}
% \begin{macrocode}
\def\HoLogoBkm@plainTeX@runtogether#1{%
@@ -970,24 +1883,65 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@plainTeX@runtogether}
+% \begin{macrocode}
+\def\HoLogoHtml@plainTeX@runtogether#1{%
+ #1{p}{P}lain\hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\HoLogo@plainTeX}
% \begin{macrocode}
\def\HoLogo@plainTeX{\HoLogo@plainTeX@space}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@plainTeX}
+% \begin{macrocode}
+\def\HoLogoCs@plainTeX{\HoLogoCs@plainTeX@space}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\HoLogoBkm@plainTeX}
% \begin{macrocode}
\def\HoLogoBkm@plainTeX{\HoLogoBkm@plainTeX@space}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@plainTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@plainTeX{\HoLogoHtml@plainTeX@space}
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{LaTeX}}
%
-% \begin{macro}{\HoLogo@LaTeX}
% Source: \hologo{LaTeX} kernel.
+%\begin{quote}
+%\begin{verbatim}
+%\DeclareRobustCommand{\LaTeX}{%
+% L%
+% \kern-.36em%
+% {%
+% \sbox\z@ T%
+% \vbox to\ht\z@{%
+% \hbox{%
+% \check@mathfonts
+% \fontsize\sf@size\z@
+% \math@fontsfalse
+% \selectfont
+% A%
+% }%
+% \vss
+% }%
+% }%
+% \kern-.15em%
+% \TeX
+%}
+%\end{verbatim}
+%\end{quote}
+%
+% \begin{macro}{\HoLogo@La}
% \begin{macrocode}
-\def\HoLogo@LaTeX#1{%
+\def\HoLogo@La#1{%
L%
\kern-.36em%
\begingroup
@@ -998,7 +1952,7 @@ and the derived files
\csname sevenrm\endcsname
}{%
\check@mathfonts
- \fontsize\sf@size\z@
+ \fontsize\sf@size{0pt}%
\math@fontsfalse\selectfont
}%
A%
@@ -1006,11 +1960,163 @@ and the derived files
\vss
}%
\endgroup
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@LaTeX}
+% Source: \hologo{LaTeX} kernel.
+% \begin{macrocode}
+\def\HoLogo@LaTeX#1{%
+ \hologo{La}%
\kern-.15em%
\hologo{TeX}%
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@LaTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@LaTeX#1{%
+ \HoLogoCss@LaTeX
+ \HOLOGO@Span{LaTeX}{%
+ L%
+ \HOLOGO@Span{a}{%
+ A%
+ }%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@LaTeX}
+% \begin{macrocode}
+\def\HoLogoCss@LaTeX{%
+ \Css{%
+ span.HoLogo-LaTeX span.HoLogo-a{%
+ position:relative;%
+ top:-.5ex;%
+ margin-left:-.36em;%
+ margin-right:-.15em;%
+ font-size:85\%;%
+ }%
+ }%
+ \global\let\HoLogoCss@LaTeX\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{(La)TeX}}
+%
+% \begin{macro}{\HoLogo@LaTeXTeX}
+% The kerning around the parentheses is taken
+% from package \xpackage{dtklogos} \cite{dtklogos}.
+%\begin{quote}
+%\begin{verbatim}
+%\DeclareRobustCommand{\LaTeXTeX}{%
+% (%
+% \kern-.15em%
+% L%
+% \kern-.36em%
+% {%
+% \sbox\z@ T%
+% \vbox to\ht0{%
+% \hbox{%
+% $\m@th$%
+% \csname S@\f@size\endcsname
+% \fontsize\sf@size\z@
+% \math@fontsfalse
+% \selectfont
+% A%
+% }%
+% \vss
+% }%
+% }%
+% \kern-.2em%
+% )%
+% \kern-.15em%
+% \TeX
+%}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\def\HoLogo@LaTeXTeX#1{%
+ (%
+ \kern-.15em%
+ \hologo{La}%
+ \kern-.2em%
+ )%
+ \kern-.15em%
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@LaTeXTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@LaTeXTeX#1{(La)TeX}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@(La)TeX}
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogo@(La)TeX\endcsname\HoLogo@LaTeXTeX
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@(La)TeX}
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogoBkm@(La)TeX\endcsname\HoLogoBkm@LaTeXTeX
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@LaTeXTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@LaTeXTeX#1{%
+ \HoLogoCss@LaTeXTeX
+ \HOLOGO@Span{LaTeXTeX}{%
+ (%
+ \HOLOGO@Span{L}{L}%
+ \HOLOGO@Span{a}{A}%
+ \HOLOGO@Span{ParenRight}{)}%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@(La)TeX}
+% Kerning after opening parentheses and before closing parentheses
+% is $-0.1$\,em. The original values $-0.15$\,em
+% looked too ugly for a serif font.
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogoHtml@(La)TeX\endcsname\HoLogoHtml@LaTeXTeX
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@LaTeXTeX}
+% \begin{macrocode}
+\def\HoLogoCss@LaTeXTeX{%
+ \Css{%
+ span.HoLogo-LaTeXTeX span.HoLogo-L{%
+ margin-left:-.1em;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-LaTeXTeX span.HoLogo-a{%
+ position:relative;%
+ top:-.5ex;%
+ margin-left:-.36em;%
+ margin-right:-.1em;%
+ font-size:85\%;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-LaTeXTeX span.HoLogo-ParenRight{%
+ margin-right:-.15em;%
+ }%
+ }%
+ \global\let\HoLogoCss@LaTeXTeX\relax
+}
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{LaTeXe}}
%
@@ -1029,6 +2135,25 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\HoLogoCs@LaTeXe}
+% \begin{macrocode}
+\ifnum64=`\^^^^0040\relax % test for big chars of LuaTeX/XeTeX
+ \catcode`\$=9 %
+ \catcode`\&=14 %
+\else
+ \catcode`\$=14 %
+ \catcode`\&=9 %
+\fi
+\def\HoLogoCs@LaTeXe#1{%
+ LaTeX2%
+$ \string ^^^^0395%
+& e%
+}%
+\catcode`\$=3 %
+\catcode`\&=4 %
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\HoLogoBkm@LaTeXe}
% \begin{macrocode}
\def\HoLogoBkm@LaTeXe#1{%
@@ -1039,14 +2164,63 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\HoLogoHtml@LaTeXe}
+% \begin{macrocode}
+\def\HoLogoHtml@LaTeXe#1{%
+ \HoLogoCss@LaTeXe
+ \HOLOGO@Span{LaTeX2e}{%
+ \hologo{LaTeX}%
+ \HOLOGO@Span{2}{2}%
+ \HOLOGO@Span{e}{%
+ \HOLOGO@MathSetup
+ \ensuremath{\textstyle\varepsilon}%
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@LaTeXe}
+% \begin{macrocode}
+\def\HoLogoCss@LaTeXe{%
+ \Css{%
+ span.HoLogo-LaTeX2e span.HoLogo-2{%
+ padding-left:.15em;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-LaTeX2e span.HoLogo-e{%
+ position:relative;%
+ top:.35ex;%
+ text-decoration:none;%
+ }%
+ }%
+ \global\let\HoLogoCss@LaTeXe\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\HoLogo@LaTeX2e}
% \begin{macrocode}
-\expandafter\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe
+\expandafter
+\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCs@LaTeX2e}
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogoCs@LaTeX2e\endcsname\HoLogoCs@LaTeXe
% \end{macrocode}
% \end{macro}
% \begin{macro}{\HoLogoBkm@LaTeX2e}
% \begin{macrocode}
-\expandafter\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe
+\expandafter
+\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@LaTeX2e}
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogoHtml@LaTeX2e\endcsname\HoLogoHtml@LaTeXe
% \end{macrocode}
% \end{macro}
%
@@ -1070,6 +2244,56 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@LaTeX3}
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogoHtml@LaTeX3\expandafter\endcsname
+\csname HoLogo@LaTeX3\endcsname
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{LaTeXML}}
+%
+% \begin{macro}{\HoLogo@LaTeXML}
+% \begin{macrocode}
+\def\HoLogo@LaTeXML#1{%
+ \HOLOGO@mbox{%
+ \hologo{La}%
+ \kern-.15em%
+ T%
+ \kern-.1667em%
+ \lower.5ex\hbox{E}%
+ \kern-.125em%
+ \HoLogoFont@font{LaTeXML}{sc}{xml}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@pdfLaTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@LaTeXML#1{%
+ \HOLOGO@Span{LaTeXML}{%
+ \HoLogoCss@LaTeX
+ \HoLogoCss@TeX
+ \HOLOGO@Span{LaTeX}{%
+ L%
+ \HOLOGO@Span{a}{%
+ A%
+ }%
+ }%
+ \HOLOGO@Span{TeX}{%
+ T%
+ \HOLOGO@Span{e}{%
+ E%
+ }%
+ }%
+ \HCode{<span style="font-variant: small-caps;">}%
+ xml%
+ \HCode{</span>}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{eTeX}}
%
@@ -1078,17 +2302,33 @@ and the derived files
% \begin{macrocode}
\def\HoLogo@eTeX#1{%
\ltx@mbox{%
- \hbox{%
- \HOLOGO@MathSetup
- $\varepsilon$%
- -%
- \HOLOGO@NegativeKerning{-T,T-,To}%
- \hologo{TeX}%
- }%
+ \HOLOGO@MathSetup
+ $\varepsilon$%
+ -%
+ \HOLOGO@NegativeKerning{-T,T-,To}%
+ \hologo{TeX}%
}%
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@eTeX}
+% \begin{macrocode}
+\ifnum64=`\^^^^0040\relax % test for big chars of LuaTeX/XeTeX
+ \catcode`\$=9 %
+ \catcode`\&=14 %
+\else
+ \catcode`\$=14 %
+ \catcode`\&=9 %
+\fi
+\def\HoLogoCs@eTeX#1{%
+$ #1{\string ^^^^0395}{\string ^^^^03b5}%
+& #1{e}{E}%
+ TeX%
+}%
+\catcode`\$=3 %
+\catcode`\&=4 %
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\HoLogoBkm@eTeX}
% \begin{macrocode}
\def\HoLogoBkm@eTeX#1{%
@@ -1098,7 +2338,18 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
-%
+% \begin{macro}{\HoLogoHtml@eTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@eTeX#1{%
+ \ltx@mbox{%
+ \HOLOGO@MathSetup
+ $\varepsilon$%
+ -%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{iniTeX}}
%
@@ -1106,11 +2357,28 @@ and the derived files
% \begin{macrocode}
\def\HoLogo@iniTeX#1{%
\HOLOGO@mbox{%
- ini\hologo{TeX}%
+ #1{i}{I}ni\hologo{TeX}%
}%
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@iniTeX}
+% \begin{macrocode}
+\def\HoLogoCs@iniTeX#1{#1{i}{I}niTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@iniTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@iniTeX#1{%
+ #1{i}{I}ni\hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@iniTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@iniTeX\HoLogo@iniTeX
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{virTeX}}
%
@@ -1118,11 +2386,259 @@ and the derived files
% \begin{macrocode}
\def\HoLogo@virTeX#1{%
\HOLOGO@mbox{%
- ini\hologo{TeX}%
+ #1{v}{V}ir\hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCs@virTeX}
+% \begin{macrocode}
+\def\HoLogoCs@virTeX#1{#1{v}{V}irTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@virTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@virTeX#1{%
+ #1{v}{V}ir\hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@virTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@virTeX\HoLogo@virTeX
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{SliTeX}}
+%
+% \paragraph{Definitions of the three variants.}
+%
+% \begin{macro}{\HoLogo@SLiTeX@lift}
+% \begin{macrocode}
+\def\HoLogo@SLiTeX@lift#1{%
+ \HoLogoFont@font{SliTeX}{rm}{%
+ S%
+ \kern-.06em%
+ L%
+ \kern-.18em%
+ \raise.32ex\hbox{\HoLogoFont@font{SliTeX}{sc}{i}}%
+ \HOLOGO@discretionary
+ \kern-.06em%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@SLiTeX@lift}
+% \begin{macrocode}
+\def\HoLogoBkm@SLiTeX@lift#1{SLiTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SLiTeX@lift}
+% \begin{macrocode}
+\def\HoLogoHtml@SLiTeX@lift#1{%
+ \HoLogoCss@SLiTeX@lift
+ \HOLOGO@Span{SLiTeX-lift}{%
+ \HoLogoFont@font{SliTeX}{rm}{%
+ S%
+ \HOLOGO@Span{L}{L}%
+ \HOLOGO@Span{i}{i}%
+ \hologo{TeX}%
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@SLiTeX@lift}
+% \begin{macrocode}
+\def\HoLogoCss@SLiTeX@lift{%
+ \Css{%
+ span.HoLogo-SLiTeX-lift span.HoLogo-L{%
+ margin-left:-.06em;%
+ margin-right:-.18em;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-SLiTeX-lift span.HoLogo-i{%
+ position:relative;%
+ top:-.32ex;%
+ margin-right:-.06em;%
+ font-variant:small-caps;%
+ }%
+ }%
+ \global\let\HoLogoCss@SLiTeX@lift\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@SliTeX@simple}
+% \begin{macrocode}
+\def\HoLogo@SliTeX@simple#1{%
+ \HoLogoFont@font{SliTeX}{rm}{%
+ \ltx@mbox{%
+ \HoLogoFont@font{SliTeX}{sc}{Sli}%
+ }%
+ \HOLOGO@discretionary
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@SliTeX@simple}
+% \begin{macrocode}
+\def\HoLogoBkm@SliTeX@simple#1{SliTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SliTeX@simple}
+% \begin{macrocode}
+\let\HoLogoHtml@SliTeX@simple\HoLogo@SliTeX@simple
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@SliTeX@narrow}
+% \begin{macrocode}
+\def\HoLogo@SliTeX@narrow#1{%
+ \HoLogoFont@font{SliTeX}{rm}{%
+ \ltx@mbox{%
+ S%
+ \kern-.06em%
+ \HoLogoFont@font{SliTeX}{sc}{%
+ l%
+ \kern-.035em%
+ i%
+ }%
+ }%
+ \HOLOGO@discretionary
+ \kern-.06em%
+ \hologo{TeX}%
}%
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoBkm@SliTeX@narrow}
+% \begin{macrocode}
+\def\HoLogoBkm@SliTeX@narrow#1{SliTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SliTeX@narrow}
+% \begin{macrocode}
+\def\HoLogoHtml@SliTeX@narrow#1{%
+ \HoLogoCss@SliTeX@narrow
+ \HOLOGO@Span{SliTeX-narrow}{%
+ \HoLogoFont@font{SliTeX}{rm}{%
+ S%
+ \HOLOGO@Span{l}{l}%
+ \HOLOGO@Span{i}{i}%
+ \hologo{TeX}%
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@SliTeX@narrow}
+% \begin{macrocode}
+\def\HoLogoCss@SliTeX@narrow{%
+ \Css{%
+ span.HoLogo-SliTeX-narrow span.HoLogo-l{%
+ margin-left:-.06em;%
+ margin-right:-.035em;%
+ font-variant:small-caps;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-SliTeX-narrow span.HoLogo-i{%
+ margin-right:-.06em;%
+ font-variant:small-caps;%
+ }%
+ }%
+ \global\let\HoLogoCss@SliTeX@narrow\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \paragraph{Macro set completion.}
+%
+% \begin{macro}{\HoLogo@SLiTeX@simple}
+% \begin{macrocode}
+\def\HoLogo@SLiTeX@simple{\HoLogo@SliTeX@simple}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@SLiTeX@simple}
+% \begin{macrocode}
+\def\HoLogoBkm@SLiTeX@simple{\HoLogoBkm@SliTeX@simple}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SLiTeX@simple}
+% \begin{macrocode}
+\def\HoLogoHtml@SLiTeX@simple{\HoLogoHtml@SliTeX@simple}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@SLiTeX@narrow}
+% \begin{macrocode}
+\def\HoLogo@SLiTeX@narrow{\HoLogo@SliTeX@narrow}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@SLiTeX@narrow}
+% \begin{macrocode}
+\def\HoLogoBkm@SLiTeX@narrow{\HoLogoBkm@SliTeX@narrow}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SLiTeX@narrow}
+% \begin{macrocode}
+\def\HoLogoHtml@SLiTeX@narrow{\HoLogoHtml@SliTeX@narrow}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@SliTeX@lift}
+% \begin{macrocode}
+\def\HoLogo@SliTeX@lift{\HoLogo@SLiTeX@lift}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@SliTeX@lift}
+% \begin{macrocode}
+\def\HoLogoBkm@SliTeX@lift{\HoLogoBkm@SLiTeX@lift}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SliTeX@lift}
+% \begin{macrocode}
+\def\HoLogoHtml@SliTeX@lift{\HoLogoHtml@SLiTeX@lift}
+% \end{macrocode}
+% \end{macro}
+%
+% \paragraph{Defaults.}
+%
+% \begin{macro}{\HoLogo@SLiTeX}
+% \begin{macrocode}
+\def\HoLogo@SLiTeX{\HoLogo@SLiTeX@lift}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@SLiTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@SLiTeX{\HoLogoBkm@SLiTeX@lift}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SLiTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@SLiTeX{\HoLogoHtml@SLiTeX@lift}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@SliTeX}
+% \begin{macrocode}
+\def\HoLogo@SliTeX{\HoLogo@SliTeX@narrow}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@SliTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@SliTeX{\HoLogoBkm@SliTeX@narrow}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SliTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@SliTeX{\HoLogoHtml@SliTeX@narrow}
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{LuaTeX}}
%
@@ -1139,6 +2655,11 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@LuaTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@LuaTeX\HoLogo@LuaTeX
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{LuaLaTeX}}
%
@@ -1152,24 +2673,219 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@LuaLaTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@LuaLaTeX\HoLogo@LuaLaTeX
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{XeTeX}, \hologo{XeLaTeX}}
%
+% \begin{macro}{\HOLOGO@IfCharExists}
+% \begin{macrocode}
+\ifluatex
+ \ifnum\luatexversion<36 %
+ \else
+ \def\HOLOGO@IfCharExists#1{%
+ \ifnum
+ \directlua{%
+ if font and font.fonts and font.current then %
+ local f = font.fonts[font.current()]%
+ if f.characters and f.characters[\number#1] then %
+ tex.print("1")%
+ end %
+ end%
+ }0=\ltx@zero
+ \expandafter\ltx@secondoftwo
+ \else
+ \expandafter\ltx@firstoftwo
+ \fi
+ }%
+ \fi
+\fi
+\ltx@IfUndefined{HOLOGO@IfCharExists}{%
+ \def\HOLOGO@@IfCharExists#1{%
+ \begingroup
+ \tracinglostchars=\ltx@zero
+ \setbox\ltx@zero=\hbox{%
+ \kern7sp\char#1\relax
+ \ifnum\lastkern>\ltx@zero
+ \expandafter\aftergroup\csname iffalse\endcsname
+ \else
+ \expandafter\aftergroup\csname iftrue\endcsname
+ \fi
+ }%
+ % \if{true|false} from \aftergroup
+ \endgroup
+ \expandafter\ltx@firstoftwo
+ \else
+ \endgroup
+ \expandafter\ltx@secondoftwo
+ \fi
+ }%
+ \ifxetex
+ \ltx@IfUndefined{XeTeXfonttype}{}{%
+ \ltx@IfUndefined{XeTeXcharglyph}{}{%
+ \def\HOLOGO@IfCharExists#1{%
+ \ifnum\XeTeXfonttype\font>\ltx@zero
+ \expandafter\ltx@firstofthree
+ \else
+ \expandafter\ltx@gobble
+ \fi
+ {%
+ \ifnum\XeTeXcharglyph#1>\ltx@zero
+ \expandafter\ltx@firstoftwo
+ \else
+ \expandafter\ltx@secondoftwo
+ \fi
+ }%
+ \HOLOGO@@IfCharExists{#1}%
+ }%
+ }%
+ }%
+ \fi
+}{}
+\ltx@ifundefined{HOLOGO@IfCharExists}{%
+ \ifnum64=`\^^^^0040\relax % test for big chars of LuaTeX/XeTeX
+ \let\HOLOGO@IfCharExists\HOLOGO@@IfCharExists
+ \else
+ \def\HOLOGO@IfCharExists#1{%
+ \ifnum#1>255 %
+ \expandafter\ltx@fourthoffour
+ \fi
+ \HOLOGO@@IfCharExists{#1}%
+ }%
+ \fi
+}{}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\HoLogo@Xe}
% Source: package \xpackage{dtklogos}
% \begin{macrocode}
\def\HoLogo@Xe#1{%
X%
\kern-.1em\relax
- \ltx@IfUndefined{HOLOGO@ReflectBox}\ltx@firstoftwo{%
- \ltx@IfUndefined{HOLOGO@ReflectBox@\hologodriver}%
- \ltx@firstoftwo\ltx@secondoftwo
+ \HOLOGO@IfCharExists{"018E}{%
+ \lower.5ex\hbox{\char"018E}%
+ }{%
+ \chardef\HOLOGO@choice=\ltx@zero
+ \ifdim\fontdimen\ltx@one\font>0pt %
+ \ltx@IfUndefined{rotatebox}{%
+ \ltx@IfUndefined{pgftext}{%
+ \ltx@IfUndefined{psscalebox}{%
+ \ltx@IfUndefined{HOLOGO@ScaleBox@\hologoDriver}{%
+ }{%
+ \chardef\HOLOGO@choice=4 %
+ }%
+ }{%
+ \chardef\HOLOGO@choice=3 %
+ }%
+ }{%
+ \chardef\HOLOGO@choice=2 %
+ }%
+ }{%
+ \chardef\HOLOGO@choice=1 %
+ }%
+ \ifcase\HOLOGO@choice
+ \HOLOGO@WarningUnsupportedDriver{Xe}%
+ e%
+ \or % 1: \rotatebox
+ \begingroup
+ \setbox\ltx@zero\hbox{\rotatebox{180}{E}}%
+ \ltx@LocDimenA=\dp\ltx@zero
+ \advance\ltx@LocDimenA by -.5ex\relax
+ \raise\ltx@LocDimenA\box\ltx@zero
+ \endgroup
+ \or % 2: \pgftext
+ \lower.5ex\hbox{%
+ \pgfpicture
+ \pgftext[rotate=180]{E}%
+ \endpgfpicture
+ }%
+ \or % 3: \psscalebox
+ \begingroup
+ \setbox\ltx@zero\hbox{\psscalebox{-1 -1}{E}}%
+ \ltx@LocDimenA=\dp\ltx@zero
+ \advance\ltx@LocDimenA by -.5ex\relax
+ \raise\ltx@LocDimenA\box\ltx@zero
+ \endgroup
+ \or % 4: \HOLOGO@PointReflectBox
+ \lower.5ex\hbox{\HOLOGO@PointReflectBox{E}}%
+ \else
+ \@PackageError{hologo}{Internal error (choice/it}\@ehc
+ \fi
+ \else
+ \ltx@IfUndefined{reflectbox}{%
+ \ltx@IfUndefined{pgftext}{%
+ \ltx@IfUndefined{psscalebox}{%
+ \ltx@IfUndefined{HOLOGO@ScaleBox@\hologoDriver}{%
+ }{%
+ \chardef\HOLOGO@choice=4 %
+ }%
+ }{%
+ \chardef\HOLOGO@choice=3 %
+ }%
+ }{%
+ \chardef\HOLOGO@choice=2 %
+ }%
+ }{%
+ \chardef\HOLOGO@choice=1 %
+ }%
+ \ifcase\HOLOGO@choice
+ \HOLOGO@WarningUnsupportedDriver{Xe}%
+ e%
+ \or % 1: reflectbox
+ \lower.5ex\hbox{%
+ \reflectbox{E}%
+ }%
+ \or % 2: \pgftext
+ \lower.5ex\hbox{%
+ \pgfpicture
+ \pgftransformxscale{-1}%
+ \pgftext{E}%
+ \endpgfpicture
+ }%
+ \or % 3: \psscalebox
+ \lower.5ex\hbox{%
+ \psscalebox{-1 1}{E}%
+ }%
+ \or % 4: \HOLOGO@Reflectbox
+ \lower.5ex\hbox{%
+ \HOLOGO@ReflectBox{E}%
+ }%
+ \else
+ \@PackageError{hologo}{Internal error (choice/up)}\@ehc
+ \fi
+ \fi
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@Xe}
+% \begin{macrocode}
+\def\HoLogoHtml@Xe#1{%
+ \HoLogoCss@Xe
+ \HOLOGO@Span{Xe}{%
+ X%
+ \HOLOGO@Span{e}{%
+ \HCode{&\ltx@hashchar x018e;}%
+ }%
}%
- {e}{%
- \lower.5ex\hbox{%
- \HOLOGO@ReflectBox{E}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@Xe}
+% \begin{macrocode}
+\def\HoLogoCss@Xe{%
+ \Css{%
+ span.HoLogo-Xe span.HoLogo-e{%
+ position:relative;%
+ top:.5ex;%
+ left-margin:-.1em;%
}%
}%
+ \global\let\HoLogoCss@Xe\relax
}
% \end{macrocode}
% \end{macro}
@@ -1184,14 +2900,62 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\HoLogoHtml@XeTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@XeTeX#1{%
+ \HoLogoCss@XeTeX
+ \HOLOGO@Span{XeTeX}{%
+ \hologo{Xe}%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@XeTeX}
+% \begin{macrocode}
+\def\HoLogoCss@XeTeX{%
+ \Css{%
+ span.HoLogo-XeTeX span.HoLogo-TeX{%
+ margin-left:-.15em;%
+ }%
+ }%
+ \global\let\HoLogoCss@XeTeX\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\HoLogo@XeLaTeX}
% \begin{macrocode}
\def\HoLogo@XeLaTeX#1{%
\hologo{Xe}%
+ \kern-.13em%
\hologo{LaTeX}%
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@XeLaTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@XeLaTeX#1{%
+ \HoLogoCss@XeLaTeX
+ \HOLOGO@Span{XeLaTeX}{%
+ \hologo{Xe}%
+ \hologo{LaTeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@XeLaTeX}
+% \begin{macrocode}
+\def\HoLogoCss@XeLaTeX{%
+ \Css{%
+ span.HoLogo-XeLaTeX span.HoLogo-Xe{%
+ margin-right:-.13em;%
+ }%
+ }%
+ \global\let\HoLogoCss@XeLaTeX\relax
+}
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{pdfTeX}, \hologo{pdfLaTeX}}
%
@@ -1204,6 +2968,23 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@pdfTeX}
+% \begin{macrocode}
+\def\HoLogoCs@pdfTeX#1{#1{p}{P}dfTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@pdfTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@pdfTeX#1{%
+ #1{p}{P}df\hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@pdfTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@pdfTeX\HoLogo@pdfTeX
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\HoLogo@pdfLaTeX}
% \begin{macrocode}
@@ -1214,6 +2995,23 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoCs@pdfLaTeX}
+% \begin{macrocode}
+\def\HoLogoCs@pdfLaTeX#1{#1{p}{P}dfLaTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@pdfLaTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@pdfLaTeX#1{%
+ #1{p}{P}df\hologo{LaTeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@pdfLaTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@pdfLaTeX\HoLogo@pdfLaTeX
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{VTeX}}
%
@@ -1226,6 +3024,11 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@VTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@VTeX\HoLogo@VTeX
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{AmS}, \dots}
%
@@ -1234,14 +3037,13 @@ and the derived files
% \begin{macro}{\HoLogo@AmS}
% \begin{macrocode}
\def\HoLogo@AmS#1{%
- \begingroup
- \usefont{OMS}{cmsy}{m}{n}%
+ \HoLogoFont@font{AmS}{sy}{%
A%
\kern-.1667em%
\lower.5ex\hbox{M}%
\kern-.125em%
S%
- \endgroup
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -1250,6 +3052,36 @@ and the derived files
\def\HoLogoBkm@AmS#1{AmS}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@AmS}
+% \begin{macrocode}
+\def\HoLogoHtml@AmS#1{%
+ \HoLogoCss@AmS
+% \HoLogoFont@font{AmS}{sy}{%
+ \HOLOGO@Span{AmS}{%
+ A%
+ \HOLOGO@Span{M}{M}%
+ S%
+ }%
+% }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@AmS}
+% \begin{macrocode}
+\def\HoLogoCss@AmS{%
+ \Css{%
+ span.HoLogo-AmS span.HoLogo-M{%
+ position:relative;%
+ top:.5ex;%
+ margin-left:-.1667em;%
+ margin-right:-.125em;%
+ text-decoration:none;%
+ }%
+ }%
+ \global\let\HoLogoCss@AmS\relax
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\HoLogo@AmSTeX}
% \begin{macrocode}
@@ -1262,7 +3094,12 @@ and the derived files
% \end{macro}
% \begin{macro}{\HoLogoBkm@AmSTeX}
% \begin{macrocode}
-\def\HoLogoBkm@AmSLaTeX#1{AmS-TeX}%
+\def\HoLogoBkm@AmSTeX#1{AmS-TeX}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@AmSTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@AmSTeX\HoLogo@AmSTeX
% \end{macrocode}
% \end{macro}
%
@@ -1280,6 +3117,202 @@ and the derived files
\def\HoLogoBkm@AmSLaTeX#1{AmS-LaTeX}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@AmSLaTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@AmSLaTeX\HoLogo@AmSLaTeX
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{BibTeX}}
+%
+% \begin{macro}{\HoLogo@BibTeX@sc}
+% A definition of \hologo{BibTeX} is provided in
+% the documentation source for the manual of \hologo{BibTeX}
+% \cite{btxdoc}.
+%\begin{quote}
+%\begin{verbatim}
+%\def\BibTeX{%
+% {%
+% \rm
+% B%
+% \kern-.05em%
+% {%
+% \sc
+% i%
+% \kern-.025em %
+% b%
+% }%
+% \kern-.08em
+% T%
+% \kern-.1667em%
+% \lower.7ex\hbox{E}%
+% \kern-.125em%
+% X%
+% }%
+%}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\def\HoLogo@BibTeX@sc#1{%
+ B%
+ \kern-.05em%
+ \HoLogoFont@font{BibTeX}{sc}{%
+ i%
+ \kern-.025em%
+ b%
+ }%
+ \HOLOGO@discretionary
+ \kern-.08em%
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@BibTeX@sc}
+% \begin{macrocode}
+\def\HoLogoHtml@BibTeX@sc#1{%
+ \HoLogoCss@BibTeX@sc
+ \HOLOGO@Span{BibTeX-sc}{%
+ B%
+ \HOLOGO@Span{i}{i}%
+ \HOLOGO@Span{b}{b}%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@BibTeX@sc}
+% \begin{macrocode}
+\def\HoLogoCss@BibTeX@sc{%
+ \Css{%
+ span.HoLogo-BibTeX-sc span.HoLogo-i{%
+ margin-left:-.05em;%
+ margin-right:-.025em;%
+ font-variant:small-caps;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-BibTeX-sc span.HoLogo-b{%
+ margin-right:-.08em;%
+ font-variant:small-caps;%
+ }%
+ }%
+ \global\let\HoLogoCss@BibTeX@sc\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@BibTeX@sf}
+% Variant \xoption{sf} avoids trouble with unavailable
+% small caps fonts (e.g., bold versions of Computer Modern or
+% Latin Modern). The definition is taken from
+% package \xpackage{dtklogos} \cite{dtklogos}.
+%\begin{quote}
+%\begin{verbatim}
+%\DeclareRobustCommand{\BibTeX}{%
+% B%
+% \kern-.05em%
+% \hbox{%
+% $\m@th$% %% force math size calculations
+% \csname S@\f@size\endcsname
+% \fontsize\sf@size\z@
+% \math@fontsfalse
+% \selectfont
+% I%
+% \kern-.025em%
+% B
+% }%
+% \kern-.08em%
+% \-%
+% \TeX
+%}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\def\HoLogo@BibTeX@sf#1{%
+ B%
+ \kern-.05em%
+ \HoLogoFont@font{BibTeX}{bibsf}{%
+ I%
+ \kern-.025em%
+ B%
+ }%
+ \HOLOGO@discretionary
+ \kern-.08em%
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@BibTeX@sf}
+% \begin{macrocode}
+\def\HoLogoHtml@BibTeX@sf#1{%
+ \HoLogoCss@BibTeX@sf
+ \HOLOGO@Span{BibTeX-sf}{%
+ B%
+ \HoLogoFont@font{BibTeX}{bibsf}{%
+ \HOLOGO@Span{i}{I}%
+ B%
+ }%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@BibTeX@sf}
+% \begin{macrocode}
+\def\HoLogoCss@BibTeX@sf{%
+ \Css{%
+ span.HoLogo-BibTeX-sf span.HoLogo-i{%
+ margin-left:-.05em;%
+ margin-right:-.025em;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-BibTeX-sf span.HoLogo-TeX{%
+ margin-left:-.08em;%
+ }%
+ }%
+ \global\let\HoLogoCss@BibTeX@sf\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@BibTeX}
+% \begin{macrocode}
+\def\HoLogo@BibTeX{\HoLogo@BibTeX@sf}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@BibTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@BibTeX{\HoLogoHtml@BibTeX@sf}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{BibTeX8}}
+%
+% \begin{macro}{\HoLogo@BibTeX8}
+% \begin{macrocode}
+\expandafter\def\csname HoLogo@BibTeX8\endcsname#1{%
+ \hologo{BibTeX}%
+ 8%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoBkm@BibTeX8}
+% \begin{macrocode}
+\expandafter\def\csname HoLogoBkm@BibTeX8\endcsname#1{%
+ \hologo{BibTeX}%
+ 8%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@BibTeX8}
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogoHtml@BibTeX8\expandafter\endcsname
+\csname HoLogo@BibTeX8\endcsname
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{\hologo{ConTeXt}}
%
@@ -1292,6 +3325,11 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@ConTeXt@simple}
+% \begin{macrocode}
+\let\HoLogoHtml@ConTeXt@simple\HoLogo@ConTeXt@simple
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\HoLogo@ConTeXt@narrow}
% This definition of logo \hologo{ConTeXt} with variant \xoption{narrow}
@@ -1305,12 +3343,751 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@ConTeXt@narrow}
+% \begin{macrocode}
+\def\HoLogoHtml@ConTeXt@narrow#1{%
+ \HoLogoCss@ConTeXt@narrow
+ \HOLOGO@Span{ConTeXt-narrow}{%
+ \HOLOGO@Span{C}{C}%
+ on%
+ \hologo{TeX}%
+ t%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@ConTeXt@narrow}
+% \begin{macrocode}
+\def\HoLogoCss@ConTeXt@narrow{%
+ \Css{%
+ span.HoLogo-ConTeXt-narrow span.HoLogo-C{%
+ margin-left:-.0333em;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-ConTeXt-narrow span.HoLogo-TeX{%
+ margin-left:-.0667em;%
+ margin-right:-.0333em;%
+ }%
+ }%
+ \global\let\HoLogoCss@ConTeXt@narrow\relax
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\HoLogo@ConTeXt}
% \begin{macrocode}
\def\HoLogo@ConTeXt{\HoLogo@ConTeXt@narrow}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\HoLogoHtml@ConTeXt}
+% \begin{macrocode}
+\def\HoLogoHtml@ConTeXt{\HoLogoHtml@ConTeXt@narrow}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{emTeX}}
+%
+% \begin{macro}{\HoLogo@emTeX}
+% \begin{macrocode}
+\def\HoLogo@emTeX#1{%
+ \HOLOGO@mbox{#1{e}{E}m}%
+ \HOLOGO@discretionary
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCs@emTeX}
+% \begin{macrocode}
+\def\HoLogoCs@emTeX#1{#1{e}{E}mTeX}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@emTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@emTeX#1{%
+ #1{e}{E}m\hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@emTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@emTeX\HoLogo@emTeX
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{ExTeX}}
+%
+% \begin{macro}{\HoLogo@ExTeX}
+% The definition is taken from the FAQ of the
+% project \hologo{ExTeX}
+% \cite{ExTeX-FAQ}.
+%\begin{quote}
+%\begin{verbatim}
+%\def\ExTeX{%
+% \textrm{% Logo always with serifs
+% \ensuremath{%
+% \textstyle
+% \varepsilon_{%
+% \kern-0.15em%
+% \mathcal{X}%
+% }%
+% }%
+% \kern-.15em%
+% \TeX
+% }%
+%}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\def\HoLogo@ExTeX#1{%
+ \HoLogoFont@font{ExTeX}{rm}{%
+ \ltx@mbox{%
+ \HOLOGO@MathSetup
+ $%
+ \textstyle
+ \varepsilon_{%
+ \kern-0.15em%
+ \HoLogoFont@font{ExTeX}{sy}{X}%
+ }%
+ $%
+ }%
+ \HOLOGO@discretionary
+ \kern-.15em%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@ExTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@ExTeX#1{%
+ \HoLogoCss@ExTeX
+ \HoLogoFont@font{ExTeX}{rm}{%
+ \HOLOGO@Span{ExTeX}{%
+ \ltx@mbox{%
+ \HOLOGO@MathSetup
+ $\textstyle\varepsilon$%
+ \HOLOGO@Span{X}{$\textstyle\chi$}%
+ \hologo{TeX}%
+ }%
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@ExTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@ExTeX#1{%
+ \HOLOGO@PdfdocUnicode{#1{e}{E}x}{\textepsilon\textchi}%
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@ExTeX}
+% \begin{macrocode}
+\def\HoLogoCss@ExTeX{%
+ \Css{%
+ span.HoLogo-ExTeX{%
+ font-family:serif;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-ExTeX span.HoLogo-TeX{%
+ margin-left:-.15em;%
+ }%
+ }%
+ \global\let\HoLogoCss@ExTeX\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{MiKTeX}}
+%
+% \begin{macro}{\HoLogo@MiKTeX}
+% \begin{macrocode}
+\def\HoLogo@MiKTeX#1{%
+ \HOLOGO@mbox{MiK}%
+ \HOLOGO@discretionary
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@MiKTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@MiKTeX\HoLogo@MiKTeX
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{OzTeX} and friends}
+%
+% Source: \hologo{OzTeX} FAQ \cite{OzTeX}:
+% \begin{quote}
+% |\def\OzTeX{O\kern-.03em z\kern-.15em\TeX}|\\
+% (There is no kerning in OzMF, OzMP and OzTtH.)
+% \end{quote}
+%
+% \begin{macro}{\HoLogo@OzTeX}
+% \begin{macrocode}
+\def\HoLogo@OzTeX#1{%
+ O%
+ \kern-.03em %
+ z%
+ \kern-.15em %
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@OzTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@OzTeX#1{%
+ \HoLogoCss@OzTeX
+ \HOLOGO@Span{OzTeX}{%
+ O%
+ \HOLOGO@Span{z}{z}%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@OzTeX}
+% \begin{macrocode}
+\def\HoLogoCss@OzTeX{%
+ \Css{%
+ span.HoLogo-OzTeX span.HoLogo-z{%
+ margin-left:-.03em;%
+ margin-right:-.15em;%
+ }%
+ }%
+ \global\let\HoLogoCss@OzTeX\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@OzMF}
+% \begin{macrocode}
+\def\HoLogo@OzMF#1{%
+ \HOLOGO@mbox{OzMF}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogo@OzMP}
+% \begin{macrocode}
+\def\HoLogo@OzMP#1{%
+ \HOLOGO@mbox{OzMP}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogo@OzTtH}
+% \begin{macrocode}
+\def\HoLogo@OzTtH#1{%
+ \HOLOGO@mbox{OzTtH}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{PCTeX}}
+%
+% \begin{macro}{\HoLogo@PCTeX}
+% \begin{macrocode}
+\def\HoLogo@PCTeX#1{%
+ \HOLOGO@mbox{PC}%
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@PCTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@PCTeX\HoLogo@PCTeX
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{PiCTeX}}
+%
+% The original definitions from \xfile{pictex.tex} \cite{PiCTeX}:
+%\begin{quote}
+%\begin{verbatim}
+%\def\PiC{%
+% P%
+% \kern-.12em%
+% \lower.5ex\hbox{I}%
+% \kern-.075em%
+% C%
+%}
+%\def\PiCTeX{%
+% \PiC
+% \kern-.11em%
+% \TeX
+%}
+%\end{verbatim}
+%\end{quote}
+%
+% \begin{macro}{\HoLogo@PiC}
+% \begin{macrocode}
+\def\HoLogo@PiC#1{%
+ P%
+ \kern-.12em%
+ \lower.5ex\hbox{I}%
+ \kern-.075em%
+ C%
+ \HOLOGO@SpaceFactor
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@PiC}
+% \begin{macrocode}
+\def\HoLogoHtml@PiC#1{%
+ \HoLogoCss@PiC
+ \HOLOGO@Span{PiC}{%
+ P%
+ \HOLOGO@Span{i}{I}%
+ C%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@PiC}
+% \begin{macrocode}
+\def\HoLogoCss@PiC{%
+ \Css{%
+ span.HoLogo-PiC span.HoLogo-i{%
+ position:relative;%
+ top:.5ex;%
+ margin-left:-.12em;%
+ margin-right:-.075em;%
+ text-decoration:none;%
+ }%
+ }%
+ \global\let\HoLogoCss@PiC\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@PiCTeX}
+% \begin{macrocode}
+\def\HoLogo@PiCTeX#1{%
+ \hologo{PiC}%
+ \HOLOGO@discretionary
+ \kern-.11em%
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@PiCTeX}
+% \begin{macrocode}
+\def\HoLogoHtml@PiCTeX#1{%
+ \HoLogoCss@PiCTeX
+ \HOLOGO@Span{PiCTeX}{%
+ \hologo{PiC}%
+ \hologo{TeX}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@PiCTeX}
+% \begin{macrocode}
+\def\HoLogoCss@PiCTeX{%
+ \Css{%
+ span.HoLogo-PiCTeX span.HoLogo-PiC{%
+ margin-right:-.11em;%
+ }%
+ }%
+ \global\let\HoLogoCss@PiCTeX\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{teTeX}}
+%
+% \begin{macro}{\HoLogo@teTeX}
+% \begin{macrocode}
+\def\HoLogo@teTeX#1{%
+ \HOLOGO@mbox{#1{t}{T}e}%
+ \HOLOGO@discretionary
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCs@teTeX}
+% \begin{macrocode}
+\def\HoLogoCs@teTeX#1{#1{t}{T}dfTeX}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@teTeX}
+% \begin{macrocode}
+\def\HoLogoBkm@teTeX#1{%
+ #1{t}{T}e\hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@teTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@teTeX\HoLogo@teTeX
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{TeX4ht}}
+%
+% \begin{macro}{\HoLogo@TeX4ht}
+% \begin{macrocode}
+\expandafter\def\csname HoLogo@TeX4ht\endcsname#1{%
+ \HOLOGO@mbox{\hologo{TeX}4ht}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@TeX4ht}
+% \begin{macrocode}
+\expandafter
+\let\csname HoLogoHtml@TeX4ht\expandafter\endcsname
+\csname HoLogo@TeX4ht\endcsname
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsubsection{\hologo{SageTeX}}
+%
+% \begin{macro}{\HoLogo@SageTeX}
+% \begin{macrocode}
+\def\HoLogo@SageTeX#1{%
+ \HOLOGO@mbox{Sage}%
+ \HOLOGO@discretionary
+ \HOLOGO@NegativeKerning{eT,oT,To}%
+ \hologo{TeX}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@SageTeX}
+% \begin{macrocode}
+\let\HoLogoHtml@SageTeX\HoLogo@SageTeX
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{\hologo{METAFONT} and friends}
+%
+% \begin{macro}{\HoLogo@METAFONT}
+% \begin{macrocode}
+\def\HoLogo@METAFONT#1{%
+ \HoLogoFont@font{METAFONT}{logo}{%
+ \HOLOGO@mbox{META}%
+ \HOLOGO@discretionary
+ \HOLOGO@mbox{FONT}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@METAPOST}
+% \begin{macrocode}
+\def\HoLogo@METAPOST#1{%
+ \HoLogoFont@font{METAPOST}{logo}{%
+ \HOLOGO@mbox{META}%
+ \HOLOGO@discretionary
+ \HOLOGO@mbox{POST}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@MetaFun}
+% \begin{macrocode}
+\def\HoLogo@MetaFun#1{%
+ \HOLOGO@mbox{Meta}%
+ \HOLOGO@discretionary
+ \HOLOGO@mbox{Fun}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogo@MetaPost}
+% \begin{macrocode}
+\def\HoLogo@MetaPost#1{%
+ \HOLOGO@mbox{Meta}%
+ \HOLOGO@discretionary
+ \HOLOGO@mbox{Post}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Others}
+%
+% \subsubsection{\hologo{biber}}
+%
+% \begin{macro}{\HoLogo@biber}
+% \begin{macrocode}
+\def\HoLogo@biber#1{%
+ \HOLOGO@mbox{#1{b}{B}i}%
+ \HOLOGO@discretionary
+ \HOLOGO@mbox{ber}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCs@biber}
+% \begin{macrocode}
+\def\HoLogoCs@biber#1{#1{b}{B}iber}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@biber}
+% \begin{macrocode}
+\def\HoLogoBkm@biber#1{%
+ #1{b}{B}iber%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@biber}
+% \begin{macrocode}
+\let\HoLogoHtml@biber\HoLogo@biber
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{KOMAScript}}
+%
+% \begin{macro}{\HoLogo@KOMAScript}
+% The definition for \hologo{KOMAScript} is taken
+% from \hologo{KOMAScript} (\xfile{scrlogo.dtx}, reformatted) \cite{scrlogo}:
+%\begin{quote}
+%\begin{verbatim}
+%\@ifundefined{KOMAScript}{%
+% \DeclareRobustCommand{\KOMAScript}{%
+% \textsf{%
+% K\kern.05em O\kern.05emM\kern.05em A%
+% \kern.1em-\kern.1em %
+% Script%
+% }%
+% }%
+%}{}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\def\HoLogo@KOMAScript#1{%
+ \HoLogoFont@font{KOMAScript}{sf}{%
+ \HOLOGO@mbox{%
+ K\kern.05em%
+ O\kern.05em%
+ M\kern.05em%
+ A%
+ }%
+ \kern.1em%
+ \HOLOGO@hyphen
+ \kern.1em%
+ \HOLOGO@mbox{Script}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@KOMAScript}
+% \begin{macrocode}
+\def\HoLogoBkm@KOMAScript#1{%
+ KOMA-Script%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@KOMAScript}
+% \begin{macrocode}
+\def\HoLogoHtml@KOMAScript#1{%
+ \HoLogoCss@KOMAScript
+ \HoLogoFont@font{KOMAScript}{sf}{%
+ \HOLOGO@Span{KOMAScript}{%
+ K%
+ \HOLOGO@Span{O}{O}%
+ M%
+ \HOLOGO@Span{A}{A}%
+ \HOLOGO@Span{hyphen}{-}%
+ Script%
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@KOMAScript}
+% \begin{macrocode}
+\def\HoLogoCss@KOMAScript{%
+ \Css{%
+ span.HoLogo-KOMAScript{%
+ font-family:sans-serif;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-KOMAScript span.HoLogo-O{%
+ padding-left:.05em;%
+ padding-right:.05em;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-KOMAScript span.HoLogo-A{%
+ padding-left:.05em;%
+ }%
+ }%
+ \Css{%
+ span.HoLogo-KOMAScript span.HoLogo-hyphen{%
+ padding-left:.1em;%
+ padding-right:.1em;%
+ }%
+ }%
+ \global\let\HoLogoCss@KOMAScript\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{LyX}}
+%
+% \begin{macro}{\HoLogo@LyX}
+% The definition is taken from the documentation source files
+% of \hologo{LyX}, \xfile{Intro.lyx} \cite{LyX}:
+%\begin{quote}
+%\begin{verbatim}
+%\def\LyX{%
+% \texorpdfstring{%
+% L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@%
+% }{%
+% LyX%
+% }%
+%}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\def\HoLogo@LyX#1{%
+ L%
+ \kern-.1667em%
+ \lower.25em\hbox{Y}%
+ \kern-.125em%
+ X%
+ \HOLOGO@SpaceFactor
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@LyX}
+% \begin{macrocode}
+\def\HoLogoHtml@LyX#1{%
+ \HoLogoCss@LyX
+ \HOLOGO@Span{LyX}{%
+ L%
+ \HOLOGO@Span{y}{Y}%
+ X%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoCss@LyX}
+% \begin{macrocode}
+\def\HoLogoCss@LyX{%
+ \Css{%
+ span.HoLogo-LyX span.HoLogo-y{%
+ position:relative;%
+ top:.25em;%
+ margin-left:-.1667em;%
+ margin-right:-.125em;%
+ text-decoration:none;%
+ }%
+ }%
+ \global\let\HoLogoCss@LyX\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\hologo{NTS}}
+%
+% \begin{macro}{\HoLogo@NTS}
+% Definition for \hologo{NTS} can be found in
+% package \xpackage{etex\textunderscore man} for the \hologo{eTeX} manual \cite{etexman}
+% and in package \xpackage{dtklogos} \cite{dtklogos}:
+%\begin{quote}
+%\begin{verbatim}
+%\def\NTS{%
+% \leavevmode
+% \hbox{%
+% $%
+% \cal N%
+% \kern-0.35em%
+% \lower0.5ex\hbox{$\cal T$}%
+% \kern-0.2em%
+% S%
+% $%
+% }%
+%}
+%\end{verbatim}
+%\end{quote}
+% \begin{macrocode}
+\def\HoLogo@NTS#1{%
+ \HoLogoFont@font{NTS}{sy}{%
+ N\/%
+ \kern-.35em%
+ \lower.5ex\hbox{T\/}%
+ \kern-.2em%
+ S\/%
+ }%
+ \HOLOGO@SpaceFactor
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\Hologo{TTH} (\hologo{TeX} to HTML translator)}
+%
+% Source: \url{http://hutchinson.belmont.ma.us/tth/}
+% In the HTML source the second `T' is printed as subscript.
+%\begin{quote}
+%\begin{verbatim}
+%T<sub>T</sub>H
+%\end{verbatim}
+%\end{quote}
+% \begin{macro}{\HoLogo@TTH}
+% \begin{macrocode}
+\def\HoLogo@TTH#1{%
+ \ltx@mbox{%
+ T\HOLOGO@SubScript{T}H%
+ }%
+ \HOLOGO@SpaceFactor
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HoLogoHtml@TTH}
+% \begin{macrocode}
+\def\HoLogoHtml@TTH#1{%
+ T\HCode{<sub>}T\HCode{</sub>}H%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{\Hologo{HanTheThanh}}
+%
+% Partial source: Package \xpackage{dtklogos}.
+% The double accent is U+1EBF (latin small letter e with circumflex
+% and acute).
+% \begin{macro}{\HoLogo@HanTheThanh}
+% \begin{macrocode}
+\def\HoLogo@HanTheThanh#1{%
+ \ltx@mbox{H\`an}%
+ \HOLOGO@space
+ \ltx@mbox{%
+ Th%
+ \HOLOGO@IfCharExists{"1EBF}{%
+ \char"1EBF\relax
+ }{%
+ \^e\hbox to 0pt{\hss\raise .5ex\hbox{\'{}}}%
+ }%
+ }%
+ \HOLOGO@space
+ \ltx@mbox{Th\`anh}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoBkm@HanTheThanh}
+% \begin{macrocode}
+\def\HoLogoBkm@HanTheThanh#1{%
+ H\`an %
+ Th\HOLOGO@PdfdocUnicode{\^e}{\9036\277} %
+ Th\`anh%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\HoLogoHtml@HanTheThanh}
+% \begin{macrocode}
+\def\HoLogoHtml@HanTheThanh#1{%
+ H\`an %
+ Th\HCode{&\ltx@hashchar x1ebf;} %
+ Th\`anh%
+}
+% \end{macrocode}
+% \end{macro}
%
% \subsection{Driver detection}
%
@@ -1319,181 +4096,284 @@ and the derived files
\InputIfFileExists{hologo.cfg}{}{}%
}{%
\ltx@IfUndefined{pdf@filesize}{%
- \chardef\HOLOGO@temp=15 %
- \def\HOLOGO@CheckRead{%
+ \def\HOLOGO@InputIfExists{%
+ \openin\HOLOGO@temp=hologo.cfg\relax
\ifeof\HOLOGO@temp
+ \closein\HOLOGO@temp
\else
- \ifcase\HOLOGO@temp
- \csname newread\endcsname\HOLOGO@temp
+ \closein\HOLOGO@temp
+ \begingroup
+ \def\x{LaTeX2e}%
+ \expandafter\endgroup
+ \ifx\fmtname\x
+ \input{hologo.cfg}%
\else
- \begingroup
- \count\ltx@cclv=\HOLOGO@temp
- \advance\ltx@cclv by -1 %
- \edef\x{\endgroup
- \chardef\noexpand\HOLOGO@temp=\the\count\ltx@cclv\relax
- }%
- \x
- \expandafter\expandafter\expandafter\HOLOGO@CheckRead
+ \input hologo.cfg\relax
\fi
\fi
}%
- \ifeof\HOLOGO@temp
- \@PackageWarningNoLine{hologo}{%
- Configuration file ignored, because\MessageBreak
- a free read register could not be found%
+ \ltx@IfUndefined{newread}{%
+ \chardef\HOLOGO@temp=15 %
+ \def\HOLOGO@CheckRead{%
+ \ifeof\HOLOGO@temp
+ \HOLOGO@InputIfExists
+ \else
+ \ifcase\HOLOGO@temp
+ \@PackageWarningNoLine{hologo}{%
+ Configuration file ignored, because\MessageBreak
+ a free read register could not be found%
+ }%
+ \else
+ \begingroup
+ \count\ltx@cclv=\HOLOGO@temp
+ \advance\ltx@cclv by \ltx@minusone
+ \edef\x{\endgroup
+ \chardef\noexpand\HOLOGO@temp=\the\count\ltx@cclv
+ \relax
+ }%
+ \x
+ \fi
+ \fi
}%
- \else
- \openin\HOLOGO@temp=hologo.cfg\relax
- \ifeof\HOLOGO@temp
- \closein\HOLOGO@temp
- \else
- \closein\HOLOGO@temp
- \input hologo.cfg\relax
- \fi
- \fi
+ }{%
+ \csname newread\endcsname\HOLOGO@temp
+ \HOLOGO@InputIfExists
+ }%
}{%
\edef\HOLOGO@temp{\pdf@filesize{hologo.cfg}}%
\ifx\HOLOGO@temp\ltx@empty
\else
- \input hologo.cfg\relax
+ \ifnum\HOLOGO@temp>0 %
+ \begingroup
+ \def\x{LaTeX2e}%
+ \expandafter\endgroup
+ \ifx\fmtname\x
+ \input{hologo.cfg}%
+ \else
+ \input hologo.cfg\relax
+ \fi
+ \else
+ \@PackageInfoNoLine{hologo}{%
+ Empty configuration file `hologo.cfg' ignored%
+ }%
+ \fi
\fi
}%
}
% \end{macrocode}
%
% \begin{macrocode}
-\ltx@IfUndefined{DeclareOption}{%
- \ltx@gobble
-}{%
- \ltx@IfUndefined{ProcessOptions}\ltx@gobble\ltx@firstofone
-}%
-{%
- \def\HOLOGO@temp#1#2{%
- \DeclareOption{#1}{\edef\hologodriver{#2}}%
- }%
- \kv@parse@normalized{%
- pdftex,%
- luatex=pdftex,%
- dvipdfm,%
- dvipdfmx=dvipdfm,%
- dvips,%
- dvipsone=dvips,%
- xdvi=dvips,%
- xetex,%
- vtex,%
- }{%
- \ifx\kv@value\relax
- \expandafter\HOLOGO@temp\expandafter{\kv@key}\kv@key
- \else
- \expandafter\HOLOGO@temp\expandafter{\kv@key}\kv@value
- \fi
- \ltx@gobbletwo
+\def\HOLOGO@temp#1#2{%
+ \kv@define@key{HoLogoDriver}{#1}[]{%
+ \begingroup
+ \def\HOLOGO@temp{##1}%
+ \ltx@onelevel@sanitize\HOLOGO@temp
+ \ifx\HOLOGO@temp\ltx@empty
+ \else
+ \@PackageError{hologo}{%
+ Value (\HOLOGO@temp) not permitted for option `#1'%
+ }%
+ \@ehc
+ \fi
+ \endgroup
+ \def\hologoDriver{#2}%
}%
- \ProcessOptions*%
+}%
+\def\HOLOGO@@temp#1#2{%
+ \ifx\kv@value\relax
+ \HOLOGO@temp{#1}{#1}%
+ \else
+ \HOLOGO@temp{#1}{#2}%
+ \fi
+}%
+\kv@parse@normalized{%
+ pdftex,%
+ luatex=pdftex,%
+ dvipdfm,%
+ dvipdfmx=dvipdfm,%
+ dvips,%
+ dvipsone=dvips,%
+ xdvi=dvips,%
+ xetex,%
+ vtex,%
+}\HOLOGO@@temp
+% \end{macrocode}
+%
+% \begin{macrocode}
+\kv@define@key{HoLogoDriver}{driverfallback}{%
+ \def\HOLOGO@DriverFallback{#1}%
+}
+% \end{macrocode}
+%
+% \begin{macro}{\HOLOGO@DriverFallback}
+% \begin{macrocode}
+\def\HOLOGO@DriverFallback{dvips}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hologoDriverSetup}
+% \begin{macrocode}
+\def\hologoDriverSetup{%
+ \let\hologoDriver\ltx@undefined
+ \HOLOGO@DriverSetup
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\HOLOGO@DriverSetup}
+% \begin{macrocode}
+\def\HOLOGO@DriverSetup#1{%
+ \kvsetkeys{HoLogoDriver}{#1}%
+ \HOLOGO@CheckDriver
+ \ltx@ifundefined{hologoDriver}{%
+ \begingroup
+ \edef\x{\endgroup
+ \noexpand\kvsetkeys{HoLogoDriver}{\HOLOGO@DriverFallback}%
+ }\x
+ }{}%
+ \@PackageInfoNoLine{hologo}{Using driver `\hologoDriver'}%
}
% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\hologodriver}
+% \begin{macro}{\HOLOGO@CheckDriver}
% \begin{macrocode}
-\ifpdf
- \def\hologodriver{pdftex}%
- \let\HOLOGO@pdfliteral\pdfliteral
- \ifluatex
+\def\HOLOGO@CheckDriver{%
+ \ifpdf
+ \def\hologoDriver{pdftex}%
+ \let\HOLOGO@pdfliteral\pdfliteral
+ \ifluatex
+ \ltx@IfUndefined{HOLOGO@pdfliteral}{%
+ \ifnum\luatexversion<36 %
+ \else
+ \begingroup
+ \let\HOLOGO@temp\endgroup
+ \ifcase0%
+ \directlua{%
+ if tex.enableprimitives then %
+ tex.enableprimitives('HOLOGO@', {'pdfliteral'})%
+ else %
+ tex.print('1')%
+ end%
+ }%
+ \ifx\HOLOGO@pdfliteral\@undefined 1\fi%
+ \relax%
+ \endgroup
+ \let\HOLOGO@temp\relax
+ \global\let\HOLOGO@pdfliteral\HOLOGO@pdfliteral
+ \fi%
+ \HOLOGO@temp
+ \fi
+ }{}%
+ \fi
\ltx@IfUndefined{HOLOGO@pdfliteral}{%
- \ifnum\luatexversion<36 %
- \else
- \begingroup
- \let\HOLOGO@temp\endgroup
- \ifcase0%
- \directlua{%
- if tex.enableprimitives then %
- tex.enableprimitives('HOLOGO@', {'pdfliteral'})%
- else %
- tex.print('1')%
- end%
- }%
- \ifx\HOLOGO@pdfliteral\@undefined 1\fi%
- \relax%
- \endgroup
- \let\HOLOGO@temp\relax
- \global\let\HOLOGO@pdfliteral\HOLOGO@pdfliteral
- \fi%
- \HOLOGO@temp
- \fi
+ \@PackageWarningNoLine{hologo}{%
+ Cannot find \string\pdfliteral
+ }%
}{}%
- \fi
- \ltx@IfUndefined{HOLOGO@pdfliteral}{%
- \@PackageWarningNoLine{hologo}{%
- Cannot find \string\pdfliteral
- }%
- }{}%
-\else
- \ifxetex
- \def\hologodriver{xetex}%
\else
- \ifvtex
- \def\hologodriver{vtex}%
+ \ifxetex
+ \def\hologoDriver{xetex}%
+ \else
+ \ifvtex
+ \def\hologoDriver{vtex}%
+ \fi
\fi
\fi
-\fi
+}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\HOLOGO@ReflectBox}
+%
+% \begin{macro}{\HOLOGO@WarningUnsupportedDriver}
+% \begin{macrocode}
+\def\HOLOGO@WarningUnsupportedDriver#1{%
+ \@PackageWarningNoLine{hologo}{%
+ Logo `#1' needs driver specific macros,\MessageBreak
+ but driver `\hologoDriver' is not supported.\MessageBreak
+ Use a different driver or\MessageBreak
+ load package `graphics' or `pgf'%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Reflect box macros}
+%
+% Skip driver part if not needed.
% \begin{macrocode}
\ltx@IfUndefined{reflectbox}{}{%
- \def\HOLOGO@ReflectBox{%
- \reflectbox
+ \ltx@IfUndefined{rotatebox}{}{%
+ \HOLOGO@AtEnd
}%
+}
+\ltx@IfUndefined{pgftext}{}{%
+ \HOLOGO@AtEnd
+}
+\ltx@IfUndefined{psscalebox}{}{%
\HOLOGO@AtEnd
-}%
-\ltx@ifundefined{hologodriver}{%
- \def\hologodriver{dvips}%
- \@PackageInfoNoLine{hologo}{Using default driver `\hologodriver'}%
-}{%
- \@PackageInfoNoLine{hologo}{Using driver `\hologodriver'}%
}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\HOLOGO@temp{LaTeX2e}
+\ifx\fmtname\HOLOGO@temp
+ \RequirePackage{kvoptions}[2011/06/30]%
+ \ProcessKeyvalOptions{HoLogoDriver}%
+\fi
+\HOLOGO@DriverSetup{}
+% \end{macrocode}
+%
+% \begin{macro}{\HOLOGO@ReflectBox}
+% \begin{macrocode}
\def\HOLOGO@ReflectBox#1{%
- \ltx@IfUndefined{HOLOGO@ReflectBox@\hologodriver}{%
- \@PackageWarning{hologo}{%
- Driver `\hologodriver' misses support for \string\reflectbox
- }%
- #1%
- }{%
- \begingroup
- \setbox\ltx@zero\hbox{\begingroup#1\endgroup}%
- \setbox\ltx@two\hbox{%
- \kern\wd\ltx@zero
- \csname HOLOGO@ReflectBox@\hologodriver\endcsname{%
- \hbox to 0pt{\copy\z@\hss}%
- }%
+ \begingroup
+ \setbox\ltx@zero\hbox{\begingroup#1\endgroup}%
+ \setbox\ltx@two\hbox{%
+ \kern\wd\ltx@zero
+ \csname HOLOGO@ScaleBox@\hologoDriver\endcsname{-1}{1}{%
+ \hbox to 0pt{\copy\ltx@zero\hss}%
}%
- \wd\ltx@two=\wd\ltx@zero
- \box\ltx@two
- \endgroup
- }%
+ }%
+ \wd\ltx@two=\wd\ltx@zero
+ \box\ltx@two
+ \endgroup
}
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\HOLOGO@PointReflectBox}
% \begin{macrocode}
-\def\HOLOGO@temp#1{%
+\def\HOLOGO@PointReflectBox#1{%
\begingroup
- \def\x{#1}%
- \expandafter\endgroup
- \ifx\x\hologodriver
- \expandafter\ltx@firstofone
- \else
- \expandafter\ltx@gobble
- \fi
+ \setbox\ltx@zero\hbox{\begingroup#1\endgroup}%
+ \setbox\ltx@two\hbox{%
+ \kern\wd\ltx@zero
+ \raise\ht\ltx@zero\hbox{%
+ \csname HOLOGO@ScaleBox@\hologoDriver\endcsname{-1}{-1}{%
+ \hbox to 0pt{\copy\ltx@zero\hss}%
+ }%
+ }%
+ }%
+ \wd\ltx@two=\wd\ltx@zero
+ \box\ltx@two
+ \endgroup
}
% \end{macrocode}
-% \begin{macro}{\HOLOGO@ReflectBox@pdftex}
+% \end{macro}
+%
+% We must define all variants because of dynamic driver setup.
+% \begin{macrocode}
+\def\HOLOGO@temp#1#2{#2}
+% \end{macrocode}
+%
+% \begin{macro}{\HOLOGO@ScaleBox@pdftex}
% \begin{macrocode}
\HOLOGO@temp{pdftex}{%
- \def\HOLOGO@ReflectBox@pdftex#1{%
+ \def\HOLOGO@ScaleBox@pdftex#1#2#3{%
\HOLOGO@pdfliteral{%
- q -1 0 0 1 0 0 cm%
+ q #1 0 0 #2 0 0 cm%
}%
- #1%
+ #3%
\HOLOGO@pdfliteral{%
Q%
}%
@@ -1501,18 +4381,18 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\HOLOGO@ReflectBox@dvips}
+% \begin{macro}{\HOLOGO@ScaleBox@dvips}
% \begin{macrocode}
\HOLOGO@temp{dvips}{%
- \def\HOLOGO@ReflectBox@dvips#1{%
+ \def\HOLOGO@ScaleBox@dvips#1#2#3{%
\special{ps:%
gsave %
currentpoint %
currentpoint translate %
- -1 1 scale %
+ #1 #2 scale %
neg exch neg exch translate%
}%
- #1%
+ #3%
\special{ps:%
currentpoint %
grestore %
@@ -1522,32 +4402,32 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\HOLOGO@ReflectBox@dvipdfm}
+% \begin{macro}{\HOLOGO@ScaleBox@dvipdfm}
% \begin{macrocode}
\HOLOGO@temp{dvipdfm}{%
- \let\HOLOGO@ReflectBox@dvipdfm\HOLOGO@ReflectBox@dvips
+ \let\HOLOGO@ScaleBox@dvipdfm\HOLOGO@ScaleBox@dvips
}
% \end{macrocode}
% \end{macro}
% Since \hologo{XeTeX} v0.6.
-% \begin{macro}{\HOLOGO@ReflectBox@xetex}
+% \begin{macro}{\HOLOGO@ScaleBox@xetex}
% \begin{macrocode}
\HOLOGO@temp{xetex}{%
- \def\HOLOGO@ReflectBox@xetex#1{%
+ \def\HOLOGO@ScaleBox@xetex#1#2#3{%
\special{x:gsave}%
- \special{x:scale -1 1}%
- #1%
+ \special{x:scale #1 #2}%
+ #3%
\special{x:grestore}%
}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\HOLOGO@ReflectBox@vtex}
+% \begin{macro}{\HOLOGO@ScaleBox@vtex}
% \begin{macrocode}
\HOLOGO@temp{vtex}{%
- \def\HOLOGO@ReflectBox@vtex#1{%
- \special{r(-1,0,0,1,0,0}%
- #1%
+ \def\HOLOGO@ScaleBox@vtex#1#2#3{%
+ \special{r(#1,0,0,#2,0,0}%
+ #3%
\special{r)}%
}%
}
@@ -1680,7 +4560,7 @@ and the derived files
%<*test-spacefactor>
\NeedsTeXFormat{LaTeX2e}
\documentclass{article}
-\usepackage{hologo}[2011/04/21]
+\usepackage{hologo}[2012/04/26]
\usepackage{kvsetkeys}
\usepackage{qstest}
\IncludeTests{*}
@@ -1694,28 +4574,23 @@ and the derived files
}%
}%
\makeatletter
-\kv@parse@normalized{%
- AmSLaTeX,%
- AmSTeX,%
- eTeX,%
- iniTeX,%
- LaTeX,%
- LaTeX2e,%
- LaTeX3,%
- LaTeXe,%
- LuaLaTeX,%
- LuaTeX,%
- pdfTeX,%
- pdfLaTeX,%
- plainTeX=,%
- plainTeX={variant=space},%
- plainTeX={variant=hyphen},%
- plainTeX={variant=runtogether},%
- TeX,%
- virTeX,%
- VTeX,%
- XeLaTeX,%
- XeTeX,%
+\def\TestList{}
+\def\hologoEntry#1#2#3{%
+ \edef\TestList{%
+ \ifx\TestList\@empty
+ \else
+ \TestList,%
+ \fi
+ #1%
+ \ifx\\#2\\%
+ \else
+ ={variant=#2}%
+ \fi
+ }%
+}
+\hologoList
+\expandafter\kv@parse@normalized\expandafter{%
+ \TestList
}{%
\begingroup
\let\@logo=\kv@key
@@ -1734,6 +4609,78 @@ and the derived files
%</test-spacefactor>
% \end{macrocode}
%
+% \subsection{Complete list}
+%
+% \begin{macrocode}
+%<*test-list>
+\NeedsTeXFormat{LaTeX2e}
+\documentclass[12pt,a4paper]{article}
+\usepackage{hologo}[2012/04/26]
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{parskip}
+\usepackage[unicode]{hyperref}[2011/09/28]
+\usepackage{bookmark}[2011/09/19]
+\bookmarksetup{%
+ numbered,%
+ open,%
+ openlevel=2,%
+}
+\renewcommand*{\contentsname}{List of logos}
+\begin{document}
+\tableofcontents
+\def\TestFont#1#2#3#4#5#6{%
+ \begingroup
+ \usefont{#3}{#4}{#5}{#6}%
+ \HologoVariant{#1}{#2}/\hologoVariant{#1}{#2}%
+ \quad
+ \begingroup\scriptsize\hologoVariant{#1}{#2}\endgroup
+ \quad
+ \endgroup
+ (#3/#4/#5/#6)%
+ \par
+}
+\makeatletter
+\def\hologoEntry#1#2#3{%
+ \section{%
+ \HologoVariant{#1}{#2}/\hologoVariant{#1}{#2} %
+ {[#1\ifx\\#2\\\else\space(#2)\fi]}% hash-ok
+ }% braces around [] because of bug in tex4ht
+ \begingroup
+ \hypersetup{unicode=false}%
+ \bookmark[%
+ dest=\@currentHref,%
+ rellevel=1,%
+ keeplevel,%
+ ]{%
+ \HologoVariant{#1}{#2}/\hologoVariant{#1}{#2} %
+ (PDFDocEncoding)%
+ }%
+ \endgroup
+ \TestFont{#1}{#2}{OT1}{cmr}{m}{n}%
+ \TestFont{#1}{#2}{OT1}{cmss}{m}{n}%
+ \TestFont{#1}{#2}{OT1}{cmr}{b}{n}%
+ \TestFont{#1}{#2}{OT1}{cmr}{m}{it}%
+ \TestFont{#1}{#2}{OT1}{cmtt}{m}{n}%
+ \TestFont{#1}{#2}{T1}{lmr}{m}{n}%
+ \TestFont{#1}{#2}{T1}{lmss}{m}{n}%
+ \TestFont{#1}{#2}{T1}{lmr}{b}{n}%
+ \TestFont{#1}{#2}{T1}{lmr}{m}{it}%
+ \TestFont{#1}{#2}{T1}{lmtt}{m}{n}%
+ \TestFont{#1}{#2}{T1}{lmvtt}{m}{n}%
+ \TestFont{#1}{#2}{T1}{qtm}{m}{n}%
+ \TestFont{#1}{#2}{T1}{qhv}{m}{n}%
+ \TestFont{#1}{#2}{T1}{qtm}{b}{n}%
+ \TestFont{#1}{#2}{T1}{qtm}{m}{it}%
+ \TestFont{#1}{#2}{T1}{qcr}{m}{n}%
+ \newpage
+}
+\makeatother
+\hologoList
+\end{document}
+%</test-list>
+% \end{macrocode}
+%
% \section{Installation}
%
% \subsection{Download}
@@ -1795,8 +4742,10 @@ and the derived files
% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
% hologo.sty & tex/generic/oberdiek/hologo.sty\\
% hologo.pdf & doc/latex/oberdiek/hologo.pdf\\
+% example/hologo-example.tex & doc/latex/oberdiek/example/hologo-example.tex\\
% test/hologo-test1.tex & doc/latex/oberdiek/test/hologo-test1.tex\\
% test/hologo-test-spacefactor.tex & doc/latex/oberdiek/test/hologo-test-spacefactor.tex\\
+% test/hologo-test-list.tex & doc/latex/oberdiek/test/hologo-test-list.tex\\
% hologo.dtx & source/latex/oberdiek/hologo.dtx\\
% \end{tabular}^^A
% }^^A
@@ -1917,6 +4866,104 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hologo.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hologo'>
+ <name>hologo</name>
+ <caption>A collection of logos with bookmark support.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010-2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ The package defines a single command <tt>\hologo</tt>, whose
+ argument is the usual case-confused ASCII version of the logo.
+ The command is bookmark-enabled, so that every logo becomes
+ available in bookmarks without further work.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hologo.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hologo.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
+% \begin{thebibliography}{9}
+% \raggedright
+%
+% \bibitem{btxdoc}
+% Oren Patashnik,
+% \textit{\hologo{BibTeX}ing},
+% 1988-02-08.\\
+% \CTAN{biblio/bibtex/base/}
+%
+% \bibitem{dtklogos}
+% Gerd Neugebauer, DANTE,
+% \textit{Package \xpackage{dtklogos}},
+% 2011-04-25.\\
+% \CTAN{usergrps/dante/dtk/dtklogos.sty}
+%
+% \bibitem{etexman}
+% The \hologo{NTS} Team,
+% \textit{The \hologo{eTeX} manual},
+% 1998-02.\\
+% \CTAN{systems/e-tex/v2/doc/}
+%
+% \bibitem{ExTeX-FAQ}
+% The \hologo{ExTeX} group,
+% \textit{\hologo{ExTeX}: FAQ -- How is \hologo{ExTeX} typeset?},
+% 2007-04-14.\\
+% \url{http://www.extex.org/documentation/faq.html}
+%
+% \bibitem{LyX}
+% %@MISC{ LyX,
+% % title = {{LyX 2.0.0 -- The Document Processor [Computer software and manual]}},
+% % author = {{The LyX Team}},
+% % howpublished = {Internet: http://www.lyx.org},
+% % year = {2011-05-08},
+% % note = {Retrieved May 10, 2011, from http://www.lyx.org},
+% % url = {http://www.lyx.org/}
+% %}
+% The \hologo{LyX} Team,
+% \textit{\hologo{LyX} -- The Document Processor},
+% 2011-05-08.\\
+% \url{http://www.lyx.org/}
+%
+% \bibitem{OzTeX}
+% Andrew Trevorrow,
+% \hologo{OzTeX} FAQ: What is the correct way to typeset ``\hologo{OzTeX}''?,
+% 2011-09-15 (visited).
+% \url{http://www.trevorrow.com/oztex/ozfaq.html#oztex-logo}
+%
+% \bibitem{PiCTeX}
+% Michael Wichura,
+% \textit{The \hologo{PiCTeX} macro package},
+% 1987-09-21.
+% \CTAN{graphics/pictex/}
+%
+% \bibitem{scrlogo}
+% Markus Kohm,
+% \textit{\hologo{KOMAScript} Datei \xfile{scrlogo.dtx}},
+% 2009-01-30.\\
+% \CTAN{install/macros/latex/contrib/komascript.tds.zip}
+%
+% \end{thebibliography}
+%
% \begin{History}
% \begin{Version}{2010/04/08 v1.0}
% \item
@@ -1954,6 +5001,80 @@ and the derived files
% \item
% Wrong TDS directory for test files fixed.
% \end{Version}
+% \begin{Version}{2011/10/01 v1.6}
+% \item
+% Support for package \xpackage{tex4ht} added.
+% \item
+% Support for \cs{csname} added if \cs{ifincsname} is available.
+% \item
+% New logos:
+% \hologo{(La)TeX},
+% \hologo{biber},
+% \hologo{BibTeX} (\xoption{sc}, \xoption{sf}),
+% \hologo{emTeX},
+% \hologo{ExTeX},
+% \hologo{KOMAScript},
+% \hologo{La},
+% \hologo{LyX},
+% \hologo{MiKTeX},
+% \hologo{NTS},
+% \hologo{OzMF},
+% \hologo{OzMP},
+% \hologo{OzTeX},
+% \hologo{OzTtH},
+% \hologo{PCTeX},
+% \hologo{PiC},
+% \hologo{PiCTeX},
+% \hologo{METAFONT},
+% \hologo{MetaFun},
+% \hologo{METAPOST},
+% \hologo{MetaPost},
+% \hologo{SLiTeX} (\xoption{lift}, \xoption{narrow}, \xoption{simple}),
+% \hologo{SliTeX} (\xoption{narrow}, \xoption{simple}, \xoption{lift}),
+% \hologo{teTeX}.
+% \item
+% Fixes:
+% \hologo{iniTeX},
+% \hologo{pdfLaTeX},
+% \hologo{pdfTeX},
+% \hologo{virTeX}.
+% \item
+% \cs{hologoFontSetup} and \cs{hologoLogoFontSetup} added.
+% \item
+% \cs{hologoVariant} and \cs{HologoVariant} added.
+% \end{Version}
+% \begin{Version}{2011/11/22 v1.7}
+% \item
+% New logos:
+% \hologo{BibTeX8},
+% \hologo{LaTeXML},
+% \hologo{SageTeX},
+% \hologo{TeX4ht},
+% \hologo{TTH}.
+% \item
+% \hologo{Xe} and friends: Driver stuff fixed.
+% \item
+% \hologo{Xe} and friends: Support for italic added.
+% \item
+% \hologo{Xe} and friends: Package support for \xpackage{pgf}
+% and \xpackage{pstricks} added.
+% \end{Version}
+% \begin{Version}{2011/11/29 v1.8}
+% \item
+% New logos:
+% \hologo{HanTheThanh}.
+% \end{Version}
+% \begin{Version}{2011/12/21 v1.9}
+% \item
+% Patch for package \xpackage{ifxetex} added for the case that
+% \cs{newif} is undefined in \hologo{iniTeX}.
+% \item
+% Some fixes for \hologo{iniTeX}.
+% \end{Version}
+% \begin{Version}{2012/04/26 v1.10}
+% \item
+% Fix in bookmark version of logo ``\hologo{HanTheThanh}''.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
index 1d352d29201..0220143a800 100644
--- a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: holtxdoc.dtx
-% Version: 2011/02/04 v0.21
-%
-% Copyright (C) 1999-2011 by
+% Version: 2012/03/21 v0.24
+% Info: Private additional ltxdoc support
+%
+% Copyright (C) 1999-2012 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
@@ -15,19 +16,19 @@
% 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 holtxdoc.dtx
% and the derived files
% holtxdoc.sty, holtxdoc.pdf, holtxdoc.ins, holtxdoc.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/holtxdoc.dtx
% CTAN:macros/latex/contrib/oberdiek/holtxdoc.pdf
-%
+%
% Unpacking:
% (a) If holtxdoc.ins is present:
% tex holtxdoc.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{holtxdoc.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If holtxdoc.drv is present:
% latex holtxdoc.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex holtxdoc.dtx
% makeindex -s gind.ist holtxdoc.idx
% pdflatex holtxdoc.dtx
% makeindex -s gind.ist holtxdoc.idx
% pdflatex holtxdoc.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/holtxdoc.sty
% TDS:doc/latex/oberdiek/holtxdoc.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: holtxdoc 2011/02/04 v0.21 Private additional ltxdoc support (HO)}
+\Msg{* Package: holtxdoc 2012/03/21 v0.24 Private additional ltxdoc support (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -86,9 +87,9 @@
This is a generated file.
Project: holtxdoc
-Version: 2011/02/04 v0.21
+Version: 2012/03/21 v0.24
-Copyright (C) 1999-2011 by
+Copyright (C) 1999-2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -117,6 +118,10 @@ and the derived files
\file{holtxdoc.drv}{\from{holtxdoc.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{holtxdoc.sty}{\from{holtxdoc.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{holtxdoc.xml}{\from{holtxdoc.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{holtxdoc.drv}%
- [2011/02/04 v0.21 Private additional ltxdoc support (HO)]%
+ [2012/03/21 v0.24 Private additional ltxdoc support (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{holtxdoc.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{347}
+% \CheckSum{361}
%
% \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
@@ -173,7 +178,7 @@ and the derived files
% \GetFileInfo{holtxdoc.drv}
%
% \title{The \xpackage{holtxdoc} package}
-% \date{2011/02/04 v0.21}
+% \date{2012/03/21 v0.24}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -213,7 +218,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{holtxdoc}%
- [2011/02/04 v0.21 Private additional ltxdoc support (HO)]
+ [2012/03/21 v0.24 Private additional ltxdoc support (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -222,7 +227,8 @@ and the derived files
\RequirePackage{hyperref}[2010/03/30]
\RequirePackage{pdftexcmds}[2010/04/01]
\RequirePackage{ltxcmds}[2010/03/09]
-\RequirePackage{hologo}[2010/04/24]
+\RequirePackage{hologo}[2011/11/22]
+\RequirePackage{ifluatex}[2010/03/01]
\RequirePackage{array}
% \end{macrocode}
%
@@ -237,6 +243,16 @@ and the derived files
}
% \end{macrocode}
%
+% \subsection{Font setup for \hologo{LuaLaTeX}}
+%
+% \begin{macrocode}
+\ifluatex
+ \RequirePackage{fontspec}[2011/09/18]%
+ \RequirePackage{unicode-math}[2011/09/19]%
+ \setmathfont{lmmath-regular.otf}%
+\fi
+% \end{macrocode}
+%
% \subsection{Date}
%
% \begin{macrocode}
@@ -278,9 +294,15 @@ and the derived files
%
% \subsection{History}
%
+% \begin{macro}{\historyname}
+% \begin{macrocode}
+\providecommand*{\historyname}{History}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
\newcommand*{\StartHistory}{%
- \section{History}%
+ \section{\historyname}%
}
\@ifpackagelater{hyperref}{2009/11/27}{%
\newcommand*{\HistVersion}[1]{%
@@ -312,9 +334,13 @@ and the derived files
\StartHistory
\def\Version##1{%
\HistVersion{##1}%
- \itemize
+ \@ifnextchar\end{%
+ \let\endVersion\relax
+ }{%
+ \let\endVersion\enditemize
+ \itemize
+ }%
}%
- \let\endVersion\enditemize
\raggedright
}{}
% \end{macrocode}
@@ -679,6 +705,43 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{holtxdoc.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='holtxdoc'>
+ <name>holtxdoc</name>
+ <caption>Documentation macros for oberdiek bundle, etc.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999-2012'/>
+ <license type='lppl1.3'/>
+ <version number='0.24'/>
+ <description>
+ These are personal macros, which are not necessarily useful to
+ other authors (they are provided as part off the source of others
+ of the author's packages). Macros that may be of use to other
+ authors are available separately, in package
+ <xref refid='hypdoc'>hypdoc</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/holtxdoc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/holtxdoc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1999/06/26 v0.3}
% \item
@@ -760,6 +823,18 @@ and the derived files
% \item
% GL needs \cs{protected@edef} instead of \cs{edef} in \cs{HistLabel}.
% \end{Version}
+% \begin{Version}{2011/11/22 v0.22}
+% \item
+% Font stuff added for \hologo{LuaLaTeX}.
+% \end{Version}
+% \begin{Version}{2012/03/07 v0.23}
+% \item
+% Accept empty history version.
+% \end{Version}
+% \begin{Version}{2012/03/21 v0.24}
+% \item
+% Section title for history uses \cs{historyname}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hopatch.dtx b/Master/texmf-dist/source/latex/oberdiek/hopatch.dtx
index b993c5f4ab7..7f51be0bab9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hopatch.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hopatch.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hopatch.dtx
-% Version: 2011/01/30 v1.0
-%
+% Version: 2011/06/24 v1.1
+% Info: Wrapper for package hooks
+%
% Copyright (C) 2011 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
@@ -15,20 +16,20 @@
% 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 hopatch.dtx
% and the derived files
% hopatch.sty, hopatch.pdf, hopatch.ins, hopatch.drv,
% hopatch-test1.tex, hopatch-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hopatch.dtx
% CTAN:macros/latex/contrib/oberdiek/hopatch.pdf
-%
+%
% Unpacking:
% (a) If hopatch.ins is present:
% tex hopatch.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hopatch.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hopatch.drv is present:
% latex hopatch.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hopatch.dtx
% makeindex -s gind.ist hopatch.idx
% pdflatex hopatch.dtx
% makeindex -s gind.ist hopatch.idx
% pdflatex hopatch.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/hopatch.sty
% TDS:doc/latex/oberdiek/hopatch.pdf
@@ -77,7 +78,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hopatch 2011/01/30 v1.0 Wrapper for package hooks (HO)}
+\Msg{* Package: hopatch 2011/06/24 v1.1 Wrapper for package hooks (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -89,7 +90,7 @@
This is a generated file.
Project: hopatch
-Version: 2011/01/30 v1.0
+Version: 2011/06/24 v1.1
Copyright (C) 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -124,6 +125,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{hopatch-test1.tex}{\from{hopatch.dtx}{test1}}%
\file{hopatch-test2.tex}{\from{hopatch.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hopatch.xml}{\from{hopatch.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -150,9 +155,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hopatch.drv}%
- [2011/01/30 v1.0 Wrapper for package hooks (HO)]%
+ [2011/06/24 v1.1 Wrapper for package hooks (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{caption}
\usepackage{array}
\setlength{\extrarowheight}{1pt}
@@ -163,7 +168,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{463}
+% \CheckSum{465}
%
% \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
@@ -184,7 +189,7 @@ and the derived files
% \GetFileInfo{hopatch.drv}
%
% \title{The \xpackage{hopatch} package}
-% \date{2011/01/30 v1.0}
+% \date{2011/06/24 v1.1}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -352,7 +357,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hopatch}%
- [2011/01/30 v1.0 Wrapper for package hooks (HO)]
+ [2011/06/24 v1.1 Wrapper for package hooks (HO)]
% \end{macrocode}
%
% \subsection{Resources}
@@ -472,23 +477,27 @@ and the derived files
% \begin{macrocode}
\AtBeginDocument{\HOpatch@list}
\ltx@ifundefined{AtEndPreamble}{}{%
- \AtEndPreamble{\HOpatch@list}%
+ \ltx@ifundefined{@endpreamblehook}{}{%
+ \AtEndPreamble{\HOpatch@list}%
+ }%
}
\ltx@ifundefined{AfterEndPreamble}{}{%
- \AfterEndPreamble{%
- \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded
- \let\HOpatch@OrgIfPackageLater\@ifpackagelater
- \let\HOpatch@OrgIfClassLoaded\@ifclassloaded
- \let\HOpatch@OrgIfClassLater\@ifclasslater
- \let\@ifpackageloaded\ltx@ifpackageloaded
- \let\@ifpackagelater\ltx@ifpackagelater
- \let\@ifclassloaded\ltx@ifclassloaded
- \let\@ifclasslater\ltx@ifclasslater
- \HOpatch@list
- \let\@ifpackageloaded\HOpatch@OrgIfPackageLoaded
- \let\@ifpackagelater\HOpatch@OrgIfPackageLater
- \let\@ifclassloaded\HOpatch@OrgIfClassLoaded
- \let\@ifclasslater\HOpatch@OrgIfClassLater
+ \ltx@ifundefined{@afterendpreamblehook}{}{%
+ \AfterEndPreamble{%
+ \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded
+ \let\HOpatch@OrgIfPackageLater\@ifpackagelater
+ \let\HOpatch@OrgIfClassLoaded\@ifclassloaded
+ \let\HOpatch@OrgIfClassLater\@ifclasslater
+ \let\@ifpackageloaded\ltx@ifpackageloaded
+ \let\@ifpackagelater\ltx@ifpackagelater
+ \let\@ifclassloaded\ltx@ifclassloaded
+ \let\@ifclasslater\ltx@ifclasslater
+ \HOpatch@list
+ \let\@ifpackageloaded\HOpatch@OrgIfPackageLoaded
+ \let\@ifpackagelater\HOpatch@OrgIfPackageLater
+ \let\@ifclassloaded\HOpatch@OrgIfClassLoaded
+ \let\@ifclasslater\HOpatch@OrgIfClassLater
+ }%
}%
}
% \end{macrocode}
@@ -504,7 +513,7 @@ and the derived files
%
% \begin{macrocode}
%<*test1>
-\def\LoadCommand{\RequirePackage{hopatch}[2011/01/30]}
+\def\LoadCommand{\RequirePackage{hopatch}[2011/06/24]}
%</test1>
% \end{macrocode}
% \subsection{Catcode checks for loading}
@@ -851,39 +860,76 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hopatch.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hopatch'>
+ <name>hopatch</name>
+ <caption>Load patches for packages.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ The hopatch package provides a command with which the user may
+ register a piece of patch code for a particular package. Hopatch
+ will apply the patch immediately, if the relevant package has
+ already been loaded; otherwise it will store the patch until the
+ package appears.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hopatch.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hopatch.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \raggedright
-%
+%
% \bibitem{etoolbox}
% Philipp Lehman:
% \textit{The etoolbox Package}
% 2011-01-03.
% \CTAN{macros/latex/contrib/etoolbox/etoolbox.pdf}
-%
+%
% \bibitem{filehook}
% Martin Scharrer:
% \textit{The filehook Package};
% 2011-01-09.
% \CTAN{macros/latex/contrib/filehook/filehook.pdf}
-%
+%
% \bibitem{ltxcmds}
% Heiko Oberdiek:
% \textit{The ltxcmds Package};
% 2010-12-12.
% \CTAN{macros/latex/contrib/oberdiek/ltxcmds.pdf}
-%
+%
% \bibitem{memoir}
% Peter Wilson, Lars Madsen:
% \textit{The Memoir Class for Configurable Typesetting, User Guide};
% 2010.
% \CTAN{macros/latex/contrib/memoir/memman.pdf}
-%
+%
% \bibitem{scrlfile}
% Markus Kohm, Jens-Uwe Morawski:
% \textit{The Guide KOMA-Script};
% 2011-01-20.
% \CTAN{macros/latex/contrib/koma-script/scrguien.pdf}
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -891,6 +937,12 @@ and the derived files
% \item
% First public version.
% \end{Version}
+% \begin{Version}{2011/06/24 v1.1}
+% \item
+% Fix the use of \cs{AtEndPreamble} and \cs{AfterEndPreamble}.
+% They are redefined by package \xpackage{etoolbox} after their
+% hooks are used and generate an error message then.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
index fed8972258d..22fe31ee420 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hycolor.dtx
% Version: 2011/01/30 v1.7
-%
+% Info: Color options for hyperref/bookmark
+%
% Copyright (C) 2007-2011 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
@@ -15,11 +16,11 @@
% 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 hycolor.dtx
% and the derived files
% hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv,
@@ -27,11 +28,11 @@
% hycolor-test3.tex, hycolor-test-xcol1.tex,
% hycolor-test-xcol2.tex, hycolor-test-xcol3.tex,
% hycolor-test-xcol4.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hycolor.dtx
% CTAN:macros/latex/contrib/oberdiek/hycolor.pdf
-%
+%
% Unpacking:
% (a) If hycolor.ins is present:
% tex hycolor.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hycolor.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hycolor.drv is present:
% latex hycolor.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hycolor.dtx
% makeindex -s gind.ist hycolor.idx
% pdflatex hycolor.dtx
% makeindex -s gind.ist hycolor.idx
% pdflatex hycolor.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/hycolor.sty
% TDS:tex/latex/oberdiek/xcolor-patch.sty
@@ -86,7 +87,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hycolor 2011/01/30 v1.7 Color options of hyperref/bookmark (HO)}
+\Msg{* Package: hycolor 2011/01/30 v1.7 Color options for hyperref/bookmark (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -142,6 +143,10 @@ and the derived files
\file{hycolor-test-xcol2.tex}{\from{hycolor.dtx}{test-xcolor,xcol2}}%
\file{hycolor-test-xcol3.tex}{\from{hycolor.dtx}{test-xcolor,xcol3}}%
\file{hycolor-test-xcol4.tex}{\from{hycolor.dtx}{test-xcolor-fbox}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hycolor.xml}{\from{hycolor.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -168,9 +173,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hycolor.drv}%
- [2011/01/30 v1.7 Color options of hyperref/bookmark (HO)]%
+ [2011/01/30 v1.7 Color options for hyperref/bookmark (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage[ruled]{algorithm2e}
\makeatletter
@@ -335,7 +340,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hycolor}%
- [2011/01/30 v1.7 Color options of hyperref/bookmark (HO)]%
+ [2011/01/30 v1.7 Color options for hyperref/bookmark (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -2138,6 +2143,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hycolor.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hycolor'>
+ <name>hycolor</name>
+ <caption>Implements colour for packages hyperref and bookmark.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.7'/>
+ <description>
+ This package provides the code for the color option
+ that is used by packages <xref refid='hyperref'>hyperref</xref>
+ and <xref refid='bookmark'>bookmark</xref>.
+ It is not intended as package for the user.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hycolor.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hycolor.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/04/09 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
index 5c280aa348c..13b3d4ef511 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hypbmsec.dtx
% Version: 2007/04/11 v2.4
-%
+% Info: Bookmarks in sectioning commands
+%
% Copyright (C) 1998-2000, 2006, 2007 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
@@ -15,19 +16,19 @@
% 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 hypbmsec.dtx
% and the derived files
% hypbmsec.sty, hypbmsec.pdf, hypbmsec.ins, hypbmsec.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hypbmsec.dtx
% CTAN:macros/latex/contrib/oberdiek/hypbmsec.pdf
-%
+%
% Unpacking:
% (a) If hypbmsec.ins is present:
% tex hypbmsec.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hypbmsec.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hypbmsec.drv is present:
% latex hypbmsec.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hypbmsec.dtx
% makeindex -s gind.ist hypbmsec.idx
% pdflatex hypbmsec.dtx
% makeindex -s gind.ist hypbmsec.idx
% pdflatex hypbmsec.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/hypbmsec.sty
% TDS:doc/latex/oberdiek/hypbmsec.pdf
@@ -117,6 +118,10 @@ and the derived files
\file{hypbmsec.drv}{\from{hypbmsec.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{hypbmsec.sty}{\from{hypbmsec.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hypbmsec.xml}{\from{hypbmsec.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -145,7 +150,7 @@ and the derived files
\ProvidesFile{hypbmsec.drv}%
[2007/04/11 v2.4 Bookmarks in sectioning commands (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{hypbmsec.dtx}%
\end{document}
@@ -768,6 +773,43 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hypbmsec.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypbmsec'>
+ <name>hypbmsec</name>
+ <caption>Hypertext bookmarks in sectioning commands.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1998-2000,2006,2007'/>
+ <license type='lppl1.3'/>
+ <version number='2.4'/>
+ <description>
+ Bookmark entries can be given as another argument to the LaTeX
+ sectioning commands. The <xref refid='hyperref'>hyperref</xref>
+ package is required to get the bookmarks, but the syntax
+ works without it.
+ <p/>
+ This package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypbmsec.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypbmsec.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1998/11/20 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
index 327ba0b69fd..a49d63c6195 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hypcap.dtx
% Version: 2011/02/16 v1.11
-%
+% Info: Adjusting the anchors of captions
+%
% Copyright (C) 1999-2001, 2006-2008, 2011 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
@@ -15,19 +16,19 @@
% 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 hypcap.dtx
% and the derived files
% hypcap.sty, hypcap.pdf, hypcap.ins, hypcap.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hypcap.dtx
% CTAN:macros/latex/contrib/oberdiek/hypcap.pdf
-%
+%
% Unpacking:
% (a) If hypcap.ins is present:
% tex hypcap.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hypcap.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hypcap.drv is present:
% latex hypcap.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hypcap.dtx
% makeindex -s gind.ist hypcap.idx
% pdflatex hypcap.dtx
% makeindex -s gind.ist hypcap.idx
% pdflatex hypcap.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/hypcap.sty
% TDS:doc/latex/oberdiek/hypcap.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hypcap 2011/02/16 v1.11 Adjusting anchors of captions (HO)}
+\Msg{* Package: hypcap 2011/02/16 v1.11 Adjusting the anchors of captions (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{hypcap.drv}{\from{hypcap.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{hypcap.sty}{\from{hypcap.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hypcap.xml}{\from{hypcap.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hypcap.drv}%
- [2011/02/16 v1.11 Adjusting anchors of captions (HO)]%
+ [2011/02/16 v1.11 Adjusting the anchors of captions (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{hypcap.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{170}
+% \CheckSum{174}
%
% \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
@@ -307,7 +312,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypcap}%
- [2011/02/16 v1.11 Adjusting anchors of captions (HO)]
+ [2011/02/16 v1.11 Adjusting the anchors of captions (HO)]
% \end{macrocode}
%
% For unique command names this package uses |hc@| as prefix
@@ -677,6 +682,47 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hypcap.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypcap'>
+ <name>hypcap</name>
+ <caption>Adjusting the anchors of captions.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999-2001,2006-2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.11'/>
+ <description>
+ The package offers a solution to the problem that when you link to
+ a float using <xref refid='hyperref'>hyperref</xref>, the link
+ anchors to below the float's caption, rather than the beginning of
+ the float.
+ <p/>
+ Hypcap defines a separate \capstart command, which you put where
+ you want links to end; you should have a \capstart command for each
+ \caption command. Package options can be used to auto-insert a
+ \capstart at the start of a float environment.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypcap.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypcap.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1999/02/13 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
index fa4ccc5ee2c..8005753e1af 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hypdestopt.dtx
-% Version: 2008/08/08 v2.2
-%
-% Copyright (C) 2006, 2007, 2008 by
+% Version: 2011/05/13 v2.3
+% Info: Hyperref destination optimizer
+%
+% Copyright (C) 2006-2008, 2011 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
@@ -15,19 +16,19 @@
% 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 hypdestopt.dtx
% and the derived files
% hypdestopt.sty, hypdestopt.pdf, hypdestopt.ins, hypdestopt.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hypdestopt.dtx
% CTAN:macros/latex/contrib/oberdiek/hypdestopt.pdf
-%
+%
% Unpacking:
% (a) If hypdestopt.ins is present:
% tex hypdestopt.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hypdestopt.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hypdestopt.drv is present:
% latex hypdestopt.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hypdestopt.dtx
% makeindex -s gind.ist hypdestopt.idx
% pdflatex hypdestopt.dtx
% makeindex -s gind.ist hypdestopt.idx
% pdflatex hypdestopt.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/hypdestopt.sty
% TDS:doc/latex/oberdiek/hypdestopt.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hypdestopt 2008/08/08 v2.2 Hyperref destination optimizer (HO)}
+\Msg{* Package: hypdestopt 2011/05/13 v2.3 Hyperref destination optimizer (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -86,9 +87,9 @@
This is a generated file.
Project: hypdestopt
-Version: 2008/08/08 v2.2
+Version: 2011/05/13 v2.3
-Copyright (C) 2006, 2007, 2008 by
+Copyright (C) 2006-2008, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -117,6 +118,10 @@ and the derived files
\file{hypdestopt.drv}{\from{hypdestopt.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{hypdestopt.sty}{\from{hypdestopt.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hypdestopt.xml}{\from{hypdestopt.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hypdestopt.drv}%
- [2008/08/08 v2.2 Hyperref destination optimizer (HO)]%
+ [2011/05/13 v2.3 Hyperref destination optimizer (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{hypdestopt.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{543}
+% \CheckSum{565}
%
% \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
@@ -173,7 +178,7 @@ and the derived files
% \GetFileInfo{hypdestopt.drv}
%
% \title{The \xpackage{hypdestopt} package}
-% \date{2008/08/08 v2.2}
+% \date{2011/05/13 v2.3}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -295,7 +300,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypdestopt}%
- [2008/08/08 v2.2 Hyperref destination optimizer (HO)]%
+ [2011/05/13 v2.3 Hyperref destination optimizer (HO)]%
% \end{macrocode}
%
% \subsection{Options}
@@ -376,7 +381,8 @@ and the derived files
\fi
% \end{macrocode}
% \begin{macrocode}
-\RequirePackage{auxhook}
+\RequirePackage{auxhook}[2009/12/14]
+\RequirePackage{pdfescape}[2007/04/21]
% \end{macrocode}
%
% \subsection{Preamble for auxiliary file}
@@ -596,29 +602,36 @@ and the derived files
\ifHypDest@name
\let\HypDest@Org@DestName\Hy@DestName
\renewcommand*{\Hy@DestName}[2]{%
- \@ifundefined{\HypDest@Prefix#1}{%
+ \EdefUnescapeString\HypDest@temp{#1}%
+ \@ifundefined{\HypDest@Prefix\HypDest@temp}{%
\HypDest@VerboseInfo{%
- DestName: (#1) unused%
+ DestName: (\HypDest@temp) unused%
}%
}{%
- \HypDest@Org@DestName{\csname\HypDest@Prefix#1\endcsname}{#2}%
+ \HypDest@Org@DestName{%
+ \csname\HypDest@Prefix\HypDest@temp\endcsname
+ }{#2}%
\HypDest@VerboseInfo{%
- DestName: (#1) %
- 0x\pdf@escapehex{\csname\HypDest@Prefix#1\endcsname}%
+ DestName: (\HypDest@temp) %
+ 0x\pdf@escapehex{%
+ \csname\HypDest@Prefix\HypDest@temp\endcsname
+ }%
}%
}%
}%
\else
\renewcommand*{\Hy@DestName}[2]{%
- \@ifundefined{\HypDest@Prefix#1}{%
+ \EdefUnescapeString\HypDest@temp{#1}%
+ \@ifundefined{\HypDest@Prefix\HypDest@temp}{%
\HypDest@VerboseInfo{%
- DestName: (#1) unused%
+ DestName: (\HypDest@temp) unused%
}%
}{%
- \pdfdest num\csname\HypDest@Prefix#1\endcsname#2\relax
+ \pdfdest num%
+ \csname\HypDest@Prefix\HypDest@temp\endcsname#2\relax
\HypDest@VerboseInfo{%
- DestName: (#1) %
- num \csname\HypDest@Prefix#1\endcsname
+ DestName: (\HypDest@temp) %
+ num \csname\HypDest@Prefix\HypDest@temp\endcsname
}%
}%
}%
@@ -704,7 +717,11 @@ and the derived files
\@ifundefined{\HypDest@Prefix#2}{%
\edef#1{goto name{hypdestopt\string :unknown}}%
}{%
- \edef#1{goto num\csname\HypDest@Prefix#2\endcsname}%
+ \ifHypDest@name
+ \edef#1{goto name{\csname\HypDest@Prefix#2\endcsname}}%
+ \else
+ \edef#1{goto num\csname\HypDest@Prefix#2\endcsname}%
+ \fi
}%
}%
\def\BKM@HypDestOptHook{%
@@ -914,24 +931,61 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hypdestopt.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypdestopt'>
+ <name>hypdestopt</name>
+ <caption>Hyperref destination optimizer.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2008,2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.3'/>
+ <description>
+ This package supports <xref refid='hyperref'>hyperref</xref>'s
+ pdftex driver. It removes unnecessary destinations
+ and shortens the destination names or uses numbered destinations
+ to get smaller PDF files.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypdestopt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypdestopt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{alphalph}
% Heiko Oberdiek: \textit{The \xpackage{alphalph} package};
% 2006/05/30 v1.4;
% \CTAN{macros/latex/contrib/oberdiek/alphalph.pdf}.
-%
+%
% \bibitem{hyperref}
% Sebastian Rahtz, Heiko Oberdiek:
% \textit{The \xpackage{hyperref} package};
% 2006/06/01 v6.75a;
% \CTAN{macros/latex/contrib/hyperref/}.
-%
+%
% \bibitem{ifpdf}
% Heiko Oberdiek: \textit{The \xpackage{ifpdf} package};
% 2006/02/20 v1.4;
% \CTAN{macros/latex/contrib/oberdiek/ifpdf.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -954,6 +1008,13 @@ and the derived files
% \item
% Support for package \xpackage{bookmark} added.
% \end{Version}
+% \begin{Version}{2011/05/13 v2.3}
+% \item
+% Fix for \cs{Hy@DestName} if the destination name contains
+% special characters.
+% \item
+% Fix for option \xoption{name} and package \xpackage{bookmark}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
index 02f20687692..c3275a09b73 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hypdoc.dtx
-% Version: 2010/03/26 v1.9
-%
-% Copyright (C) 2002, 2006, 2007, 2009, 2010 by
+% Version: 2011/08/19 v1.11
+% Info: Hyper extensions for doc.sty
+%
+% Copyright (C) 2002, 2006, 2007, 2009-2011 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
@@ -15,19 +16,19 @@
% 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 hypdoc.dtx
% and the derived files
% hypdoc.sty, hypdoc.pdf, hypdoc.ins, hypdoc.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hypdoc.dtx
% CTAN:macros/latex/contrib/oberdiek/hypdoc.pdf
-%
+%
% Unpacking:
% (a) If hypdoc.ins is present:
% tex hypdoc.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hypdoc.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hypdoc.drv is present:
% latex hypdoc.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hypdoc.dtx
% makeindex -s gind.ist hypdoc.idx
% pdflatex hypdoc.dtx
% makeindex -s gind.ist hypdoc.idx
% pdflatex hypdoc.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/hypdoc.sty
% TDS:doc/latex/oberdiek/hypdoc.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hypdoc 2010/03/26 v1.9 Hyper extensions for doc.sty (HO)}
+\Msg{* Package: hypdoc 2011/08/19 v1.11 Hyper extensions for doc.sty (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -86,9 +87,9 @@
This is a generated file.
Project: hypdoc
-Version: 2010/03/26 v1.9
+Version: 2011/08/19 v1.11
-Copyright (C) 2002, 2006, 2007, 2009, 2010 by
+Copyright (C) 2002, 2006, 2007, 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -117,6 +118,10 @@ and the derived files
\file{hypdoc.drv}{\from{hypdoc.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{hypdoc.sty}{\from{hypdoc.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hypdoc.xml}{\from{hypdoc.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,9 +148,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hypdoc.drv}%
- [2010/03/26 v1.9 Hyper extensions for doc.sty (HO)]%
+ [2011/08/19 v1.11 Hyper extensions for doc.sty (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{hypdoc.dtx}%
\end{document}
@@ -173,7 +178,7 @@ and the derived files
% \GetFileInfo{hypdoc.drv}
%
% \title{The \xpackage{hypdoc} package}
-% \date{2010/03/26 v1.9}
+% \date{2011/08/19 v1.11}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -350,7 +355,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypdoc}%
- [2010/03/26 v1.9 Hyper extensions for doc.sty (HO)]%
+ [2011/08/19 v1.11 Hyper extensions for doc.sty (HO)]%
% \end{macrocode}
% The package identification is done at the top of the |.dtx| file
% in order to use only one identification string.
@@ -385,7 +390,7 @@ and the derived files
hyperindex=false,%
pdfusetitle,%
colorlinks,%
- pdfpagelabels,%
+ pdfpagelabels%
]{hyperref}[2002/05/09]%
\hypersetup{%
plainpages=false,%
@@ -807,7 +812,7 @@ and the derived files
\ifhmode
\settoheight{\HD@helplength}{[H]}%
\addtolength{\HD@helplength}{0.4ex}%
- \raisebox{\HD@helplength}{%
+ \raisebox{\HD@helplength}[0pt][0pt]{%
\HD@maketarget
}%
\else
@@ -1308,6 +1313,43 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hypdoc.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypdoc'>
+ <name>hypdoc</name>
+ <caption>Hyper extensions for doc.sty.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2002,2006,2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.11'/>
+ <description>
+ This package adds hypertext features to the package
+ <xref refid='doc'>doc</xref> that is used in the documentation
+ system of <xref refid='latex'>LaTeX2e</xref>. Bookmarks are added
+ and references are linked as far as possible.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypdoc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypdoc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2002/05/10 v1.0}
% \item
@@ -1361,6 +1403,16 @@ and the derived files
% \item
% Definition of \cs{HD@SetMacroIndex} is provided in the \xext{aux} file.
% \end{Version}
+% \begin{Version}{2011/05/05 v1.10}
+% \item
+% \cs{raisebox} in \cs{HD@target} with height and depth of \texttt{0pt}
+% (request of GL).
+% \end{Version}
+% \begin{Version}{2011/08/19 v1.11}
+% \item
+% Latest comma in option list for hyperref removed to avoid option clash
+% because of \hologo{LaTeX} 2011/06/27 with the new \cs{in@}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx
index 751054ee439..d2b155d9fcf 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hypgotoe.dtx
% Version: 2007/10/30 v0.1
-%
+% Info: Links to embedded files
+%
% Copyright (C) 2007 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
@@ -15,20 +16,20 @@
% 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 hypgotoe.dtx
% and the derived files
% hypgotoe.sty, hypgotoe.pdf, hypgotoe.ins, hypgotoe.drv,
% hypgotoe-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hypgotoe.dtx
% CTAN:macros/latex/contrib/oberdiek/hypgotoe.pdf
-%
+%
% Unpacking:
% (a) If hypgotoe.ins is present:
% tex hypgotoe.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hypgotoe.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hypgotoe.drv is present:
% latex hypgotoe.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hypgotoe.dtx
% makeindex -s gind.ist hypgotoe.idx
% pdflatex hypgotoe.dtx
% makeindex -s gind.ist hypgotoe.idx
% pdflatex hypgotoe.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/hypgotoe.sty
% TDS:doc/latex/oberdiek/hypgotoe.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hypgotoe 2007/10/30 v0.1 Experimental links to embedded files (HO)}
+\Msg{* Package: hypgotoe 2007/10/30 v0.1 Links to embedded files (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{hypgotoe.sty}{\from{hypgotoe.dtx}{package}}%
\usedir{doc/latex/oberdiek}%
\file{hypgotoe-example.tex}{\from{hypgotoe.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hypgotoe.xml}{\from{hypgotoe.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,9 +153,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hypgotoe.drv}%
- [2007/10/30 v0.1 Experimental links to embedded files (HO)]%
+ [2007/10/30 v0.1 Links to embedded files (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{hypgotoe.dtx}%
\end{document}
@@ -311,7 +316,7 @@ Anker foobar is here.
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypgotoe}%
- [2007/10/30 v0.1 Experimental links to embedded files (HO)]%
+ [2007/10/30 v0.1 Links to embedded files (HO)]%
% \end{macrocode}
%
% \subsection{Load packages}
@@ -657,6 +662,41 @@ Anker foobar is here.
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hypgotoe.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hypgotoe'>
+ <name>hypgotoe</name>
+ <caption>Links to embedded files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='0.1'/>
+ <description>
+ This experimental package is a first experiment for links to embedded
+ files. It is named after the PDF action name <tt>/GoToE</tt>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hypgotoe.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hypgotoe.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{pdfspec}
% Adobe Systems Incorporated:
@@ -664,7 +704,7 @@ Anker foobar is here.
% {\textit{PDF Reference, Sixth Edition, Version 1.7}},%
% Oktober 2006;
% \url{http://www.adobe.com/devnet/pdf/pdf_reference.html}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
index b23a6f70ef1..de0a6fcb3f3 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: hyphsubst.dtx
% Version: 2008/06/09 v0.2
-%
+% Info: Substitute hyphenation patterns
+%
% Copyright (C) 2008 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file hyphsubst.dtx
% and the derived files
% hyphsubst.sty, hyphsubst.pdf, hyphsubst.ins, hyphsubst.drv,
% hyphsubst-test1.tex, hyphsubst-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/hyphsubst.dtx
% CTAN:macros/latex/contrib/oberdiek/hyphsubst.pdf
-%
+%
% Unpacking:
% (a) If hyphsubst.ins is present:
% tex hyphsubst.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{hyphsubst.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If hyphsubst.drv is present:
% latex hyphsubst.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex hyphsubst.dtx
% makeindex -s gind.ist hyphsubst.idx
% pdflatex hyphsubst.dtx
% makeindex -s gind.ist hyphsubst.idx
% pdflatex hyphsubst.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/hyphsubst.sty
% TDS:doc/latex/oberdiek/hyphsubst.pdf
@@ -130,6 +131,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{hyphsubst-test1.tex}{\from{hyphsubst.dtx}{test1}}%
\file{hyphsubst-test2.tex}{\from{hyphsubst.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{hyphsubst.xml}{\from{hyphsubst.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -158,7 +163,7 @@ and the derived files
\ProvidesFile{hyphsubst.drv}%
[2008/06/09 v0.2 Substitute hyphenation patterns (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{hyphsubst.dtx}%
\end{document}
@@ -899,6 +904,45 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{hyphsubst.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='hyphsubst'>
+ <name>hyphsubst</name>
+ <caption>Substitute hyphenation patterns.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008'/>
+ <license type='lppl1.3'/>
+ <version number='0.2'/>
+ <description>
+ A TeX format file may include alternative hyphenation patterns
+ for a language with a different name. If the naming convention
+ follows <xref refid='babel'>babel&#x2019;s</xref> rules, then the
+ hyphenation patterns
+ for a language can be replaced by the alternative hyphenation patterns,
+ provided in the format file.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/hyphsubst.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/hyphsubst.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2008/06/07 v0.1}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
index 75fa973e831..7579674faa4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: ifdraft.dtx
% Version: 2008/08/11 v1.3
-%
+% Info: Detect class options draft and final
+%
% Copyright (C) 1999, 2005, 2006, 2008 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
@@ -15,19 +16,19 @@
% 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 ifdraft.dtx
% and the derived files
% ifdraft.sty, ifdraft.pdf, ifdraft.ins, ifdraft.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/ifdraft.dtx
% CTAN:macros/latex/contrib/oberdiek/ifdraft.pdf
-%
+%
% Unpacking:
% (a) If ifdraft.ins is present:
% tex ifdraft.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{ifdraft.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If ifdraft.drv is present:
% latex ifdraft.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex ifdraft.dtx
% makeindex -s gind.ist ifdraft.idx
% pdflatex ifdraft.dtx
% makeindex -s gind.ist ifdraft.idx
% pdflatex ifdraft.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/ifdraft.sty
% TDS:doc/latex/oberdiek/ifdraft.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: ifdraft 2008/08/11 v1.3 Switch for option draft (HO)}
+\Msg{* Package: ifdraft 2008/08/11 v1.3 Detect class options draft and final (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{ifdraft.drv}{\from{ifdraft.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{ifdraft.sty}{\from{ifdraft.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{ifdraft.xml}{\from{ifdraft.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ifdraft.drv}%
- [2008/08/11 v1.3 Switch for option draft (HO)]%
+ [2008/08/11 v1.3 Detect class options draft and final (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{ifdraft.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{43}
+% \CheckSum{46}
%
% \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
@@ -270,7 +275,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{ifdraft}%
- [2008/08/11 v1.3 Switch for option draft (HO)]
+ [2008/08/11 v1.3 Detect class options draft and final (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -505,6 +510,50 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{ifdraft.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifdraft'>
+ <name>ifdraft</name>
+ <caption>Detect "draft" and "final" class options.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2005,2006,2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package defines commands that switch according to the
+ prevailing &#x2018;draft&#x2019; or &#x2018;final&#x2019;
+ options; each command takes two arguments, the first for the
+ &#x2018;true&#x2019;, the second for the &#x2018;false&#x2019;
+ case. Commands are:<br/>
+ &#x2014; <tt>\ifdraft</tt> determines whether we're operating in
+ draft (&#x2018;true&#x2019;) or final mode;<br/>
+
+ &#x2014; <tt>\ifoptiondraft</tt> determines whether a
+ &#x2018;draft&#x2019; option has been given; and<br/>
+ &#x2014; <tt>\ifoptionfinal</tt> determines whether a
+ &#x2018;final&#x2019; option has been given.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifdraft.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifdraft.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1999/12/28 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
index e85ec0ac09f..ded9efc8fd8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: iflang.dtx
% Version: 2007/11/11 v1.5
-%
+% Info: Checks for the current language
+%
% Copyright (C) 2007 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file iflang.dtx
% and the derived files
% iflang.sty, iflang.pdf, iflang.ins, iflang.drv, iflang-test1.tex,
% iflang-test2.tex, iflang-test3.tex, iflang-test4.tex,
% iflang-test5.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/iflang.dtx
% CTAN:macros/latex/contrib/oberdiek/iflang.pdf
-%
+%
% Unpacking:
% (a) If iflang.ins is present:
% tex iflang.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{iflang.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If iflang.drv is present:
% latex iflang.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex iflang.dtx
% makeindex -s gind.ist iflang.idx
% pdflatex iflang.dtx
% makeindex -s gind.ist iflang.idx
% pdflatex iflang.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/iflang.sty
% TDS:doc/latex/oberdiek/iflang.pdf
@@ -84,7 +85,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: iflang 2007/11/11 v1.5 Language checks (HO)}
+\Msg{* Package: iflang 2007/11/11 v1.5 Checks for the current language (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -138,6 +139,10 @@ and the derived files
\file{iflang-test3.tex}{\from{iflang.dtx}{test3}}%
\file{iflang-test4.tex}{\from{iflang.dtx}{test4}}%
\file{iflang-test5.tex}{\from{iflang.dtx}{test5}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{iflang.xml}{\from{iflang.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -164,16 +169,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{iflang.drv}%
- [2007/11/11 v1.5 Language checks (HO)]%
+ [2007/11/11 v1.5 Checks for the current language (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{iflang.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{909}
+% \CheckSum{910}
%
% \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
@@ -359,7 +364,7 @@ and the derived files
\fi
\expandafter\x\csname ver@iflang.sty\endcsname
\ProvidesPackage{iflang}%
- [2007/11/11 v1.5 Language checks (HO)]%
+ [2007/11/11 v1.5 Checks for the current language (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -1162,6 +1167,40 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{iflang.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='iflang'>
+ <name>iflang</name>
+ <caption>Expandable checks for the current language.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ This package provides expandable checks for the current language
+ based on macro <tt>\languagename</tt> or hyphenation patterns.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/iflang.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/iflang.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
% I wish to thank:
% \begin{description}
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx
index eb8eb494439..f6eefff4e0f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: ifluatex.dtx
% Version: 2010/03/01 v1.3
-%
+% Info: Provides the ifluatex switch
+%
% Copyright (C) 2007, 2009, 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file ifluatex.dtx
% and the derived files
% ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
% ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/ifluatex.dtx
% CTAN:macros/latex/contrib/oberdiek/ifluatex.pdf
-%
+%
% Unpacking:
% (a) If ifluatex.ins is present:
% tex ifluatex.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{ifluatex.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If ifluatex.drv is present:
% latex ifluatex.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex ifluatex.dtx
% makeindex -s gind.ist ifluatex.idx
% pdflatex ifluatex.dtx
% makeindex -s gind.ist ifluatex.idx
% pdflatex ifluatex.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/ifluatex.sty
% TDS:doc/latex/oberdiek/ifluatex.pdf
@@ -132,6 +133,10 @@ and the derived files
\file{ifluatex-test1.tex}{\from{ifluatex.dtx}{test1}}%
\file{ifluatex-test2.tex}{\from{ifluatex.dtx}{test-reload1}}%
\file{ifluatex-test3.tex}{\from{ifluatex.dtx}{test-reload2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{ifluatex.xml}{\from{ifluatex.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -160,14 +165,14 @@ and the derived files
\ProvidesFile{ifluatex.drv}%
[2010/03/01 v1.3 Provides the ifluatex switch (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{ifluatex.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{568}
+% \CheckSum{570}
%
% \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
@@ -842,6 +847,41 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{ifluatex.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifluatex'>
+ <name>ifluatex</name>
+ <caption>Provides the \ifluatex switch.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package looks for LuaTeX regardless of its mode and provides
+ the switch <tt>\ifluatex</tt>; it works with Plain TeX or LaTeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifluatex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifluatex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='ifluatex'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/12/12 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
index 6d1a9778135..4252d6a05fa 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: ifpdf.dtx
% Version: 2011/01/30 v2.3
-%
+% Info: Provides the ifpdf switch
+%
% Copyright (C) 2001, 2005-2011 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
@@ -15,22 +16,22 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file ifpdf.dtx
% and the derived files
% ifpdf.sty, ifpdf.pdf, ifpdf.ins, ifpdf.drv, ifpdf-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/ifpdf.dtx
% CTAN:macros/latex/contrib/oberdiek/ifpdf.pdf
-%
+%
% Unpacking:
% (a) If ifpdf.ins is present:
% tex ifpdf.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{ifpdf.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If ifpdf.drv is present:
% latex ifpdf.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex ifpdf.dtx
% makeindex -s gind.ist ifpdf.idx
% pdflatex ifpdf.dtx
% makeindex -s gind.ist ifpdf.idx
% pdflatex ifpdf.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/ifpdf.sty
% TDS:doc/latex/oberdiek/ifpdf.pdf
@@ -126,6 +127,10 @@ and the derived files
\file{ifpdf.sty}{\from{ifpdf.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{ifpdf-test1.tex}{\from{ifpdf.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{ifpdf.xml}{\from{ifpdf.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -154,14 +159,14 @@ and the derived files
\ProvidesFile{ifpdf.drv}%
[2011/01/30 v2.3 Provides the ifpdf switch (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{ifpdf.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{593}
+% \CheckSum{600}
%
% \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
@@ -926,6 +931,44 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{ifpdf.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifpdf'>
+ <name>ifpdf</name>
+ <caption>Provides the \ifpdf conditional.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2005-2011'/>
+ <license type='lppl1.3'/>
+ <version number='2.3'/>
+ <description>
+ This package looks for pdfTeX in pdf mode and implements and
+ sets the switch <tt>\ifpdf</tt>. The detection is based on the
+ value of <tt>\pdfoutput</tt> (which the package will not
+ change). The package works with plain or LaTeX formats. To use
+ it with LaTeX simply <tt>\usepackage{ifpdf}</tt>. Then use
+ <tt>\ifpdf ... \else ... \fi</tt>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifpdf.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifpdf.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2001/06/14 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
index 44eae127e54..5dfa512464c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: ifvtex.dtx
% Version: 2010/03/01 v1.5
-%
+% Info: Detect VTeX and its facilities
+%
% Copyright (C) 2001, 2006-2008, 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
@@ -15,22 +16,22 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file ifvtex.dtx
% and the derived files
% ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv, ifvtex-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/ifvtex.dtx
% CTAN:macros/latex/contrib/oberdiek/ifvtex.pdf
-%
+%
% Unpacking:
% (a) If ifvtex.ins is present:
% tex ifvtex.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{ifvtex.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If ifvtex.drv is present:
% latex ifvtex.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex ifvtex.dtx
% makeindex -s gind.ist ifvtex.idx
% pdflatex ifvtex.dtx
% makeindex -s gind.ist ifvtex.idx
% pdflatex ifvtex.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/ifvtex.sty
% TDS:doc/latex/oberdiek/ifvtex.pdf
@@ -78,7 +79,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: ifvtex 2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)}
+\Msg{* Package: ifvtex 2010/03/01 v1.5 Detect VTeX and its facilities (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -126,6 +127,10 @@ and the derived files
\file{ifvtex.sty}{\from{ifvtex.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{ifvtex-test1.tex}{\from{ifvtex.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{ifvtex.xml}{\from{ifvtex.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -152,16 +157,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ifvtex.drv}%
- [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]%
+ [2010/03/01 v1.5 Detect VTeX and its facilities (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{ifvtex.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{575}
+% \CheckSum{580}
%
% \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
@@ -315,7 +320,7 @@ and the derived files
\fi
\expandafter\x\csname ver@ifvtex.sty\endcsname
\ProvidesPackage{ifvtex}%
- [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]%
+ [2010/03/01 v1.5 Detect VTeX and its facilities (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -819,6 +824,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{ifvtex.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ifvtex'>
+ <name>ifvtex</name>
+ <caption>Detects use of VTeX and its facilities.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006-2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ The package looks for VTeX and sets the switch <tt>\ifvtex</tt>.
+ In the presence of VTeX, the mode switches <tt>\ifvtexdvi</tt>,
+ <tt>\ifvtexpdf</tt> and <tt>\ifvtexps</tt> are set;
+ <tt>\ifvtexgex</tt> tells you whether GeX is operating.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ifvtex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ifvtex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2001/09/26 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
index f6a9472694f..0eebe6432ee 100644
--- a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: infwarerr.dtx
% Version: 2010/04/08 v1.3
-%
+% Info: Providing info/warning/error messages
+%
% Copyright (C) 2007, 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file infwarerr.dtx
% and the derived files
% infwarerr.sty, infwarerr.pdf, infwarerr.ins, infwarerr.drv,
% infwarerr-test1.tex, infwarerr-test2.tex,
% infwarerr-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/infwarerr.dtx
% CTAN:macros/latex/contrib/oberdiek/infwarerr.pdf
-%
+%
% Unpacking:
% (a) If infwarerr.ins is present:
% tex infwarerr.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{infwarerr.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If infwarerr.drv is present:
% latex infwarerr.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex infwarerr.dtx
% makeindex -s gind.ist infwarerr.idx
% pdflatex infwarerr.dtx
% makeindex -s gind.ist infwarerr.idx
% pdflatex infwarerr.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/infwarerr.sty
% TDS:doc/latex/oberdiek/infwarerr.pdf
@@ -82,7 +83,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: infwarerr 2010/04/08 v1.3 Providing info/warning/message (HO)}
+\Msg{* Package: infwarerr 2010/04/08 v1.3 Providing info/warning/error messages (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -134,6 +135,10 @@ and the derived files
\file{infwarerr-test1.tex}{\from{infwarerr.dtx}{test1}}%
\file{infwarerr-test2.tex}{\from{infwarerr.dtx}{test2}}%
\file{infwarerr-test3.tex}{\from{infwarerr.dtx}{test3}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{infwarerr.xml}{\from{infwarerr.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -160,9 +165,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{infwarerr.drv}%
- [2010/04/08 v1.3 Providing info/warning/message (HO)]%
+ [2010/04/08 v1.3 Providing info/warning/error messages (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{infwarerr.dtx}%
\end{document}
@@ -311,7 +316,7 @@ and the derived files
\fi
\expandafter\x\csname ver@infwarerr.sty\endcsname
\ProvidesPackage{infwarerr}%
- [2010/04/08 v1.3 Providing info/warning/message (HO)]%
+ [2010/04/08 v1.3 Providing info/warning/error messages (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1173,6 +1178,43 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{infwarerr.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='infwarerr'>
+ <name>infwarerr</name>
+ <caption>Complete set of information/warning/error messages.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ This package provides a complete set of macros for information,
+ warning and error messages. Under LaTeX, the commands are
+ wrappers for the corresponding LaTeX commands; under Plain TeX
+ they are also available as complete implementations.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/infwarerr.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/infwarerr.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/04/26 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
index 8417093d15b..c32a8163b40 100644
--- a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: inputenx.dtx
-% Version: 2011/04/10 v1.8
-%
+% Version: 2011/05/27 v1.10
+% Info: Enhanced input encoding handling
+%
% Copyright (C) 2006-2011 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
@@ -15,11 +16,11 @@
% 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 inputenx.dtx
% and the derived files
% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def,
@@ -31,15 +32,15 @@
% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def,
% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def,
% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def,
-% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def,
-% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def,
-% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt,
-% inputenx-utf8enc.txt.
-%
+% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def,
+% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def,
+% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def,
+% inputenx-licrcmds.txt, inputenx-utf8enc.txt.
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/inputenx.dtx
% CTAN:macros/latex/contrib/oberdiek/inputenx.pdf
-%
+%
% Unpacking:
% (a) If inputenx.ins is present:
% tex inputenx.ins
@@ -48,7 +49,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{inputenx.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If inputenx.drv is present:
% latex inputenx.drv
@@ -58,14 +59,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex inputenx.dtx
% makeindex -s gind.ist inputenx.idx
% pdflatex inputenx.dtx
% makeindex -s gind.ist inputenx.idx
% pdflatex inputenx.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/inputenx.sty
% TDS:tex/latex/oberdiek/ix-alias.def
@@ -99,6 +100,7 @@
% TDS:tex/latex/oberdiek/x-cp1250.def
% TDS:tex/latex/oberdiek/x-cp1251.def
% TDS:tex/latex/oberdiek/x-cp1252.def
+% TDS:tex/latex/oberdiek/x-cp1255.def
% TDS:tex/latex/oberdiek/x-cp1257.def
% TDS:tex/latex/oberdiek/x-dec-mcs.def
% TDS:tex/latex/oberdiek/x-koi8-r.def
@@ -126,7 +128,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: inputenx 2011/04/10 v1.8 Enhanced input encoding handling (HO)}
+\Msg{* Package: inputenx 2011/05/27 v1.10 Enhanced input encoding handling (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -138,7 +140,7 @@
This is a generated file.
Project: inputenx
-Version: 2011/04/10 v1.8
+Version: 2011/05/27 v1.10
Copyright (C) 2006-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -168,10 +170,10 @@ and the derived files
x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def,
x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def,
x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def,
- x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def,
- x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def,
- x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt,
- inputenx-utf8enc.txt.
+ x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def,
+ x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def,
+ x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def,
+ inputenx-licrcmds.txt, inputenx-utf8enc.txt.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -212,6 +214,7 @@ and the derived files
\file{x-cp1250.def}{\from{inputenx.dtx}{cp1250}}%
\file{x-cp1251.def}{\from{inputenx.dtx}{cp1251}}%
\file{x-cp1252.def}{\from{inputenx.dtx}{cp1252}}%
+ \file{x-cp1255.def}{\from{inputenx.dtx}{cp1255}}%
\file{x-cp1257.def}{\from{inputenx.dtx}{cp1257}}%
\file{x-dec-mcs.def}{\from{inputenx.dtx}{dec-mcs}}%
\file{x-koi8-r.def}{\from{inputenx.dtx}{koi8-r}}%
@@ -222,6 +225,10 @@ and the derived files
\usedir{doc/latex/oberdiek}%
\file{inputenx-licrcmds.txt}{\from{inputenx.dtx}{licrcmds}}%
\file{inputenx-utf8enc.txt}{\from{inputenx.dtx}{dfudoc}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{inputenx.xml}{\from{inputenx.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -240,9 +247,9 @@ and the derived files
\Msg{* x-iso-8859-15.def, x-iso-8859-16.def, x-cp437.def,}
\Msg{* x-cp850.def, x-cp852.def, x-cp855.def, x-cp858.def,}
\Msg{* x-cp865.def, x-cp866.def, x-cp1250.def, x-cp1251.def,}
-\Msg{* x-cp1252.def, x-cp1257.def, x-dec-mcs.def, x-koi8-r.def,}
-\Msg{* x-mac-centeuro.def, x-mac-cyrillic.def, x-mac-roman.def,}
-\Msg{* x-nextstep.def}
+\Msg{* x-cp1252.def, x-cp1255.def, x-cp1257.def, x-dec-mcs.def,}
+\Msg{* x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def,}
+\Msg{* x-mac-roman.def, x-nextstep.def}
\Msg{*}
\Msg{* To produce the documentation run the file `inputenx.drv'}
\Msg{* through LaTeX.}
@@ -259,9 +266,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{inputenx.drv}%
- [2011/04/10 v1.8 Enhanced input encoding handling (HO)]%
+ [2011/05/27 v1.10 Enhanced input encoding handling (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{longtable}
\begin{document}
\DocInput{inputenx.dtx}%
@@ -269,7 +276,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{0}
+% \CheckSum{10478}
%
% \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
@@ -290,7 +297,7 @@ and the derived files
% \GetFileInfo{inputenx.drv}
%
% \title{The \xpackage{inputenx} package}
-% \date{2011/04/10 v1.8}
+% \date{2011/05/27 v1.10}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -359,6 +366,7 @@ and the derived files
% \xfile{x-cp1250.def} & \xoption{cp1250} & Code page 1250\\
% \xfile{x-cp1251.def} & \xoption{cp1251} & Code page 1251\\
% \xfile{x-cp1252.def} & \xoption{cp1252}, \xoption{ansinew} & Code page 1252\\
+% \xfile{x-cp1255.def} & \xoption{cp1255} & Code page 1255\\
% \xfile{x-cp1257.def} & \xoption{cp1257} & Code page 1257\\
% \xfile{x-dec-mcs.def} & \xoption{dec-mcs}, \xoption{decmulti} & DEC Multinational\\
% \xfile{x-koi8-r.def} & \xoption{koi8-r} & KOI8-R (RFC1489)\\
@@ -425,7 +433,14 @@ and the derived files
% \subsection{Unicode}
%
% File \xfile{ix-utf8enc.dfu} provides additions to \xpackage{inputenc}'s
-% file \xfile{utf8enc.dfu}.
+% file \xfile{utf8enc.dfu}. It can be loaded after \xfile{utf8.def},
+% for example:
+%\begin{quote}
+%\begin{verbatim}
+%\usepackage[utf8]{inputenc}% or package `inputenx'
+%\input{ix-utf8enc.dfu}
+%\end{verbatim}
+%\end{quote}
%
% \subsection{Verbatim}
%
@@ -441,6 +456,7 @@ and the derived files
%\begin{VerbatimOut}[codes={\InputEncoding{verbatim}}]{\jobname.tmp}
% Text with 8 bit characters.
%\end{VerbatimOut}
+%\end{verbatim}
%\end{quote}
%
% \subsection{Math}
@@ -526,7 +542,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{inputenx}%
- [2011/04/10 v1.8 Enhanced input encoding handling (HO)]%
+ [2011/05/27 v1.10 Enhanced input encoding handling (HO)]%
% \end{macrocode}
%
% \subsection{Encoding names}
@@ -788,7 +804,7 @@ and the derived files
%
% \begin{macrocode}
%<*alias>
-\ProvidesFile{ix-alias.def}[2011/04/10 v1.8 Alias list (inputenx)]
+\ProvidesFile{ix-alias.def}[2011/05/27 v1.10 Alias list (inputenx)]
% \end{macrocode}
% The alias mechanism is also used to hide the prefix |x-|:
% \begin{macrocode}
@@ -816,6 +832,7 @@ and the derived files
\InputenxAlias{cp1250}{x-cp1250}
\InputenxAlias{cp1251}{x-cp1251}
\InputenxAlias{cp1252}{x-cp1252}
+\InputenxAlias{cp1255}{x-cp1255}
\InputenxAlias{cp1257}{x-cp1257}
\InputenxAlias{dec-mcs}{x-dec-mcs}
\InputenxAlias{koi8-r}{x-koi8-r}
@@ -871,7 +888,7 @@ and the derived files
% \begin{macrocode}
%<*ascii>
\ProvidesFile{x-ascii.def}%
- [2011/04/10 v1.8 Input encoding ascii (inputenx)]%
+ [2011/05/27 v1.10 Input encoding ascii (inputenx)]%
\csname @inpenc@test\endcsname
%</ascii>
% \end{macrocode}
@@ -880,7 +897,7 @@ and the derived files
% \begin{macrocode}
%<*verbatim>
\ProvidesFile{x-verbatim.def}%
- [2011/04/10 v1.8 Input encoding verbatim (inputenx)]%
+ [2011/05/27 v1.10 Input encoding verbatim (inputenx)]%
\csname @inpenc@test\endcsname
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
@@ -911,7 +928,7 @@ and the derived files
% \begin{macrocode}
%<*atarist>
\ProvidesFile{x-atarist.def}%
- [2011/04/10 v1.8 Input encoding atarist (inputenx)]%
+ [2011/05/27 v1.10 Input encoding atarist (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textGamma}{%
@@ -1175,7 +1192,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-1>
\ProvidesFile{x-iso-8859-1.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-1 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-1 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -1340,7 +1357,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-2>
\ProvidesFile{x-iso-8859-2.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-2 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-2 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textacutedbl}{%
@@ -1475,7 +1492,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-3>
\ProvidesFile{x-iso-8859-3.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-3 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-3 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -1615,7 +1632,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-4>
\ProvidesFile{x-iso-8859-4.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-4 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-4 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textTstroke}{%
@@ -1756,7 +1773,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-5>
\ProvidesFile{x-iso-8859-5.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-5 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-5 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textnumero}{%
@@ -1878,7 +1895,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-8>
\ProvidesFile{x-iso-8859-8.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-8 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-8 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -2017,7 +2034,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-9>
\ProvidesFile{x-iso-8859-9.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-9 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-9 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -2182,7 +2199,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-10>
\ProvidesFile{x-iso-8859-10.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-10 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-10 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textTstroke}{%
@@ -2305,7 +2322,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-13>
\ProvidesFile{x-iso-8859-13.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-13 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-13 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textbrokenbar}{%
@@ -2458,7 +2475,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-14>
\ProvidesFile{x-iso-8859-14.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-14 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-14 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\DeclareInputText{160}{\nobreakspace}
@@ -2566,7 +2583,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-15>
\ProvidesFile{x-iso-8859-15.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-15 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-15 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciimacron}{%
@@ -2713,7 +2730,7 @@ and the derived files
% \begin{macrocode}
%<*iso-8859-16>
\ProvidesFile{x-iso-8859-16.def}%
- [2011/04/10 v1.8 Input encoding iso-8859-16 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding iso-8859-16 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textcommabelow}[1]{%
@@ -2844,7 +2861,7 @@ and the derived files
% \begin{macrocode}
%<*cp437>
\ProvidesFile{x-cp437.def}%
- [2011/04/10 v1.8 Input encoding cp437 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp437 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textGamma}{%
@@ -3093,7 +3110,7 @@ and the derived files
% \begin{macrocode}
%<*cp850>
\ProvidesFile{x-cp850.def}%
- [2011/04/10 v1.8 Input encoding cp850 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp850 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -3308,7 +3325,7 @@ and the derived files
% \begin{macrocode}
%<*cp852>
\ProvidesFile{x-cp852.def}%
- [2011/04/10 v1.8 Input encoding cp852 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp852 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textacutedbl}{%
@@ -3481,7 +3498,7 @@ and the derived files
% \begin{macrocode}
%<*cp855>
\ProvidesFile{x-cp855.def}%
- [2011/04/10 v1.8 Input encoding cp855 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp855 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textblacksquare}{%
@@ -3641,7 +3658,7 @@ and the derived files
% \begin{macrocode}
%<*cp858>
\ProvidesFile{x-cp858.def}%
- [2011/04/10 v1.8 Input encoding cp858 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp858 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -3859,7 +3876,7 @@ and the derived files
% \begin{macrocode}
%<*cp865>
\ProvidesFile{x-cp865.def}%
- [2011/04/10 v1.8 Input encoding cp865 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp865 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textGamma}{%
@@ -4105,7 +4122,7 @@ and the derived files
% \begin{macrocode}
%<*cp866>
\ProvidesFile{x-cp866.def}%
- [2011/04/10 v1.8 Input encoding cp866 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp866 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textblacksquare}{%
@@ -4271,7 +4288,7 @@ and the derived files
% \begin{macrocode}
%<*cp1250>
\ProvidesFile{x-cp1250.def}%
- [2011/04/10 v1.8 Input encoding cp1250 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp1250 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textacutedbl}{%
@@ -4448,7 +4465,7 @@ and the derived files
% \begin{macrocode}
%<*cp1251>
\ProvidesFile{x-cp1251.def}%
- [2011/04/10 v1.8 Input encoding cp1251 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp1251 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textbrokenbar}{%
@@ -4622,7 +4639,7 @@ and the derived files
% \begin{macrocode}
%<*cp1252>
\ProvidesFile{x-cp1252.def}%
- [2011/04/10 v1.8 Input encoding cp1252 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp1252 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -4815,12 +4832,162 @@ and the derived files
%</cp1252>
% \end{macrocode}
%
+% \subsubsection{Encoding cp1255}
+%
+% \begin{macrocode}
+%<*cp1255>
+\ProvidesFile{x-cp1255.def}%
+ [2011/05/27 v1.10 Input encoding cp1255 (inputenx)]%
+\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
+\makeatletter
+\ProvideTextCommandDefault{\textasciiacute}{%
+ \@tabacckludge'{}%
+}
+\ProvideTextCommandDefault{\textasciidieresis}{%
+ \"{}%
+}
+\ProvideTextCommandDefault{\textasciimacron}{%
+ \@tabacckludge={}%
+}
+\ProvideTextCommandDefault{\textbrokenbar}{%
+ \TextSymbolUnavailable\textbrokenbar
+}
+\ProvideTextCommandDefault{\textcent}{%
+ \TextSymbolUnavailable\textcent
+}
+\ProvideTextCommandDefault{\textdegree}{%
+ \ensuremath{{^\circ}}%
+}
+\ProvideTextCommandDefault{\textdiv}{%
+ \TextSymbolUnavailable\textdiv
+}
+\ProvideTextCommandDefault{\texteuro}{%
+ \TextSymbolUnavailable\texteuro
+}
+\ProvideTextCommandDefault{\textflorin}{%
+ \textit{f}%
+}
+\ProvideTextCommandDefault{\textlnot}{%
+ \ensuremath\lnot
+}
+\ProvideTextCommandDefault{\textmu}{%
+ \ensuremath\mu
+}
+\ProvideTextCommandDefault{\textonehalf}{%
+ \ensuremath{\frac12}%
+}
+\ProvideTextCommandDefault{\textonequarter}{%
+ \ensuremath{\frac14}%
+}
+\ProvideTextCommandDefault{\textonesuperior}{%
+ \ensuremath{{^1}}%
+}
+\ProvideTextCommandDefault{\textpm}{%
+ \ensuremath\pm
+}
+\ProvideTextCommandDefault{\textthreequarters}{%
+ \ensuremath{\frac34}%
+}
+\ProvideTextCommandDefault{\textthreesuperior}{%
+ \ensuremath{{^3}}%
+}
+\ProvideTextCommandDefault{\texttimes}{%
+ \ensuremath\times
+}
+\ProvideTextCommandDefault{\texttwosuperior}{%
+ \ensuremath{{^2}}%
+}
+\ProvideTextCommandDefault{\textyen}{%
+ \TextSymbolUnavailable\textyen
+}
+\DeclareInputText{128}{\texteuro}
+\DeclareInputText{130}{\quotesinglbase}
+\DeclareInputText{131}{\textflorin}
+\DeclareInputText{132}{\quotedblbase}
+\DeclareInputText{133}{\textellipsis}
+\DeclareInputText{134}{\textdagger}
+\DeclareInputText{135}{\textdaggerdbl}
+\DeclareInputText{136}{\textasciicircum}
+\DeclareInputText{137}{\textperthousand}
+\DeclareInputText{139}{\guilsinglleft}
+\DeclareInputText{145}{\textquoteleft}
+\DeclareInputText{146}{\textquoteright}
+\DeclareInputText{147}{\textquotedblleft}
+\DeclareInputText{148}{\textquotedblright}
+\DeclareInputText{149}{\textbullet}
+\DeclareInputText{150}{\textendash}
+\DeclareInputText{151}{\textemdash}
+\DeclareInputText{152}{\textasciitilde}
+\DeclareInputText{153}{\texttrademark}
+\DeclareInputText{155}{\guilsinglright}
+\DeclareInputText{160}{\nobreakspace}
+\DeclareInputText{161}{\textexclamdown}
+\DeclareInputText{162}{\textcent}
+\DeclareInputText{163}{\textsterling}
+\DeclareInputText{165}{\textyen}
+\DeclareInputText{166}{\textbrokenbar}
+\DeclareInputText{167}{\textsection}
+\DeclareInputText{168}{\textasciidieresis}
+\DeclareInputText{169}{\textcopyright}
+\DeclareInputText{170}{\texttimes}
+\DeclareInputText{171}{\guillemotleft}
+\DeclareInputText{172}{\textlnot}
+\DeclareInputText{173}{\-}
+\DeclareInputText{174}{\textregistered}
+\DeclareInputText{175}{\textasciimacron}
+\DeclareInputText{176}{\textdegree}
+\DeclareInputText{177}{\textpm}
+\DeclareInputText{178}{\texttwosuperior}
+\DeclareInputText{179}{\textthreesuperior}
+\DeclareInputText{180}{\textasciiacute}
+\DeclareInputText{181}{\textmu}
+\DeclareInputText{182}{\textparagraph}
+\DeclareInputText{183}{\textperiodcentered}
+\DeclareInputText{184}{\c\ }
+\DeclareInputText{185}{\textonesuperior}
+\DeclareInputText{186}{\textdiv}
+\DeclareInputText{187}{\guillemotright}
+\DeclareInputText{188}{\textonequarter}
+\DeclareInputText{189}{\textonehalf}
+\DeclareInputText{190}{\textthreequarters}
+\DeclareInputText{191}{\textquestiondown}
+\DeclareInputText{224}{\hebalef}
+\DeclareInputText{225}{\hebbet}
+\DeclareInputText{226}{\hebgimel}
+\DeclareInputText{227}{\hebdalet}
+\DeclareInputText{228}{\hebhe}
+\DeclareInputText{229}{\hebvav}
+\DeclareInputText{230}{\hebzayin}
+\DeclareInputText{231}{\hebhet}
+\DeclareInputText{232}{\hebtet}
+\DeclareInputText{233}{\hebyod}
+\DeclareInputText{234}{\hebfinalkaf}
+\DeclareInputText{235}{\hebkaf}
+\DeclareInputText{236}{\heblamed}
+\DeclareInputText{237}{\hebfinalmem}
+\DeclareInputText{238}{\hebmem}
+\DeclareInputText{239}{\hebfinalnun}
+\DeclareInputText{240}{\hebnun}
+\DeclareInputText{241}{\hebsamekh}
+\DeclareInputText{242}{\hebayin}
+\DeclareInputText{243}{\hebfinalpe}
+\DeclareInputText{244}{\hebpe}
+\DeclareInputText{245}{\hebfinaltsadi}
+\DeclareInputText{246}{\hebtsadi}
+\DeclareInputText{247}{\hebqof}
+\DeclareInputText{248}{\hebresh}
+\DeclareInputText{249}{\hebshin}
+\DeclareInputText{250}{\hebtav}
+\RestoreAtCatcode
+%</cp1255>
+% \end{macrocode}
+%
% \subsubsection{Encoding cp1257}
%
% \begin{macrocode}
%<*cp1257>
\ProvidesFile{x-cp1257.def}%
- [2011/04/10 v1.8 Input encoding cp1257 (inputenx)]%
+ [2011/05/27 v1.10 Input encoding cp1257 (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciiacute}{%
@@ -5008,7 +5175,7 @@ and the derived files
% \begin{macrocode}
%<*dec-mcs>
\ProvidesFile{x-dec-mcs.def}%
- [2011/04/10 v1.8 Input encoding dec-mcs (inputenx)]%
+ [2011/05/27 v1.10 Input encoding dec-mcs (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textcent}{%
@@ -5134,7 +5301,7 @@ and the derived files
% \begin{macrocode}
%<*koi8-r>
\ProvidesFile{x-koi8-r.def}%
- [2011/04/10 v1.8 Input encoding koi8-r (inputenx)]%
+ [2011/05/27 v1.10 Input encoding koi8-r (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textapproxequal}{%
@@ -5296,7 +5463,7 @@ and the derived files
% \begin{macrocode}
%<*mac-centeuro>
\ProvidesFile{x-mac-centeuro.def}%
- [2011/04/10 v1.8 Input encoding mac-centeuro (inputenx)]%
+ [2011/05/27 v1.10 Input encoding mac-centeuro (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textasciicaron}{%
@@ -5475,7 +5642,7 @@ and the derived files
% \begin{macrocode}
%<*mac-cyrillic>
\ProvidesFile{x-mac-cyrillic.def}%
- [2011/04/10 v1.8 Input encoding mac-cyrillic (inputenx)]%
+ [2011/05/27 v1.10 Input encoding mac-cyrillic (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textapproxequal}{%
@@ -5671,7 +5838,7 @@ and the derived files
% \begin{macrocode}
%<*mac-roman>
\ProvidesFile{x-mac-roman.def}%
- [2011/04/10 v1.8 Input encoding mac-roman (inputenx)]%
+ [2011/05/27 v1.10 Input encoding mac-roman (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textOmega}{%
@@ -5900,7 +6067,7 @@ and the derived files
% \begin{macrocode}
%<*nextstep>
\ProvidesFile{x-nextstep.def}%
- [2011/04/10 v1.8 Input encoding nextstep (inputenx)]%
+ [2011/05/27 v1.10 Input encoding nextstep (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
\ProvideTextCommandDefault{\textacutedbl}{%
@@ -6121,7 +6288,7 @@ and the derived files
% \begin{macrocode}
%<*dfu>
\ProvidesFile{ix-utf8enc.dfu}%
- [2011/04/10 v1.8 Additions of inputenx for utf8enc.dfu]%
+ [2011/05/27 v1.10 Additions of inputenx for utf8enc.dfu]%
\DeclareUnicodeCharacter{00A0}{\nobreakspace}
\DeclareUnicodeCharacter{00AD}{\-}
\DeclareUnicodeCharacter{0100}{\@tabacckludge=A}
@@ -6366,7 +6533,7 @@ and the derived files
% \begin{macrocode}
%<*name>
\ProvidesFile{ix-name.def}%
- [2011/04/10 v1.8 Name list (inputenx)]%
+ [2011/05/27 v1.10 Name list (inputenx)]%
% \end{macrocode}
%
% \textit{List omitted here, see \xfile{ix-name.def}.}
@@ -7076,7 +7243,7 @@ and the derived files
% \begin{macrocode}
%<*slot>
\ProvidesFile{ix-slot.def}%
- [2011/04/10 v1.8 SLOT and UC to Encodings (inputenx)]%
+ [2011/05/27 v1.10 SLOT and UC to Encodings (inputenx)]%
% \end{macrocode}
%
% \textit{List omitted here, see \xfile{ix-slot.def}.}
@@ -7090,7 +7257,9 @@ and the derived files
\InputenxSlot{128}{0402}{\do{cp1251}}
\InputenxSlot{128}{0410}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{128}{0452}{\do{cp855}}
-\InputenxSlot{128}{20AC}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{128}{20AC}{%
+ \do{cp1250}\do{cp1252}\do{cp1255}\do{cp1257}%
+}
\InputenxSlot{128}{2500}{\do{koi8-r}}
\InputenxSlot{129}{00C0}{\do{nextstep}}
\InputenxSlot{129}{00C5}{\do{mac-roman}}
@@ -7111,7 +7280,7 @@ and the derived files
\InputenxSlot{130}{0412}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{130}{0453}{\do{cp855}}
\InputenxSlot{130}{201A}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{130}{250C}{\do{koi8-r}}
\InputenxSlot{131}{00C2}{\do{nextstep}}
@@ -7119,7 +7288,7 @@ and the derived files
\InputenxSlot{131}{00E2}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
}
-\InputenxSlot{131}{0192}{\do{cp1252}}
+\InputenxSlot{131}{0192}{\do{cp1252}\do{cp1255}}
\InputenxSlot{131}{0403}{\do{cp855}}
\InputenxSlot{131}{0413}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{131}{0453}{\do{cp1251}}
@@ -7133,7 +7302,7 @@ and the derived files
\InputenxSlot{132}{0414}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{132}{0451}{\do{cp855}}
\InputenxSlot{132}{201E}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{132}{2514}{\do{koi8-r}}
\InputenxSlot{133}{00C4}{\do{nextstep}}
@@ -7145,7 +7314,7 @@ and the derived files
\InputenxSlot{133}{0401}{\do{cp855}}
\InputenxSlot{133}{0415}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{133}{2026}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{133}{2518}{\do{koi8-r}}
\InputenxSlot{134}{00C5}{\do{nextstep}}
@@ -7157,7 +7326,7 @@ and the derived files
\InputenxSlot{134}{0416}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{134}{0454}{\do{cp855}}
\InputenxSlot{134}{2020}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{134}{251C}{\do{koi8-r}}
\InputenxSlot{135}{00C7}{\do{nextstep}}
@@ -7168,7 +7337,7 @@ and the derived files
\InputenxSlot{135}{0404}{\do{cp855}}
\InputenxSlot{135}{0417}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{135}{2021}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{135}{2524}{\do{koi8-r}}
\InputenxSlot{136}{00C8}{\do{nextstep}}
@@ -7178,7 +7347,7 @@ and the derived files
}
\InputenxSlot{136}{0105}{\do{mac-centeuro}}
\InputenxSlot{136}{0142}{\do{cp852}}
-\InputenxSlot{136}{02C6}{\do{cp1252}}
+\InputenxSlot{136}{02C6}{\do{cp1252}\do{cp1255}}
\InputenxSlot{136}{0418}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{136}{0455}{\do{cp855}}
\InputenxSlot{136}{20AC}{\do{cp1251}}
@@ -7192,7 +7361,7 @@ and the derived files
\InputenxSlot{137}{0405}{\do{cp855}}
\InputenxSlot{137}{0419}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{137}{2030}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{137}{2534}{\do{koi8-r}}
\InputenxSlot{138}{00CA}{\do{nextstep}}
@@ -7216,7 +7385,7 @@ and the derived files
\InputenxSlot{139}{0406}{\do{cp855}}
\InputenxSlot{139}{041B}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{139}{2039}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{139}{2580}{\do{koi8-r}}
\InputenxSlot{140}{00CC}{\do{nextstep}}
@@ -7287,7 +7456,7 @@ and the derived files
\InputenxSlot{145}{0409}{\do{cp855}}
\InputenxSlot{145}{0421}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{145}{2018}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{145}{2592}{\do{koi8-r}}
\InputenxSlot{146}{00C6}{%
@@ -7299,7 +7468,7 @@ and the derived files
\InputenxSlot{146}{0422}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{146}{045A}{\do{cp855}}
\InputenxSlot{146}{2019}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{146}{2593}{\do{koi8-r}}
\InputenxSlot{147}{00D3}{\do{nextstep}}
@@ -7311,7 +7480,7 @@ and the derived files
\InputenxSlot{147}{040A}{\do{cp855}}
\InputenxSlot{147}{0423}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{147}{201C}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{148}{00D4}{\do{nextstep}}
\InputenxSlot{148}{00EE}{\do{mac-roman}}
@@ -7322,7 +7491,7 @@ and the derived files
\InputenxSlot{148}{0424}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{148}{045B}{\do{cp855}}
\InputenxSlot{148}{201D}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{148}{25A0}{\do{koi8-r}}
\InputenxSlot{149}{00D5}{\do{nextstep}}
@@ -7335,7 +7504,7 @@ and the derived files
\InputenxSlot{149}{040B}{\do{cp855}}
\InputenxSlot{149}{0425}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{149}{2022}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{149}{2219}{\do{koi8-r}}
\InputenxSlot{150}{00D6}{\do{nextstep}}
@@ -7348,7 +7517,7 @@ and the derived files
\InputenxSlot{150}{0426}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{150}{045C}{\do{cp855}}
\InputenxSlot{150}{2013}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{150}{221A}{\do{koi8-r}}
\InputenxSlot{151}{00D9}{\do{nextstep}}
@@ -7360,7 +7529,7 @@ and the derived files
\InputenxSlot{151}{040C}{\do{cp855}}
\InputenxSlot{151}{0427}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{151}{2014}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{151}{2248}{\do{koi8-r}}
\InputenxSlot{152}{00DA}{\do{nextstep}}
@@ -7370,7 +7539,7 @@ and the derived files
}
\InputenxSlot{152}{0117}{\do{mac-centeuro}}
\InputenxSlot{152}{015B}{\do{cp852}}
-\InputenxSlot{152}{02DC}{\do{cp1252}}
+\InputenxSlot{152}{02DC}{\do{cp1252}\do{cp1255}}
\InputenxSlot{152}{0428}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{152}{045E}{\do{cp855}}
\InputenxSlot{152}{2264}{\do{koi8-r}}
@@ -7382,7 +7551,7 @@ and the derived files
\InputenxSlot{153}{040E}{\do{cp855}}
\InputenxSlot{153}{0429}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{153}{2122}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{153}{2265}{\do{koi8-r}}
\InputenxSlot{154}{00A0}{\do{koi8-r}}
@@ -7403,7 +7572,7 @@ and the derived files
\InputenxSlot{155}{040F}{\do{cp855}}
\InputenxSlot{155}{042B}{\do{cp866}\do{mac-cyrillic}}
\InputenxSlot{155}{203A}{%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{156}{00A3}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -7457,7 +7626,7 @@ and the derived files
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
\do{iso-8859-5}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}%
\do{iso-8859-13}\do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{160}{00A9}{\do{nextstep}}
\InputenxSlot{160}{00E1}{%
@@ -7468,7 +7637,7 @@ and the derived files
\InputenxSlot{160}{2550}{\do{koi8-r}}
\InputenxSlot{161}{00A1}{%
\do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
- \do{dec-mcs}\do{nextstep}%
+ \do{cp1255}\do{dec-mcs}\do{nextstep}%
}
\InputenxSlot{161}{00B0}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
\InputenxSlot{161}{00ED}{%
@@ -7488,8 +7657,8 @@ and the derived files
\InputenxSlot{161}{2551}{\do{koi8-r}}
\InputenxSlot{162}{00A2}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
- \do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{mac-roman}%
- \do{nextstep}%
+ \do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
+ \do{mac-roman}\do{nextstep}%
}
\InputenxSlot{162}{00F3}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
@@ -7509,8 +7678,8 @@ and the derived files
\InputenxSlot{163}{00A3}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}%
\do{iso-8859-13}\do{iso-8859-14}\do{iso-8859-15}\do{cp1252}%
- \do{cp1257}\do{dec-mcs}\do{mac-centeuro}\do{mac-cyrillic}%
- \do{mac-roman}\do{nextstep}%
+ \do{cp1255}\do{cp1257}\do{dec-mcs}\do{mac-centeuro}%
+ \do{mac-cyrillic}\do{mac-roman}\do{nextstep}%
}
\InputenxSlot{163}{00FA}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
@@ -7543,7 +7712,7 @@ and the derived files
\InputenxSlot{164}{2553}{\do{koi8-r}}
\InputenxSlot{165}{00A5}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-15}%
- \do{cp1252}\do{dec-mcs}\do{nextstep}%
+ \do{cp1252}\do{cp1255}\do{dec-mcs}\do{nextstep}%
}
\InputenxSlot{165}{00D1}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -7562,7 +7731,7 @@ and the derived files
\InputenxSlot{165}{2554}{\do{koi8-r}}
\InputenxSlot{166}{00A6}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{166}{00AA}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -7584,7 +7753,8 @@ and the derived files
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}%
\do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}%
- \do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{nextstep}%
+ \do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
+ \do{nextstep}%
}
\InputenxSlot{167}{00BA}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -7599,7 +7769,7 @@ and the derived files
\InputenxSlot{168}{00A4}{\do{dec-mcs}\do{nextstep}}
\InputenxSlot{168}{00A8}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
- \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}%
+ \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1255}%
}
\InputenxSlot{168}{00AE}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
\InputenxSlot{168}{00BF}{%
@@ -7618,8 +7788,8 @@ and the derived files
\InputenxSlot{169}{00A9}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
\do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}%
- \do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{mac-centeuro}%
- \do{mac-cyrillic}\do{mac-roman}%
+ \do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
+ \do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}%
}
\InputenxSlot{169}{00AE}{\do{cp850}\do{cp858}}
\InputenxSlot{169}{0110}{\do{iso-8859-10}}
@@ -7639,7 +7809,7 @@ and the derived files
\InputenxSlot{170}{00AC}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
}
-\InputenxSlot{170}{00D7}{\do{iso-8859-8}}
+\InputenxSlot{170}{00D7}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{170}{0112}{\do{iso-8859-4}}
\InputenxSlot{170}{0156}{\do{iso-8859-13}\do{cp1257}}
\InputenxSlot{170}{015E}{\do{iso-8859-2}\do{iso-8859-3}\do{cp1250}}
@@ -7656,7 +7826,7 @@ and the derived files
\InputenxSlot{171}{00AB}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}%
- \do{cp1257}\do{dec-mcs}\do{nextstep}%
+ \do{cp1255}\do{cp1257}\do{dec-mcs}\do{nextstep}%
}
\InputenxSlot{171}{00B4}{\do{mac-roman}}
\InputenxSlot{171}{00BD}{%
@@ -7677,7 +7847,8 @@ and the derived files
\InputenxSlot{172}{00A8}{\do{mac-centeuro}\do{mac-roman}}
\InputenxSlot{172}{00AC}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
- \do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}%
+ \do{cp1257}%
}
\InputenxSlot{172}{00BC}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -7701,7 +7872,7 @@ and the derived files
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
\do{iso-8859-5}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}%
\do{iso-8859-13}\do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{173}{015F}{\do{cp852}}
\InputenxSlot{173}{0413}{\do{cp855}}
@@ -7716,7 +7887,7 @@ and the derived files
\InputenxSlot{174}{00AE}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
\do{iso-8859-14}\do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}%
- \do{cp1257}%
+ \do{cp1255}\do{cp1257}%
}
\InputenxSlot{174}{00C6}{\do{mac-roman}}
\InputenxSlot{174}{0123}{\do{mac-centeuro}}
@@ -7731,7 +7902,7 @@ and the derived files
\InputenxSlot{175}{00A4}{\do{cp865}}
\InputenxSlot{175}{00AF}{%
\do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-8}\do{iso-8859-9}%
- \do{iso-8859-15}\do{cp1252}%
+ \do{iso-8859-15}\do{cp1252}\do{cp1255}%
}
\InputenxSlot{175}{00BB}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}%
@@ -7755,7 +7926,7 @@ and the derived files
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}%
\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}%
- \do{cp1257}\do{dec-mcs}%
+ \do{cp1255}\do{cp1257}\do{dec-mcs}%
}
\InputenxSlot{176}{00E3}{\do{atarist}}
\InputenxSlot{176}{012F}{\do{mac-centeuro}}
@@ -7770,7 +7941,7 @@ and the derived files
\InputenxSlot{177}{00B1}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}%
- \do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}%
+ \do{cp1255}\do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}%
}
\InputenxSlot{177}{00F5}{\do{atarist}}
\InputenxSlot{177}{0105}{\do{iso-8859-2}\do{iso-8859-4}\do{iso-8859-10}}
@@ -7786,7 +7957,8 @@ and the derived files
}
\InputenxSlot{178}{00B2}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}%
- \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}%
+ \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}%
+ \do{dec-mcs}%
}
\InputenxSlot{178}{00D8}{\do{atarist}}
\InputenxSlot{178}{010C}{\do{iso-8859-16}}
@@ -7804,7 +7976,8 @@ and the derived files
}
\InputenxSlot{179}{00B3}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}%
- \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}%
+ \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}%
+ \do{dec-mcs}%
}
\InputenxSlot{179}{00F8}{\do{atarist}}
\InputenxSlot{179}{0121}{\do{iso-8859-14}}
@@ -7823,7 +7996,8 @@ and the derived files
\InputenxSlot{180}{00A5}{\do{mac-roman}}
\InputenxSlot{180}{00B4}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
- \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1257}%
+ \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1255}%
+ \do{cp1257}%
}
\InputenxSlot{180}{00B7}{\do{nextstep}}
\InputenxSlot{180}{012B}{\do{iso-8859-10}\do{mac-centeuro}}
@@ -7843,7 +8017,7 @@ and the derived files
\InputenxSlot{181}{00B5}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}%
\do{iso-8859-13}\do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}%
- \do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}%
+ \do{cp1255}\do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}%
}
\InputenxSlot{181}{00C1}{\do{cp850}\do{cp852}\do{cp858}}
\InputenxSlot{181}{0129}{\do{iso-8859-4}\do{iso-8859-10}}
@@ -7859,7 +8033,8 @@ and the derived files
\InputenxSlot{182}{00B6}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
\do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}%
- \do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{nextstep}%
+ \do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
+ \do{nextstep}%
}
\InputenxSlot{182}{00C0}{\do{atarist}}
\InputenxSlot{182}{00C2}{\do{cp850}\do{cp852}\do{cp858}}
@@ -7876,7 +8051,7 @@ and the derived files
\InputenxSlot{183}{00B7}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}%
\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-15}\do{iso-8859-16}%
- \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}%
+ \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
}
\InputenxSlot{183}{00C0}{\do{cp850}\do{cp858}}
\InputenxSlot{183}{00C3}{\do{atarist}}
@@ -7893,7 +8068,7 @@ and the derived files
\InputenxSlot{184}{00A9}{\do{cp850}\do{cp858}}
\InputenxSlot{184}{00B8}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
- \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}%
+ \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1255}%
}
\InputenxSlot{184}{00D5}{\do{atarist}}
\InputenxSlot{184}{00F8}{\do{iso-8859-13}\do{cp1257}}
@@ -7912,7 +8087,7 @@ and the derived files
\InputenxSlot{185}{00A8}{\do{atarist}}
\InputenxSlot{185}{00B9}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
- \do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}%
+ \do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
}
\InputenxSlot{185}{0105}{\do{cp1250}}
\InputenxSlot{185}{010D}{\do{iso-8859-16}}
@@ -7936,7 +8111,7 @@ and the derived files
\do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
\do{dec-mcs}%
}
-\InputenxSlot{186}{00F7}{\do{iso-8859-8}}
+\InputenxSlot{186}{00F7}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{186}{0113}{\do{iso-8859-4}}
\InputenxSlot{186}{013C}{\do{mac-centeuro}}
\InputenxSlot{186}{0157}{\do{iso-8859-13}\do{cp1257}}
@@ -7958,7 +8133,7 @@ and the derived files
\InputenxSlot{187}{00BB}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}%
- \do{cp1257}\do{dec-mcs}\do{nextstep}%
+ \do{cp1255}\do{cp1257}\do{dec-mcs}\do{nextstep}%
}
\InputenxSlot{187}{011F}{\do{iso-8859-3}}
\InputenxSlot{187}{0123}{\do{iso-8859-4}}
@@ -7978,7 +8153,7 @@ and the derived files
\InputenxSlot{188}{00BA}{\do{mac-roman}}
\InputenxSlot{188}{00BC}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
- \do{cp1252}\do{cp1257}\do{dec-mcs}%
+ \do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
}
\InputenxSlot{188}{0135}{\do{iso-8859-3}}
\InputenxSlot{188}{013D}{\do{cp1250}}
@@ -8001,7 +8176,7 @@ and the derived files
\InputenxSlot{189}{00A9}{\do{atarist}}
\InputenxSlot{189}{00BD}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}%
- \do{iso-8859-13}\do{cp1252}\do{cp1257}\do{dec-mcs}%
+ \do{iso-8859-13}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}%
}
\InputenxSlot{189}{0139}{\do{mac-centeuro}}
\InputenxSlot{189}{014A}{\do{iso-8859-4}}
@@ -8023,7 +8198,7 @@ and the derived files
\InputenxSlot{190}{00AE}{\do{atarist}}
\InputenxSlot{190}{00BE}{%
\do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}%
- \do{cp1252}\do{cp1257}%
+ \do{cp1252}\do{cp1255}\do{cp1257}%
}
\InputenxSlot{190}{00E6}{\do{mac-roman}}
\InputenxSlot{190}{013A}{\do{mac-centeuro}}
@@ -8042,7 +8217,7 @@ and the derived files
\InputenxSlot{191}{00A9}{\do{koi8-r}}
\InputenxSlot{191}{00BF}{%
\do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
- \do{dec-mcs}\do{nextstep}%
+ \do{cp1255}\do{dec-mcs}\do{nextstep}%
}
\InputenxSlot{191}{00E6}{\do{iso-8859-13}\do{cp1257}}
\InputenxSlot{191}{00F8}{\do{mac-roman}}
@@ -8651,7 +8826,7 @@ and the derived files
\InputenxSlot{224}{042F}{\do{cp855}}
\InputenxSlot{224}{0430}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{224}{0440}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{224}{05D0}{\do{iso-8859-8}}
+\InputenxSlot{224}{05D0}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{224}{2021}{\do{mac-roman}}
\InputenxSlot{225}{00B7}{\do{mac-roman}}
\InputenxSlot{225}{00C6}{\do{nextstep}}
@@ -8670,7 +8845,7 @@ and the derived files
\InputenxSlot{225}{0431}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{225}{0440}{\do{cp855}}
\InputenxSlot{225}{0441}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{225}{05D1}{\do{iso-8859-8}}
+\InputenxSlot{225}{05D1}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{226}{00D4}{\do{cp850}\do{cp852}\do{cp858}}
\InputenxSlot{226}{00E2}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -8684,7 +8859,7 @@ and the derived files
\InputenxSlot{226}{0420}{\do{cp855}}
\InputenxSlot{226}{0432}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{226}{0442}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{226}{05D2}{\do{iso-8859-8}}
+\InputenxSlot{226}{05D2}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{226}{201A}{\do{mac-centeuro}\do{mac-roman}}
\InputenxSlot{227}{00AA}{\do{nextstep}}
\InputenxSlot{227}{00D2}{\do{cp850}\do{cp858}}
@@ -8700,7 +8875,7 @@ and the derived files
\InputenxSlot{227}{0433}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{227}{0441}{\do{cp855}}
\InputenxSlot{227}{0443}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{227}{05D3}{\do{iso-8859-8}}
+\InputenxSlot{227}{05D3}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{227}{201E}{\do{mac-centeuro}\do{mac-roman}}
\InputenxSlot{228}{00E4}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -8717,7 +8892,7 @@ and the derived files
\InputenxSlot{228}{0421}{\do{cp855}}
\InputenxSlot{228}{0434}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{228}{0444}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{228}{05D4}{\do{iso-8859-8}}
+\InputenxSlot{228}{05D4}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{228}{2030}{\do{mac-roman}}
\InputenxSlot{229}{00C2}{\do{mac-roman}}
\InputenxSlot{229}{00D5}{\do{cp850}\do{cp858}}
@@ -8737,7 +8912,7 @@ and the derived files
\InputenxSlot{229}{0435}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{229}{0442}{\do{cp855}}
\InputenxSlot{229}{0445}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{229}{05D5}{\do{iso-8859-8}}
+\InputenxSlot{229}{05D5}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{230}{00B5}{%
\do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}%
}
@@ -8757,7 +8932,7 @@ and the derived files
\InputenxSlot{230}{0424}{\do{koi8-r}}
\InputenxSlot{230}{0436}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{230}{0446}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{230}{05D6}{\do{iso-8859-8}}
+\InputenxSlot{230}{05D6}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{231}{00C1}{\do{mac-centeuro}\do{mac-roman}}
\InputenxSlot{231}{00E7}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-9}%
@@ -8774,7 +8949,7 @@ and the derived files
\InputenxSlot{231}{0437}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{231}{0443}{\do{cp855}}
\InputenxSlot{231}{0447}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{231}{05D7}{\do{iso-8859-8}}
+\InputenxSlot{231}{05D7}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{232}{00CB}{\do{mac-roman}}
\InputenxSlot{232}{00DE}{\do{cp850}\do{cp858}}
\InputenxSlot{232}{00E8}{%
@@ -8793,7 +8968,7 @@ and the derived files
\InputenxSlot{232}{0425}{\do{koi8-r}}
\InputenxSlot{232}{0438}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{232}{0448}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{232}{05D8}{\do{iso-8859-8}}
+\InputenxSlot{232}{05D8}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{233}{00C8}{\do{mac-roman}}
\InputenxSlot{233}{00D8}{\do{nextstep}}
\InputenxSlot{233}{00DA}{\do{cp850}\do{cp852}\do{cp858}}
@@ -8809,7 +8984,7 @@ and the derived files
\InputenxSlot{233}{0436}{\do{cp855}}
\InputenxSlot{233}{0439}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{233}{0449}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{233}{05D9}{\do{iso-8859-8}}
+\InputenxSlot{233}{05D9}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{234}{00CD}{\do{mac-centeuro}\do{mac-roman}}
\InputenxSlot{234}{00DB}{\do{cp850}\do{cp858}}
\InputenxSlot{234}{00EA}{%
@@ -8827,7 +9002,7 @@ and the derived files
\InputenxSlot{234}{0419}{\do{koi8-r}}
\InputenxSlot{234}{043A}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{234}{044A}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{234}{05DA}{\do{iso-8859-8}}
+\InputenxSlot{234}{05DA}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{235}{00BA}{\do{nextstep}}
\InputenxSlot{235}{00CE}{\do{mac-roman}}
\InputenxSlot{235}{00D9}{\do{cp850}\do{cp858}}
@@ -8844,7 +9019,7 @@ and the derived files
\InputenxSlot{235}{0432}{\do{cp855}}
\InputenxSlot{235}{043B}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{235}{044B}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{235}{05DB}{\do{iso-8859-8}}
+\InputenxSlot{235}{05DB}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{236}{00CF}{\do{mac-roman}}
\InputenxSlot{236}{00EC}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
@@ -8860,7 +9035,7 @@ and the derived files
\InputenxSlot{236}{041B}{\do{koi8-r}}
\InputenxSlot{236}{043C}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{236}{044C}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{236}{05DC}{\do{iso-8859-8}}
+\InputenxSlot{236}{05DC}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{236}{221E}{\do{cp437}\do{cp865}}
\InputenxSlot{236}{222E}{\do{atarist}}
\InputenxSlot{237}{00CC}{\do{mac-roman}}
@@ -8878,7 +9053,7 @@ and the derived files
\InputenxSlot{237}{043D}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{237}{044C}{\do{cp855}}
\InputenxSlot{237}{044D}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{237}{05DD}{\do{iso-8859-8}}
+\InputenxSlot{237}{05DD}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{238}{00AF}{\do{cp850}\do{cp858}}
\InputenxSlot{238}{00D3}{\do{mac-centeuro}\do{mac-roman}}
\InputenxSlot{238}{00EE}{%
@@ -8894,7 +9069,7 @@ and the derived files
\InputenxSlot{238}{042C}{\do{cp855}}
\InputenxSlot{238}{043E}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{238}{044E}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{238}{05DE}{\do{iso-8859-8}}
+\InputenxSlot{238}{05DE}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{238}{2208}{\do{atarist}}
\InputenxSlot{239}{00B4}{\do{cp850}\do{cp852}\do{cp858}}
\InputenxSlot{239}{00D4}{\do{mac-centeuro}\do{mac-roman}}
@@ -8910,7 +9085,7 @@ and the derived files
\InputenxSlot{239}{041E}{\do{koi8-r}}
\InputenxSlot{239}{043F}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{239}{044F}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{239}{05DF}{\do{iso-8859-8}}
+\InputenxSlot{239}{05DF}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{239}{2116}{\do{cp855}}
\InputenxSlot{239}{2229}{\do{atarist}\do{cp437}\do{cp865}}
\InputenxSlot{240}{00AD}{%
@@ -8930,7 +9105,7 @@ and the derived files
\InputenxSlot{240}{0401}{\do{cp866}}
\InputenxSlot{240}{041F}{\do{koi8-r}}
\InputenxSlot{240}{0440}{\do{cp1251}\do{mac-cyrillic}}
-\InputenxSlot{240}{05E0}{\do{iso-8859-8}}
+\InputenxSlot{240}{05E0}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{240}{2116}{\do{iso-8859-5}}
\InputenxSlot{240}{2261}{\do{atarist}\do{cp437}\do{cp865}}
\InputenxSlot{241}{00B1}{%
@@ -8953,7 +9128,7 @@ and the derived files
\InputenxSlot{241}{0441}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{241}{044B}{\do{cp855}}
\InputenxSlot{241}{0451}{\do{iso-8859-5}\do{cp866}}
-\InputenxSlot{241}{05E1}{\do{iso-8859-8}}
+\InputenxSlot{241}{05E1}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{242}{00DA}{\do{mac-centeuro}\do{mac-roman}}
\InputenxSlot{242}{00F2}{%
\do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
@@ -8969,7 +9144,7 @@ and the derived files
\InputenxSlot{242}{042B}{\do{cp855}}
\InputenxSlot{242}{0442}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{242}{0452}{\do{iso-8859-5}}
-\InputenxSlot{242}{05E2}{\do{iso-8859-8}}
+\InputenxSlot{242}{05E2}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{242}{2017}{\do{cp850}\do{cp858}}
\InputenxSlot{242}{2265}{\do{atarist}\do{cp437}\do{cp865}}
\InputenxSlot{243}{00BE}{\do{cp850}\do{cp858}}
@@ -8988,7 +9163,7 @@ and the derived files
\InputenxSlot{243}{0443}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{243}{0453}{\do{iso-8859-5}}
\InputenxSlot{243}{0454}{\do{cp866}}
-\InputenxSlot{243}{05E3}{\do{iso-8859-8}}
+\InputenxSlot{243}{05E3}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{243}{2264}{\do{atarist}\do{cp437}\do{cp865}}
\InputenxSlot{244}{00B6}{\do{cp850}\do{cp858}}
\InputenxSlot{244}{00D9}{\do{mac-roman}}
@@ -9006,7 +9181,7 @@ and the derived files
\InputenxSlot{244}{0422}{\do{koi8-r}}
\InputenxSlot{244}{0444}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{244}{0454}{\do{iso-8859-5}}
-\InputenxSlot{244}{05E4}{\do{iso-8859-8}}
+\InputenxSlot{244}{05E4}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{245}{00A7}{\do{cp850}\do{cp852}\do{cp858}}
\InputenxSlot{245}{00F5}{%
\do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}%
@@ -9022,7 +9197,7 @@ and the derived files
\InputenxSlot{245}{0448}{\do{cp855}}
\InputenxSlot{245}{0455}{\do{iso-8859-5}}
\InputenxSlot{245}{0457}{\do{cp866}}
-\InputenxSlot{245}{05E5}{\do{iso-8859-8}}
+\InputenxSlot{245}{05E5}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{246}{00F6}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
\do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-14}%
@@ -9040,7 +9215,7 @@ and the derived files
\InputenxSlot{246}{0428}{\do{cp855}}
\InputenxSlot{246}{0446}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{246}{0456}{\do{iso-8859-5}}
-\InputenxSlot{246}{05E6}{\do{iso-8859-8}}
+\InputenxSlot{246}{05E6}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{247}{00B8}{\do{cp850}\do{cp852}\do{cp858}}
\InputenxSlot{247}{00F7}{%
\do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -9058,7 +9233,7 @@ and the derived files
\InputenxSlot{247}{044D}{\do{cp855}}
\InputenxSlot{247}{0457}{\do{iso-8859-5}}
\InputenxSlot{247}{045E}{\do{cp866}}
-\InputenxSlot{247}{05E7}{\do{iso-8859-8}}
+\InputenxSlot{247}{05E7}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{247}{1E6B}{\do{iso-8859-14}}
\InputenxSlot{247}{2248}{\do{atarist}\do{cp437}\do{cp865}}
\InputenxSlot{248}{00AF}{\do{mac-roman}}
@@ -9080,7 +9255,7 @@ and the derived files
\InputenxSlot{248}{042D}{\do{cp855}}
\InputenxSlot{248}{0448}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{248}{0458}{\do{iso-8859-5}}
-\InputenxSlot{248}{05E8}{\do{iso-8859-8}}
+\InputenxSlot{248}{05E8}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{249}{00A8}{\do{cp850}\do{cp852}\do{cp858}}
\InputenxSlot{249}{00F8}{\do{nextstep}}
\InputenxSlot{249}{00F9}{%
@@ -9095,7 +9270,7 @@ and the derived files
\InputenxSlot{249}{042B}{\do{koi8-r}}
\InputenxSlot{249}{0449}{\do{cp855}\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{249}{0459}{\do{iso-8859-5}}
-\InputenxSlot{249}{05E9}{\do{iso-8859-8}}
+\InputenxSlot{249}{05E9}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{249}{2219}{%
\do{atarist}\do{cp437}\do{cp865}\do{cp866}%
}
@@ -9115,7 +9290,7 @@ and the derived files
\InputenxSlot{250}{0429}{\do{cp855}}
\InputenxSlot{250}{044A}{\do{cp1251}\do{mac-cyrillic}}
\InputenxSlot{250}{045A}{\do{iso-8859-5}}
-\InputenxSlot{250}{05EA}{\do{iso-8859-8}}
+\InputenxSlot{250}{05EA}{\do{iso-8859-8}\do{cp1255}}
\InputenxSlot{251}{00B9}{\do{cp850}\do{cp858}}
\InputenxSlot{251}{00DF}{\do{nextstep}}
\InputenxSlot{251}{00FB}{%
@@ -9221,7 +9396,7 @@ and the derived files
% \begin{macrocode}
%<*uc>
\ProvidesFile{ix-uc.def}%
- [2011/04/10 v1.8 UC to LICR (inputenx)]%
+ [2011/05/27 v1.10 UC to LICR (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
% \end{macrocode}
@@ -10294,7 +10469,7 @@ and the derived files
% \begin{macrocode}
%<*math>
\ProvidesFile{ix-math.def}%
- [2011/04/10 v1.8 Math list (inputenx)]%
+ [2011/05/27 v1.10 Math list (inputenx)]%
\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax}
\makeatletter
% \end{macrocode}
@@ -10386,7 +10561,7 @@ and the derived files
% defined by standard \LaTeX\ without extra packages.
% \begin{macrocode}
%<*licrcmds>
- % List of known LICR commdands of inputenx 2011/04/10 v1.8
+ % List of known LICR commdands of inputenx 2011/05/27 v1.10
%
% Format: \LICRcmd{<command>}{<type>}
% Types:
@@ -10495,7 +10670,7 @@ and the derived files
%
% \begin{macrocode}
%<*dfudoc>
- % inputenx-utf8enc.txt 2011/04/10 v1.8
+ % inputenx-utf8enc.txt 2011/05/27 v1.10
% Commented additions for utf8enc.dfu
% \end{macrocode}
@@ -11662,6 +11837,7 @@ and the derived files
% x-cp1250.def & tex/latex/oberdiek/x-cp1250.def\\
% x-cp1251.def & tex/latex/oberdiek/x-cp1251.def\\
% x-cp1252.def & tex/latex/oberdiek/x-cp1252.def\\
+% x-cp1255.def & tex/latex/oberdiek/x-cp1255.def\\
% x-cp1257.def & tex/latex/oberdiek/x-cp1257.def\\
% x-dec-mcs.def & tex/latex/oberdiek/x-dec-mcs.def\\
% x-koi8-r.def & tex/latex/oberdiek/x-koi8-r.def\\
@@ -11792,117 +11968,154 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{inputenx.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='inputenx'>
+ <name>inputenx</name>
+ <caption>Enhanced input encoding handling.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ This package deals with input encodings. The first stage
+ provides input encodings using
+ standard mappings and covers nearly all slots. Thus it
+ serves as more uptodate replacement for package
+ <xref refid='inputenc'>inputenc</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/inputenx.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/inputenx.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{ltc}
% Frank Mittelbach, Michel Goossens,
% \textit{The \LaTeX\ Companion}, second edition, April 2004.
-%
+%
% \bibitem{inputenc}
% Alan Jeffrey, Frank Mittelbach,
% \textit{inputenc.sty}, 2006/05/05 v1.1b.
% \CTAN{macros/latex/base/inputenc.dtx}
-%
+%
% \bibitem{selinput}
% Heiko Oberdiek,
% \textit{The \xpackage{selinput} package}, 2007/06/16 v1.1.
% \CTAN{macros/latex/contrib/oberdiek/selinput.pdf}
-%
+%
% \bibitem{pmboxdraw}
% Heiko Oberdiek,
% \textit{The \xpackage{pmboxdraw} package}, 2006/05/03 v1.0.
% \CTAN{macros/latex/contrib/oberdiek/pmboxdraw.pdf}
-%
+%
% \bibitem{dash}
% Wikipedia, \textit{Dash}.
% \url{http://en.wikipedia.org/wiki/Dash}
-%
+%
% \subsection{Mappings to Unicode}
-%
+%
% \bibitem{atarist}
% Philippe Verdy, Bruno Haible,
% \textit{AtariST to Unicode}, 22th April 2005.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/ATARIST.TXT}
-%
+%
% \bibitem{iso8859-1}
% Ken Whistler,
% \textit{ISO/IEC 8859-1:1998 to Unicode}, 27th July 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-1.TXT}
-%
+%
% \bibitem{iso8859-2}
% Ken Whistler,
% \textit{ISO/IEC 8859-2:1999 to Unicode}, 27th July 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-2.TXT}
-%
+%
% \bibitem{iso8859-3}
% Ken Whistler,
% \textit{ISO/IEC 8859-3:1999 to Unicode}, 27th July 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-3.TXT}
-%
+%
% \bibitem{iso8859-4}
% Ken Whistler,
% \textit{ISO/IEC 8859-4:1998 to Unicode}, 27th July 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-4.TXT}
-%
+%
% \bibitem{iso8859-5}
% Ken Whistler,
% \textit{ISO/IEC 8859-5:1998 to Unicode}, 27th July 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-5.TXT}
-%
+%
% \bibitem{iso8859-8}
% Ken Whistler,
% \textit{ISO/IEC 8859-8:1999 to Unicode}, 3rd January 2000.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-8.TXT}
-%
+%
% \bibitem{iso8859-9}
% Ken Whistler,
% \textit{ISO/IEC 8859-9:1999 to Unicode}, 27th July 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-9.TXT}
-%
+%
% \bibitem{iso8859-15}
% Ken Whistler,
% \textit{ISO/IEC 8859-15:1999 to Unicode}, 27th July 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-15.TXT}
-%
+%
% \bibitem{iso8859-16}
% Ken Whistler,
% \textit{ISO/IEC 8859-16:2001 to Unicode}, 26th July 2001.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-16.TXT}
-%
+%
% \bibitem{koi8-r}
% Helmut Richter,
% \textit{KOI8-R (RFC1486) to Unicode}, 18th August 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT}
-%
+%
% \bibitem{mac-centeuro}
% Apple Computer,
% \textit{Map (external version) from MAC OS Central European character
% set to Unicode 2.1 and later}, 4th April 2005.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CENTEURO.TXT}
-%
+%
% \bibitem{mac-cyrillic}
% Apple Computer,
% \textit{Map (external version) from MAC OS Cyrillic character
% set to Unicode 2.1 and later}, 5th April 2005.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CYRILLIC.TXT}
-%
+%
% \bibitem{mac-roman}
% Apple Computer,
% \textit{Map (external version) from MAC OS Roman character
% set to Unicode 2.1 and later}, 5th April 2005.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ROMAN.TXT}
-%
+%
% \bibitem{mac-ukrainian}
% Apple Computer,
% \textit{Map (external version) from MAC OS Urainian character
% set to Unicode 2.1 and later}, 5th April 2005.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/UKRAINE.TXT}
-%
+%
% \bibitem{nextstep}
% Rick McGowan,
% \textit{NextStep Encoding to Unicode}, 23rd September 1999.
% \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/NEXT/NEXTSTEP.TXT}
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -11957,6 +12170,14 @@ and the derived files
% Some accented characters from set ``Latin Extended-B'' added to
% \xfile{if-utf8enc.dfu}.
% \end{Version}
+% \begin{Version}{2011/04/26 v1.9}
+% \item
+% Added encoding: cp1255 (Hebrew, letters only).
+% \end{Version}
+% \begin{Version}{2011/05/27 v1.10}
+% \item
+% Documentation fixed (missing |\end{verbatim}| added).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
index c31033ec217..9d1ec520e53 100644
--- a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: intcalc.dtx
% Version: 2007/09/27 v1.1
-%
+% Info: Expandable calculations with integers
+%
% Copyright (C) 2007 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file intcalc.dtx
% and the derived files
% intcalc.sty, intcalc.pdf, intcalc.ins, intcalc.drv,
% intcalc-test1.tex, intcalc-test2.tex, intcalc-test3.tex,
% intcalc-test4.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/intcalc.dtx
% CTAN:macros/latex/contrib/oberdiek/intcalc.pdf
-%
+%
% Unpacking:
% (a) If intcalc.ins is present:
% tex intcalc.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{intcalc.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If intcalc.drv is present:
% latex intcalc.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex intcalc.dtx
% makeindex -s gind.ist intcalc.idx
% pdflatex intcalc.dtx
% makeindex -s gind.ist intcalc.idx
% pdflatex intcalc.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/intcalc.sty
% TDS:doc/latex/oberdiek/intcalc.pdf
@@ -83,7 +84,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: intcalc 2007/09/27 v1.1 Expandable integer calculations (HO)}
+\Msg{* Package: intcalc 2007/09/27 v1.1 Expandable calculations with integers (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -136,6 +137,10 @@ and the derived files
\file{intcalc-test2.tex}{\from{intcalc.dtx}{test2,etex}}%
\file{intcalc-test3.tex}{\from{intcalc.dtx}{test2,noetex}}%
\file{intcalc-test4.tex}{\from{intcalc.dtx}{test4,etex}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{intcalc.xml}{\from{intcalc.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -162,9 +167,8 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{intcalc.drv}%
- [2007/09/27 v1.1 Expandable integer calculations (HO)]%
+ [2007/09/27 v1.1 Expandable calculations with integers (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
\usepackage{wasysym}
\let\iint\relax
\let\iiint\relax
@@ -199,13 +203,14 @@ and the derived files
\newcommand*{\op}[1]{%
\textsf{#1}%
}
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{intcalc.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{3221}
+% \CheckSum{3222}
%
% \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
@@ -525,7 +530,7 @@ and the derived files
% \end{gather*}
% ($0! = 1$)
%
-% \begin{declcs}{intcalcPow} M{x} M{y}
+% \begin{declcs}{intcalcPow} \M{x} \M{y}
% \end{declcs}
% Macro \cs{intcalcPow} calculates the value of \meta{x} to the
% power of \meta{y}. The error ``division by zero'' is thrown
@@ -695,7 +700,7 @@ and the derived files
\fi
\expandafter\x\csname ver@intcalc.sty\endcsname
\ProvidesPackage{intcalc}%
- [2007/09/27 v1.1 Expandable integer calculations (HO)]%
+ [2007/09/27 v1.1 Expandable calculations with integers (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -4239,6 +4244,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{intcalc.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='intcalc'>
+ <name>intcalc</name>
+ <caption>Expandable arithmetic operations with integers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package provides expandable arithmetic operations
+ with integers, using the e-TeX extension <tt>\numexpr</tt> if it
+ is available.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/intcalc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/intcalc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/09/09 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx
index afff5f48f40..fc886576c52 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: kvdefinekeys.dtx
% Version: 2011/04/07 v1.3
-%
+% Info: Define keys
+%
% Copyright (C) 2010, 2011 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file kvdefinekeys.dtx
% and the derived files
% kvdefinekeys.sty, kvdefinekeys.pdf, kvdefinekeys.ins, kvdefinekeys.drv,
% kvdefinekeys-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/kvdefinekeys.dtx
% CTAN:macros/latex/contrib/oberdiek/kvdefinekeys.pdf
-%
+%
% Unpacking:
% (a) If kvdefinekeys.ins is present:
% tex kvdefinekeys.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{kvdefinekeys.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If kvdefinekeys.drv is present:
% latex kvdefinekeys.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex kvdefinekeys.dtx
% makeindex -s gind.ist kvdefinekeys.idx
% pdflatex kvdefinekeys.dtx
% makeindex -s gind.ist kvdefinekeys.idx
% pdflatex kvdefinekeys.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/kvdefinekeys.sty
% TDS:doc/latex/oberdiek/kvdefinekeys.pdf
@@ -79,7 +80,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: kvdefinekeys 2011/04/07 v1.3 Defining keys (HO)}
+\Msg{* Package: kvdefinekeys 2011/04/07 v1.3 Define keys (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -128,6 +129,10 @@ and the derived files
\file{kvdefinekeys.sty}{\from{kvdefinekeys.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{kvdefinekeys-test1.tex}{\from{kvdefinekeys.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{kvdefinekeys.xml}{\from{kvdefinekeys.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -154,16 +159,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{kvdefinekeys.drv}%
- [2011/04/07 v1.3 Defining keys (HO)]%
+ [2011/04/07 v1.3 Define keys (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{kvdefinekeys.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{426}
+% \CheckSum{428}
%
% \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
@@ -302,7 +307,7 @@ and the derived files
\fi
\expandafter\x\csname ver@kvdefinekeys.sty\endcsname
\ProvidesPackage{kvdefinekeys}%
- [2011/04/07 v1.3 Defining keys (HO)]%
+ [2011/04/07 v1.3 Define keys (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -708,13 +713,49 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{kvdefinekeys.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='kvdefinekeys'>
+ <name>kvdefinekeys</name>
+ <caption>Define keys for use in the kvsetkeys package.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ The package provides a macro <tt>\kv@define@key</tt> (analogous to
+ <xref refid='keyval'>keyval&#x2019;s</xref> <tt>\define@key</tt>, to
+ define keys for use by <xref refid='kvsetkeys'>kvsetkeys</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/kvdefinekeys.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/kvdefinekeys.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{keyval}
% David Carlisle:
% \textit{The \xpackage{keyval} package};
% 1999/03/16 v1.13;
% \CTAN{macros/latex/required/graphics/keyval.dtx}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
index b320732c69f..0b98b24d021 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: kvoptions.dtx
-% Version: 2010/12/23 v3.10
-%
-% Copyright (C) 2004, 2006, 2007, 2009, 2010 by
+% Version: 2011/06/30 v3.11
+% Info: Key value format for package options
+%
+% Copyright (C) 2004, 2006, 2007, 2009-2011 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
@@ -15,11 +16,11 @@
% 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 kvoptions.dtx
% and the derived files
% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
@@ -27,11 +28,11 @@
% kvoptions-test1.tex, kvoptions-test2.tex,
% kvoptions-test3.tex, kvoptions-test4.tex,
% kvoptions-test4.sty.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/kvoptions.dtx
% CTAN:macros/latex/contrib/oberdiek/kvoptions.pdf
-%
+%
% Unpacking:
% (a) If kvoptions.ins is present:
% tex kvoptions.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{kvoptions.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If kvoptions.drv is present:
% latex kvoptions.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex kvoptions.dtx
% makeindex -s gind.ist kvoptions.idx
% pdflatex kvoptions.dtx
% makeindex -s gind.ist kvoptions.idx
% pdflatex kvoptions.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/kvoptions.sty
% TDS:tex/latex/oberdiek/kvoptions-patch.sty
@@ -85,7 +86,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: kvoptions 2010/12/23 v3.10 Keyval support for LaTeX options (HO)}
+\Msg{* Package: kvoptions 2011/06/30 v3.11 Key value format for package options (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -97,9 +98,9 @@
This is a generated file.
Project: kvoptions
-Version: 2010/12/23 v3.10
+Version: 2011/06/30 v3.11
-Copyright (C) 2004, 2006, 2007, 2009, 2010 by
+Copyright (C) 2004, 2006, 2007, 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -141,6 +142,10 @@ and the derived files
\file{kvoptions-test3.tex}{\from{kvoptions.dtx}{test3}}%
\file{kvoptions-test4.tex}{\from{kvoptions.dtx}{test4}}%
\file{kvoptions-test4.sty}{\from{kvoptions.dtx}{test4pkg}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{kvoptions.xml}{\from{kvoptions.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -167,16 +172,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{kvoptions.drv}%
- [2010/12/23 v3.10 Keyval support for LaTeX options (HO)]%
+ [2011/06/30 v3.11 Key value format for package options (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{kvoptions.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{2361}
+% \CheckSum{2398}
%
% \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
@@ -197,7 +202,7 @@ and the derived files
% \GetFileInfo{kvoptions.drv}
%
% \title{The \xpackage{kvoptions} package}
-% \date{2010/12/23 v3.10}
+% \date{2011/06/30 v3.11}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -485,7 +490,7 @@ and the derived files
% Sometimes contrasting names are used to characterize the
% two states of a boolean switch, for example \xoption{draft}
% vs.\@ \xoption{final}. Both options behave like boolean
-% options but they do not need to different switches, they
+% options but they do not need two different switches, they
% should share one. \cs{DeclareComplementaryOption} allows this.
% The option \meta{key} shares the switch of option \meta{parent}.
% Example:
@@ -763,7 +768,7 @@ and the derived files
% Package identification
% -----------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{example-mycolorsetup}[2010/12/23 Managing my colors]
+\ProvidesPackage{example-mycolorsetup}[2011/06/30 Managing my colors]
\RequirePackage{ifpdf}
\RequirePackage{kvoptions}
@@ -944,7 +949,7 @@ and the derived files
% Some remarks:
% \begin{itemize}
% \item The patch requires \eTeX, its \cs{unexpanded} feature
-% is much to nice. It is possible to work around using token
+% is much too nice. It is possible to work around using token
% registers. But the code becomes longer, slower, more difficult
% to read and maintain. The package without option \xoption{patch}
% works and will work without \eTeX.
@@ -1146,7 +1151,7 @@ and the derived files
\fi
\expandafter\x\csname ver@kvoptions.sty\endcsname
\ProvidesPackage{kvoptions}%
- [2010/12/23 v3.10 Keyval support for LaTeX options (HO)]%
+ [2011/06/30 v3.11 Key value format for package options (HO)]%
% \end{macrocode}
%
% \paragraph{Catcodes}
@@ -1251,7 +1256,7 @@ and the derived files
% \begin{macrocode}
\DeclareOption{patch}{%
\AtEndOfPackage{%
- \RequirePackage{kvoptions-patch}[2010/12/23]%
+ \RequirePackage{kvoptions-patch}[2011/06/30]%
}%
}
% \end{macrocode}
@@ -1858,6 +1863,59 @@ and the derived files
%
% \subsection{Process options}
%
+% \subsubsection{Get global options}
+%
+% Package \xpackage{xkeyval} removes options with equal signs from
+% the global options (\cs{@classoptionslist}). The effect is that
+% other packages and classes will not see these global options anymore.
+% A bug-report was answered that this behaviour is ``by design''.
+% Thus I call it a design bug. Now getting the global options require
+% an algorithm instead of a simple macro call.
+% \begin{macrocode}
+%</package>
+%<*package|patch>
+% \end{macrocode}
+% \begin{macro}{\KVO@IfDefThen}
+% Call |#2| if command |#1| is defined and not \cs{relax}.
+% (Package \xpackage{kvoptions-patch} does not load
+% package \xpackage{ltxcmds}.)
+% \begin{macrocode}
+\def\KVO@IfDefThen#1#2{%
+ \ifx#1\ltx@undefined
+ \else
+ \ifx#1\relax
+ \else
+ #2%
+ \fi
+ \fi
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\KVO@GetClassOptionsList}
+% \begin{macrocode}
+\def\KVO@GetClassOptionsList{%
+ \let\KVO@classoptionslist\@classoptionslist
+ \KVO@IfDefThen\@classoptionslist{%
+ \KVO@IfDefThen\XKV@documentclass{%
+ \ifx\XKV@documentclass\ltx@empty
+ \else
+ \KVO@IfDefThen\XKV@classoptionslist{%
+ \ifx\XKV@classoptionslist\ltx@empty
+ \else
+ \let\KVO@classoptionslist\XKV@classoptionslist
+ \fi
+ }%
+ \fi
+ }%
+ }%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+%</package|patch>
+%<*package>
+% \end{macrocode}
+%
% \subsubsection{\cs{ProcessKeyvalOptions}}
%
% \begin{macro}{\ProcessKeyvalOptions}
@@ -1888,9 +1946,10 @@ and the derived files
% \begin{macrocode}
\ifx\@currext\@clsextension
\else
- \ifx\@classoptionslist\relax
+ \KVO@GetClassOptionsList
+ \ifx\KVO@classoptionslist\relax
\else
- \@for\KVO@CurrentOption:=\@classoptionslist\do{%
+ \@for\KVO@CurrentOption:=\KVO@classoptionslist\do{%
\@ifundefined{KV@#1@\expandafter\KVO@getkey
\KVO@CurrentOption=\@nil}{%
}{%
@@ -2226,7 +2285,7 @@ and the derived files
\TMP@EnsureCode{124}{12}% |
\edef\KVO@AtEnd{\KVO@AtEnd\noexpand\endinput}
\ProvidesPackage{kvoptions-patch}%
- [2010/12/23 v3.10 LaTeX patch for keyval options (HO)]%
+ [2011/06/30 v3.11 LaTeX patch for keyval options (HO)]%
% \end{macrocode}
%
% Check for \eTeX.
@@ -2326,7 +2385,8 @@ and the derived files
\ifx\@currext\@clsextension
\toks@{}%
\else
- \toks@\expandafter{\@classoptionslist,}%
+ \KVO@GetClassOptionsList
+ \toks@\expandafter{\KVO@classoptionslist,}%
\fi
\toks\tw@\expandafter{\@curroptions}%
\edef\x{\endgroup
@@ -2347,7 +2407,8 @@ and the derived files
\def\KVO@xprocess@ptions{%
\ifx\@currext\@clsextension
\else
- \@for\CurrentOption:=\@classoptionslist\do{%
+ \KVO@GetClassOptionsList
+ \@for\CurrentOption:=\KVO@classoptionslist\do{%
\ifx\CurrentOption\@empty
\else
\KVO@in@\CurrentOption\@declaredoptions
@@ -2896,7 +2957,7 @@ and the derived files
%<*test3>
\NeedsTeXFormat{LaTeX2e}
\makeatletter
-\RequirePackage{kvoptions}[2010/12/23]
+\RequirePackage{kvoptions}[2011/06/30]
\def\msg#{\immediate\write16}
\define@key{testfamily}{testkey}{%
\msg{[testfamily/testkey/#1]}%
@@ -2936,8 +2997,8 @@ and the derived files
% \begin{macrocode}
%<*test4pkg>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{kvoptions-test4}[2010/12/23 package for testing]
-\RequirePackage{kvoptions}[2010/12/23]
+\ProvidesPackage{kvoptions-test4}[2011/06/30 package for testing]
+\RequirePackage{kvoptions}[2011/06/30]
\SetupKeyvalOptions{%
family=FOO,%
prefix=foo,%
@@ -2956,10 +3017,10 @@ and the derived files
% \begin{macrocode}
%<*test4>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{kvoptions-test4.tex}[2010/12/23 test file]
+\ProvidesFile{kvoptions-test4.tex}[2011/06/30 test file]
\RequirePackage[%
str=A,set=B,str=C,%
-]{kvoptions-test4}[2010/12/23]
+]{kvoptions-test4}[2011/06/30]
\def\TestExpected{C}
\ifx\foostr\TestExpected
\typeout{* Test ok.}%
@@ -3160,12 +3221,46 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{kvoptions.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='kvoptions'>
+ <name>kvoptions</name>
+ <caption>Key value format for package options.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2004,2006,2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='3.11'/>
+ <description>
+ This package offers support for package authors who want to
+ use options in key-value format for their package options.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/kvoptions.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/kvoptions.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \newcommand*{\bibpackage}[4]{^^A
% \bibitem{#1}
% Package \xpackage{#1}, #2, #3.^^A
% \ifx\\#4\\\else\space#4\fi\par
% }
-%
+%
% \begin{thebibliography}{99}
% \bibitem{tb94wright}
% A guide to key-value methods, Joseph Wright, second draft for
@@ -3191,7 +3286,7 @@ and the derived files
% The \LaTeX3 Project, \textit{\LaTeXe\ for class and package writers},
% 2003/12/09.
% \CTAN{macros/latex/doc/clsguide.pdf}
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -3324,6 +3419,11 @@ and the derived files
% \hologo{TeX} argument to improve compatibility with
% \cs{DeclareOption}.
% \end{Version}
+% \begin{Version}{2011/06/30 v3.11}
+% \item
+% Fix because of design bug in package \xpackage{xkeyval} that
+% removes global options with equal signs.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
index fb6d8b26895..68dd55834eb 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: kvsetkeys.dtx
-% Version: 2011/04/07 v1.13
-%
-% Copyright (C) 2006, 2007, 2009-2011 by
+% Version: 2012/04/25 v1.16
+% Info: Key value parser
+%
+% Copyright (C) 2006, 2007, 2009-2012 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
@@ -15,24 +16,25 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file kvsetkeys.dtx
% and the derived files
% kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv,
% kvsetkeys-example.tex, kvsetkeys-test1.tex,
-% kvsetkeys-test2.tex, kvsetkeys-test3.tex.
-%
+% kvsetkeys-test2.tex, kvsetkeys-test3.tex,
+% kvsetkeys-test4.tex.
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/kvsetkeys.dtx
% CTAN:macros/latex/contrib/oberdiek/kvsetkeys.pdf
-%
+%
% Unpacking:
% (a) If kvsetkeys.ins is present:
% tex kvsetkeys.ins
@@ -41,7 +43,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{kvsetkeys.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If kvsetkeys.drv is present:
% latex kvsetkeys.drv
@@ -51,14 +53,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex kvsetkeys.dtx
% makeindex -s gind.ist kvsetkeys.idx
% pdflatex kvsetkeys.dtx
% makeindex -s gind.ist kvsetkeys.idx
% pdflatex kvsetkeys.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/kvsetkeys.sty
% TDS:doc/latex/oberdiek/kvsetkeys.pdf
@@ -66,6 +68,7 @@
% TDS:doc/latex/oberdiek/test/kvsetkeys-test1.tex
% TDS:doc/latex/oberdiek/test/kvsetkeys-test2.tex
% TDS:doc/latex/oberdiek/test/kvsetkeys-test3.tex
+% TDS:doc/latex/oberdiek/test/kvsetkeys-test4.tex
% TDS:source/latex/oberdiek/kvsetkeys.dtx
%
%<*ignore>
@@ -83,7 +86,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: kvsetkeys 2011/04/07 v1.13 Key value parser (HO)}
+\Msg{* Package: kvsetkeys 2012/04/25 v1.16 Key value parser (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -95,9 +98,9 @@
This is a generated file.
Project: kvsetkeys
-Version: 2011/04/07 v1.13
+Version: 2012/04/25 v1.16
-Copyright (C) 2006, 2007, 2009-2011 by
+Copyright (C) 2006, 2007, 2009-2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -121,7 +124,8 @@ This work consists of the main source file kvsetkeys.dtx
and the derived files
kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv,
kvsetkeys-example.tex, kvsetkeys-test1.tex,
- kvsetkeys-test2.tex, kvsetkeys-test3.tex.
+ kvsetkeys-test2.tex, kvsetkeys-test3.tex,
+ kvsetkeys-test4.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -137,6 +141,11 @@ and the derived files
\file{kvsetkeys-test1.tex}{\from{kvsetkeys.dtx}{test1}}%
\file{kvsetkeys-test2.tex}{\from{kvsetkeys.dtx}{test2}}%
\file{kvsetkeys-test3.tex}{\from{kvsetkeys.dtx}{test2,noetex}}%
+ \file{kvsetkeys-test4.tex}{\from{kvsetkeys.dtx}{test4}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{kvsetkeys.xml}{\from{kvsetkeys.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -163,16 +172,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{kvsetkeys.drv}%
- [2011/04/07 v1.13 Key value parser (HO)]%
+ [2012/04/25 v1.16 Key value parser (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{kvsetkeys.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1265}
+% \CheckSum{1557}
%
% \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
@@ -193,7 +202,7 @@ and the derived files
% \GetFileInfo{kvsetkeys.drv}
%
% \title{The \xpackage{kvsetkeys} package}
-% \date{2011/04/07 v1.13}
+% \date{2012/04/25 v1.16}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -345,6 +354,18 @@ and the derived files
%
% \subsection{Processing key value pairs}
%
+% Key value pairs can be processed in many different ways.
+% For example, the processor for \cs{kvsetkeys} works similar
+% to \cs{setkeys} of package \xpackage{keyval}. There unknown
+% keys raise an error.
+%
+% Package \xpackage{xkeyval} also knows a star form of \cs{setkeys}
+% that stores unknown keys in an internal macro for further processing
+% with \cs{setrmkeys} and similar macros. This feature is covered
+% by processor \cs{kv@processor@known}.
+%
+% \subsubsection{Processing similar to \xpackage{keyval}}
+%
% \begin{declcs}{kv@processor@default}\,\M{family}\,\M{key}\,\M{value}
% \end{declcs}
% There are many possiblities to process key value pairs.
@@ -357,19 +378,48 @@ and the derived files
% may contain package \xpackage{babel}'s shorthands
% (since 2011/04/07 v1.13).
%
+% Since 2011/10/18 v1.15 the family handler can reject the
+% successful handling of a key by calling \cs{kv@handled@false}.
+%
+% Since 2012/04/25 v1.16 \cs{kv@processor@default} also defines
+% macro \cs{kv@fam} with meaning \meta{family} for convenience.
+%
+% \subsubsection{Processing similar to \cs{setkeys*} of package \xpackage{xkeyval}}
+%
+% \begin{declcs}{kv@processor@known}\,\M{family}\,^^A
+% \M{cmd}\,\M{key}\,\M{value}
+% \end{declcs}
+% The key value processor \cs{kv@processor@known} behaves similar
+% to \cs{kv@processor@default}. If the \meta{key} exists in the
+% \meta{family} its code is called, otherwise the family handler
+% is tried. If the family handler is not set or cannot handle the
+% key, the unknown key value pair is added to the macro \meta{cmd}.
+% Since 2011/10/18 v1.15.
+%
% The behaviour in pseudo code:
% \begin{quote}
% if \meta{key} exists\\
% \hspace*{1.5em}call the keyval code of \meta{key}\\
% else\\
% \hspace*{1.5em}if \meta{handler} for \meta{family} exists\\
+% \hspace*{3em}handled = true\\
% \hspace*{3em}\meta{handler}\,\M{key}\,\M{value}\\
+% \hspace*{3em}if handled\\
+% \hspace*{3em}else\\
+% \hspace*{4.5em}add \texttt{"}\M{key}\texttt{=}\M{value}\texttt{"}
+% to \M{cmd}\\
+% \hspace*{3em}fi\\
% \hspace*{1.5em}else\\
+% \hspace*{3em}add \texttt{"}\M{key}\texttt{=}\M{value}\texttt{"}
+% to \M{cmd}\\
% \hspace*{3em}raise unknown key error\\
% \hspace*{1.5em}fi\\
% fi
% \end{quote}
%
+% Since 2012/04/25 v1.16 \cs{kv@processor@known} also defines
+% macro \cs{kv@fam} with meaning \meta{family} for convenience.
+%
% \subsection{Default family handler}
%
% \cs{kv@processor@default} calls \meta{handler}, the default
@@ -385,17 +435,51 @@ and the derived files
% can be used for the key and the value. If the value is not given,
% \cs{kv@value} has the meaning \cs{relax}.
%
+% \begin{declcs}{kv@unset@family@handler}\,\M{family}
+% \end{declcs}
+% It removes the family handler for \meta{family}.
+% Since 2011/10/18 v1.15.
+%
% \subsection{Put it all together}
%
% \begin{declcs}{kvsetkeys}\,\M{family}\,\M{key value list}
% \end{declcs}
-% The work is done by the previous commands. \cs{kvsetkeys}
-% just calls them:
+% Macro \cs{kvsetkeys} processes the \meta{key value list} with
+% the standard processor \cs{kv@processor@default}:
% \begin{quote}
% \cs{kv@parse}\,\M{key value list}^^A
% \texttt{\{}\cs{kv@processor@default}\,\M{family}\texttt{\}}
% \end{quote}
%
+% \begin{declcs}{kvsetknownkeys}\,\M{family}\,\M{cmd}\,\M{key value list}
+% \end{declcs}
+% Macro \cs{kvsetknownkeys} processes the \meta{key value list}
+% with processor \cs{kv@processor@known}. All key value pairs
+% with keys that are not known in \meta{family} are stored
+% in macro \meta{cmd}. A previous contents of macro \meta{cmd}
+% will be overwritten. If all keys can be handled, \meta{cmd}
+% will be empty, otherwise it contains a key value list of
+% unhandled key value pairs.
+% Since 2011/10/18 v1.15.
+%
+% Pseudo code:
+% \begin{quote}
+% create macro \meta{cmdaux} with unique name (inside the current group)\\
+% \cs{def}\meta{cmdaux}\{\}\\
+% \cs{kv@parse}\,\M{key value list}^^A
+% \texttt{\{}\cs{kv@processor@known}\,\M{family}\,\M{cmdaux}\texttt{\}}\\
+% \cs{let}\meta{cmd}=\meta{cmdaux}
+% \end{quote}
+%
+% \begin{declcs}{kvsetkeys@expandafter}\,\M{family}\,\M{list cmd}\\
+% \cs{kvsetknownkeys@expandafter}\,\M{family}\,%
+% \M{cmd}\,\M{list cmd}
+% \end{declcs}
+% Both macros behave like the counterparts without suffix
+% |@expandafter|. The difference is that the key value list is
+% given as macro that is expanded once.
+% Since 2011/10/18 v1.15.
+%
% Thus you can replace \cs{setkeys} of package \xpackage{keyval}
% by the key value parser of this package:
% \begin{quote}
@@ -573,7 +657,7 @@ and the derived files
\fi
\expandafter\x\csname ver@kvsetkeys.sty\endcsname
\ProvidesPackage{kvsetkeys}%
- [2011/04/07 v1.13 Key value parser (HO)]%
+ [2012/04/25 v1.16 Key value parser (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -612,7 +696,9 @@ and the derived files
\TMP@EnsureCode{36}{3}% $
\TMP@EnsureCode{38}{4}% &
\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{43}{12}% +
\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
\TMP@EnsureCode{46}{12}% .
\TMP@EnsureCode{47}{12}% /
\TMP@EnsureCode{91}{12}% [
@@ -713,11 +799,11 @@ $ \expandafter\endgroup
\begingroup
\toks@{,#1,}%
\KVS@Comma
- \KVS@SpaceComma{ }%
+ \KVS@SpaceComma
\KVS@CommaSpace
\KVS@CommaComma
\KVS@Equals
- \KVS@SpaceEquals{ }%
+ \KVS@SpaceEquals
\KVS@EqualsSpace
\xdef\KVS@Global{\the\toks@}%
\endgroup
@@ -731,7 +817,7 @@ $ \expandafter\endgroup
\begingroup
\toks@{,#1,}%
\KVS@Comma
- \KVS@SpaceComma{ }%
+ \KVS@SpaceComma
\KVS@CommaSpace
\KVS@CommaComma
\xdef\KVS@Global{\the\toks@}%
@@ -766,9 +852,12 @@ $ \expandafter\endgroup
% \begin{macro}{\KVS@SpaceComma}
% Removes spaces before the comma, may add commas at the end.
% \begin{macrocode}
-\long\def\KVS@SpaceComma#1{%
- \expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil
+\def\KVS@SpaceComma#1{%
+ \def\KVS@SpaceComma{%
+ \expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil
+ }%
}
+\KVS@SpaceComma{ }
% \end{macrocode}
% \end{macro}
% \begin{macro}{\KVS@@SpaceComma}
@@ -777,8 +866,7 @@ $ \expandafter\endgroup
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
- \toks@{#1,#2}%
- \expandafter\KVS@@SpaceComma\the\toks@\KVS@Nil
+ \KVS@@SpaceComma#1,#2\KVS@Nil
}%
}
% \end{macrocode}
@@ -797,8 +885,7 @@ $ \expandafter\endgroup
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
- \toks@{#1,#2}%
- \expandafter\KVS@@CommaSpace\the\toks@\KVS@Nil
+ \KVS@@CommaSpace#1,#2\KVS@Nil
}%
}
% \end{macrocode}
@@ -814,10 +901,10 @@ $ \expandafter\endgroup
% \begin{macro}{\KVS@@CommaComma}
% \begin{macrocode}
\long\def\KVS@@CommaComma#1,,#2\KVS@Nil{%
- \toks@{#1,#2}%
\KVS@IfEmpty{#2}{%
+ \toks@{#1,}% (!)
}{%
- \expandafter\KVS@@CommaComma\the\toks@\KVS@Nil
+ \KVS@@CommaComma#1,#2\KVS@Nil
}%
}
% \end{macrocode}
@@ -857,9 +944,12 @@ $ \expandafter\endgroup
% \begin{macro}{\KVS@SpaceEquals}
% Removes spaces before the equals sign.
% \begin{macrocode}
-\long\def\KVS@SpaceEquals#1{%
- \expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil
+\def\KVS@SpaceEquals#1{%
+ \def\KVS@SpaceEquals{%
+ \expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil
+ }%
}
+\KVS@SpaceEquals{ }
% \end{macrocode}
% \end{macro}
% \begin{macro}{\KVS@@SpaceEquals}
@@ -868,8 +958,7 @@ $ \expandafter\endgroup
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
- \toks@{#1=#2}%
- \expandafter\KVS@@SpaceEquals\the\toks@\KVS@Nil
+ \KVS@@SpaceEquals#1=#2\KVS@Nil
}%
}
% \end{macrocode}
@@ -888,8 +977,7 @@ $ \expandafter\endgroup
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
- \toks@{#1=#2}%
- \expandafter\KVS@@EqualsSpace\the\toks@\KVS@Nil
+ \KVS@@EqualsSpace#1=#2\KVS@Nil
}%
}
% \end{macrocode}
@@ -1034,6 +1122,30 @@ $ \let\kv@value\KVS@Global
%
% \subsection{Processing key value pairs}
%
+% \begin{macro}{\kv@handled@false}
+% The handler can call \cs{kv@handled@false} or
+% \cs{kv@handled@true} so report failure or success.
+% The default is success (compatibility for versions
+% before 2011/10/18 v1.15).
+% \begin{macrocode}
+\def\kv@handled@false{%
+ \let\ifkv@handled@\iffalse
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\kv@handled@true}
+% \begin{macrocode}
+\def\kv@handled@true{%
+ \let\ifkv@handled@\iftrue
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ifkv@handled@}
+% \begin{macrocode}
+\kv@handled@true
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\kv@processor@default}
% \begin{macrocode}
\def\kv@processor@default#1#2{%
@@ -1050,6 +1162,7 @@ $ \let\kv@value\KVS@Global
% \begin{macro}{\KVS@ProcessorDefault}
% \begin{macrocode}
\long\def\KVS@ProcessorDefault#1#2#3{%
+ \def\kv@fam{#1}%
& \unless\ifcsname KV@#1@#2\endcsname
$ \begingroup\expandafter\expandafter\expandafter\endgroup
$ \expandafter\ifx\csname KV@#1@#2\endcsname\relax
@@ -1058,8 +1171,13 @@ $ \begingroup\expandafter\expandafter\expandafter\endgroup
$ \expandafter\ifx\csname KVS@#1@handler\endcsname\relax
\kv@error@unknownkey{#1}{#2}%
\else
+ \kv@handled@true
\csname KVS@#1@handler\endcsname{#2}{#3}%
\relax
+ \ifkv@handled@
+ \else
+ \kv@error@unknownkey{#1}{#2}%
+ \fi
\fi
\else
\ifx\kv@value\relax
@@ -1079,6 +1197,79 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\kv@processor@known}
+% \begin{macrocode}
+\def\kv@processor@known#1#2#3{%
+ \begingroup
+ \csname @safe@activestrue\endcsname
+ \let\ifincsname\iftrue
+ \edef\KVS@temp{\endgroup
+ \noexpand\KVS@ProcessorKnown{#1}\noexpand#2{#3}%
+ }%
+ \KVS@temp
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\KVS@ProcessorKnown}
+% \begin{macrocode}
+\long\def\KVS@ProcessorKnown#1#2#3#4{%
+ \def\kv@fam{#1}%
+& \unless\ifcsname KV@#1@#3\endcsname
+$ \begingroup\expandafter\expandafter\expandafter\endgroup
+$ \expandafter\ifx\csname KV@#1@#3\endcsname\relax
+& \unless\ifcsname KVS@#1@handler\endcsname
+$ \begingroup\expandafter\expandafter\expandafter\endgroup
+$ \expandafter\ifx\csname KVS@#1@handler\endcsname\relax
+ \KVS@AddUnhandled#2{#3}{#4}%
+ \else
+ \kv@handled@true
+ \csname KVS@#1@handler\endcsname{#3}{#4}%
+ \relax
+ \ifkv@handled@
+ \else
+ \KVS@AddUnhandled#2{#3}{#4}%
+ \fi
+ \fi
+ \else
+ \ifx\kv@value\relax
+& \unless\ifcsname KV@#1@#2@default\endcsname
+$ \begingroup\expandafter\expandafter\expandafter\endgroup
+$ \expandafter\ifx\csname KV@#1@#3@default\endcsname\relax
+ \kv@error@novalue{#1}{#3}%
+ \else
+ \csname KV@#1@#3@default\endcsname
+ \relax
+ \fi
+ \else
+ \csname KV@#1@#3\endcsname{#4}%
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\KVS@AddUnhandled}
+% \begin{macrocode}
+\long\def\KVS@AddUnhandled#1#2#3{%
+& \edef#1{%
+& \ifx#1\KVS@empty
+& \else
+& \etex@unexpanded{#1},%
+& \fi
+& \etex@unexpanded{{#2}={#3}}%
+& }%
+$ \begingroup
+$ \ifx#1\KVS@empty
+$ \toks@{{#2}={#3}}%
+$ \else
+$ \toks@\expandafter{#1,{#2}={#3}}%
+$ \fi
+$ \xdef\KVS@Global{\the\toks@}%
+$ \endgroup
+$ \let#1\KVS@Global
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\kv@set@family@handler}
% \begin{macrocode}
\long\def\kv@set@family@handler#1#2{%
@@ -1091,6 +1282,18 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\kv@unset@family@handler}
+% \begin{macrocode}
+\long\def\kv@unset@family@handler#1#2{%
+ \begingroup
+ \csname @safe@activestrue\endcsname
+ \let\ifincsname\iftrue
+ \expandafter\endgroup
+ \expandafter\let\csname KVS@#1@handler\endcsname\@UnDeFiNeD
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Error handling}
%
% \begin{macro}{\kv@error@novalue}
@@ -1132,6 +1335,85 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\kvsetkeys@expandafter}
+% \begin{macrocode}
+\def\kvsetkeys@expandafter#1#2{%
+ \expandafter\kv@parse\expandafter{#2}{%
+ \kv@processor@default{#1}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\KVS@cmd}
+% \begin{macrocode}
+\def\KVS@cmd{0}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\KVS@cmd@inc}
+% \begin{macrocode}
+\def\KVS@cmd@inc{%
+& \edef\KVS@cmd{\the\numexpr\KVS@cmd+1}%
+$ \begingroup
+$ \count255=\KVS@cmd\relax
+$ \advance\count255 by 1\relax
+$ \edef\x{\endgroup
+$ \noexpand\def\noexpand\KVS@cmd{\number\count255}%
+$ }%
+$ \x
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\KVS@cmd@dec}
+% \begin{macrocode}
+\def\KVS@cmd@dec{%
+& \edef\KVS@cmd{\the\numexpr\KVS@cmd-1}%
+$ \begingroup
+$ \count255=\KVS@cmd\relax
+$ \advance\count255 by -1\relax
+$ \edef\x{\endgroup
+$ \noexpand\def\noexpand\KVS@cmd{\number\count255}%
+$ }%
+$ \x
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\KVS@empty}
+% \begin{macrocode}
+\def\KVS@empty{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\kvsetknownkeys}
+% \begin{macrocode}
+\def\kvsetknownkeys{%
+ \expandafter
+ \KVS@setknownkeys\csname KVS@cmd\KVS@cmd\endcsname{}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\KVS@setknownkeys}
+% \begin{macrocode}
+\long\def\KVS@setknownkeys#1#2#3#4#5{%
+ \let#1\KVS@empty
+ \KVS@cmd@inc
+ #2\kv@parse#2{#5}{\kv@processor@known{#3}#1}%
+ \KVS@cmd@dec
+ \let#4=#1%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\kvsetknownkeys@expandafter}
+% \begin{macrocode}
+\def\kvsetknownkeys@expandafter{%
+ \expandafter
+ \KVS@setknownkeys
+ \csname KVS@cmd\KVS@cmd\endcsname\expandafter
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
\KVS@AtEnd%
%</package>
@@ -1261,7 +1543,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
\makeatletter
\chardef\KVS@TestMode=1 %
\makeatother
-\usepackage{kvsetkeys}[2011/04/07]
+\usepackage{kvsetkeys}[2012/04/25]
%<noetex>\let\unexpanded\SavedUnexpanded
\usepackage{qstest}
\IncludeTests{*}
@@ -1507,6 +1789,68 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
%</test2>
% \end{macrocode}
%
+% \subsection{Tests for key value processing handler}
+%
+% \begin{macrocode}
+%<*test4>
+\catcode`\{=1
+\catcode`\}=2
+\catcode`\#=6
+\catcode`\@=11
+\input kvdefinekeys.sty\relax
+\input kvsetkeys.sty\relax
+\input infwarerr.sty\relax
+\def\Error#1{%
+ \@PackageError{test}{#1}\@ehc
+}
+% \end{macrocode}
+% \begin{macrocode}
+\def\temp#1#2{%
+ \kv@define@key{#1}{#2}{%
+ \edef\result{%
+ \result
+ [#1:#2=##1]% hash-ok
+ }%
+ }%
+}
+\temp{FA}{key1}
+\temp{FA}{key2}
+\temp{FB}{key3}
+\temp{FB}{key3}
+% \end{macrocode}
+% \begin{macrocode}
+\setbox0=\hbox{%
+ \def\result{}%
+ \kvsetknownkeys{FA}\cmd{key1=234,key3=456}%
+ \def\expected{[FA:key1=234]}%
+ \ifx\expected\result
+ \else
+ \Error{%
+ \string\kvsetknownkeys/\string\result\MessageBreak
+ Expected: \expected\MessageBreak
+ Result: \space\result
+ }%
+ \fi
+ \def\expected{{key3}={456}}%
+ \ifx\cmd\expected
+ \else
+ \Error{%
+ \string\kvsetknownkeys/\string\cmd\MessageBreak
+ Expected: \expected\MessageBreak
+ Result: \space\cmd
+ }%
+ \fi
+}
+\ifdim\wd0=0pt %
+\else
+ \Error{Spurious spaces?}%
+\fi
+% \end{macrocode}
+% \begin{macrocode}
+\csname @@end\endcsname\end
+%</test4>
+% \end{macrocode}
+%
% \section{Installation}
%
% \subsection{Download}
@@ -1572,6 +1916,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
% test/kvsetkeys-test1.tex & doc/latex/oberdiek/test/kvsetkeys-test1.tex\\
% test/kvsetkeys-test2.tex & doc/latex/oberdiek/test/kvsetkeys-test2.tex\\
% test/kvsetkeys-test3.tex & doc/latex/oberdiek/test/kvsetkeys-test3.tex\\
+% test/kvsetkeys-test4.tex & doc/latex/oberdiek/test/kvsetkeys-test4.tex\\
% kvsetkeys.dtx & source/latex/oberdiek/kvsetkeys.dtx\\
% \end{tabular}^^A
% }^^A
@@ -1692,18 +2037,56 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{kvsetkeys.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='kvsetkeys'>
+ <name>kvsetkeys</name>
+ <caption>Key value parser with default handler support.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007,2009-2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.16'/>
+ <description>
+ This package provides \kvsetkeys, a variant of package
+ <xref refid='keyval'>keyval</xref>'s <tt>\setkeys</tt>. It allows
+ the user to specify a handler that deals with unknown options.
+ Active commas and equal signs may be used (e.g. see
+ <xref refid='babel'>babel</xref>'s shorthands) and only one level
+ of curly braces are removed from the values.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/kvsetkeys.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/kvsetkeys.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{tb94wright}
% A guide to key-value methods, Joseph Wright, second draft for
% \href{http://www.tug.org/tugboat}{TUGBoat}, 2009-03-17.
% \url{http://www.texdev.net/wp-content/uploads/2009/03/keyval.pdf}
-%
+%
% \bibitem{keyval}
% David Carlisle:
% \textit{The \xpackage{keyval} package};
% 1999/03/16 v1.13;
% \CTAN{macros/latex/required/graphics/keyval.dtx}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -1781,6 +2164,28 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
% \item
% \cs{kv@set@family@handler} with shorthand support.
% \end{Version}
+% \begin{Version}{2011/06/15 v1.14}
+% \item
+% Some optimizations in token register uses (GL, HO).
+% \end{Version}
+% \begin{Version}{2011/10/18 v1.15}
+% \item
+% \cs{kv@processor@known} and \cs{kvsetknownkeys} added.
+% \item
+% \cs{kvsetkeys@expandafter} and \cs{kvsetknownkeys@expandafter} added.
+% \item
+% Family handler can report success or failure by \cs{kv@handled@true}
+% or \cs{kv@handled@false}.
+% \item
+% \cs{kv@unset@family@handler} added.
+% \end{Version}
+% \begin{Version}{2012/04/25 v1.16}
+% \item
+% \cs{kv@processor@default} and \cs{kv@processor@known} define
+% macro \cs{kv@fam} for convenience.
+% \item
+% Catcode section: Catcode setting for \texttt{+} added for \hologo{eTeX}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx b/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx
index 590a0808137..deded606ba7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: letltxmacro.dtx
% Version: 2010/09/02 v1.4
-%
+% Info: Let assignment for LaTeX macros
+%
% Copyright (C) 2008, 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
@@ -15,21 +16,21 @@
% 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 letltxmacro.dtx
% and the derived files
% letltxmacro.sty, letltxmacro.pdf, letltxmacro.ins, letltxmacro.drv,
% letltxmacro-showcases.tex, letltxmacro-test1.tex,
% letltxmacro-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/letltxmacro.dtx
% CTAN:macros/latex/contrib/oberdiek/letltxmacro.pdf
-%
+%
% Unpacking:
% (a) If letltxmacro.ins is present:
% tex letltxmacro.ins
@@ -38,7 +39,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{letltxmacro.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If letltxmacro.drv is present:
% latex letltxmacro.drv
@@ -48,14 +49,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex letltxmacro.dtx
% makeindex -s gind.ist letltxmacro.idx
% pdflatex letltxmacro.dtx
% makeindex -s gind.ist letltxmacro.idx
% pdflatex letltxmacro.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/letltxmacro.sty
% TDS:doc/latex/oberdiek/letltxmacro.pdf
@@ -129,6 +130,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{letltxmacro-test1.tex}{\from{letltxmacro.dtx}{test1}}%
\file{letltxmacro-test2.tex}{\from{letltxmacro.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{letltxmacro.xml}{\from{letltxmacro.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -157,14 +162,14 @@ and the derived files
\ProvidesFile{letltxmacro.drv}%
[2010/09/02 v1.4 Let assignment for LaTeX macros (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{letltxmacro.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{987}
+% \CheckSum{990}
%
% \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
@@ -1129,6 +1134,44 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{letltxmacro.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='letltxmacro'>
+ <name>letltxmacro</name>
+ <caption>Let assignment for LaTeX macros.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ TeX&#x2019;s <tt>\let</tt> assignment does not work for LaTeX macros
+ with optional arguments or for macros that are defined
+ as robust macros by <tt>\DeclareRobustCommand</tt>. This package
+ defines <tt>\LetLtxMacro</tt> that also takes care of the involved
+ internal macros.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/letltxmacro.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/letltxmacro.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2008/06/09 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx
index 59f35a9750d..93c55a4c427 100644
--- a/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: listingsutf8.dtx
-% Version: 2007/11/11 v1.1
-%
-% Copyright (C) 2007 by
+% Version: 2011/11/10 v1.2
+% Info: Allow UTF-8 in listings input
+%
+% Copyright (C) 2007, 2011 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
@@ -15,22 +16,22 @@
% 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 listingsutf8.dtx
% and the derived files
% listingsutf8.sty, listingsutf8.pdf, listingsutf8.ins, listingsutf8.drv,
% listingsutf8-test1.tex, listingsutf8-test2.tex,
% listingsutf8-test3.tex, listingsutf8-test4.tex,
% listingsutf8-test5.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/listingsutf8.dtx
% CTAN:macros/latex/contrib/oberdiek/listingsutf8.pdf
-%
+%
% Unpacking:
% (a) If listingsutf8.ins is present:
% tex listingsutf8.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{listingsutf8.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If listingsutf8.drv is present:
% latex listingsutf8.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex listingsutf8.dtx
% makeindex -s gind.ist listingsutf8.idx
% pdflatex listingsutf8.dtx
% makeindex -s gind.ist listingsutf8.idx
% pdflatex listingsutf8.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/listingsutf8.sty
% TDS:doc/latex/oberdiek/listingsutf8.pdf
@@ -82,7 +83,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: listingsutf8 2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)}
+\Msg{* Package: listingsutf8 2011/11/10 v1.2 Allow UTF-8 in listings input (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -94,9 +95,9 @@
This is a generated file.
Project: listingsutf8
-Version: 2007/11/11 v1.1
+Version: 2011/11/10 v1.2
-Copyright (C) 2007 by
+Copyright (C) 2007, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -134,6 +135,10 @@ and the derived files
\file{listingsutf8-test3.tex}{\from{listingsutf8.dtx}{test3,utf8x}}%
\file{listingsutf8-test4.tex}{\from{listingsutf8.dtx}{test4,utf8,noetex}}%
\file{listingsutf8-test5.tex}{\from{listingsutf8.dtx}{test5,utf8x,noetex}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{listingsutf8.xml}{\from{listingsutf8.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -160,16 +165,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{listingsutf8.drv}%
- [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)]%
+ [2011/11/10 v1.2 Allow UTF-8 in listings input (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{listingsutf8.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{285}
+% \CheckSum{311}
%
% \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
@@ -190,7 +195,7 @@ and the derived files
% \GetFileInfo{listingsutf8.drv}
%
% \title{The \xpackage{listingsutf8} package}
-% \date{2007/11/11 v1.1}
+% \date{2011/11/10 v1.2}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -322,7 +327,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{listingsutf8}%
- [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)]
+ [2011/11/10 v1.2 Allow UTF-8 in listings input (HO)]
% \end{macrocode}
%
% \subsection{Package options}
@@ -352,7 +357,7 @@ and the derived files
% \subsection{Check prerequisites}
%
% \begin{macrocode}
-\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{pdftexcmds}[2011/04/22]
% \end{macrocode}
%
% \begin{macrocode}
@@ -374,7 +379,7 @@ and the derived files
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{stringenc}[2007/10/22]
+\RequirePackage{stringenc}[2010/03/01]
% \end{macrocode}
%
% \subsection{Add support for UTF-8}
@@ -423,6 +428,7 @@ and the derived files
\pdf@filedump{0}{\pdf@filesize{#1}}{#1}%
}%
}%
+ \lstU@CRLFtoLF\lstU@text
\StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc
\def\lstU@temp{%
\scantokens\expandafter{\lstU@text}%
@@ -437,6 +443,31 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Convert CR/LF pairs to LF}
+%
+% \begin{macro}{\lstU@CRLFtoLF}
+% \begin{macrocode}
+\begingroup
+ \endlinechar=-1 %
+ \@makeother\^^J %
+ \@makeother\^^M %
+ \gdef\lstU@CRLFtoLF#1{%
+ \edef#1{%
+ \expandafter\lstU@CRLFtoLF@aux#1^^M^^J\@nil
+ }%
+ }%
+ \gdef\lstU@CRLFtoLF@aux#1^^M^^J#2\@nil{%
+ #1%
+ \ifx\relax#2\relax
+ \@car
+ \fi
+ ^^J%
+ \lstU@CRLFtoLF@aux#2\@nil
+ }%
+\endgroup %
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{Patch \cs{lst@InputListing}}
%
% \begin{macrocode}
@@ -500,7 +531,7 @@ and the derived files
\catcode`\%=14 %
\catcode`\ =10 %
\catcode13=5 %
- \RequirePackage{listingsutf8}[2007/11/11]\relax
+ \RequirePackage{listingsutf8}[2011/11/10]\relax
\RestoreCatcodes
}
\Test
@@ -538,7 +569,7 @@ public class ExampleUTF8 {
}
}
\end{filecontents*}
-\usepackage{listingsutf8}[2007/11/11]
+\usepackage{listingsutf8}[2011/11/10]
\def\Text{%
Umlauts: %
^^c3^^84^^c3^^96^^c3^^9c^^c3^^a4^^c3^^b6^^c3^^bc^^c3^^9f%
@@ -738,25 +769,63 @@ public class ExampleUTF8 {
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{listingsutf8.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='listingsutf8'>
+ <name>listingsutf8</name>
+ <caption>Allow UTF-8 in listings input.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Package <xref refid='listings'>listings</xref> does not support files
+ with multi-byte encodings such as UTF-8. In the case of
+ <tt>\lstinputlisting</tt>, a simple workaround is possible if a
+ one-byte encoding exists that the file can be converted to. The
+ package requires the e-TeX extensions under pdfTeX (in either PDF
+ or DVI output mode).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/listingsutf8.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/listingsutf8.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{inputenc}
% Alan Jeffrey, Frank Mittelbach,
% \textit{inputenc.sty}, 2006/05/05 v1.1b.
% \CTAN{macros/latex/base/inputenc.dtx}
-%
+%
% \bibitem{listings}
% Carsten Heinz, Brooks Moses:
% \textit{The \xpackage{listings} package};
% 2007/02/22;\\
% \CTAN{macros/latex/contrib/listings/}.
-%
+%
% \bibitem{stringenc}
% Heiko Oberdiek:
% \textit{The \xpackage{stringenc} package};
% 2007/10/22;\\
% \CTAN{macros/latex/contrib/oberdiek/stringenc.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -768,6 +837,11 @@ public class ExampleUTF8 {
% \item
% Use of package \xpackage{pdftexcmds}.
% \end{Version}
+% \begin{Version}{2011/11/10 v1.2}
+% \item
+% DOS line ends CR/LF normalized to LF to avoid empty lines
+% (Bug report of Thomas Benkert in de.comp.text.tex).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx
index c13a2a457e5..1a6e0c4de65 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: ltxcmds.dtx
-% Version: 2011/04/18 v1.20
-%
+% Version: 2011/11/09 v1.22
+% Info: LaTeX kernel commands for general use
+%
% Copyright (C) 2009-2011 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
@@ -15,25 +16,26 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file ltxcmds.dtx
% and the derived files
% ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv,
% ltxcmds-test1.tex, ltxcmds-test-gobble.tex,
% ltxcmds-test-ifempty.tex, ltxcmds-test-zapspace.tex,
-% ltxcmds-test-ifboxempty.tex, ltxcmds-test-nextchar.tex.
-%
+% ltxcmds-test-ifboxempty.tex, ltxcmds-test-nextchar.tex,
+% ltxcmds-test-carcdr.tex.
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/ltxcmds.dtx
% CTAN:macros/latex/contrib/oberdiek/ltxcmds.pdf
-%
+%
% Unpacking:
% (a) If ltxcmds.ins is present:
% tex ltxcmds.ins
@@ -42,7 +44,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{ltxcmds.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If ltxcmds.drv is present:
% latex ltxcmds.drv
@@ -52,14 +54,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex ltxcmds.dtx
% makeindex -s gind.ist ltxcmds.idx
% pdflatex ltxcmds.dtx
% makeindex -s gind.ist ltxcmds.idx
% pdflatex ltxcmds.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/ltxcmds.sty
% TDS:doc/latex/oberdiek/ltxcmds.pdf
@@ -69,6 +71,7 @@
% TDS:doc/latex/oberdiek/test/ltxcmds-test-zapspace.tex
% TDS:doc/latex/oberdiek/test/ltxcmds-test-ifboxempty.tex
% TDS:doc/latex/oberdiek/test/ltxcmds-test-nextchar.tex
+% TDS:doc/latex/oberdiek/test/ltxcmds-test-carcdr.tex
% TDS:source/latex/oberdiek/ltxcmds.dtx
%
%<*ignore>
@@ -86,7 +89,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: ltxcmds 2011/04/18 v1.20 LaTeX kernel commands for general use (HO)}
+\Msg{* Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -98,7 +101,7 @@
This is a generated file.
Project: ltxcmds
-Version: 2011/04/18 v1.20
+Version: 2011/11/09 v1.22
Copyright (C) 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -125,7 +128,8 @@ and the derived files
ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv,
ltxcmds-test1.tex, ltxcmds-test-gobble.tex,
ltxcmds-test-ifempty.tex, ltxcmds-test-zapspace.tex,
- ltxcmds-test-ifboxempty.tex, ltxcmds-test-nextchar.tex.
+ ltxcmds-test-ifboxempty.tex, ltxcmds-test-nextchar.tex,
+ ltxcmds-test-carcdr.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -142,6 +146,11 @@ and the derived files
\file{ltxcmds-test-zapspace.tex}{\from{ltxcmds.dtx}{test-zapspace}}%
\file{ltxcmds-test-ifboxempty.tex}{\from{ltxcmds.dtx}{test-ifboxempty}}%
\file{ltxcmds-test-nextchar.tex}{\from{ltxcmds.dtx}{test-nextchar}}%
+ \file{ltxcmds-test-carcdr.tex}{\from{ltxcmds.dtx}{test-carcdr}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{ltxcmds.xml}{\from{ltxcmds.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -168,9 +177,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltxcmds.drv}%
- [2011/04/18 v1.20 LaTeX kernel commands for general use (HO)]%
+ [2011/11/09 v1.22 LaTeX kernel commands for general use (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{zref-savepos}
\usepackage{paralist}
\hfuzz=1pt
@@ -180,7 +189,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{2385}
+% \CheckSum{2685}
%
% \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
@@ -201,7 +210,7 @@ and the derived files
% \GetFileInfo{ltxcmds.drv}
%
% \title{The \xpackage{ltxcmds} package}
-% \date{2011/04/18 v1.20}
+% \date{2011/11/09 v1.22}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -306,7 +315,7 @@ and the derived files
% Macros \cs{ltx@firstofthree}, \cs{ltx@secondofthree}
% and \cs{ltx@thirdofthree} were added in version
% 2010/11/12 v1.11.
-% Macros \cs{ltx@firstoffour}, \dots, \cs{ltx@forthoffour}
+% Macros \cs{ltx@firstoffour}, \dots, \cs{ltx@fourthoffour}
% were added in version 2011/02/04 v1.16.
%
% \subsection{List helpers}
@@ -321,28 +330,46 @@ and the derived files
%
% \begin{declcs}{ltx@cartwo} \M{1} \M{2} \dots\ \cs{@nil}
% \TO \meta{1}\meta{2}\\
+% \cs{ltx@carsecond} \M{1} \M{2} \dots\ \cs{@nil} \TO \meta{2}\\
% \cs{ltx@cdrtwo} \M{1} \M{2} \dots\ \cs{@nil} \TO \dots
% \end{declcs}
%
% \begin{declcs}{ltx@carthree} \M{1} \M{2} \M{3} \dots\ \cs{@nil}
% \TO \meta{1}\meta{2}\meta{3}\\
+% \cs{ltx@carthird} \M{1} \M{2} \M{3} \dots\ \cs{@nil}
+% \TO \meta{3}\\
% \cs{ltx@cdrthree} \M{1} \M{2} \M{3} \dots\ \cs{@nil} \TO \dots
% \end{declcs}
%
% \begin{declcs}{ltx@carfour} \M{1} \M{2} \M{3} \M{4} \dots\ \cs{@nil}
% \TO \meta{1}\meta{2}\meta{3}\meta{4}\\
+% \cs{ltx@carfourth} \M{1} \M{2} \M{3} \M{4} \dots\ \cs{@nil}
+% \TO \meta{4}\\
% \cs{ltx@cdrfour} \M{1} \M{2} \M{3} \M{4} \dots\ \cs{@nil} \TO \dots
% \end{declcs}
%
% \begin{declcs}{ltx@CarNum} \M{num} \M{1} \dots\ \M{\meta{num}}
% \M{\meta{num}+1} \dots\ \cs{@nil}\\
% \TO \M{1} \dots\ \M{\meta{num}} \dots\\
+% \cs{ltx@CarNumth} \M{num} \M{1} \dots\ \M{\meta{num}}
+% \M{\meta{num}+1} \dots\ \cs{@nil}\\
+% \TO \M{\meta{num}} \dots\\
% \cs{ltx@CdrNum} \M{num} \M{1} \dots\ \M{\meta{num}}
% \M{\meta{num}+1} \dots\ \cs{@nil}\\
% \TO \M{\meta{num}+1} \dots
% \end{declcs}
-% Macros \cs{ltx@CarNum} and \cs{ltx@CdrNum} are expandable
-% in exact two expansion steps.
+%
+% Macros with uppercase letters are expandable in two expansion steps.
+% Changes in version 2011/11/09 v1.22:
+% \begin{itemize}
+% \item
+% Macros \cs{ltx@carsecond}, \cs{ltx@carthird}, \cs{ltx@carfourth},
+% \cs{ltx@CarNumth} added.
+% \item
+% Macros \cs{ltx@cdr}, \cs{ltx@cdrtwo}, \cs{ltx@cdrthree}, \cs{ltx@cdrfour},
+% \cs{ltx@CdrNum} are expandable in two expansion steps and retain
+% spaces and braces after the first gobbled arguments.
+% \end{itemize}
%
% \subsection{Tail recursion}
%
@@ -499,9 +526,17 @@ and the derived files
% \end{declcs}
% The \meta{addition} is appended to the parameterless macro \meta{cmd}.
% If \meta{cmd} is undefined or has the meaning \cs{relax}, then
-% it will be initialized as empty macro before. Due to a bug \meta{addition}
+% it will be initialized as empty macro beforehand. Due to a bug \meta{addition}
% must not contain \cs{par} before version 2010/10/25 v1.9.
%
+% \begin{declcs}{ltx@GlobalPrependToMacro} \M{cmd} \M{addition}\\
+% \cs{ltx@LocalPrependToMacro} \M{cmd} \M{addition}
+% \end{declcs}
+% The \meta{addition} is prepended to the parameterless macro \meta{cmd}.
+% If \meta{cmd} is undefined or has the meaning \cs{relax}, then
+% it will be initialized as empty macro beforehand. The macros
+% were added in version 2011/08/22 v1.21.
+%
% \subsection{Next character detection}
%
% \begin{declcs}{ltx@ifnextchar} \M{char} \M{yes} \M{no}
@@ -692,7 +727,7 @@ and the derived files
\fi
\expandafter\x\csname ver@ltxcmds.sty\endcsname
\ProvidesPackage{ltxcmds}%
- [2011/04/18 v1.20 LaTeX kernel commands for general use (HO)]%
+ [2011/11/09 v1.22 LaTeX kernel commands for general use (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -1045,25 +1080,34 @@ and the derived files
%
% \subsection{List helpers}
%
-% \begin{macro}{\ltx@car}
+% \begin{macro}{\ltx@carzero}
% \begin{macrocode}
-\long\def\ltx@car#1#2\@nil{#1}
+\long\def\ltx@carzero#1\@nil{}%
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\ltx@cdr}
+% \begin{macro}{\LTXcmds@cdrzero}
% \begin{macrocode}
-\long\def\ltx@cdr#1#2\@nil{#2}
+\long\def\LTXcmds@cdrzero#1\@nil{#1}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ltx@cdrzero}
+% \begin{macrocode}
+\def\ltx@cdrzero{%
+ \romannumeral\LTXcmds@cdrzero\ltx@zero
+}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\ltx@carzero}
+% \begin{macro}{\ltx@car}
% \begin{macrocode}
-\long\def\ltx@carzero#1\@nil{}%
+\long\def\ltx@car#1#2\@nil{#1}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\ltx@cdrzero}
+% \begin{macro}{\ltx@cdr}
% \begin{macrocode}
-\long\def\ltx@cdrzero#1\@nil{#1}%
+\long\def\ltx@cdr#1{%
+ \romannumeral\LTXcmds@cdrzero\ltx@zero
+}
% \end{macrocode}
% \end{macro}
%
@@ -1072,9 +1116,16 @@ and the derived files
\long\def\ltx@cartwo#1#2#3\@nil{#1#2}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\ltx@carsecond}
+% \begin{macrocode}
+\long\def\ltx@carsecond#1#2#3\@nil{#2}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\ltx@cdrtwo}
% \begin{macrocode}
-\long\def\ltx@cdrtwo#1#2#3\@nil{#3}
+\long\def\ltx@cdrtwo#1#2{%
+ \romannumeral\LTXcmds@cdrzero\ltx@zero
+}
% \end{macrocode}
% \end{macro}
%
@@ -1083,9 +1134,16 @@ and the derived files
\long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\ltx@carthird}
+% \begin{macrocode}
+\long\def\ltx@carthird#1#2#3#4\@nil{#3}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\ltx@cdrthree}
% \begin{macrocode}
-\long\def\ltx@cdrthree#1#2#3#4\@nil{#4}
+\long\def\ltx@cdrthree#1#2#3{%
+ \romannumeral\LTXcmds@cdrzero\ltx@zero
+}
% \end{macrocode}
% \end{macro}
%
@@ -1094,9 +1152,16 @@ and the derived files
\long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\ltx@carfourth}
+% \begin{macrocode}
+\long\def\ltx@carfourth#1#2#3#4#5\@nil{#4}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\ltx@cdrfour}
% \begin{macrocode}
-\long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5}
+\long\def\ltx@cdrfour#1#2#3#4{%
+ \romannumeral\LTXcmds@cdrzero\ltx@zero
+}
% \end{macrocode}
% \end{macro}
%
@@ -1140,18 +1205,33 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\ltx@CdrNum}
+% \begin{macro}{\ltx@CarNumth}
% \begin{macrocode}
-\def\ltx@CdrNum#1{%
- \romannumeral0%
- \expandafter\expandafter\expandafter\LTXcmds@CdrNum
- \ltx@GobbleNum{#1}%
+\def\ltx@CarNumth#1{%
+ \romannumeral
+ \expandafter\expandafter\expandafter
+ \LTXcmds@CarNumth
+ \ltx@GobbleNum{#1}{}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\LTXcmds@CdrNum}
+% \begin{macro}{\LTXcmds@CarNumth}
% \begin{macrocode}
-\long\def\LTXcmds@CdrNum#1\@nil{ #1}%
+\long\def\LTXcmds@CarNumth#1#2\@nil{%
+ \ltx@zero
+ #1%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ltx@CdrNum}
+% \begin{macrocode}
+\def\ltx@CdrNum#1{%
+ \romannumeral%
+ \expandafter\expandafter\expandafter\ltx@cdrzero
+ \expandafter\expandafter\expandafter\ltx@zero
+ \ltx@GobbleNum{#1}%
+}
% \end{macrocode}
% \end{macro}
%
@@ -1569,6 +1649,45 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ltx@GlobalPrependToMacro}
+% \begin{macrocode}
+\long\def\ltx@GlobalPrependToMacro#1#2{%
+ \ifx\ltx@undefined#1%
+ \let#1\ltx@empty
+ \else
+ \ifx\relax#1%
+ \let#1\ltx@empty
+ \fi
+ \fi
+ \begingroup
+ \ltx@LocToksA{#2}%
+ \ltx@LocToksB\expandafter{#1}%
+ \xdef#1{\the\ltx@LocToksA\the\ltx@LocToksB}%
+ \endgroup
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ltx@LocalPrependToMacro}
+% \begin{macrocode}
+\long\def\ltx@LocalPrependToMacro#1#2{%
+ \global\let\LTXcmds@gtemp#1%
+ \ifx\ltx@undefined\LTXcmds@gtemp
+ \global\let\LTXcmds@gtemp\ltx@empty
+ \else
+ \ifx\relax\LTXcmds@gtemp
+ \global\letLTXcmds@gtemp\ltx@empty
+ \fi
+ \fi
+ \begingroup
+ \ltx@LocToksA{#2}%
+ \ltx@LocToksB\expandafter{\LTXcmds@gtemp}%
+ \xdef\LTXcmds@gtemp{\the\ltx@LocToksA\the\ltx@LocToksB}%
+ \endgroup
+ \let#1\LTXcmds@gtemp
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Next character detection}
%
% \begin{macro}{\ltx@ifnextchar}
@@ -2056,7 +2175,7 @@ $ \next
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input ltxcmds.sty\relax
\else
- \RequirePackage{ltxcmds}[2011/04/18]%
+ \RequirePackage{ltxcmds}[2011/11/09]%
\fi
\catcode`\@=11 %
\def\msg#{\immediate\write16}%
@@ -2243,7 +2362,7 @@ X=%
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input ltxcmds.sty\relax
\else
- \RequirePackage{ltxcmds}[2011/04/18]%
+ \RequirePackage{ltxcmds}[2011/11/09]%
\fi
\def\msg#{\immediate\write16}
\def\TestY{\Y}
@@ -2363,7 +2482,7 @@ X=%
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input ltxcmds.sty\relax
\else
- \RequirePackage{ltxcmds}[2011/04/18]%
+ \RequirePackage{ltxcmds}[2011/11/09]%
\fi
\def\msg#{\immediate\write16}
\def\space{ }
@@ -2437,7 +2556,7 @@ X=%
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input ltxcmds.sty\relax
\else
- \RequirePackage{ltxcmds}[2011/04/18]%
+ \RequirePackage{ltxcmds}[2011/11/09]%
\fi
\def\msg#{\immediate\write16}
% make box 0 void
@@ -2534,7 +2653,7 @@ X=%
\input ltxcmds.sty\relax
\input eolgrab.sty\relax
\else
- \RequirePackage{ltxcmds}[2011/04/18]%
+ \RequirePackage{ltxcmds}[2011/11/09]%
\RequirePackage{eolgrab}[2011/01/12]%
\fi
\def\msg#{\immediate\write16}
@@ -2700,6 +2819,85 @@ X=%
%</test-nextchar>
% \end{macrocode}
%
+% \subsection{Test for list helpers}
+%
+% \begin{macrocode}
+%<*test-carcdr>
+\catcode`\{=1 %
+\catcode`\}=2 %
+\catcode`\#=6 %
+\catcode`\@=11 %
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input ltxcmds.sty\relax
+ \input eolgrab.sty\relax
+\else
+ \RequirePackage{ltxcmds}[2011/11/09]%
+ \RequirePackage{eolgrab}[2011/01/12]%
+\fi
+\def\msg#{\immediate\write16}
+\def\space{ }
+\long\def\Test#1#2#3{%
+ \begingroup
+ \def\TestExpected{#3}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\TestResult
+ \expandafter\expandafter\expandafter{%
+ #1#2\@nil
+ }%
+ \ifx\TestResult\TestExpected
+ \else
+ \msg{\string\TestExpected: [\meaning\TestExpected]}%
+ \msg{\string\TestResult: \space\space[\meaning\TestResult]}%
+ \errmessage{Test failed!}%
+ \fi
+ \endgroup
+}
+\Test\ltx@carzero{abc}{}
+\Test\ltx@carzero{}{}
+\Test\ltx@carzero{\par\par}{}
+\Test\ltx@cdrzero{}{}
+\Test\ltx@cdrzero{abc}{abc}
+\Test\ltx@cdrzero{ \par}{ \par}
+\Test\ltx@cdrzero{\@empty}{\@empty}
+\Test\ltx@cdrzero{{}}{{}}
+\Test\ltx@car{abc}{a}
+\Test\ltx@car{\par}{\par}
+\Test\ltx@cdr{abc}{bc}
+\Test\ltx@cdr{a \par}{ \par}
+\Test\ltx@cdr{a\@empty}{\@empty}
+\Test\ltx@cartwo{abc}{ab}
+\Test\ltx@cartwo{\par\@empty}{\par\@empty}
+\Test\ltx@carsecond{abc}{b}
+\Test\ltx@carsecond{\@empty b\@empty}{b}
+\Test\ltx@carsecond{\par\par\par}{\par}
+\Test\ltx@cdrtwo{abc}{c}
+\Test\ltx@cdrtwo{ab \par}{ \par}
+\Test\ltx@cdrtwo{ab\@empty}{\@empty}
+\Test\ltx@cdrtwo{ab{}}{{}}
+\Test\ltx@cdrthree{abcdefg}{defg}
+\Test\ltx@cdrfour{abcdefg}{efg}
+\Test{\ltx@CdrNum{5}}{abcdefg}{fg}
+\Test{\ltx@CdrNum{0}}{\par}{\par}
+\Test{\ltx@CdrNum{0}}{\@empty}{\@empty}
+\Test{\ltx@CdrNum{0}}{{}}{{}}
+\Test{\ltx@CdrNum{0}}{ }{ }
+\Test{\ltx@CdrNum{2}}{abcd}{cd}
+\Test{\ltx@CdrNum{2}}{\vbox\par\hbox\par}{\hbox\par}
+\Test{\ltx@carthree}{abcdefg}{abc}
+\Test{\ltx@carfour}{abcdefg}{abcd}
+\Test{\ltx@CarNum{5}}{abcdefg}{abcde}
+\Test{\ltx@CarNum{2}}{\@empty\par}{\@empty\par}
+\Test\ltx@carthird{abcdefg}{c}
+\Test\ltx@carfourth{abcdefg}{d}
+\Test{\ltx@CarNumth{5}}{abcdefg}{e}
+\Test{\ltx@CarNumth{2}}{\@empty\@empty\@empty}{\@empty}
+\Test{\ltx@CarNumth{2}}{\par\par\par}{\par}
+\Test{\ltx@CarNumth{2}}{ab}{b}
+\csname @@end\endcsname\end
+%</test-carcdr>
+% \end{macrocode}
+%
% \section{Installation}
%
% \subsection{Download}
@@ -2767,6 +2965,7 @@ X=%
% test/ltxcmds-test-zapspace.tex & doc/latex/oberdiek/test/ltxcmds-test-zapspace.tex\\
% test/ltxcmds-test-ifboxempty.tex & doc/latex/oberdiek/test/ltxcmds-test-ifboxempty.tex\\
% test/ltxcmds-test-nextchar.tex & doc/latex/oberdiek/test/ltxcmds-test-nextchar.tex\\
+% test/ltxcmds-test-carcdr.tex & doc/latex/oberdiek/test/ltxcmds-test-carcdr.tex\\
% ltxcmds.dtx & source/latex/oberdiek/ltxcmds.dtx\\
% \end{tabular}^^A
% }^^A
@@ -2887,9 +3086,45 @@ X=%
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{ltxcmds.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='ltxcmds'>
+ <name>ltxcmds</name>
+ <caption>Some LaTeX kernel commands for general use.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.22'/>
+ <description>
+ This package exports some utility macros
+ from the LaTeX kernel into a separate namespace and
+ also makes them available for other formats such as plain TeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/ltxcmds.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/ltxcmds.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \raggedright
-%
+%
% \bibitem{ifempty:schneck}
% Robert R. Schneck:
% \textit{Re: \cs{ifempty} solution %
@@ -2899,7 +3134,7 @@ X=%
% 2003-06-17.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/be03a159ec374895}}
-%
+%
% \bibitem{ifnull:diez}
% Ulrich Diez:
% \textit{Re: TeX refuses to strip outer braces in argument};
@@ -2908,7 +3143,7 @@ X=%
% 2010-11-12.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/803bd57221a04996}}
-%
+%
% \bibitem{ifstrempty:musa}
% Ahmed Musa:
% \textit{Re: TeX refuses to strip outer braces in argument};
@@ -2917,7 +3152,7 @@ X=%
% 2010-12-03.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/fbf7d61a0c3a807d}}
-%
+%
% \bibitem{ifstrempty:diez1}
% Ulrich Diez:
% \textit{Re: TeX refuses to strip outer braces in argument};
@@ -2926,7 +3161,7 @@ X=%
% 2010-12-03.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/0c230ee479487962}}
-%
+%
% \bibitem{ifstrempty:diez2}
% Ulrich Diez:
% \textit{Re: TeX refuses to strip outer braces in argument};
@@ -2935,7 +3170,7 @@ X=%
% 2010-12-03.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/bbef4263390d647b}}
-%
+%
% \bibitem{ifstrempty:diez3}
% Ulrich Diez:
% \textit{Re: TeX refuses to strip outer braces in argument};
@@ -2944,7 +3179,7 @@ X=%
% 2010-12-04.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/00dfd1ec103cd272}}
-%
+%
% \bibitem{ifstrempty:gl}
% GL:
% \textit{Re: TeX refuses to strip outer braces in argument};
@@ -2953,7 +3188,7 @@ X=%
% 2010-12-04.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/d3a75995c1cf267e}}
-%
+%
% \bibitem{ifstrempty:ho}
% Heiko Oberdiek:
% \textit{Re: TeX refuses to strip outer braces in argument};
@@ -2962,7 +3197,7 @@ X=%
% 2010-12-04.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/5f7a23e3ab70e347}}
-%
+%
% \bibitem{ifboxempty:dak}
% David Kastrup:
% \textit{How to detect if \cs{vbox} is empty};
@@ -2970,7 +3205,7 @@ X=%
% 2011-02-04.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/8d3cb89496a4d86d}}
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -3095,6 +3330,20 @@ X=%
% \cs{ltx@ifnextchar} with conditional support (thanks GL for
% bug report).
% \end{Version}
+% \begin{Version}{2011/08/22 v1.21}
+% \item
+% \cs{ltx@GlobalPrependToMacro}, \cs{ltx@LocalPrependToMacro} added
+% (feature request of Martin M\"unch).
+% \end{Version}
+% \begin{Version}{2011/11/09 v1.22}
+% \item
+% \cs{ltx@carsecond}, \cs{ltx@carthird}, \cs{ltx@carfourth},
+% \cs{ltx@CarNumth} added.
+% \item
+% \cs{ltx@cdrzero}, \cs{ltx@cdr}, \cs{ltx@cdrtwo}, cs{ltx@cdrthree},
+% \cs{ltx@cdrfour}, \cs{ltx@CdrNum} modified to retain braces and spaces.
+% They are expandable in two expansion steps.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
index c714e3cc79e..4d4d4386e84 100644
--- a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: luacolor.dtx
-% Version: 2011/04/23 v1.6
-%
+% Version: 2011/11/01 v1.8
+% Info: Color support via LuaTeX's attributes
+%
% Copyright (C) 2007, 2009-2011 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
@@ -15,22 +16,22 @@
% 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 luacolor.dtx
% and the derived files
% luacolor.sty, luacolor.pdf, luacolor.ins, luacolor.drv,
% luacolor-test1.tex, luacolor-test2.tex, luacolor-test3.tex,
% oberdiek.luacolor.lua, luacolor.lua,
% oberdiek.luacolor-pre065.lua, luacolor-pre065.lua.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/luacolor.dtx
% CTAN:macros/latex/contrib/oberdiek/luacolor.pdf
-%
+%
% Unpacking:
% (a) If luacolor.ins is present:
% tex luacolor.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{luacolor.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If luacolor.drv is present:
% latex luacolor.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex luacolor.dtx
% makeindex -s gind.ist luacolor.idx
% pdflatex luacolor.dtx
% makeindex -s gind.ist luacolor.idx
% pdflatex luacolor.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/luacolor.sty
% TDS:scripts/oberdiek/oberdiek.luacolor.lua
@@ -84,7 +85,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luacolor 2011/04/23 v1.6 Coloring based on LuaTeX's node attributes (HO)}
+\Msg{* Package: luacolor 2011/11/01 v1.8 Color support via LuaTeX's attributes (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -96,7 +97,7 @@
This is a generated file.
Project: luacolor
-Version: 2011/04/23 v1.6
+Version: 2011/11/01 v1.8
Copyright (C) 2007, 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -134,6 +135,10 @@ and the derived files
\file{luacolor-test1.tex}{\from{luacolor.dtx}{test1}}%
\file{luacolor-test2.tex}{\from{luacolor.dtx}{test2}}%
\file{luacolor-test3.tex}{\from{luacolor.dtx}{test3}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{luacolor.xml}{\from{luacolor.dtx}{catalogue}}%
}
\def\MetaPrefix{-- }
\def\defaultpostamble{%
@@ -178,9 +183,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luacolor.drv}%
- [2011/04/23 v1.6 Coloring based on LuaTeX's node attributes (HO)]%
+ [2011/11/01 v1.8 Color support via LuaTeX's attributes (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
\makeatletter
\g@addto@macro\MakePrivateLetters{%
@@ -214,7 +219,7 @@ and the derived files
% \GetFileInfo{luacolor.drv}
%
% \title{The \xpackage{luacolor} package}
-% \date{2011/04/23 v1.6}
+% \date{2011/11/01 v1.8}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -356,7 +361,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luacolor}%
- [2011/04/23 v1.6 Coloring based on LuaTeX's node attributes (HO)]
+ [2011/11/01 v1.8 Color support via LuaTeX's attributes (HO)]
% \end{macrocode}
%
% \subsection{Check for \LuaTeX}
@@ -418,7 +423,7 @@ and the derived files
% \end{macrocode}
% \begin{macrocode}
\begingroup
- \edef\x{\LuaCol@directlua{tex.write("2011/04/23 v1.6")}}%
+ \edef\x{\LuaCol@directlua{tex.write("2011/11/01 v1.8")}}%
\edef\y{%
\LuaCol@directlua{%
if oberdiek.luacolor.getversion then %
@@ -593,7 +598,7 @@ module("oberdiek.luacolor", package.seeall)
% \begin{macro}{getversion()}
% \begin{macrocode}
function getversion()
- tex.write("2011/04/23 v1.6")
+ tex.write("2011/11/01 v1.8")
end
% \end{macrocode}
% \end{macro}
@@ -645,7 +650,7 @@ function dvidetect()
assert(v.id == node.id("hlist"))
%<!pre065> for v in node.traverse_id(node.id("whatsit"), v.head) do
%<pre065> for v in node.traverse_id(node.id("whatsit"), v.list) do
- if v and v.subtype == 3 then -- special
+ if v and v.subtype == node.subtype("special") then
local data = v.data
for pattern, driver in pairs(patterns) do
if string.find(data, pattern) then
@@ -673,6 +678,13 @@ local map = {
% \begin{macro}{get()}
% \begin{macrocode}
function get(color)
+ tex.write("" .. getvalue(color))
+end
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{getvalue()}
+% \begin{macrocode}
+function getvalue(color)
local n = map[color]
if not n then
n = map.n + 1
@@ -680,7 +692,7 @@ function get(color)
map[n] = color
map[color] = n
end
- tex.write("" .. n)
+ return n
end
% \end{macrocode}
% \end{macro}
@@ -696,6 +708,14 @@ end
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{getattribute()}
+% \begin{macrocode}
+function getattribute()
+ return attribute
+end
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{Whatsit insertion}
%
% \begin{macrocode}
@@ -710,9 +730,9 @@ local node_types = {
[node.id("glyph")] = COLOR,
[node.id("disc")] = COLOR,
[node.id("whatsit")] = {
- [3] = COLOR, -- special
- [8] = COLOR, -- pdf_literal
- [14] = COLOR, -- pdf_refximage
+ [node.subtype("special")] = COLOR,
+ [node.subtype("pdf_literal")] = COLOR,
+ [node.subtype("pdf_refximage")] = COLOR,
},
[node.id("glue")] =
function(n)
@@ -958,7 +978,7 @@ end
\pdfoutput=0 %
\fi
\documentclass{minimal}
-\usepackage{luacolor}[2011/04/23]
+\usepackage{luacolor}[2011/11/01]
\csname @@end\endcsname
\end
%</test2>
@@ -970,7 +990,7 @@ end
% \end{macrocode}
% \begin{macrocode}
\documentclass{minimal}
-\usepackage{luacolor}[2011/04/23]
+\usepackage{luacolor}[2011/11/01]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -1169,6 +1189,40 @@ end
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{luacolor.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='luacolor'>
+ <name>luacolor</name>
+ <caption>Color support based on LuaTeX's node attributes.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ This package implements color support based on LuaTeX's node
+ attributes.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/luacolor.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/luacolor.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/12/12 v1.0}
% \item
@@ -1224,6 +1278,16 @@ end
% \item
% Version check for Lua module added.
% \end{Version}
+% \begin{Version}{2011/10/22 v1.7}
+% \item
+% Lua functions \texttt{getattribute} and \texttt{getvalue}
+% added to tell other external Lua functions
+% the attribute register number for coloring.
+% \end{Version}
+% \begin{Version}{2011/11/01 v1.8}
+% \item
+% Use of \texttt{node.subtype} instead of magic numbers.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
index 891380bb656..c5e43771787 100644
--- a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: luatex.dtx
% Version: 2010/03/09 v0.4
-%
+% Info: LuaTeX basic definition package
+%
% Copyright (C) 2007, 2009, 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file luatex.dtx
% and the derived files
% luatex.sty, luatex.pdf, luatex.ins, luatex.drv, luatex-loader.sty,
% luatex-test1.tex, luatex-test2.tex, luatex-test3.tex,
% luatex-test4.tex, luatex-test5.tex, oberdiek.luatex.lua.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/luatex.dtx
% CTAN:macros/latex/contrib/oberdiek/luatex.pdf
-%
+%
% Unpacking:
% (a) If luatex.ins is present:
% tex luatex.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{luatex.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If luatex.drv is present:
% latex luatex.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex luatex.dtx
% makeindex -s gind.ist luatex.idx
% pdflatex luatex.dtx
% makeindex -s gind.ist luatex.idx
% pdflatex luatex.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/luatex.sty
% TDS:tex/generic/oberdiek/luatex-loader.sty
@@ -141,6 +142,10 @@ and the derived files
\file{luatex-test3.tex}{\from{luatex.dtx}{test1,test3}}%
\file{luatex-test4.tex}{\from{luatex.dtx}{test4}}%
\file{luatex-test5.tex}{\from{luatex.dtx}{test5}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{luatex.xml}{\from{luatex.dtx}{catalogue}}%
}
\def\MetaPrefix{-- }
\def\defaultpostamble{%
@@ -183,7 +188,7 @@ and the derived files
\ProvidesFile{luatex.drv}%
[2010/03/09 v0.4 LuaTeX basic definition package (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
\begin{document}
\DocInput{luatex.dtx}%
@@ -1864,6 +1869,49 @@ table.insert(package.loaders, kpse_module_loader)
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{luatex.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='luatex'>
+ <name>luatex</name>
+ <caption>The LuaTeX engine.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='0.4'/>
+ <description>
+ LuaTeX is an extended version of pdfTeX using Lua as an embedded
+ scripting language. The LuaTeX project&#x2019;s main objective
+ is to provide an open and configurable variant of TeX while at the
+ same time offering downward compatibility.
+ <p/>
+ LuaTeX uses Unicode (as UTF-8) as its default input encoding, and
+ is able to use modern (OpenType) fonts (for both text and mathematics).
+ <p/>
+ It should be noted that LuaTeX is still under development; its
+ specification has been declared stable, but absolute stability
+ may not in practice be assumed.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/luatex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/luatex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/12/12 v0.1}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx
index 2050d78b194..161dd909801 100644
--- a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: magicnum.dtx
% Version: 2011/04/10 v1.4
-%
-% Copyright (C) 2007, 2009, 2010, 2011 by
+% Info: Magic numbers
+%
+% Copyright (C) 2007, 2009-2011 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file magicnum.dtx
% and the derived files
% magicnum.sty, magicnum.pdf, magicnum.ins, magicnum.drv, magicnum.txt,
% magicnum-test1.tex, magicnum-test2.tex, magicnum-test3.tex,
% magicnum-test4.tex, magicnum.lua, oberdiek.magicnum.lua.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/magicnum.dtx
% CTAN:macros/latex/contrib/oberdiek/magicnum.pdf
-%
+%
% Unpacking:
% (a) If magicnum.ins is present:
% tex magicnum.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{magicnum.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If magicnum.drv is present:
% latex magicnum.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex magicnum.dtx
% makeindex -s gind.ist magicnum.idx
% pdflatex magicnum.dtx
% makeindex -s gind.ist magicnum.idx
% pdflatex magicnum.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/magicnum.sty
% TDS:scripts/oberdiek/magicnum.lua
@@ -100,7 +101,7 @@ This is a generated file.
Project: magicnum
Version: 2011/04/10 v1.4
-Copyright (C) 2007, 2009, 2010, 2011 by
+Copyright (C) 2007, 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -143,6 +144,8 @@ and the derived files
\nopostamble
\usedir{doc/latex/oberdiek}%
\file{magicnum.txt}{\from{magicnum.dtx}{data}}%
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{magicnum.xml}{\from{magicnum.dtx}{catalogue}}%
}
\def\MetaPrefix{-- }
\def\defaultpostamble{%
@@ -186,7 +189,7 @@ and the derived files
\ProvidesFile{magicnum.drv}%
[2011/04/10 v1.4 Magic numbers (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{array}
\begin{document}
\DocInput{magicnum.dtx}%
@@ -1518,6 +1521,42 @@ end
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{magicnum.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='magicnum'>
+ <name>magicnum</name>
+ <caption>Access TeX systems' "magic numbers".</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ This package allows access to the various parameter values in
+ TeX (catcode values), e-TeX (group, if and node types, and
+ interaction mode), and LuaTeX (pdfliteral mode) by a hierarchical
+ name system.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/magicnum.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/magicnum.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/12/12 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
index 332bf02461d..2334906fd50 100644
--- a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: makerobust.dtx
% Version: 2006/03/18 v1.0
-%
+% Info: Make existing macro robust
+%
% Copyright (C) 2006 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
@@ -15,20 +16,20 @@
% 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 makerobust.dtx
% and the derived files
% makerobust.sty, makerobust.pdf, makerobust.ins, makerobust.drv,
% makerobust-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/makerobust.dtx
% CTAN:macros/latex/contrib/oberdiek/makerobust.pdf
-%
+%
% Unpacking:
% (a) If makerobust.ins is present:
% tex makerobust.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{makerobust.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If makerobust.drv is present:
% latex makerobust.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex makerobust.dtx
% makeindex -s gind.ist makerobust.idx
% pdflatex makerobust.dtx
% makeindex -s gind.ist makerobust.idx
% pdflatex makerobust.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/makerobust.sty
% TDS:doc/latex/oberdiek/makerobust.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: makerobust 2006/03/18 v1.0 Making a macro robust (HO)}
+\Msg{* Package: makerobust 2006/03/18 v1.0 Make existing macro robust (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{makerobust.sty}{\from{makerobust.dtx}{package}}%
\usedir{doc/latex/oberdiek}%
\file{makerobust-example.tex}{\from{makerobust.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{makerobust.xml}{\from{makerobust.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,9 +153,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{makerobust.drv}%
- [2006/03/18 v1.0 Making a macro robust (HO)]%
+ [2006/03/18 v1.0 Make existing macro robust (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{makerobust.dtx}%
\end{document}
@@ -268,7 +273,7 @@ Second page.
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{makerobust}%
- [2006/03/18 v1.0 Making a macro robust (HO)]%
+ [2006/03/18 v1.0 Make existing macro robust (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -493,6 +498,41 @@ Second page.
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{makerobust.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='makerobust'>
+ <name>makerobust</name>
+ <caption>Making a macro robust.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package provides the command MakeRobustCommand
+ that converts an existing macro to a robust one.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/makerobust.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/makerobust.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2006/03/18 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/mleftright.dtx b/Master/texmf-dist/source/latex/oberdiek/mleftright.dtx
index b20c6f3280c..f74033db5af 100644
--- a/Master/texmf-dist/source/latex/oberdiek/mleftright.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/mleftright.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: mleftright.dtx
% Version: 2010/09/25 v1.0
-%
+% Info: Math left/right delim. as open/close
+%
% Copyright (C) 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file mleftright.dtx
% and the derived files
% mleftright.sty, mleftright.pdf, mleftright.ins, mleftright.drv,
% mleftright-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/mleftright.dtx
% CTAN:macros/latex/contrib/oberdiek/mleftright.pdf
-%
+%
% Unpacking:
% (a) If mleftright.ins is present:
% tex mleftright.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{mleftright.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If mleftright.drv is present:
% latex mleftright.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex mleftright.dtx
% makeindex -s gind.ist mleftright.idx
% pdflatex mleftright.dtx
% makeindex -s gind.ist mleftright.idx
% pdflatex mleftright.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/mleftright.sty
% TDS:doc/latex/oberdiek/mleftright.pdf
@@ -79,7 +80,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: mleftright 2010/09/25 v1.0 Usual delimiter spacing with left and right (HO)}
+\Msg{* Package: mleftright 2010/09/25 v1.0 Math left/right delim. as open/close (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -128,6 +129,10 @@ and the derived files
\file{mleftright.sty}{\from{mleftright.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{mleftright-test1.tex}{\from{mleftright.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{mleftright.xml}{\from{mleftright.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -154,9 +159,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{mleftright.drv}%
- [2010/09/25 v1.0 Usual delimiter spacing with left and right (HO)]%
+ [2010/09/25 v1.0 Math left/right delim. as open/close (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{mleftright}[2010/09/25]
\begin{document}
\DocInput{mleftright.dtx}%
@@ -164,7 +169,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{544}
+% \CheckSum{550}
%
% \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
@@ -353,7 +358,7 @@ and the derived files
\fi
\expandafter\x\csname ver@mleftright.sty\endcsname
\ProvidesPackage{mleftright}%
- [2010/09/25 v1.0 Usual delimiter spacing with left and right (HO)]%
+ [2010/09/25 v1.0 Math left/right delim. as open/close (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -475,7 +480,7 @@ and the derived files
\ltx@IfUndefined{currentgrouplevel}{%
\catcode38=14 % & = comment
}{%
- \catcode38=9 % & = ignore_
+ \catcode38=9 % & = ignore
}
% \end{macrocode}
%
@@ -886,8 +891,44 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{mleftright.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='mleftright'>
+ <name>mleftright</name>
+ <caption>Variants of delimiters that act as maths open/close.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines variants <tt>\mleft</tt> and <tt>\mright</tt>
+ of <tt>\left</tt> and <tt>\right</tt>, that make the delimiters
+ act as <tt>\mathopen</tt> and <tt>\mathclose</tt>. These commands
+ address spacing difficulties in subformulas.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/mleftright.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/mleftright.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
-%
+%
% \begin{description}
% \item[Donald Arsenau:]
% He provided the main trick and the first macros.
@@ -905,7 +946,7 @@ and the derived files
% 2010-08-12.
% \newblock
% {\small\url{http://groups.google.com/group/comp.text.tex/msg/e5b6833da7dc29bf}}
-%
+%
% \bibitem{arseneau}
% Donald Arseneau,
% \textit{Re: spacing after \cs{right}\texttt) and before \cs{left}\texttt)},
@@ -914,7 +955,7 @@ and the derived files
% 2010-08-30.
% \newblock
% {\small\url{http://groups.google.com/group/comp.text.tex/msg/e0b2e4386e5d04e4}}
-%
+%
% \bibitem{stephani}
% Philipp Stephani,
% \textit{Re: spacing after \cs{right}\texttt) and before \cs{left}\texttt)},
@@ -923,7 +964,7 @@ and the derived files
% 2010-09-12.
% \newblock
% {\small\url{http://groups.google.com/group/comp.text.tex/msg/87ac1f61321de3ef}}
-%
+%
% \bibitem{oberdiek}
% Heiko Oberdiek,
% \textit{Re: spacing after \cs{right}\texttt) and before \cs{left}\texttt)},
@@ -932,7 +973,7 @@ and the derived files
% 2010-09-12.
% \newblock
% {\small\url{http://groups.google.com/group/comp.text.tex/msg/257aa6119bef878b}}
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index c802b20d750..bde53bb30e8 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
-% 2011/04/23
+% 2012/04/26
%
% Copyright (C) 1999, 2001, 2006 by
% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -43,9 +43,11 @@
\batchinput{dvipscol.dtx}
\batchinput{embedfile.dtx}
\batchinput{engord.dtx}
+\batchinput{enparen.dtx}
\batchinput{eolgrab.dtx}
\batchinput{epstopdf.dtx}
\batchinput{etexcmds.dtx}
+\batchinput{fibnum.dtx}
\batchinput{flags.dtx}
\batchinput{gettitlestring.dtx}
\batchinput{grfext.dtx}
@@ -109,6 +111,7 @@
\batchinput{tabularht.dtx}
\batchinput{tabularkv.dtx}
\batchinput{telprint.dtx}
+\batchinput{thepdfnumber.dtx}
\batchinput{transparent.dtx}
\batchinput{twoopt.dtx}
\batchinput{uniquecounter.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index d6fc4cb4fba..342d30c4a63 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}{2011/04/23}
+\newcommand*{\Date}{2012/04/26}
% Copyright (C) 2006-2011 by
% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -28,6 +28,14 @@
% for the projects in CTAN:macros/latex/contrib/oberdiek/.
%
\documentclass[a4paper,12pt]{article}
+
+\usepackage{ifluatex}
+\ifluatex
+ \usepackage{fontspec}[2011/09/18]%
+ \usepackage{unicode-math}[2011/09/19]%
+ \setmathfont{lmmath-regular.otf}%
+\fi
+
\usepackage[
ignorehead,
top=1in,
@@ -36,6 +44,7 @@
\usepackage{color}
\usepackage[ngerman,english]{babel}
\usepackage{hologo}
+\usepackage{biblatex}% for internals in .toc files
\definecolor{link}{rgb}{1,0,0}% red
\definecolor{file}{rgb}{0,0,1}% blue
@@ -166,187 +175,193 @@
\begin{overview}
\entry{accsupp}{2010/01/16}{0.3}{Accessibility support by marked content}%
[\entrysep]
-\entry{aliascnt}{2009/09/08}{1.3}{Alias counter}%
+\entry{aliascnt}{2009/09/08}{1.3}{Alias counters}%
[\entrysep]
-\entry{alphalph}{2010/04/18}{2.3}{Converting numbers to letters}%
+\entry{alphalph}{2011/05/13}{2.4}{Convert numbers to letters}%
[\entrysep]
-\entry{askinclude}{2008/08/11}{2.1}{Interactive asking of included files}%
+\entry{askinclude}{2011/12/02}{2.2}{Interactive asking of included files}%
[\entrysep]
-\entry{atbegshi}{2011/01/30}{1.15}{At begin shipout hook}%
+\entry{atbegshi}{2011/10/05}{1.16}{At begin shipout hook}%
[\entrysep]
\entry{atenddvi}{2007/04/17}{1.1}{At end DVI hook}%
[\entrysep]
-\entry{attachfile2}{2010/09/27}{2.6}{attach files into PDF}%
+\entry{attachfile2}{2012/04/18}{2.7}{Attach files into PDF}%
[\entrysep]
-\entry{atveryend}{2011/04/23}{1.7}{Hooks at very end of document}%
+\entry{atveryend}{2011/06/30}{1.8}{Hooks at the very end of document}%
[\entrysep]
\entry{auxhook}{2011/03/04}{1.3}{Hooks for auxiliary files}%
[\entrysep]
-\entry{bigintcalc}{2011/01/30}{1.2}{Expandable big integer calculations}%
+\entry{bigintcalc}{2012/04/08}{1.3}{Expandable calculations on big integers}%
[\entrysep]
-\entry{bitset}{2011/01/30}{1.1}{Data type bit set}%
+\entry{bitset}{2011/01/30}{1.1}{Handle bit-vector datatype}%
[\entrysep]
-\entry{bmpsize}{2009/09/04}{1.6}{Extract size and resolution data from bitmap files}%
+\entry{bmpsize}{2009/09/04}{1.6}{Extract size/resolution from bitmap files}%
[\entrysep]
-\entry{bookmark}{2011/04/21}{1.21}{PDF bookmarks}%
+\entry{bookmark}{2011/12/02}{1.24}{PDF bookmarks}%
[\entrysep]
-\entry{catchfile}{2011/03/01}{1.6}{Catches the contents of a file}%
+\entry{catchfile}{2011/03/01}{1.6}{Catch the contents of a file}%
[\entrysep]
-\entry{centernot}{2010/03/29}{1.2}{Centers the not symbol horizontally}%
+\entry{centernot}{2011/07/11}{1.3}{Centers the not symbol horizontally}%
[\entrysep]
-\entry{chemarr}{2006/02/20}{1.2}{Chemical reaction arrows}%
+\entry{chemarr}{2006/02/20}{1.2}{Arrows for chemical reactions}%
[\entrysep]
-\entry{classlist}{2008/08/11}{1.3}{Record loaded classes}%
+\entry{classlist}{2011/10/17}{1.4}{Record classes used in a document}%
[\entrysep]
\entry{colonequals}{2006/08/01}{1.0}{Colon equals symbols}%
[\entrysep]
-\entry{dvipscol}{2008/08/11}{1.2}{Fix for dvips.def}%
+\entry{dvipscol}{2008/08/11}{1.2}{Alter the usage of the dvips color stack}%
[\entrysep]
-\entry{embedfile}{2011/04/13}{2.6}{embed files into PDF}%
+\entry{embedfile}{2011/04/13}{2.6}{Embed files into PDF}%
[\entrysep]
\entry{engord}{2010/03/01}{1.8}{Provides English ordinal numbers}%
[\entrysep]
-\entry{eolgrab}{2011/01/12}{1.0}{Grab line end delimited argument}%
+\entry{enparen}{2012/01/07}{1.0}{Parentheses nesting}%
+[\entrysep]
+\entry{eolgrab}{2011/01/12}{1.0}{Catch arguments delimited by end of line}%
[\entrysep]
\entry{epstopdf}{2010/02/09}{2.5}{Conversion with epstopdf on the fly}%
[\entrysep]
-\entry{etexcmds}{2011/02/16}{1.5}{Prefix for e-TeX command names}%
+\entry{etexcmds}{2011/02/16}{1.5}{Avoid name clashes with \hologo{eTeX} commands}%
[\entrysep]
-\entry{flags}{2007/09/30}{0.4}{Flag setting in bit fields}%
+\entry{fibnum}{2012/04/08}{1.0}{Fibonacci numbers}%
+[\entrysep]
+\entry{flags}{2007/09/30}{0.4}{Setting/clearing of flags in bit fields}%
[\entrysep]
\entry{gettitlestring}{2010/12/03}{1.4}{Cleanup title references}%
[\entrysep]
-\entry{grfext}{2010/08/19}{1.1}{Managing graphics extensions}%
+\entry{grfext}{2010/08/19}{1.1}{Manage graphics extensions}%
[\entrysep]
-\entry{grffile}{2010/12/09}{1.13}{Extended file name support for graphics}%
+\entry{grffile}{2012/04/05}{1.16}{Extended file name support for graphics}%
[\entrysep]
-\entry{hobsub}{2011/04/23}{1.4}{Subsetting bundle oberdiek}%
+\entry{hobsub}{2012/04/25}{1.12}{Construct package bundles}%
[\entrysep]
-\entry{hologo}{2011/04/21}{1.5}{Logo collection}%
+\entry{hologo}{2012/04/26}{1.10}{A logo collection with bookmark support}%
[\entrysep]
-\entry{holtxdoc}{2011/02/04}{0.21}{Private additional ltxdoc support}%
+\entry{holtxdoc}{2012/03/21}{0.24}{Private additional ltxdoc support}%
[\entrysep]
-\entry{hopatch}{2011/01/30}{1.0}{Wrapper for package hooks}%
+\entry{hopatch}{2011/06/24}{1.1}{Wrapper for package hooks}%
[\entrysep]
-\entry{hycolor}{2011/01/30}{1.7}{Color options of hyperref/bookmark}%
+\entry{hycolor}{2011/01/30}{1.7}{Color options for hyperref/bookmark}%
[\entrysep]
\entry{hypbmsec}{2007/04/11}{2.4}{Bookmarks in sectioning commands}%
[\entrysep]
-\entry{hypcap}{2011/02/16}{1.11}{Adjusting anchors of captions}%
+\entry{hypcap}{2011/02/16}{1.11}{Adjusting the anchors of captions}%
[\entrysep]
-\entry{hypdestopt}{2008/08/08}{2.2}{Hyperref destination optimizer}%
+\entry{hypdestopt}{2011/05/13}{2.3}{Hyperref destination optimizer}%
[\entrysep]
-\entry{hypdoc}{2010/03/26}{1.9}{Hyper extensions for doc.sty}%
+\entry{hypdoc}{2011/08/19}{1.11}{Hyper extensions for doc.sty}%
[\entrysep]
-\entry{hypgotoe}{2007/10/30}{0.1}{Experimental links to embedded files}%
+\entry{hypgotoe}{2007/10/30}{0.1}{Links to embedded files}%
[\entrysep]
\entry{hyphsubst}{2008/06/09}{0.2}{Substitute hyphenation patterns}%
[\entrysep]
-\entry{ifdraft}{2008/08/11}{1.3}{Switch for option draft}%
+\entry{ifdraft}{2008/08/11}{1.3}{Detect class options draft and final}%
[\entrysep]
-\entry{iflang}{2007/11/11}{1.5}{Language checks}%
+\entry{iflang}{2007/11/11}{1.5}{Checks for the current language}%
[\entrysep]
\entry{ifluatex}{2010/03/01}{1.3}{Provides the ifluatex switch}%
[\entrysep]
\entry{ifpdf}{2011/01/30}{2.3}{Provides the ifpdf switch}%
[\entrysep]
-\entry{ifvtex}{2010/03/01}{1.5}{Switches for detecting VTeX and its modes}%
+\entry{ifvtex}{2010/03/01}{1.5}{Detect \hologo{VTeX} and its facilities}%
[\entrysep]
-\entry{infwarerr}{2010/04/08}{1.3}{Providing info/warning/message}%
+\entry{infwarerr}{2010/04/08}{1.3}{Providing info/warning/error messages}%
[\entrysep]
-\entry{inputenx}{2011/04/10}{1.8}{Enhanced input encoding handling}%
+\entry{inputenx}{2011/05/27}{1.10}{Enhanced input encoding handling}%
[\entrysep]
-\entry{intcalc}{2007/09/27}{1.1}{Expandable integer calculations}%
+\entry{intcalc}{2007/09/27}{1.1}{Expandable calculations with integers}%
[\entrysep]
-\entry{kvdefinekeys}{2011/04/07}{1.3}{Defining keys}%
+\entry{kvdefinekeys}{2011/04/07}{1.3}{Define keys}%
[\entrysep]
-\entry{kvoptions}{2010/12/23}{3.10}{Keyval support for \LaTeX{} options}%
+\entry{kvoptions}{2011/06/30}{3.11}{Key value format for package options}%
[\entrysep]
-\entry{kvsetkeys}{2011/04/07}{1.13}{Key value parser}%
+\entry{kvsetkeys}{2012/04/25}{1.16}{Key value parser}%
[\entrysep]
-\entry{letltxmacro}{2010/09/02}{1.4}{Let assignment for \LaTeX{} macros}%
+\entry{letltxmacro}{2010/09/02}{1.4}{Let assignment for \hologo{LaTeX} macros}%
[\entrysep]
-\entry{listingsutf8}{2007/11/11}{1.1}{Adding support for UTF-8 to listings}%
+\entry{listingsutf8}{2011/11/10}{1.2}{Allow UTF-8 in listings input}%
[\entrysep]
-\entry{ltxcmds}{2011/04/18}{1.20}{\LaTeX{} kernel commands for general use}%
+\entry{ltxcmds}{2011/11/09}{1.22}{\hologo{LaTeX} kernel commands for general use}%
[\entrysep]
-\entry{luacolor}{2011/04/23}{1.6}{Coloring based on LuaTeX's node attributes}%
+\entry{luacolor}{2011/11/01}{1.8}{Color support via \hologo{LuaTeX}'s attributes}%
[\entrysep]
-\entry{luatex}{2010/03/09}{0.4}{LuaTeX basic definition package}%
+\entry{luatex}{2010/03/09}{0.4}{\hologo{LuaTeX} basic definition package}%
[\entrysep]
\entry{magicnum}{2011/04/10}{1.4}{Magic numbers}%
[\entrysep]
-\entry{makerobust}{2006/03/18}{1.0}{Making a macro robust}%
+\entry{makerobust}{2006/03/18}{1.0}{Make existing macro robust}%
[\entrysep]
-\entry{mleftright}{2010/09/25}{1.0}{Usual delimiter spacing with left and right}%
+\entry{mleftright}{2010/09/25}{1.0}{Math left/right delim.\@ as open/close}%
[\entrysep]
\entry{pagegrid}{2009/12/04}{1.4}{Print page grid in background}%
[\entrysep]
-\entry{pagesel}{2008/08/11}{1.8}{Selecting shipout output pages}%
+\entry{pagesel}{2008/08/11}{1.8}{Select pages of a document for output}%
[\entrysep]
-\entry{pdfcol}{2007/12/12}{1.2}{Maintaining additional color stacks for pdfTeX}%
+\entry{pdfcol}{2007/12/12}{1.2}{Handle new color stacks for \hologo{pdfTeX}}%
[\entrysep]
-\entry{pdfcolfoot}{2007/09/09}{1.1}{pdfTeX's color stack for footnotes}%
+\entry{pdfcolfoot}{2012/01/02}{1.2}{Color stack for footnotes with \hologo{pdfTeX}}%
[\entrysep]
-\entry{pdfcolmk}{2008/08/11}{1.2}{PDFtex COLor MarK}%
+\entry{pdfcolmk}{2008/08/11}{1.2}{Color support for \hologo{pdfTeX} via marks}%
[\entrysep]
-\entry{pdfcolparallel}{2010/01/11}{1.3}{Fixed parallel with color stacks support}%
+\entry{pdfcolparallel}{2010/01/11}{1.3}{Color stacks support for parallel}%
[\entrysep]
-\entry{pdfcolparcolumns}{2010/01/11}{1.3}{Color stacks support for parcolumns}%
+\entry{pdfcolparcolumns}{2010/01/11}{1.3}{Color stacks for parcolumns}%
[\entrysep]
-\entry{pdfcrypt}{2007/04/26}{1.0}{Setting pdf encryption}%
+\entry{pdfcrypt}{2007/04/26}{1.0}{Allows the setting of PDF encryption}%
[\entrysep]
-\entry{pdfescape}{2011/04/04}{1.12}{Provides string conversions}%
+\entry{pdfescape}{2011/11/25}{1.13}{Implements \hologo{pdfTeX}'s escape features}%
[\entrysep]
-\entry{pdflscape}{2008/08/11}{0.10}{Landscape pages in PDF}%
+\entry{pdflscape}{2008/08/11}{0.10}{Display of landscape pages in PDF}%
[\entrysep]
\entry{pdfrender}{2010/01/28}{1.2}{Access to some PDF graphics parameters}%
[\entrysep]
-\entry{pdftexcmds}{2011/04/22}{0.16}{Utilities of pdfTeX for LuaTeX}%
+\entry{pdftexcmds}{2011/11/29}{0.20}{Utility functions of \hologo{pdfTeX} for \hologo{LuaTeX}}%
[\entrysep]
\entry{picture}{2009/10/11}{1.3}{Dimens for picture macros}%
[\entrysep]
\entry{pmboxdraw}{2011/03/24}{1.1}{Poor man's box drawing characters}%
[\entrysep]
-\entry{protecteddef}{2011/01/31}{1.0}{Definition of protected macros}%
+\entry{protecteddef}{2011/01/31}{1.0}{Define protected commands}%
[\entrysep]
-\entry{refcount}{2010/12/01}{3.2}{Data extraction from references}%
+\entry{refcount}{2011/10/16}{3.4}{Data extraction from label references}%
[\entrysep]
\entry{rerunfilecheck}{2011/04/15}{1.7}{Rerun checks for auxiliary files}%
[\entrysep]
-\entry{resizegather}{2010/03/01}{1.2}{Automatically resizing of too large equations}%
+\entry{resizegather}{2010/03/01}{1.2}{Resize overly large equations}%
[\entrysep]
-\entry{rotchiffre}{2010/11/12}{1.0}{Provides ROT13, ROT5, ROT18, ROT47}%
+\entry{rotchiffre}{2010/11/12}{1.0}{Perform simple rotation ciphers}%
[\entrysep]
-\entry{scrindex}{2008/08/11}{1.1}{Package index with scr* classes}%
+\entry{scrindex}{2008/08/11}{1.1}{Package index with \hologo{KOMAScript} classes}%
[\entrysep]
-\entry{selinput}{2007/09/09}{1.2}{Select input encoding}%
+\entry{selinput}{2007/09/09}{1.2}{Semi-automatic input encoding detection}%
[\entrysep]
\entry{setouterhbox}{2007/09/09}{1.7}{Set hbox in outer horizontal mode}%
[\entrysep]
-\entry{settobox}{2008/08/11}{1.4}{Getting box sizes}%
+\entry{settobox}{2008/08/11}{1.4}{Assign box dimensions to length registers}%
[\entrysep]
-\entry{soulutf8}{2007/09/09}{1.0}{Adding support for UTF-8 to soul}%
+\entry{soulutf8}{2007/09/09}{1.0}{Permit use of UTF-8 characters in soul}%
[\entrysep]
\entry{stackrel}{2007/11/11}{1.2}{Adding subscript option to stackrel}%
[\entrysep]
-\entry{stampinclude}{2008/07/14}{1.0}{Time stamp based including}%
+\entry{stampinclude}{2008/07/14}{1.0}{Include files based on time stamps}%
+[\entrysep]
+\entry{stringenc}{2011/12/02}{1.10}{Convert strings between diff.\@ encodings}%
[\entrysep]
-\entry{stringenc}{2010/03/01}{1.8}{Converts strings between encodings}%
+\entry{tabularht}{2007/04/11}{2.5}{Tabular with height specified}%
[\entrysep]
-\entry{tabularht}{2007/04/11}{2.5}{Tabular with height specification}%
+\entry{tabularkv}{2006/02/20}{1.1}{Tabular with key value interface}%
[\entrysep]
-\entry{tabularkv}{2006/02/20}{1.1}{Key value interface for tabular parameters}%
+\entry{telprint}{2008/08/11}{1.10}{Format German phone numbers}%
[\entrysep]
-\entry{telprint}{2008/08/11}{1.10}{Formatting of German phone numbers}%
+\entry{thepdfnumber}{2011/11/24}{1.0}{Print PDF numbers with minimal digits}%
[\entrysep]
-\entry{transparent}{2007/01/08}{1.0}{Using a pdfTeX's color stack for transparency}%
+\entry{transparent}{2007/01/08}{1.0}{Transparency via \hologo{pdfTeX}'s color stack}%
[\entrysep]
\entry{twoopt}{2008/08/11}{1.5}{Definitions with two optional arguments}%
[\entrysep]
-\entry{uniquecounter}{2011/01/30}{1.2}{Provides unlimited unique counter}%
+\entry{uniquecounter}{2011/01/30}{1.2}{Provide unlimited unique counter}%
[\entrysep]
-\entry{zref}{2011/03/18}{2.21}{New reference scheme for \LaTeXe{}}%
+\entry{zref}{2012/04/04}{2.24}{A new reference scheme for \hologo{LaTeX}}%
\end{overview}
\section{Packages}
@@ -377,7 +392,7 @@ share the same counter register and clear list.
\label{alphalph}
\begin{abstract}
The package provides methods to represent numbers with a limited
-set of symbols. Both \LaTeX\ and \plainTeX are supported.
+set of symbols. Both \hologo{LaTeX} and \hologo{plainTeX} are supported.
\end{abstract}
\tocinclude{alphalph}
@@ -573,6 +588,15 @@ It can be used with plain and \LaTeX\ formats.
\tocinclude{engord}
\newpage
+\subsection{\pkgsectformat{enparen}}
+\label{enparen}
+\begin{abstract}
+The package defines macros to set parentheses that automatically
+change the symbols from inner to outer fences.
+\end{abstract}
+\tocinclude{enparen}
+
+\newpage
\subsection{\pkgsectformat{eolgrab}}
\label{eolgrab}
\begin{abstract}
@@ -604,6 +628,15 @@ name clashes by adding a prefix to \eTeX's commands. For example,
\tocinclude{etexcmds}
\newpage
+\subsection{\pkgsectformat{fibnum}}
+\label{fibnum}
+\begin{abstract}
+The package \xpackage{fibnum} provides expandable fibonacci
+numbers for both \hologo{LaTeX} and \hologo{plainTeX}.
+\end{abstract}
+\tocinclude{fibnum}
+
+\newpage
\subsection{\pkgsectformat{flags}}
\label{flags}
\begin{abstract}
@@ -1107,7 +1140,7 @@ Otherwise the macro is not made robust.
References are not numbers, however they often store numerical
data such as section or page numbers. \cs{ref} or \cs{pageref}
cannot be used for counter assignments or calculations because
-they are not expandable, generate warnings, or can even be links,
+they are not expandable, generate warnings, or can even be links.
The package provides expandable macros to extract the data
from references. Packages \xpackage{hyperref}, \xpackage{nameref},
\xpackage{titleref}, and \xpackage{babel} are supported.
@@ -1258,6 +1291,16 @@ German phone numbers.
\tocinclude{telprint}
\newpage
+\subsection{\pkgsectformat{thepdfnumber}}
+\label{thepdfnumber}
+\begin{abstract}
+The package converts real numbers to a minimal representation
+that is stripped from leading or trailing zeros,
+plus signs and decimal point if not necessary.
+\end{abstract}
+\tocinclude{thepdfnumber}
+
+\newpage
\subsection{\pkgsectformat{transparent}}
\label{transparent}
\begin{abstract}
@@ -1281,7 +1324,7 @@ optional arguments.
\label{uniquecounter}
\begin{abstract}
This package provides a kind of counter that provides unique
-number values. Several counter can be created by different names.
+number values. Several counters can be created by different names.
The numeric values are not limited.
\end{abstract}
\tocinclude{uniquecounter}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx b/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx
index ba6f54d9f20..e335c8f14cb 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pagegrid.dtx
% Version: 2009/12/04 v1.4
-%
+% Info: Print page grid in background
+%
% Copyright (C) 2009 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
@@ -15,20 +16,20 @@
% 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 pagegrid.dtx
% and the derived files
% pagegrid.sty, pagegrid.pdf, pagegrid.ins, pagegrid.drv,
% pagegrid-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pagegrid.dtx
% CTAN:macros/latex/contrib/oberdiek/pagegrid.pdf
-%
+%
% Unpacking:
% (a) If pagegrid.ins is present:
% tex pagegrid.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pagegrid.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pagegrid.drv is present:
% latex pagegrid.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pagegrid.dtx
% makeindex -s gind.ist pagegrid.idx
% pdflatex pagegrid.dtx
% makeindex -s gind.ist pagegrid.idx
% pdflatex pagegrid.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pagegrid.sty
% TDS:doc/latex/oberdiek/pagegrid.pdf
@@ -122,6 +123,10 @@ and the derived files
\file{pagegrid.sty}{\from{pagegrid.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{pagegrid-test1.tex}{\from{pagegrid.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pagegrid.xml}{\from{pagegrid.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -150,7 +155,7 @@ and the derived files
\ProvidesFile{pagegrid.drv}%
[2009/12/04 v1.4 Print page grid in background (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pagegrid.dtx}%
\end{document}
@@ -1052,8 +1057,48 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pagegrid.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pagegrid'>
+ <name>pagegrid</name>
+ <caption>Print page grid in background.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ This package puts a grid on the paper. It was written for
+ developers of a class or package
+ who have to put elements on definite locations on a page
+ (e.g. letter class). The grid allows a faster optical check,
+ whether the positions are correct. If the previewer already
+ offers features for measuring, the package might be unnecessary.
+ Otherwise it saves the developer from printing the page and
+ measuring by hand.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pagegrid.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pagegrid.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
-%
+%
% \begin{description}
% \item[Klaus Braune:]
% He provided the idea and the first \xpackage{tikz} code.
diff --git a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
index b9bfe563c2c..e95e952587f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pagesel.dtx
% Version: 2008/08/11 v1.8
-%
+% Info: Select pages of a document for output
+%
% Copyright (C) 1999, 2003, 2006-2008 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
@@ -15,19 +16,19 @@
% 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 pagesel.dtx
% and the derived files
% pagesel.sty, pagesel.pdf, pagesel.ins, pagesel.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pagesel.dtx
% CTAN:macros/latex/contrib/oberdiek/pagesel.pdf
-%
+%
% Unpacking:
% (a) If pagesel.ins is present:
% tex pagesel.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pagesel.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pagesel.drv is present:
% latex pagesel.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pagesel.dtx
% makeindex -s gind.ist pagesel.idx
% pdflatex pagesel.dtx
% makeindex -s gind.ist pagesel.idx
% pdflatex pagesel.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pagesel.sty
% TDS:doc/latex/oberdiek/pagesel.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pagesel 2008/08/11 v1.8 Selecting shipout output pages (HO)}
+\Msg{* Package: pagesel 2008/08/11 v1.8 Select pages of a document for output (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{pagesel.drv}{\from{pagesel.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{pagesel.sty}{\from{pagesel.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pagesel.xml}{\from{pagesel.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,9 +148,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pagesel.drv}%
- [2008/08/11 v1.8 Selecting shipout output pages (HO)]%
+ [2008/08/11 v1.8 Select pages of a document for output (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pagesel.dtx}%
\end{document}
@@ -295,7 +300,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pagesel}
- [2008/08/11 v1.8 Selecting shipout output pages (HO)]%
+ [2008/08/11 v1.8 Select pages of a document for output (HO)]%
% \end{macrocode}
%
% If the package is loaded twice, the package code does not
@@ -804,6 +809,41 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pagesel.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pagesel'>
+ <name>pagesel</name>
+ <caption>Select pages of a document for output.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2003,2006-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.8'/>
+ <description>
+ Selects single pages, ranges of pages, odd pages or even pages
+ for output.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pagesel.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pagesel.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1999/03/01 v0.9}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
index 94059d42cdc..7d85f26bc5f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfcol.dtx
% Version: 2007/12/12 v1.2
-%
+% Info: Handle new color stacks for pdfTeX
+%
% Copyright (C) 2007 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file pdfcol.dtx
% and the derived files
% pdfcol.sty, pdfcol.pdf, pdfcol.ins, pdfcol.drv, pdfcol-test1.tex,
% pdfcol-test2.tex, pdfcol-test3.tex, pdfcol-test4.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfcol.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfcol.pdf
-%
+%
% Unpacking:
% (a) If pdfcol.ins is present:
% tex pdfcol.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfcol.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfcol.drv is present:
% latex pdfcol.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfcol.dtx
% makeindex -s gind.ist pdfcol.idx
% pdflatex pdfcol.dtx
% makeindex -s gind.ist pdfcol.idx
% pdflatex pdfcol.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/pdfcol.sty
% TDS:doc/latex/oberdiek/pdfcol.pdf
@@ -82,7 +83,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfcol 2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)}
+\Msg{* Package: pdfcol 2007/12/12 v1.2 Handle new color stacks for pdfTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -134,6 +135,10 @@ and the derived files
\file{pdfcol-test2.tex}{\from{pdfcol.dtx}{test2}}%
\file{pdfcol-test3.tex}{\from{pdfcol.dtx}{test3}}%
\file{pdfcol-test4.tex}{\from{pdfcol.dtx}{test4}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfcol.xml}{\from{pdfcol.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -160,9 +165,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfcol.drv}%
- [2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)]%
+ [2007/12/12 v1.2 Handle new color stacks for pdfTeX (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pdfcol.dtx}%
\end{document}
@@ -371,7 +376,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdfcol.sty\endcsname
\ProvidesPackage{pdfcol}%
- [2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)]%
+ [2007/12/12 v1.2 Handle new color stacks for pdfTeX (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1103,6 +1108,46 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfcol.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcol'>
+ <name>pdfcol</name>
+ <caption>Defines macros fpr maintaining color stacks under pdfTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Since version 1.40 pdfTeX supports color stacks.
+ The driver file <tt>pdftex.def</tt> for package
+ <xref refid='color'>color</xref> defines and uses a main color
+ stack since version v0.04b.
+ <p/>
+ This package is intended for package writers.
+ It defines macros for setting and maintaining new color stacks.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcol.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcol.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/09/09 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
index 782ab0610d9..4706dc63de0 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfcolfoot.dtx
-% Version: 2007/09/09 v1.1
-%
-% Copyright (C) 2007 by
+% Version: 2012/01/02 v1.2
+% Info: Color stack for footnotes with pdfTeX
+%
+% Copyright (C) 2007, 2012 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
@@ -15,20 +16,20 @@
% 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 pdfcolfoot.dtx
% and the derived files
% pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv,
% pdfcolfoot-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfcolfoot.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfcolfoot.pdf
-%
+%
% Unpacking:
% (a) If pdfcolfoot.ins is present:
% tex pdfcolfoot.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfcolfoot.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfcolfoot.drv is present:
% latex pdfcolfoot.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfcolfoot.dtx
% makeindex -s gind.ist pdfcolfoot.idx
% pdflatex pdfcolfoot.dtx
% makeindex -s gind.ist pdfcolfoot.idx
% pdflatex pdfcolfoot.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pdfcolfoot.sty
% TDS:doc/latex/oberdiek/pdfcolfoot.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfcolfoot 2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)}
+\Msg{* Package: pdfcolfoot 2012/01/02 v1.2 Color stack for footnotes with pdfTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -88,9 +89,9 @@
This is a generated file.
Project: pdfcolfoot
-Version: 2007/09/09 v1.1
+Version: 2012/01/02 v1.2
-Copyright (C) 2007 by
+Copyright (C) 2007, 2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -122,6 +123,10 @@ and the derived files
\file{pdfcolfoot.sty}{\from{pdfcolfoot.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{pdfcolfoot-test1.tex}{\from{pdfcolfoot.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfcolfoot.xml}{\from{pdfcolfoot.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,16 +153,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfcolfoot.drv}%
- [2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)]%
+ [2012/01/02 v1.2 Color stack for footnotes with pdfTeX (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pdfcolfoot.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{238}
+% \CheckSum{240}
%
% \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
@@ -178,7 +183,7 @@ and the derived files
% \GetFileInfo{pdfcolfoot.drv}
%
% \title{The \xpackage{pdfcolfoot} package}
-% \date{2007/09/09 v1.1}
+% \date{2012/01/02 v1.2}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -277,7 +282,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfcolfoot}%
- [2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)]%
+ [2012/01/02 v1.2 Color stack for footnotes with pdfTeX (HO)]%
% \end{macrocode}
%
% \subsection{Load package \xpackage{pdfcol}}
@@ -449,6 +454,7 @@ and the derived files
% \begin{macrocode}
\pdfcolfoot@patch\mem@makecol
\pdfcolfoot@patch\mem@makecolbf
+ \pdfcolfoot@patch\m@mopfootnote
% \end{macrocode}
% Class \xclass{revtex4}:
% \begin{macrocode}
@@ -507,7 +513,7 @@ and the derived files
\pdfcompresslevel=0 %
\fi
\documentclass[12pt,a5paper]{article}
-\usepackage{pdfcolfoot}[2007/09/09]
+\usepackage{pdfcolfoot}[2012/01/02]
\dimen\footins=\baselineskip % for testing
\begin{document}
Black\footnote{Black \textcolor{blue}{Blue\\Blue} Black} %
@@ -698,13 +704,49 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfcolfoot.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolfoot'>
+ <name>pdfcolfoot</name>
+ <caption>Separate color stack for footnotes with pdfTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2012'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Since version 1.40 <xref refid='pdftex'>pdfTeX</xref> supports
+ several colour stacks. This package uses a separate colour stack
+ for footnotes that can break across pages.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolfoot.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolfoot.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{pdfcol}
% Heiko Oberdiek: \textit{The \xpackage{pdfcol} package};
% 2007/09/09;\\
% \CTAN{macros/latex/contrib/oberdiek/pdfcol.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
@@ -718,6 +760,11 @@ and the derived files
% \item
% Test file added.
% \end{Version}
+% \begin{Version}{2012/01/02 v1.2}
+% \item
+% Support updated for memoir 2011/03/06 v3.6j.
+% (Thanks Bob for the bug report.)
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
index 9a15b4db009..3598f608b05 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfcolmk.dtx
% Version: 2008/08/11 v1.2
-%
+% Info: Color support for pdfTeX via marks
+%
% Copyright (C) 2000, 2005-2008 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
@@ -15,19 +16,19 @@
% 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 pdfcolmk.dtx
% and the derived files
% pdfcolmk.sty, pdfcolmk.pdf, pdfcolmk.ins, pdfcolmk.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfcolmk.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfcolmk.pdf
-%
+%
% Unpacking:
% (a) If pdfcolmk.ins is present:
% tex pdfcolmk.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfcolmk.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfcolmk.drv is present:
% latex pdfcolmk.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfcolmk.dtx
% makeindex -s gind.ist pdfcolmk.idx
% pdflatex pdfcolmk.dtx
% makeindex -s gind.ist pdfcolmk.idx
% pdflatex pdfcolmk.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pdfcolmk.sty
% TDS:doc/latex/oberdiek/pdfcolmk.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfcolmk 2008/08/11 v1.2 PDFtex COLor MarK (HO)}
+\Msg{* Package: pdfcolmk 2008/08/11 v1.2 Color support for pdfTeX via marks (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{pdfcolmk.drv}{\from{pdfcolmk.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{pdfcolmk.sty}{\from{pdfcolmk.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfcolmk.xml}{\from{pdfcolmk.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,9 +148,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfcolmk.drv}%
- [2008/08/11 v1.2 PDFtex COLor MarK (HO)]%
+ [2008/08/11 v1.2 Color support for pdfTeX via marks (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pdfcolmk.dtx}%
\end{document}
@@ -275,7 +280,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfcolmk}%
- [2008/08/11 v1.2 PDFtex COLor MarK (HO)]
+ [2008/08/11 v1.2 Color support for pdfTeX via marks (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -939,6 +944,47 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfcolmk.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolmk'>
+ <name>pdfcolmk</name>
+ <caption>Improving colour support under pdftex.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2005-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ The package provides macros that emulate the &#x2018;colour stack&#x2019;
+ functionality of dvips. The colour stack deals with colour
+ manipulations when asynchronous events (like page-breaking) occur;
+ pdftex does not (yet) have such a stack, but dvips does, and the
+ <xref refid='color'>color</xref> package makes extensive use of
+ it.
+ <p/>
+ This package is an experimental solution to the problem, and works
+ best with pdf-e-tex.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolmk.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolmk.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2000/08/27 v0.1}
% \item
@@ -985,7 +1031,7 @@ and the derived files
% \begin{Version}{2007/01/01 v1.0}
% \item
% If \xfile{pdftex.def} \textgreater= 2007/01/01 v0.04a is used with
-% \pdfTeX\ 1.40.0, then package \xpackage{pdfcolmk} is obsolete.
+% \pdfTeX\ \textgreater= 1.40.0, then package \xpackage{pdfcolmk} is obsolete.
% \end{Version}
% \begin{Version}{2007/04/11 v1.1}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
index 405e568ba7e..18b7025ae0b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfcolparallel.dtx
% Version: 2010/01/11 v1.3
-%
+% Info: Color stacks support for parallel
+%
% Copyright (C) 2007, 2008, 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
@@ -15,20 +16,20 @@
% 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 pdfcolparallel.dtx
% and the derived files
% pdfcolparallel.sty, pdfcolparallel.pdf, pdfcolparallel.ins,
% pdfcolparallel.drv, pdfcolparallel-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfcolparallel.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfcolparallel.pdf
-%
+%
% Unpacking:
% (a) If pdfcolparallel.ins is present:
% tex pdfcolparallel.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfcolparallel.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfcolparallel.drv is present:
% latex pdfcolparallel.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfcolparallel.dtx
% makeindex -s gind.ist pdfcolparallel.idx
% pdflatex pdfcolparallel.dtx
% makeindex -s gind.ist pdfcolparallel.idx
% pdflatex pdfcolparallel.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pdfcolparallel.sty
% TDS:doc/latex/oberdiek/pdfcolparallel.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfcolparallel 2010/01/11 v1.3 Fixed parallel with color stacks support (HO)}
+\Msg{* Package: pdfcolparallel 2010/01/11 v1.3 Color stacks support for parallel (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{pdfcolparallel.sty}{\from{pdfcolparallel.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{pdfcolparallel-test1.tex}{\from{pdfcolparallel.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfcolparallel.xml}{\from{pdfcolparallel.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,9 +153,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfcolparallel.drv}%
- [2010/01/11 v1.3 Fixed parallel with color stacks support (HO)]%
+ [2010/01/11 v1.3 Color stacks support for parallel (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pdfcolparallel.dtx}%
\end{document}
@@ -237,7 +242,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfcolparallel}%
- [2010/01/11 v1.3 Fixed parallel with color stacks support (HO)]%
+ [2010/01/11 v1.3 Color stacks support for parallel (HO)]%
% \end{macrocode}
%
% \subsection{Load and fix package \xpackage{parallel}}
@@ -1064,18 +1069,54 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfcolparallel.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolparallel'>
+ <name>pdfcolparallel</name>
+ <caption>Fix colour problems in package 'parallel'.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ Since version 1.40 pdfTeX supports colour stacks.
+ This package uses them to fix colour problems in
+ package <xref refid='parallel'>parallel</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolparallel.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolparallel.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{parallel}
% Matthias Eckermann: \textit{The \xpackage{parallel}-package};
% 2003/04/13;\\
% \CTAN{macros/latex/contrib/parallel/}.
-%
+%
% \bibitem{pdfcol}
% Heiko Oberdiek: \textit{The \xpackage{pdfcol} package};
% 2007/09/09;\\
% \CTAN{macros/latex/contrib/oberdiek/pdfcol.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
index 77eed31e550..97de92a9e5a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfcolparcolumns.dtx
% Version: 2010/01/11 v1.3
-%
+% Info: Color stacks for parcolumns
+%
% Copyright (C) 2007, 2008, 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
@@ -15,20 +16,20 @@
% 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 pdfcolparcolumns.dtx
% and the derived files
% pdfcolparcolumns.sty, pdfcolparcolumns.pdf, pdfcolparcolumns.ins,
% pdfcolparcolumns.drv, pdfcolparcolumns-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
-%
+%
% Unpacking:
% (a) If pdfcolparcolumns.ins is present:
% tex pdfcolparcolumns.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfcolparcolumns.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfcolparcolumns.drv is present:
% latex pdfcolparcolumns.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfcolparcolumns.dtx
% makeindex -s gind.ist pdfcolparcolumns.idx
% pdflatex pdfcolparcolumns.dtx
% makeindex -s gind.ist pdfcolparcolumns.idx
% pdflatex pdfcolparcolumns.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pdfcolparcolumns.sty
% TDS:doc/latex/oberdiek/pdfcolparcolumns.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfcolparcolumns 2010/01/11 v1.3 Color stacks support for parcolumns (HO)}
+\Msg{* Package: pdfcolparcolumns 2010/01/11 v1.3 Color stacks for parcolumns (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{pdfcolparcolumns.sty}{\from{pdfcolparcolumns.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{pdfcolparcolumns-test1.tex}{\from{pdfcolparcolumns.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfcolparcolumns.xml}{\from{pdfcolparcolumns.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,9 +153,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfcolparcolumns.drv}%
- [2010/01/11 v1.3 Color stacks support for parcolumns (HO)]%
+ [2010/01/11 v1.3 Color stacks for parcolumns (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pdfcolparcolumns.dtx}%
\end{document}
@@ -255,7 +260,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfcolparcolumns}%
- [2010/01/11 v1.3 Color stacks support for parcolumns (HO)]%
+ [2010/01/11 v1.3 Color stacks for parcolumns (HO)]%
% \end{macrocode}
%
% \subsection{Load packages}
@@ -747,18 +752,54 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfcolparcolumns.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolparcolumns'>
+ <name>pdfcolparcolumns</name>
+ <caption>Fix colour problems in package 'parcolumns'.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2008,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ Since version 1.40 pdfTeX supports colour stacks.
+ This package uses them to fix colour problems in
+ package <xref refid='parcolumns'>parcolumns</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{parcolumns}
% Jonathan Sauer: \textit{The \xpackage{parcolumns} package};
% 2004/11/25;\\
% \CTAN{macros/latex/contrib/sauerj/parcolumns.pdf}.
-%
+%
% \bibitem{pdfcol}
% Heiko Oberdiek: \textit{The \xpackage{pdfcol} package};
% 2007/09/09;\\
% \CTAN{macros/latex/contrib/oberdiek/pdfcol.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
index 7f4843199a4..c28466122c7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfcrypt.dtx
% Version: 2007/04/26 v1.0
-%
+% Info: Allows the setting of PDF encryption
+%
% Copyright (C) 2001, 2006, 2007 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
@@ -15,22 +16,22 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file pdfcrypt.dtx
% and the derived files
% pdfcrypt.sty, pdfcrypt.pdf, pdfcrypt.ins, pdfcrypt.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfcrypt.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfcrypt.pdf
-%
+%
% Unpacking:
% (a) If pdfcrypt.ins is present:
% tex pdfcrypt.ins
@@ -39,7 +40,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfcrypt.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfcrypt.drv is present:
% latex pdfcrypt.drv
@@ -49,14 +50,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfcrypt.dtx
% makeindex -s gind.ist pdfcrypt.idx
% pdflatex pdfcrypt.dtx
% makeindex -s gind.ist pdfcrypt.idx
% pdflatex pdfcrypt.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/pdfcrypt.sty
% TDS:doc/latex/oberdiek/pdfcrypt.pdf
@@ -77,7 +78,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfcrypt 2007/04/26 v1.0 Setting pdf encryption (HO)}
+\Msg{* Package: pdfcrypt 2007/04/26 v1.0 Allows the setting of PDF encryption (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -123,6 +124,10 @@ and the derived files
\file{pdfcrypt.drv}{\from{pdfcrypt.dtx}{driver}}%
\usedir{tex/generic/oberdiek}%
\file{pdfcrypt.sty}{\from{pdfcrypt.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfcrypt.xml}{\from{pdfcrypt.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -149,16 +154,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfcrypt.drv}%
- [2007/04/26 v1.0 Setting pdf encryption (HO)]%
+ [2007/04/26 v1.0 Allows the setting of PDF encryption (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pdfcrypt.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{676}
+% \CheckSum{679}
%
% \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
@@ -429,7 +434,7 @@ and the derived files
%
% \begin{macrocode}
\ProvidesPackage{pdfcrypt}%
- [2007/04/26 v1.0 Setting pdf encryption (HO)]%
+ [2007/04/26 v1.0 Allows the setting of PDF encryption (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -1040,6 +1045,49 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfcrypt.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcrypt'>
+ <name>pdfcrypt</name>
+ <caption>Allows the setting of pdf encryption.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2006,2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ Allows the setting of pdf encryption options for VTeX and some
+ older versions of pdfTeX. The options can be set as package
+ options or in the command <tt>\pdfcryptsetup</tt>. Options
+ include <tt>owner=OwnerPassword</tt>, <tt>user=UserPassword,
+ print</tt>, <tt>copy</tt>, <tt>edit</tt>, <tt>annotate=true,
+ false all, none</tt>. The encryption is set at
+ <tt>\begin{document}</tt> by default, but this can be forced for
+ an earlier time by option &#x2018;set&#x2019;.
+ <p/>
+ Example:
+ <tt>\usepackage[owner=Donald,user=Knuth,print=false]{pdfcrypt}</tt>
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfcrypt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcrypt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2001/04/02 v0.1}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
index 04900d029b8..7dcc0a39a3b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfescape.dtx
-% Version: 2011/04/04 v1.12
-%
+% Version: 2011/11/25 v1.13
+% Info: Implements pdfTeX's escape features
+%
% Copyright (C) 2007, 2010, 2011 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
@@ -15,25 +16,25 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file pdfescape.dtx
% and the derived files
% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv,
% pdfescape-test1.tex, pdfescape-test2.tex,
% pdfescape-test3.tex, pdfescape-test4.tex,
% pdfescape-test5.tex, pdfescape-test6.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfescape.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfescape.pdf
-%
+%
% Unpacking:
% (a) If pdfescape.ins is present:
% tex pdfescape.ins
@@ -42,7 +43,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfescape.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfescape.drv is present:
% latex pdfescape.drv
@@ -52,14 +53,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfescape.dtx
% makeindex -s gind.ist pdfescape.idx
% pdflatex pdfescape.dtx
% makeindex -s gind.ist pdfescape.idx
% pdflatex pdfescape.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/pdfescape.sty
% TDS:doc/latex/oberdiek/pdfescape.pdf
@@ -86,7 +87,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfescape 2011/04/04 v1.12 Provides string conversions (HO)}
+\Msg{* Package: pdfescape 2011/11/25 v1.13 Implements pdfTeX's escape features (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -98,7 +99,7 @@
This is a generated file.
Project: pdfescape
-Version: 2011/04/04 v1.12
+Version: 2011/11/25 v1.13
Copyright (C) 2007, 2010, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -142,6 +143,10 @@ and the derived files
\file{pdfescape-test4.tex}{\from{pdfescape.dtx}{test4}}%
\file{pdfescape-test5.tex}{\from{pdfescape.dtx}{test5}}%
\file{pdfescape-test6.tex}{\from{pdfescape.dtx}{test6}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfescape.xml}{\from{pdfescape.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -168,16 +173,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfescape.drv}%
- [2011/04/04 v1.12 Provides string conversions (HO)]%
+ [2011/11/25 v1.13 Implements pdfTeX's escape features (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{pdfescape.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{2451}
+% \CheckSum{2516}
%
% \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
@@ -198,7 +203,7 @@ and the derived files
% \GetFileInfo{pdfescape.drv}
%
% \title{The \xpackage{pdfescape} package}
-% \date{2011/04/04 v1.12}
+% \date{2011/11/25 v1.13}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -349,7 +354,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdfescape.sty\endcsname
\ProvidesPackage{pdfescape}%
- [2011/04/04 v1.12 Provides string conversions (HO)]%
+ [2011/11/25 v1.13 Implements pdfTeX's escape features (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -389,6 +394,8 @@ and the derived files
}
\TMP@EnsureCode\catcode{0}{12}% ^^@
\TMP@EnsureCode\catcode{34}{12}% "
+\TMP@EnsureCode\catcode{36}{3}% $
+\TMP@EnsureCode\catcode{38}{4}% &
\TMP@EnsureCode\catcode{39}{12}% '
\TMP@EnsureCode\catcode{42}{12}% *
\TMP@EnsureCode\catcode{45}{12}% -
@@ -798,7 +805,7 @@ and the derived files
% \begin{macrocode}
\def\PE@OctII#1#2{%
\ifcase\PE@TestOctDigit#2%
- \def\PE@next{\PE@OctAll{#1#2}}%
+ \def\PE@next{\PE@OctIII#1#2}%
\else
\def\PE@next{\PE@OctAll{#1}#2}%
\fi
@@ -806,6 +813,35 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+% \begin{macrocode}
+\ltx@IfUndefined{numexpr}{%
+ \catcode`\$=9 %
+ \catcode`\&=14 %
+}{%
+ \catcode`\$=14 %
+ \catcode`\&=9 %
+}
+% \end{macrocode}
+% \begin{macro}{\PE@OctIII}
+% \begin{macrocode}
+\def\PE@OctIII#1#2#3{%
+ \ifnum#1<4 %
+ \def\PE@next{\PE@OctAll{#1#2#3}}%
+ \else
+$ \count\ltx@cclv#1 %
+$ \advance\count\ltx@cclv -4 %
+ \edef\PE@next{%
+ \noexpand\PE@OctAll{%
+$ \the\count\ltx@cclv
+& \the\numexpr#1-4\relax
+ #2#3%
+ }%
+ }%
+ \fi
+ \PE@next
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\PE@OctAll}
% \begin{macrocode}
\def\PE@OctAll#1{%
@@ -1390,7 +1426,7 @@ and the derived files
% \begin{macrocode}
%<*test2>
\ProvidesFile{pdfescape-test2.tex}%
- [2011/04/04 v1.12 Test with \string\pdfescape... commands]%
+ [2011/11/25 v1.13 Test with \string\pdfescape... commands]%
%</test2>
% \end{macrocode}
%
@@ -1399,7 +1435,7 @@ and the derived files
% \begin{macrocode}
%<*test3>
\ProvidesFile{pdfescape-test3.tex}%
- [2011/04/04 v1.12 Test without \string\pdfescape..., with e-TeX]%
+ [2011/11/25 v1.13 Test without \string\pdfescape..., with e-TeX]%
%</test3>
% \end{macrocode}
%
@@ -1408,7 +1444,7 @@ and the derived files
% \begin{macrocode}
%<*test4>
\ProvidesFile{pdfescape-test4.tex}%
- [2011/04/04 v1.12 Test without \string\pdfescape... and e-TeX]%
+ [2011/11/25 v1.13 Test without \string\pdfescape... and e-TeX]%
%</test4>
% \end{macrocode}
%
@@ -1417,7 +1453,7 @@ and the derived files
% \begin{macrocode}
%<*test5>
\ProvidesFile{pdfescape-test5.tex}%
- [2011/04/04 v1.12 Test with LuaTeX]%
+ [2011/11/25 v1.13 Test with LuaTeX]%
%</test5>
% \end{macrocode}
%
@@ -1831,6 +1867,15 @@ and the derived files
\test{x\lf}{x\lf}%
\test{x\lf\cr}{x\lf\lf}%
\test{x\\\cr\lf y\cr}{xy\lf}%
+%
+ \test{\\409}{ 9}%
+ \test{\\800}{800}%
+ \test{\\900}{900}%
+ \test{\\578}{/8}%
+ \test{\\477}{?}%
+ \test{\\377}{^^ff}%
+ \test{\\777}{^^ff}%
+ \test{\\7777}{^^ff7}%
\end{qstest}
\stop
% \end{macrocode}
@@ -2172,6 +2217,43 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfescape.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfescape'>
+ <name>pdfescape</name>
+ <caption>Implements pdfTeX's escape features using TeX or e-TeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.13'/>
+ <description>
+ This package implements <xref refid='pdftex'>pdfTeX</xref>'s
+ escape features (<tt>\pdfescapehex</tt>, <tt>\pdfunescapehex</tt>,
+ <tt>\pdfescapename</tt>, <tt>\pdfescapestring</tt>) using TeX or
+ e-TeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfescape.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfescape.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/02/21 v1.0}
% \item
@@ -2243,6 +2325,12 @@ and the derived files
% \item
% Test file for \hologo{iniTeX} added.
% \end{Version}
+% \begin{Version}{2011/11/25 v1.13}
+% \item
+% Higher order bit of octal sequences in \cs{EdefUnescapeString}
+% ignored according to the PDF specification
+% (Bug found by Bruno Le Floch).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
index 54cef809c15..f7ac7b7b804 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdflscape.dtx
% Version: 2008/08/11 v0.10
-%
+% Info: Display of landscape pages in PDF
+%
% Copyright (C) 2001, 2004, 2006-2008 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
@@ -15,11 +16,11 @@
% 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 pdflscape.dtx
% and the derived files
% pdflscape.sty, pdflscape.pdf, pdflscape.ins, pdflscape.drv,
@@ -27,11 +28,11 @@
% pdflscape-test3.tex, pdflscape-test4.tex,
% pdflscape-test5.tex, pdflscape-test6.tex,
% pdflscape-test6.txt, ExtractRotate.java.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdflscape.dtx
% CTAN:macros/latex/contrib/oberdiek/pdflscape.pdf
-%
+%
% Unpacking:
% (a) If pdflscape.ins is present:
% tex pdflscape.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdflscape.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdflscape.drv is present:
% latex pdflscape.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdflscape.dtx
% makeindex -s gind.ist pdflscape.idx
% pdflatex pdflscape.dtx
% makeindex -s gind.ist pdflscape.idx
% pdflatex pdflscape.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pdflscape.sty
% TDS:doc/latex/oberdiek/pdflscape.pdf
@@ -86,7 +87,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdflscape 2008/08/11 v0.10 Landscape pages in PDF (HO)}
+\Msg{* Package: pdflscape 2008/08/11 v0.10 Display of landscape pages in PDF (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -144,6 +145,8 @@ and the derived files
\nopostamble
\file{pdflscape-test6.txt}{\from{pdflscape.dtx}{result6}}%
\file{ExtractRotate.java}{\from{pdflscape.dtx}{ExtractRotate}}%
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdflscape.xml}{\from{pdflscape.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -170,9 +173,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdflscape.drv}%
- [2008/08/11 v0.10 Landscape pages in PDF (HO)]%
+ [2008/08/11 v0.10 Display of landscape pages in PDF (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{graphics}
\begin{document}
\DocInput{pdflscape.dtx}%
@@ -267,7 +270,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdflscape}%
- [2008/08/11 v0.10 Landscape pages in PDF (HO)]
+ [2008/08/11 v0.10 Display of landscape pages in PDF (HO)]
% \end{macrocode}
%
% \subsection{Driver options}
@@ -996,6 +999,42 @@ public class ExtractRotate {
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdflscape.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdflscape'>
+ <name>pdflscape</name>
+ <caption>Make landscape pages display as landscape.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2001,2004,2006-2008'/>
+ <license type='lppl1.3'/>
+ <version number='0.10'/>
+ <description>
+ The package adds PDF support to the landscape environment of
+ package <xref refid='lscape'>lscape</xref>, by setting the PDF
+ <tt>/Rotate</tt> page attribute. Pages with this attribute will be
+ displayed in landscape orientation by conforming PDF viewers.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdflscape.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdflscape.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2001/01/15 v0.1}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx
index 252f49d78c9..1d7e171fff4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdfrender.dtx
% Version: 2010/01/28 v1.2
-%
+% Info: Access to some PDF graphics parameters
+%
% Copyright (C) 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
@@ -15,25 +16,25 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file pdfrender.dtx
% and the derived files
% pdfrender.sty, pdfrender.pdf, pdfrender.ins, pdfrender.drv,
% pdfrender-test1.tex, pdfrender-test2.tex,
% pdfrender-test3.tex, pdfrender-test4.tex,
% pdfrender-test5.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfrender.dtx
% CTAN:macros/latex/contrib/oberdiek/pdfrender.pdf
-%
+%
% Unpacking:
% (a) If pdfrender.ins is present:
% tex pdfrender.ins
@@ -42,7 +43,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdfrender.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdfrender.drv is present:
% latex pdfrender.drv
@@ -52,14 +53,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdfrender.dtx
% makeindex -s gind.ist pdfrender.idx
% pdflatex pdfrender.dtx
% makeindex -s gind.ist pdfrender.idx
% pdflatex pdfrender.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/pdfrender.sty
% TDS:doc/latex/oberdiek/pdfrender.pdf
@@ -140,6 +141,10 @@ and the derived files
\file{pdfrender-test3.tex}{\from{pdfrender.dtx}{test3}}%
\file{pdfrender-test4.tex}{\from{pdfrender.dtx}{test4}}%
\file{pdfrender-test5.tex}{\from{pdfrender.dtx}{test5}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdfrender.xml}{\from{pdfrender.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -168,7 +173,7 @@ and the derived files
\ProvidesFile{pdfrender.drv}%
[2010/01/28 v1.2 Access to some PDF graphics parameters (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{longtable}
\renewcommand*{\arraystretch}{1.2}
\begin{document}
@@ -1822,8 +1827,44 @@ After %
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfrender.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfrender'>
+ <name>pdfrender</name>
+ <caption>Control rendering parameters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ The package provides interfaces for the user to control PDF
+ parameters, such as line width or text rendering mode. The
+ control operations work in a manner very similar to that of the
+ <xref refid='color'>color</xref> package.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdfrender.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfrender.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
-%
+%
% \begin{description}
% \item[Friedrich Vosberg] asked in the
% newsgroup \textsf{de.comp.text.tex} for the font
@@ -1835,28 +1876,28 @@ After %
%
% \begin{thebibliography}{9}
% \raggedright
-%
+%
% \bibitem{pdf-spec}
% Adobe Systems Incorporated. \textit{PDF Reference --
% Adobe Portable Document format -- Version 1.7}.
% 6th ed. 2006.
% \textsc{URL:}\,\url{http://www.adobe.com/devnet/acrobat/pdfs/pdf_reference_1-7.pdf}.
-%
+%
% \bibitem{news-Vosberg}
% Friedrich Vosberg, \textit{Text in Buchstabenumrissen},
% de.comp.text.tex, 2010-01-22.
% \textsc{URL:}\,\url{http://groups.google.com/group/de.comp.text.tex/msg/f442310ac8b2d506}.
-%
+%
% \bibitem{news-Pupus}
% Gaius Pupus, \textit{Re: Text in Buchstabenumrissen},
% de.comp.text.tex, 2010-01-23.
% \textsc{URL:}\,\url{http://groups.google.com/group/de.comp.text.tex/msg/95d890d77ac47eb1}.
-%
+%
% \bibitem{news-Niepraschk}
% Rolf Niepraschk, \textit{Re: Text in Buchstabenumrissen},
% de.comp.text.tex, 2010-01-24.
% \textsc{URL:}\,\url{http://groups.google.com/group/de.comp.text.tex/msg/4eb61a5879db54db}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
index 18aebaabbdb..455f5b95d17 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pdftexcmds.dtx
-% Version: 2011/04/22 v0.16
-%
+% Version: 2011/11/29 v0.20
+% Info: Utility functions of pdfTeX for LuaTeX
+%
% Copyright (C) 2007, 2009-2011 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
@@ -15,25 +16,25 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file pdftexcmds.dtx
% and the derived files
% pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv,
-% pdftexcmds-test1.tex, pdftexcmds-test2.tex,
+% pdftexcmds.bib, pdftexcmds-test1.tex, pdftexcmds-test2.tex,
% pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex,
% oberdiek.pdftexcmds.lua, pdftexcmds.lua.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdftexcmds.dtx
% CTAN:macros/latex/contrib/oberdiek/pdftexcmds.pdf
-%
+%
% Unpacking:
% (a) If pdftexcmds.ins is present:
% tex pdftexcmds.ins
@@ -42,7 +43,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pdftexcmds.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pdftexcmds.drv is present:
% latex pdftexcmds.drv
@@ -52,14 +53,15 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pdftexcmds.dtx
+% bibtex pdftexcmds.aux
% makeindex -s gind.ist pdftexcmds.idx
% pdflatex pdftexcmds.dtx
% makeindex -s gind.ist pdftexcmds.idx
% pdflatex pdftexcmds.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/pdftexcmds.sty
% TDS:scripts/oberdiek/oberdiek.pdftexcmds.lua
@@ -86,7 +88,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdftexcmds 2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)}
+\Msg{* Package: pdftexcmds 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -98,7 +100,7 @@
This is a generated file.
Project: pdftexcmds
-Version: 2011/04/22 v0.16
+Version: 2011/11/29 v0.20
Copyright (C) 2007, 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -123,7 +125,7 @@ because some files are installed in TDS:tex/generic//.
This work consists of the main source file pdftexcmds.dtx
and the derived files
pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv,
- pdftexcmds-test1.tex, pdftexcmds-test2.tex,
+ pdftexcmds.bib, pdftexcmds-test1.tex, pdftexcmds-test2.tex,
pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex,
oberdiek.pdftexcmds.lua, pdftexcmds.lua.
@@ -133,6 +135,11 @@ and the derived files
\generate{%
\file{pdftexcmds.ins}{\from{pdftexcmds.dtx}{install}}%
\file{pdftexcmds.drv}{\from{pdftexcmds.dtx}{driver}}%
+ \nopreamble
+ \nopostamble
+ \file{pdftexcmds.bib}{\from{pdftexcmds.dtx}{bib}}%
+ \usepreamble\defaultpreamble
+ \usepostamble\defaultpostamble
\usedir{tex/generic/oberdiek}%
\file{pdftexcmds.sty}{\from{pdftexcmds.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
@@ -140,6 +147,10 @@ and the derived files
\file{pdftexcmds-test2.tex}{\from{pdftexcmds.dtx}{test2}}%
\file{pdftexcmds-test-shell.tex}{\from{pdftexcmds.dtx}{test-shell}}%
\file{pdftexcmds-test-escape.tex}{\from{pdftexcmds.dtx}{test-escape}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pdftexcmds.xml}{\from{pdftexcmds.dtx}{catalogue}}%
}
\def\MetaPrefix{-- }
\def\defaultpostamble{%
@@ -175,23 +186,39 @@ and the derived files
\endbatchfile
%</install>
+%<*bib>
+@online{AndyThomas:Analog,
+ author={Thomas, Andy},
+ title={Analog of {\texttt{\textbackslash}pdfelapsedtime} for
+ {\hologo{LuaTeX}} and {\hologo{XeTeX}}},
+ url={http://tex.stackexchange.com/a/32531},
+ urldate={2011-11-29},
+}
+%</bib>
%<*ignore>
\fi
%</ignore>
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdftexcmds.drv}%
- [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]%
+ [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
+\usepackage{csquotes}
+\usepackage[
+ bibencoding=ascii,
+ alldates=iso8601,
+]{biblatex}[2011/11/13]
+\bibliography{oberdiek-source}
+\bibliography{pdftexcmds}
\begin{document}
\DocInput{pdftexcmds.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1647}
+% \CheckSum{1756}
%
% \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
@@ -212,7 +239,7 @@ and the derived files
% \GetFileInfo{pdftexcmds.drv}
%
% \title{The \xpackage{pdftexcmds} package}
-% \date{2011/04/22 v0.16}
+% \date{2011/11/29 v0.20}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -229,7 +256,8 @@ and the derived files
%
% \section{Documentation}
%
-% Some primitives of \hologo{pdfTeX} are not defined by \hologo{LuaTeX}.
+% Some primitives of \hologo{pdfTeX} \cite{pdftex-manual}
+% are not defined by \hologo{LuaTeX} \cite{luatex-manual}.
% This package implements macro based solutions using Lua code
% for the following missing \hologo{pdfTeX} primitives;
% \begin{compactitem}
@@ -242,6 +270,8 @@ and the derived files
% \item \cs{pdffilemoddate}
% \item \cs{pdffiledump}
% \item \cs{pdfmdfivesum}
+% \item \cs{pdfresettimer}
+% \item \cs{pdfelapsedtime}
% \item |\immediate\write18|
% \end{compactitem}
% The original names of the primitives cannot be used:
@@ -298,6 +328,8 @@ and the derived files
%
% \subsection{Macros}
%
+% \subsubsection[Strings]{Strings \cite[``7.15 Strings'']{pdftex-manual}}
+%
% \begin{declcs}{pdf@strcmp} \M{stringA} \M{stringB}
% \end{declcs}
% Same as |\pdfstrcmp{|\meta{stringA}|}{|\meta{stringB}|}|.
@@ -318,6 +350,8 @@ and the derived files
% string is treated as byte string, characters with more than
% eight bits are ignored.
%
+% \subsubsection[Files]{Files \cite[``7.18 Files'']{pdftex-manual}}
+%
% \begin{declcs}{pdf@filesize} \M{filename}
% \end{declcs}
% Same as |\pdffilesize{|\meta{filename}|}|.
@@ -341,6 +375,33 @@ and the derived files
% \end{declcs}
% Same as |\pdfmdfivesum file{|\meta{filename}|}|.
%
+% \subsubsection[Timekeeping]{Timekeeping \cite[``7.17 Timekeeping'']{pdftex-manual}}
+%
+% The timekeeping macros are based on Andy Thomas' work \cite{AndyThomas:Analog}.
+%
+% \begin{declcs}{pdf@resettimer}
+% \end{declcs}
+% Same as \cs{pdfresettimer}, it resets the internal timer.
+%
+% \begin{declcs}{pdf@elapsedtime}
+% \end{declcs}
+% Same as \cs{pdfelapsedtime}. It behaves like a read-only integer.
+% For printing purposes it can be prefixed by \cs{the} or \cs{number}.
+% It measures the time in scaled seconds (seconds multiplied with 65536)
+% since the latest call of \cs{pdf@resettimer} or start of
+% program/package. The resolution, the shortest time interval that
+% can be measured, depends on the program and system.
+% \begin{itemize}
+% \item \hologo{pdfTeX} with |gettimeofday|: $\ge$ 1/65536\,s
+% \item \hologo{pdfTeX} with |ftime|: $\ge$ 1\,ms
+% \item \hologo{pdfTeX} with |time|: $\ge$ 1\,s
+% \item \hologo{LuaTeX}: $\ge$ 10\,ms\\
+% (|os.clock()| returns a float number with two decimal digits in
+% \hologo{LuaTeX} beta-0.70.1-2011061416 (rev 4277)).
+% \end{itemize}
+%
+% \subsubsection[Miscellaneous]{Miscellaneous \cite[``7.21 Miscellaneous'']{pdftex-manual}}
+%
% \begin{declcs}{pdf@draftmode}
% \end{declcs}
% If the \TeX\ compiler knows \cs{pdfdraftmode} (\hologo{pdfTeX},
@@ -376,11 +437,24 @@ and the derived files
% In \hologo{LuaTeX} before 0.68.0 \cs{pdf@shellescape} is not
% available due to a bug in |os.execute()|. The argumentless form
% crashes in some circumstances with segmentation fault.
-% (It is fixed in version 0.70.0, revision 4167 of \hologo{LuaTeX}.
+% (It is fixed in version 0.68.0 or revision 4167 of \hologo{LuaTeX}.
% and packported to some version of 0.67.0).
%
% Hints for usage:
% \begin{itemize}
+% \item Before its use \cs{pdf@shellescape} should be tested,
+% whether it is available. Example with package \xpackage{ltxcmds}
+% (loaded by package \xpackage{pdftexcmds}):
+%\begin{quote}
+%\begin{verbatim}
+%\ltx@IfUndefined{pdf@shellescape}{%
+% % \pdf@shellescape is undefined
+%}{%
+% % \pdf@shellescape is available
+%}
+%\end{verbatim}
+%\end{quote}
+% Use \cs{ltx@ifundefined} in expandable contexts.
% \item \cs{pdf@shellescape} might be a numerical constant,
% expands to the primitive, or expands to a plain number.
% Therefore use it in contexts where these differences does not matter.
@@ -541,7 +615,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]%
+ [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -702,6 +776,17 @@ and the derived files
\def\pdf@system#{%
\immediate\write18%
}%
+ \def\pdftexcmds@temp#1{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname pdf#1\endcsname\relax
+ \pdftexcmds@nopdftex
+ \else
+ \expandafter\let\csname pdf@#1\expandafter\endcsname
+ \csname pdf#1\endcsname
+ \fi
+ }%
+ \pdftexcmds@temp{resettimer}%
+ \pdftexcmds@temp{elapsedtime}%
\fi
% \end{macrocode}
%
@@ -811,7 +896,8 @@ and the derived files
\endgroup
\let\pdf@primitive\@undefined
\@PackageInfoNoLine{pdftexcmds}{%
- \string\pdf@primitive disabled, because\MessageBreak
+ \string\pdf@primitive\space disabled, %
+ because\MessageBreak
\string\pdfprimitive\space is broken until pdfTeX 1.40.4%
}%
\begingroup
@@ -1051,8 +1137,23 @@ and the derived files
\pdftexcmds@directlua{%
require("oberdiek.pdftexcmds")%
}
+\ifnum\luatexversion>37 %
+ \ifnum0%
+ \pdftexcmds@directlua{%
+ if status.ini_version then %
+ tex.write("1")%
+ end%
+ }>0 %
+ \everyjob\expandafter{%
+ \the\everyjob
+ \pdftexcmds@directlua{%
+ require("oberdiek.pdftexcmds")%
+ }%
+ }%
+ \fi
+\fi
\begingroup
- \def\x{2011/04/22 v0.16}%
+ \def\x{2011/11/29 v0.20}%
\ltx@onelevel@sanitize\x
\edef\y{%
\pdftexcmds@directlua{%
@@ -1074,6 +1175,8 @@ and the derived files
%
% \subsection{Lua functions}
%
+% \subsubsection{Helper macros}
+%
% \begin{macro}{\pdftexcmds@toks}
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -1150,6 +1253,8 @@ and the derived files
\fi
% \end{macrocode}
%
+% \subsubsection[Strings]{Strings \cite[``7.15 Strings'']{pdftex-manual}}
+%
% \begin{macro}{\pdf@strcmp}
% \begin{macrocode}
\long\def\pdf@strcmp#1#2{%
@@ -1234,6 +1339,9 @@ and the derived files
}
% \end{macrocode}
% \end{macro}
+%
+% \subsubsection[Files]{Files \cite[``7.18 Files'']{pdftex-manual}}
+%
% \begin{macro}{\pdf@filesize}
% \begin{macrocode}
\def\pdf@filesize#1{%
@@ -1291,6 +1399,82 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \subsubsection[Timekeeping]{Timekeeping \cite[``7.17 Timekeeping'']{pdftex-manual}}
+%
+% \begin{macro}{\protected}
+% \begin{macrocode}
+\let\pdftexcmds@temp=Y%
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname protected\endcsname\relax
+ \pdftexcmds@directlua0{%
+ if tex.enableprimitives then %
+ tex.enableprimitives('', {'protected'})%
+ end%
+ }%
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname protected\endcsname\relax
+ \let\pdftexcmds@temp=N%
+\fi
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\numexpr}
+% \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
+ \pdftexcmds@directlua0{%
+ if tex.enableprimitives then %
+ tex.enableprimitives('', {'numexpr'})%
+ end%
+ }%
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
+ \let\pdftexcmds@temp=N%
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\ifx\pdftexcmds@temp N%
+ \@PackageWarningNoLine{pdftexcmds}{%
+ Definitions of \ltx@backslashchar pdf@resettimer and%
+ \MessageBreak
+ \ltx@backslashchar pdf@elapsedtime are skipped, because%
+ \MessageBreak
+ e-TeX's \ltx@backslashchar protected or %
+ \ltx@backslashchar numexpr are missing%
+ }%
+\else
+% \end{macrocode}
+%
+% \begin{macro}{\pdf@resettimer}
+% \begin{macrocode}
+ \protected\def\pdf@resettimer{%
+ \pdftexcmds@directlua0{%
+ oberdiek.pdftexcmds.resettimer()%
+ }%
+ }%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pdf@elapsedtime}
+% \begin{macrocode}
+ \protected\def\pdf@elapsedtime{%
+ \numexpr
+ \pdftexcmds@directlua0{%
+ oberdiek.pdftexcmds.elapsedtime()%
+ }%
+ \relax
+ }%
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+\fi
+% \end{macrocode}
+%
+% \subsubsection{Shell escape}
+%
% \begin{macro}{\pdf@shellescape}
% Caution: Catcode of digit zero might be `ignore'.
% \begin{macrocode}
@@ -1376,8 +1560,13 @@ and the derived files
module("oberdiek.pdftexcmds", package.seeall)
local systemexitstatus
function getversion()
- tex.write("2011/04/22 v0.16")
+ tex.write("2011/11/29 v0.20")
end
+% \end{macrocode}
+%
+% \subsubsection[Strings]{Strings \cite[``7.15 Strings'']{pdftex-manual}}
+%
+% \begin{macrocode}
function strcmp(A, B)
if A == B then
tex.write("0")
@@ -1546,6 +1735,11 @@ function escapename(str, mode)
end
)))
end
+% \end{macrocode}
+%
+% \subsubsection[Files]{Files \cite[``7.18 Files'']{pdftex-manual}}
+%
+% \begin{macrocode}
function filesize(filename)
local foundfile = kpse.find_file(filename, "tex", true)
if foundfile then
@@ -1631,6 +1825,37 @@ function filemdfivesum(filename)
end
end
end
+% \end{macrocode}
+%
+% \subsubsection[Timekeeping]{Timekeeping \cite[``7.17 Timekeeping'']{pdftex-manual}}
+%
+% The functions for timekeeping are based on
+% Andy Thomas' work \cite{AndyThomas:Analog}.
+% Changes:
+% \begin{itemize}
+% \item Overflow check is added.
+% \item |string.format| is used to avoid exponential number
+% representation for sure.
+% \item |tex.write| is used instead of |tex.print| to get
+% tokens with catcode 12 and without appended \cs{endlinechar}.
+% \end{itemize}
+% \begin{macrocode}
+local basetime = 0
+function resettimer()
+ basetime = os.clock()
+end
+function elapsedtime()
+ local val = (os.clock() - basetime) * 65536 + .5
+ if val > 2147483647 then
+ val = 2147483647
+ end
+ tex.write(string.format("%d", val))
+end
+% \end{macrocode}
+%
+% \subsubsection[Miscellaneous]{Miscellaneous \cite[``7.21 Miscellaneous'']{pdftex-manual}}
+%
+% \begin{macrocode}
function shellescape()
if os.execute then
if status
@@ -2279,6 +2504,7 @@ end
% \begin{quote}
%\begin{verbatim}
%pdflatex pdftexcmds.dtx
+%bibtex pdftexcmds.aux
%makeindex -s gind.ist pdftexcmds.idx
%pdflatex pdftexcmds.dtx
%makeindex -s gind.ist pdftexcmds.idx
@@ -2286,6 +2512,47 @@ end
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdftexcmds.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdftexcmds'>
+ <name>pdftexcmds</name>
+ <caption>LuaTeX support for pdfTeX utility functions.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='0.20'/>
+ <description>
+ LuaTeX provides most of the commands of
+ <xref refid='pdftex'>pdfTeX</xref> 1.40. However, a number of
+ utility functions are not available. This package tries to fill
+ the gap and implements some of the missing primitives using Lua.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pdftexcmds.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pdftexcmds.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
+% \printbibliography[
+% heading=bibnumbered,
+% ]
+%
% \begin{History}
% \begin{Version}{2007/11/11 v0.1}
% \item
@@ -2368,6 +2635,24 @@ end
% The version border is lowered to 0.68, because some
% beta-0.67.0 seems also to work.
% \end{Version}
+% \begin{Version}{2011/06/29 v0.17}
+% \item
+% Documentation addition to \cs{pdf@shellescape}.
+% \end{Version}
+% \begin{Version}{2011/07/01 v0.18}
+% \item
+% Add Lua module loading in \cs{everyjob} for \hologo{iniTeX}
+% (\hologo{LuaTeX} only).
+% \end{Version}
+% \begin{Version}{2011/07/28 v0.19}
+% \item
+% Missing space in an info message added (Martin M\"unch).
+% \end{Version}
+% \begin{Version}{2011/11/29 v0.20}
+% \item
+% \cs{pdf@resettimer} and \cs{pdf@elapsedtime} added
+% (thanks Andy Thomas).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/picture.dtx b/Master/texmf-dist/source/latex/oberdiek/picture.dtx
index 0e2eeacdcd8..0e8fda7bc17 100644
--- a/Master/texmf-dist/source/latex/oberdiek/picture.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/picture.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: picture.dtx
% Version: 2009/10/11 v1.3
-%
+% Info: Dimens for picture macros
+%
% Copyright (C) 2006-2009 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
@@ -15,20 +16,20 @@
% 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 picture.dtx
% and the derived files
% picture.sty, picture.pdf, picture.ins, picture.drv,
% picture-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/picture.dtx
% CTAN:macros/latex/contrib/oberdiek/picture.pdf
-%
+%
% Unpacking:
% (a) If picture.ins is present:
% tex picture.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{picture.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If picture.drv is present:
% latex picture.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex picture.dtx
% makeindex -s gind.ist picture.idx
% pdflatex picture.dtx
% makeindex -s gind.ist picture.idx
% pdflatex picture.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/picture.sty
% TDS:doc/latex/oberdiek/picture.pdf
@@ -122,6 +123,10 @@ and the derived files
\file{picture.sty}{\from{picture.dtx}{package}}%
\usedir{doc/latex/oberdiek}%
\file{picture-example.tex}{\from{picture.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{picture.xml}{\from{picture.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -150,14 +155,14 @@ and the derived files
\ProvidesFile{picture.drv}%
[2009/10/11 v1.3 Dimens for picture macros (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{picture.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{321}
+% \CheckSum{322}
%
% \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
@@ -764,6 +769,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{picture.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='picture'>
+ <name>picture</name>
+ <caption>Dimens for picture macros.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2009'/>
+ <license type='lppl1.3'/>
+ <version number='1.3'/>
+ <description>
+ There are macro and environment arguments that expect numbers
+ that will internally be multiplied by <tt>\unitlength</tt>.
+ This package extends the syntax of these arguments, so that
+ dimensions with calculation support may be used for these arguments.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/picture.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/picture.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2006/08/26 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
index 870321b7085..6a0247b25d7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: pmboxdraw.dtx
% Version: 2011/03/24 v1.1
-%
+% Info: Poor man's box drawing characters
+%
% Copyright (C) 2006, 2011 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
@@ -15,20 +16,20 @@
% 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 pmboxdraw.dtx
% and the derived files
% pmboxdraw.sty, pmboxdraw.pdf, pmboxdraw.ins, pmboxdraw.drv,
% pmboxdrawenc.dfu, pmboxdraw-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pmboxdraw.dtx
% CTAN:macros/latex/contrib/oberdiek/pmboxdraw.pdf
-%
+%
% Unpacking:
% (a) If pmboxdraw.ins is present:
% tex pmboxdraw.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{pmboxdraw.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If pmboxdraw.drv is present:
% latex pmboxdraw.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex pmboxdraw.dtx
% makeindex -s gind.ist pmboxdraw.idx
% pdflatex pmboxdraw.dtx
% makeindex -s gind.ist pmboxdraw.idx
% pdflatex pmboxdraw.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/pmboxdraw.sty
% TDS:tex/latex/oberdiek/pmboxdrawenc.dfu
@@ -124,6 +125,10 @@ and the derived files
\file{pmboxdrawenc.dfu}{\from{pmboxdraw.dtx}{utf8}}%
\usedir{doc/latex/oberdiek/test}%
\file{pmboxdraw-test1.tex}{\from{pmboxdraw.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{pmboxdraw.xml}{\from{pmboxdraw.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -152,7 +157,7 @@ and the derived files
\ProvidesFile{pmboxdraw.drv}%
[2011/03/24 v1.1 Poor man's box drawing characters (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{color}
\let\orgdimexpr\dimexpr
%\let\dimexpr\relax
@@ -5552,30 +5557,64 @@ $ \kern.5\pmbd@C
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pmboxdraw.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pmboxdraw'>
+ <name>pmboxdraw</name>
+ <caption>Poor man's box drawing characters.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package declares box drawing characters of
+ old code pages, e.g. cp437. It uses rules instead of using a font.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/pmboxdraw.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/pmboxdraw.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{inputenx}
% Heiko Oberdiek, The \xpackage{inputenx} Package (Enhanced input encoding
% handling), 2006/03/05 v1.0,
% \url{ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/oberdiek/inputenx.pdf}.
-%
+%
% \bibitem{aglfn}
% Adobe Systems Incorporated,
% Adobe Glyph List for New Fonts (AGLFN), version 1.5, 2005/09/18,
% \url{http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt}.
-%
+%
% \bibitem{2500}
% Unicode Inc.,
% The Unicode Standard, Version 4.1, Box Drawing, Range: 2500--257F,
% 2005.
% \url{http://www.unicode.org/charts/PDF/U2500.pdf}
-%
+%
% \bibitem{2580}
% Unicode Inc.,
% The Unicode Standard, Version 4.1, Block Elements, Range: 2580--259F,
% 2005.
% \url{http://www.unicode.org/charts/PDF/U2580.pdf}
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx b/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx
index 7a216c4ab9c..b9353f26510 100644
--- a/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: protecteddef.dtx
% Version: 2011/01/31 v1.0
-%
+% Info: Define protected commands
+%
% Copyright (C) 2011 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file protecteddef.dtx
% and the derived files
% protecteddef.sty, protecteddef.pdf, protecteddef.ins, protecteddef.drv,
% protecteddef-test1.tex, protecteddef-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/protecteddef.dtx
% CTAN:macros/latex/contrib/oberdiek/protecteddef.pdf
-%
+%
% Unpacking:
% (a) If protecteddef.ins is present:
% tex protecteddef.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{protecteddef.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If protecteddef.drv is present:
% latex protecteddef.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex protecteddef.dtx
% makeindex -s gind.ist protecteddef.idx
% pdflatex protecteddef.dtx
% makeindex -s gind.ist protecteddef.idx
% pdflatex protecteddef.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/protecteddef.sty
% TDS:doc/latex/oberdiek/protecteddef.pdf
@@ -80,7 +81,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: protecteddef 2011/01/31 v1.0 Definition of protected macros (HO)}
+\Msg{* Package: protecteddef 2011/01/31 v1.0 Define protected commands (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -130,6 +131,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{protecteddef-test1.tex}{\from{protecteddef.dtx}{test1}}%
\file{protecteddef-test2.tex}{\from{protecteddef.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{protecteddef.xml}{\from{protecteddef.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -156,16 +161,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{protecteddef.drv}%
- [2011/01/31 v1.0 Definition of protected macros (HO)]%
+ [2011/01/31 v1.0 Define protected commands (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{protecteddef.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{810}
+% \CheckSum{811}
%
% \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
@@ -349,7 +354,7 @@ and the derived files
\fi
\expandafter\x\csname ver@protecteddef.sty\endcsname
\ProvidesPackage{protecteddef}%
- [2011/01/31 v1.0 Definition of protected macros (HO)]%
+ [2011/01/31 v1.0 Define protected commands (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -991,6 +996,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{protecteddef.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='protecteddef'>
+ <name>protecteddef</name>
+ <caption>Define protected commands.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines a command <tt>\ProtectedDef</tt> that will
+ create LaTeX &#x2018;robust&#x2019; command or an e-TeX
+ &#x2018;protected&#x2019; command as appropriate
+ to its environment.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/protecteddef.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/protecteddef.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2011/01/31 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt b/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt
index eb3243dfd53..d0897c98c74 100644
--- a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt
+++ b/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt
@@ -1,4 +1,4 @@
-README 2011/04/15
+README 2012/04/26
This file describes the directory
CTAN:macros/latex/contrib/oberdiek/
diff --git a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
index 5840a945849..3aacff49d00 100644
--- a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: refcount.dtx
-% Version: 2010/12/01 v3.2
-%
-% Copyright (C) 1998, 2000, 2006, 2008, 2010 by
+% Version: 2011/10/16 v3.4
+% Info: Data extraction from label references
+%
+% Copyright (C) 1998, 2000, 2006, 2008, 2010, 2011 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
@@ -15,21 +16,21 @@
% 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 refcount.dtx
% and the derived files
% refcount.sty, refcount.pdf, refcount.ins, refcount.drv,
% refcount-test1.tex, refcount-test2.tex, refcount-test3.tex,
-% refcount-test4.tex.
-%
+% refcount-test4.tex, refcount-test5.tex.
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/refcount.dtx
% CTAN:macros/latex/contrib/oberdiek/refcount.pdf
-%
+%
% Unpacking:
% (a) If refcount.ins is present:
% tex refcount.ins
@@ -38,7 +39,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{refcount.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If refcount.drv is present:
% latex refcount.drv
@@ -48,14 +49,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex refcount.dtx
% makeindex -s gind.ist refcount.idx
% pdflatex refcount.dtx
% makeindex -s gind.ist refcount.idx
% pdflatex refcount.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/refcount.sty
% TDS:doc/latex/oberdiek/refcount.pdf
@@ -63,6 +64,7 @@
% TDS:doc/latex/oberdiek/test/refcount-test2.tex
% TDS:doc/latex/oberdiek/test/refcount-test3.tex
% TDS:doc/latex/oberdiek/test/refcount-test4.tex
+% TDS:doc/latex/oberdiek/test/refcount-test5.tex
% TDS:source/latex/oberdiek/refcount.dtx
%
%<*ignore>
@@ -80,7 +82,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: refcount 2010/12/01 v3.2 Data extraction from references (HO)}
+\Msg{* Package: refcount 2011/10/16 v3.4 Data extraction from label references (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -92,9 +94,9 @@
This is a generated file.
Project: refcount
-Version: 2010/12/01 v3.2
+Version: 2011/10/16 v3.4
-Copyright (C) 1998, 2000, 2006, 2008, 2010 by
+Copyright (C) 1998, 2000, 2006, 2008, 2010, 2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -115,7 +117,7 @@ This work consists of the main source file refcount.dtx
and the derived files
refcount.sty, refcount.pdf, refcount.ins, refcount.drv,
refcount-test1.tex, refcount-test2.tex, refcount-test3.tex,
- refcount-test4.tex.
+ refcount-test4.tex, refcount-test5.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -130,6 +132,11 @@ and the derived files
\file{refcount-test2.tex}{\from{refcount.dtx}{test2}}%
\file{refcount-test3.tex}{\from{refcount.dtx}{test3}}%
\file{refcount-test4.tex}{\from{refcount.dtx}{test3,test4}}%
+ \file{refcount-test5.tex}{\from{refcount.dtx}{test5}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{refcount.xml}{\from{refcount.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -156,16 +163,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{refcount.drv}%
- [2010/12/01 v3.2 Data extraction from references (HO)]%
+ [2011/10/16 v3.4 Data extraction from label references (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{refcount.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1072}
+% \CheckSum{1185}
%
% \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
@@ -186,7 +193,7 @@ and the derived files
% \GetFileInfo{refcount.drv}
%
% \title{The \xpackage{refcount} package}
-% \date{2010/12/01 v3.2}
+% \date{2011/10/16 v3.4}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -195,7 +202,7 @@ and the derived files
% References are not numbers, however they often store numerical
% data such as section or page numbers. \cs{ref} or \cs{pageref}
% cannot be used for counter assignments or calculations because
-% they are not expandable, generate warnings, or can even be links,
+% they are not expandable, generate warnings, or can even be links.
% The package provides expandable macros to extract the data
% from references. Packages \xpackage{hyperref}, \xpackage{nameref},
% \xpackage{titleref}, and \xpackage{babel} are supported.
@@ -413,7 +420,7 @@ and the derived files
\fi
\expandafter\x\csname ver@refcount.sty\endcsname
\ProvidesPackage{refcount}%
- [2010/12/01 v3.2 Data extraction from references (HO)]%
+ [2011/10/16 v3.4 Data extraction from label references (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -469,7 +476,7 @@ and the derived files
\input ltxcmds.sty\relax
\input infwarerr.sty\relax
\else
- \RequirePackage{ltxcmds}[2010/04/08]%
+ \RequirePackage{ltxcmds}[2011/11/09]%
\RequirePackage{infwarerr}[2010/04/08]%
\fi
% \end{macrocode}
@@ -501,6 +508,7 @@ and the derived files
% \end{macro}
%
% \begin{macro}{\rc@RobustDefOne}
+% \begin{macro}{\rc@RobustDefZero}
% \begin{macrocode}
\ltx@IfUndefined{protected}{%
\ltx@IfUndefined{DeclareRobustCommand}{%
@@ -509,12 +517,22 @@ and the derived files
#1\def#3##1{#4}%
}%
}%
+ \def\rc@RobustDefZero#1#2{%
+ \rc@IfDefinable#1{%
+ \def#1{#2}%
+ }%
+ }%
}{%
\def\rc@RobustDefOne#1#2#3#4{%
\rc@IfDefinable#3{%
\DeclareRobustCommand#2#3[1]{#4}%
}%
}%
+ \def\rc@RobustDefZero#1#2{%
+ \rc@IfDefinable#1{%
+ \DeclareRobustCommand#1{#2}%
+ }%
+ }%
}%
}{%
\def\rc@RobustDefOne#1#2#3#4{%
@@ -522,9 +540,15 @@ and the derived files
\protected#1\def#3##1{#4}%
}%
}%
+ \def\rc@RobustDefZero#1#2{%
+ \rc@IfDefinable#1{%
+ \protected\def#1{#2}%
+ }%
+ }%
}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\rc@newcommand}
% \begin{macrocode}
@@ -629,7 +653,7 @@ and the derived files
\def\rc@set#1#2#3#4{%
\begingroup
\csname @safe@activestrue\endcsname
- \rc@refused{#4}%
+ \refused{#4}%
\expandafter\rc@@set\csname r@#4\endcsname{#1}{#2}{#3}%
\endgroup
}
@@ -640,7 +664,7 @@ and the derived files
%\begin{tabular}[t]{@{}l@{: }l@{}}
% |#1|& \cs{r@<...>}\\
% |#2|& \cs{setcounter}, \cs{addtocounter}\\
-% |#3|& \cs{ltx@car} (for \cs{ref}), \cs{ltx@cartwo} (for \cs{pageref})\\
+% |#3|& \cs{ltx@car} (for \cs{ref}), \cs{ltx@carsecond} (for \cs{pageref})\\
% |#4|& \hologo{LaTeX} counter\\
%\end{tabular}
%\end{quote}
@@ -661,29 +685,29 @@ and the derived files
%
% \begin{macro}{\setcounterref}
% \begin{macrocode}
-\rc@newcommand*{\setcounterref}[0]{%
+\rc@RobustDefZero\setcounterref{%
\rc@set\setcounter\ltx@car
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\addtocounterref}
% \begin{macrocode}
-\rc@newcommand*{\addtocounterref}[0]{%
+\rc@RobustDefZero\addtocounterref{%
\rc@set\addtocounter\ltx@car
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\setcounterpageref}
% \begin{macrocode}
-\rc@newcommand*{\setcounterpageref}[0]{%
- \rc@set\setcounter\ltx@cartwo
+\rc@RobustDefZero\setcounterpageref{%
+ \rc@set\setcounter\ltx@carsecond
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\addtocounterpageref}
% \begin{macrocode}
-\rc@newcommand*{\addtocounterpageref}[0]{%
- \rc@set\addtocounter\ltx@cartwo
+\rc@RobustDefZero\addtocounterpageref{%
+ \rc@set\addtocounter\ltx@carsecond
}
% \end{macrocode}
% \end{macro}
@@ -989,7 +1013,7 @@ and the derived files
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input refcount.sty\relax
\else
- \RequirePackage{refcount}[2010/12/01]%
+ \RequirePackage{refcount}[2011/10/16]%
\fi
\catcode`\@=11 %
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -1159,7 +1183,7 @@ and the derived files
%<*test3>
\NeedsTeXFormat{LaTeX2e}
\documentclass{article}
-\usepackage{refcount}[2010/12/01]
+\usepackage{refcount}[2011/10/16]
%<test4>\usepackage{nameref}
\usepackage{titleref}
\begin{document}
@@ -1207,6 +1231,74 @@ and the derived files
\end{document}
%</test3>
% \end{macrocode}
+% \begin{macrocode}
+%<*test5>
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{book}
+\usepackage{refcount}[2011/10/16]
+\usepackage{zref-runs}
+\newcounter{test}
+\begin{document}
+\ifnum\zruns>1 %
+ \makeatletter
+ \def\Test#1#2#3{%
+ \begingroup
+ \setcounter{test}{10}%
+ \sbox0{%
+ #1{test}{#2}%
+ \ifnum#3=\value{test}%
+ \else
+ \PackageError{test}{\string#1{#2} <> #3 (\the\value{test})}%
+ \fi
+ }%
+ \ifdim\wd0=0pt %
+ \else
+ \PackageError{test}{Non-empty box}\@ehc
+ \fi
+ \endgroup
+ }%
+ \makeatother
+ \Test\setcounterpageref{ch:two}{1}%
+ \Test\setcounterpageref{ch:three}{3}%
+ \Test\setcounterpageref{ch:four}{5}%
+ \Test\setcounterpageref{ch:five}{7}%
+ \Test\setcounterpageref{ch:six}{9}%
+ \Test\setcounterpageref{ch:seven}{13}%
+ \Test\addtocounterpageref{ch:two}{11}%
+ \Test\addtocounterpageref{ch:three}{13}%
+ \Test\addtocounterpageref{ch:four}{15}%
+ \Test\addtocounterpageref{ch:five}{17}%
+ \Test\addtocounterpageref{ch:six}{19}%
+ \Test\addtocounterpageref{ch:seven}{23}%
+ \Test\setcounterref{ch:two}{1}%
+ \Test\setcounterref{ch:three}{2}%
+ \Test\setcounterref{ch:four}{11}%
+ \Test\addtocounterref{ch:two}{11}%
+ \Test\addtocounterref{ch:three}{12}%
+ \Test\addtocounterref{ch:four}{21}%
+\fi
+\frontmatter
+\chapter{Chapter one}\label{ch:one}
+\cleardoublepage
+\mainmatter
+\chapter{Chapter two}\label{ch:two}
+\cleardoublepage
+\chapter{Chapter three}\label{ch:three}
+\cleardoublepage
+\setcounter{chapter}{10}
+\chapter{Chapter four}\label{ch:four}
+\cleardoublepage
+\appendix
+\chapter{Chapter five}\label{ch:five}
+\cleardoublepage
+\chapter{Chapter six}\label{ch:six}
+\cleardoublepage
+\null
+\cleardoublepage
+\chapter{Chapter seven}\label{ch:seven}
+\end{document}
+%</test5>
+% \end{macrocode}
%
% \section{Installation}
%
@@ -1273,6 +1365,7 @@ and the derived files
% test/refcount-test2.tex & doc/latex/oberdiek/test/refcount-test2.tex\\
% test/refcount-test3.tex & doc/latex/oberdiek/test/refcount-test3.tex\\
% test/refcount-test4.tex & doc/latex/oberdiek/test/refcount-test4.tex\\
+% test/refcount-test5.tex & doc/latex/oberdiek/test/refcount-test5.tex\\
% refcount.dtx & source/latex/oberdiek/refcount.dtx\\
% \end{tabular}^^A
% }^^A
@@ -1393,6 +1486,55 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{refcount.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='refcount'>
+ <name>refcount</name>
+ <caption>Counter operations with label references.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1998,2000,2006,2008,2010,2011'/>
+ <license type='lppl1.3'/>
+ <version number='3.4'/>
+ <description>
+ Provides commands <tt>\setcounterref</tt> and
+ <tt>\addtocounterref</tt> which use the section (or whatever)
+ number from the reference as the value to put into the counter, as
+ in:
+
+ <pre>
+ ...\label{sec:foo}
+ ...
+ \setcounterref{foonum}{sec:foo}
+ </pre>
+ Commands <tt>\setcounterpageref</tt> and
+ <tt>\addtocounterpageref</tt> do the corresponding thing with the
+ page reference of the label.
+ <p/>
+ No <tt>.ins</tt> file is distributed; process the
+ <tt>.dtx</tt> with plain TeX to create one.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/refcount.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/refcount.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1998/04/08 v1.0}
% \item
@@ -1434,6 +1576,18 @@ and the derived files
% \item
% Test files added.
% \end{Version}
+% \begin{Version}{2011/06/22 v3.3}
+% \item
+% Bug fix: \cs{rc@refused} is undefined for \cs{setcounterpageref}
+% and similar macros. (Bug found by Marc van Dongen.)
+% \end{Version}
+% \begin{Version}{2011/10/16 v3.4}
+% \item
+% Bug fix: \cs{setcounterpageref} and \cs{addtocounterpageref} fixed.
+% (Bug found by Staz.)
+% \item
+% Macros \cs{(set|addto)counter(page|)ref} are made robust.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx b/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx
index 2157386fbd9..d2f3a961736 100644
--- a/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: rerunfilecheck.dtx
% Version: 2011/04/15 v1.7
-%
+% Info: Rerun checks for auxiliary files
+%
% Copyright (C) 2009-2011 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
@@ -15,21 +16,21 @@
% 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 rerunfilecheck.dtx
% and the derived files
% rerunfilecheck.sty, rerunfilecheck.pdf, rerunfilecheck.ins,
% rerunfilecheck.drv, rerunfilecheck-example.cfg,
% rerunfilecheck-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/rerunfilecheck.dtx
% CTAN:macros/latex/contrib/oberdiek/rerunfilecheck.pdf
-%
+%
% Unpacking:
% (a) If rerunfilecheck.ins is present:
% tex rerunfilecheck.ins
@@ -38,7 +39,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{rerunfilecheck.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If rerunfilecheck.drv is present:
% latex rerunfilecheck.drv
@@ -48,14 +49,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex rerunfilecheck.dtx
% makeindex -s gind.ist rerunfilecheck.idx
% pdflatex rerunfilecheck.dtx
% makeindex -s gind.ist rerunfilecheck.idx
% pdflatex rerunfilecheck.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/rerunfilecheck.sty
% TDS:doc/latex/oberdiek/rerunfilecheck.pdf
@@ -129,6 +130,8 @@ and the derived files
\nopostamble
\usedir{doc/latex/oberdiek}%
\file{rerunfilecheck-example.cfg}{\from{rerunfilecheck.dtx}{cfg}}%
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{rerunfilecheck.xml}{\from{rerunfilecheck.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -157,7 +160,7 @@ and the derived files
\ProvidesFile{rerunfilecheck.drv}%
[2011/04/15 v1.7 Rerun checks for auxiliary files (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{rerunfilecheck.dtx}%
\end{document}
@@ -1012,6 +1015,41 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{rerunfilecheck.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='rerunfilecheck'>
+ <name>rerunfilecheck</name>
+ <caption>Checksum based rerun checks on auxiliary files.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.7'/>
+ <description>
+ The package provides additional rerun warnings if some
+ auxiliary files have changed. It is based on MD5 checksum,
+ provided by pdfTeX.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/rerunfilecheck.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/rerunfilecheck.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2009/12/10 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx b/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx
index 948882ccebe..8e7a96961a4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: resizegather.dtx
% Version: 2010/03/01 v1.2
-%
+% Info: Resize overly large equations
+%
% Copyright (C) 2009, 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
@@ -15,20 +16,20 @@
% 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 resizegather.dtx
% and the derived files
% resizegather.sty, resizegather.pdf, resizegather.ins, resizegather.drv,
% resizegather-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/resizegather.dtx
% CTAN:macros/latex/contrib/oberdiek/resizegather.pdf
-%
+%
% Unpacking:
% (a) If resizegather.ins is present:
% tex resizegather.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{resizegather.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If resizegather.drv is present:
% latex resizegather.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex resizegather.dtx
% makeindex -s gind.ist resizegather.idx
% pdflatex resizegather.dtx
% makeindex -s gind.ist resizegather.idx
% pdflatex resizegather.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/resizegather.sty
% TDS:doc/latex/oberdiek/resizegather.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: resizegather 2010/03/01 v1.2 Automatically resizing of too large equations (HO)}
+\Msg{* Package: resizegather 2010/03/01 v1.2 Resize overly large equations (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{resizegather.sty}{\from{resizegather.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{resizegather-test1.tex}{\from{resizegather.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{resizegather.xml}{\from{resizegather.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,12 +153,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{resizegather.drv}%
- [2010/03/01 v1.2 Automatically resizing of too large equations (HO)]%
+ [2010/03/01 v1.2 Resize overly large equations (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{lmodern}
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{ifluatex}
+\ifluatex
+\else
+ \usepackage[T1]{fontenc}%
+ \usepackage{textcomp}%
+ \usepackage{lmodern}%
+\fi
\begin{document}
\DocInput{resizegather.dtx}%
\end{document}
@@ -395,7 +404,7 @@ and the derived files
\fi
\expandafter\x\csname ver@resizegather.sty\endcsname
\ProvidesPackage{resizegather}%
- [2010/03/01 v1.2 Automatically resizing of too large equations (HO)]%
+ [2010/03/01 v1.2 Resize overly large equations (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -957,8 +966,46 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{resizegather.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='resizegather'>
+ <name>resizegather</name>
+ <caption>Automatically resize overly large equations.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009,2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ Equations that are too large are resized to fit the available
+ space. The environment &#x2018;gather&#x2019; of package
+ <xref refid='amsmath'>amsmath</xref> is supported. Also the
+ environments &#x2018;equation&#x2019; and
+ &#x2018;displaymath&#x2019; are redefined using
+ &#x2018;gather&#x2019; and its starred version.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/resizegather.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/resizegather.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \section{Acknowledgement}
-%
+%
% \begin{description}
% \item[Dieter Jurzitza:]
% He wanted the resizing feature at the \TeX\ table
diff --git a/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx b/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx
index 9a04606c724..b8c123be962 100644
--- a/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: rotchiffre.dtx
% Version: 2010/11/12 v1.0
-%
+% Info: Perform simple rotation ciphers
+%
% Copyright (C) 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file rotchiffre.dtx
% and the derived files
% rotchiffre.sty, rotchiffre.pdf, rotchiffre.ins, rotchiffre.drv,
% rotchiffre-test1.tex, rotchiffre-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/rotchiffre.dtx
% CTAN:macros/latex/contrib/oberdiek/rotchiffre.pdf
-%
+%
% Unpacking:
% (a) If rotchiffre.ins is present:
% tex rotchiffre.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{rotchiffre.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If rotchiffre.drv is present:
% latex rotchiffre.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex rotchiffre.dtx
% makeindex -s gind.ist rotchiffre.idx
% pdflatex rotchiffre.dtx
% makeindex -s gind.ist rotchiffre.idx
% pdflatex rotchiffre.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/rotchiffre.sty
% TDS:doc/latex/oberdiek/rotchiffre.pdf
@@ -80,7 +81,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: rotchiffre 2010/11/12 v1.0 Provides ROT13, ROT5, ROT18, ROT47 (HO)}
+\Msg{* Package: rotchiffre 2010/11/12 v1.0 Perform simple rotation ciphers (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -130,6 +131,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{rotchiffre-test1.tex}{\from{rotchiffre.dtx}{test1}}%
\file{rotchiffre-test2.tex}{\from{rotchiffre.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{rotchiffre.xml}{\from{rotchiffre.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -156,9 +161,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{rotchiffre.drv}%
- [2010/11/12 v1.0 Provides ROT13, ROT5, ROT18, ROT47 (HO)]%
+ [2010/11/12 v1.0 Perform simple rotation ciphers (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{rotchiffre}[2010/11/12]
\usepackage{wasysym}
\begin{document}
@@ -167,7 +172,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{933}
+% \CheckSum{934}
%
% \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
@@ -370,7 +375,7 @@ and the derived files
\fi
\expandafter\x\csname ver@rotchiffre.sty\endcsname
\ProvidesPackage{rotchiffre}%
- [2010/11/12 v1.0 Provides ROT13, ROT5, ROT18, ROT47 (HO)]%
+ [2010/11/12 v1.0 Perform simple rotation ciphers (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1294,9 +1299,48 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{rotchiffre.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='rotchiffre'>
+ <name>rotchiffre</name>
+ <caption>Perform simple rotation cyphers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2010'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ The package defines a command <tt>\EdefRot</tt> that defines a
+ macro (whose name is given as an argument) to the rotation of the
+ given string. Available rotations are <tt>ROT13</tt> (for
+ letters), <tt>ROT5</tt> (for digits), <tt>ROT18</tt> (for digits
+ and letters together) and <tt>ROT47</tt> (for all ASCII
+ characters).
+ <p/>
+ The package is part of the
+ <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/rotchiffre.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/rotchiffre.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \raggedright
-%
+%
% \bibitem{fontspecthread}
% Stephan Hennig et.\,al.:
% \textit{fontspec: no ligatures with Times New Roman};
@@ -1305,7 +1349,7 @@ and the derived files
% 2010-11-11.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/browse_thread/thread/6266f98e998ce333/d7b32e9dcc610c87}}
-%
+%
% \bibitem{rot13modern}
% Stephan Hennig:
% \textit{Re: fontspec: no ligatures with Times New Roman};
@@ -1314,7 +1358,7 @@ and the derived files
% 2010-11-11.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/d7b32e9dcc610c87}}
-%
+%
% \bibitem{rot13robin}
% Robin Fairbairns:
% \textit{Re: fontspec: no ligatures with Times New Roman};
@@ -1323,33 +1367,33 @@ and the derived files
% 2010-11-12.\\
% {\small
% \url{http://groups.google.com/group/comp.text.tex/msg/7c03e91407144704}}
-%
+%
% \bibitem{wiki:rot13:de}
% Wikipedia/German:
% \textit{ROT13};
% 2010-10-26.
% {\small
% \url{http://de.wikipedia.org/wiki/ROT13}}
-%
+%
% \bibitem{wiki:rot13:en}
% Wikipedia/English:
% \textit{ROT13};
% 2010-11-11.
% {\small
% \url{http://en.wikipedia.org/wiki/ROT13}}
-%
+%
% \bibitem{cf:rot18}
% Computerfreak/German: \textit{ROT-18};
% 2010-04-12.\\
% {\small
% \url{http://www.compufreak.info/2010/04/12/rot-18/}}
-%
+%
% \bibitem{lazydog}
% Wikipedia/English: \textit{The quick brown fox jumps over the lazy dog};
% 2010-11-09.\\
% {\small
% \url{http://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog}}
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx b/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx
index be502a8af45..71afbdbcd80 100644
--- a/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: scrindex.dtx
% Version: 2008/08/11 v1.1
-%
+% Info: Package index with KOMA-Script classes
+%
% Copyright (C) 2008 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
@@ -15,20 +16,20 @@
% 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 scrindex.dtx
% and the derived files
% scrindex.sty, scrindex.pdf, scrindex.ins, scrindex.drv,
% scrindex-example1.tex, scrindex-example2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/scrindex.dtx
% CTAN:macros/latex/contrib/oberdiek/scrindex.pdf
-%
+%
% Unpacking:
% (a) If scrindex.ins is present:
% tex scrindex.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{scrindex.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If scrindex.drv is present:
% latex scrindex.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex scrindex.dtx
% makeindex -s gind.ist scrindex.idx
% pdflatex scrindex.dtx
% makeindex -s gind.ist scrindex.idx
% pdflatex scrindex.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/scrindex.sty
% TDS:doc/latex/oberdiek/scrindex.pdf
@@ -77,7 +78,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: scrindex 2008/08/11 v1.1 Package index with scr* classes (HO)}
+\Msg{* Package: scrindex 2008/08/11 v1.1 Package index with KOMA-Script classes (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -124,6 +125,10 @@ and the derived files
\usedir{doc/latex/oberdiek}%
\file{scrindex-example1.tex}{\from{scrindex.dtx}{example1}}%
\file{scrindex-example2.tex}{\from{scrindex.dtx}{example2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{scrindex.xml}{\from{scrindex.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -150,9 +155,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{scrindex.drv}%
- [2008/08/11 v1.1 Package index with scr* classes (HO)]%
+ [2008/08/11 v1.1 Package index with KOMA-Script classes (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{calc}
\begin{document}
\DocInput{scrindex.dtx}%
@@ -329,7 +334,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{scrindex}
- [2008/08/11 v1.1 Package index with scr* classes (HO)]%
+ [2008/08/11 v1.1 Package index with KOMA-Script classes (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -706,6 +711,44 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{scrindex.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='scrindex'>
+ <name>scrindex</name>
+ <caption>Make index package work with Koma-script classes.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ This package redefines environment `theindex' of package `index',
+ if a class from <xref refid='koma-script'>KOMA-Script</xref> is loaded.
+ Also option `idxtotoc' is supported. Index preambles can be given
+ either by means of package `index' or via the interface provided
+ by <xref refid='koma-script'>KOMA-Script</xref>.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/scrindex.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/scrindex.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2008/07/07 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
index 7a6119faa75..91675683517 100644
--- a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: selinput.dtx
% Version: 2007/09/09 v1.2
-%
+% Info: Semi-automatic input encoding detection
+%
% Copyright (C) 2007 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
@@ -15,21 +16,21 @@
% 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 selinput.dtx
% and the derived files
% selinput.sty, selinput.pdf, selinput.ins, selinput.drv,
% selinput-test1.tex, selinput-test2.tex, selinput-test3.tex,
% selinput-test4.tex, selinput-test5.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/selinput.dtx
% CTAN:macros/latex/contrib/oberdiek/selinput.pdf
-%
+%
% Unpacking:
% (a) If selinput.ins is present:
% tex selinput.ins
@@ -38,7 +39,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{selinput.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If selinput.drv is present:
% latex selinput.drv
@@ -48,14 +49,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex selinput.dtx
% makeindex -s gind.ist selinput.idx
% pdflatex selinput.dtx
% makeindex -s gind.ist selinput.idx
% pdflatex selinput.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/selinput.sty
% TDS:doc/latex/oberdiek/selinput.pdf
@@ -81,7 +82,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: selinput 2007/09/09 v1.2 Select input encoding (HO)}
+\Msg{* Package: selinput 2007/09/09 v1.2 Semi-automatic input encoding detection (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -132,6 +133,10 @@ and the derived files
\file{selinput-test3.tex}{\from{selinput.dtx}{test,test3}}%
\file{selinput-test4.tex}{\from{selinput.dtx}{test,test4}}%
\file{selinput-test5.tex}{\from{selinput.dtx}{test,test5}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{selinput.xml}{\from{selinput.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -158,12 +163,12 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{selinput.drv}%
- [2007/09/09 v1.2 Select input encoding (HO)]%
+ [2007/09/09 v1.2 Semi-automatic input encoding detection (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
\usepackage[T1]{fontenc}
\usepackage{textcomp}
\usepackage{lmodern}
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{color}
\begin{document}
\DocInput{selinput.dtx}%
@@ -369,7 +374,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{selinput}
- [2007/09/09 v1.2 Select input encoding (HO)]%
+ [2007/09/09 v1.2 Semi-automatic input encoding detection (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -953,27 +958,62 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{selinput.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='selinput'>
+ <name>selinput</name>
+ <caption>Semi-automatic detection of input encoding.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ This package selects the input encoding by specifying pairs
+ of input characters and their glyph names.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/selinput.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/selinput.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{inputenx}
% Heiko Oberdiek: \textit{The \xpackage{inputenx} package};
% 2007-04-11 v1.1;
% \CTAN{macros/latex/contrib/oberdiek/inputenx.pdf}.
-%
+%
% \bibitem{adobe:glyphlist}
% Adobe: \textit{Adobe Glyph List};
% 2002-09-20 v2.0;
% \url{http://partners.adobe.com/public/developer/en/opentype/glyphlist.txt}.
-%
+%
% \bibitem{adobe:aglfn}
% Adobe: \textit{Adobe Glyph List For New Fonts};
% 2005-11-18 v1.5;
% \url{http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt}.
-%
+%
% \bibitem{stringenc}
% Heiko Oberdiek: \textit{The \xpackage{stringenc} package};
% 2007-06-16 v1.1;
% \CTAN{macros/latex/contrib/oberdiek/stringenc.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
index e4c4456f7a0..c057c3e5436 100644
--- a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: setouterhbox.dtx
% Version: 2007/09/09 v1.7
-%
-% Copyright (C) 2005, 2006, 2007 by
+% Info: Set hbox in outer horizontal mode
+%
+% Copyright (C) 2005-2007 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file setouterhbox.dtx
% and the derived files
% setouterhbox.sty, setouterhbox.pdf, setouterhbox.ins, setouterhbox.drv,
% setouterhbox-example.tex, setouterhbox-test1.tex,
% setouterhbox-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/setouterhbox.dtx
% CTAN:macros/latex/contrib/oberdiek/setouterhbox.pdf
-%
+%
% Unpacking:
% (a) If setouterhbox.ins is present:
% tex setouterhbox.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{setouterhbox.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If setouterhbox.drv is present:
% latex setouterhbox.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex setouterhbox.dtx
% makeindex -s gind.ist setouterhbox.idx
% pdflatex setouterhbox.dtx
% makeindex -s gind.ist setouterhbox.idx
% pdflatex setouterhbox.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/setouterhbox.sty
% TDS:doc/latex/oberdiek/setouterhbox.pdf
@@ -96,7 +97,7 @@ This is a generated file.
Project: setouterhbox
Version: 2007/09/09 v1.7
-Copyright (C) 2005, 2006, 2007 by
+Copyright (C) 2005-2007 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -135,6 +136,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{setouterhbox-test1.tex}{\from{setouterhbox.dtx}{test1}}%
\file{setouterhbox-test2.tex}{\from{setouterhbox.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{setouterhbox.xml}{\from{setouterhbox.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -163,14 +168,14 @@ and the derived files
\ProvidesFile{setouterhbox.drv}%
[2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{setouterhbox.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{639}
+% \CheckSum{643}
%
% \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
@@ -1105,15 +1110,52 @@ by/a/very_long_long_long_path.html}%
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{setouterhbox.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='setouterhbox'>
+ <name>setouterhbox</name>
+ <caption>Set hbox in outer horizontal mode.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005-2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.7'/>
+ <description>
+ If math stuff is set in an <tt>\hbox</tt>, then TeX
+ performs some optimization and omits the implicit
+ penalties <tt>\binoppenalty</tt> and <tt>\relpenalty</tt>.
+ This packages tries to put stuff into an <tt>\hbox</tt>
+ without losing those penalties.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/setouterhbox.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/setouterhbox.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{newsstart}
% Damian Menscher, \Newsgroup{comp.text.tex},
% \textit{overlong lines in List of Figures},
% \nolinkurl{<dh058t$qbd$1@news.ks.uiuc.edu>},
% 23rd September 2005.
% \url{http://groups.google.com/group/comp.text.tex/msg/79648d4cf1f8bc13}
-%
+%
% \bibitem{kastrup}
% David Kastrup, \Newsgroup{comp.text.tex},
% \textit{Re: ANN: outerhbox.sty -- collect horizontal material,
@@ -1121,17 +1163,17 @@ by/a/very_long_long_long_path.html}%
% \nolinkurl{<85y855lrx3.fsf@lola.goethe.zz>},
% 7th October 2005.
% \url{http://groups.google.com/group/comp.text.tex/msg/7cf0a345ef932e52}
-%
+%
% \bibitem{downes}
% Michael Downes, \textit{Line breaking in \cs{unhbox}ed Text},
% TUGboat 11 (1990), pp. 605--612.
-%
+%
% \bibitem{hyperref}
% Sebastian Rahtz, Heiko Oberdiek:
% \textit{The \xpackage{hyperref} package};
% 2006/08/16 v6.75c;
% \CTAN{macros/latex/contrib/hyperref/}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
index b9d0e45c021..b9360fa3bf7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: settobox.dtx
% Version: 2008/08/11 v1.4
-%
+% Info: Assign box dimensions to length registers
+%
% Copyright (C) 2000, 2006-2008 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
@@ -15,20 +16,20 @@
% 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 settobox.dtx
% and the derived files
% settobox.sty, settobox.pdf, settobox.ins, settobox.drv,
% settobox-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/settobox.dtx
% CTAN:macros/latex/contrib/oberdiek/settobox.pdf
-%
+%
% Unpacking:
% (a) If settobox.ins is present:
% tex settobox.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{settobox.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If settobox.drv is present:
% latex settobox.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex settobox.dtx
% makeindex -s gind.ist settobox.idx
% pdflatex settobox.dtx
% makeindex -s gind.ist settobox.idx
% pdflatex settobox.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/settobox.sty
% TDS:doc/latex/oberdiek/settobox.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: settobox 2008/08/11 v1.4 Getting box sizes (HO)}
+\Msg{* Package: settobox 2008/08/11 v1.4 Assign box dimensions to length registers (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{settobox.sty}{\from{settobox.dtx}{package}}%
\usedir{doc/latex/oberdiek}%
\file{settobox-example.tex}{\from{settobox.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{settobox.xml}{\from{settobox.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,9 +153,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{settobox.drv}%
- [2008/08/11 v1.4 Getting box sizes (HO)]%
+ [2008/08/11 v1.4 Assign box dimensions to length registers (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{calc}
\usepackage{settobox}
\begin{document}
@@ -159,7 +164,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{97}
+% \CheckSum{109}
%
% \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
@@ -414,7 +419,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{settobox}%
- [2008/08/11 v1.4 Getting box sizes (HO)]
+ [2008/08/11 v1.4 Assign box dimensions to length registers (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -715,6 +720,48 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{settobox.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='settobox'>
+ <name>settobox</name>
+ <caption>Assigning dimensions of a box to a length register.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2000,2006-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.4'/>
+ <description>
+ Commands to assist the reuse of boxes (set up by <tt>\sbox</tt> or
+ by the <tt>lrbox</tt> environment); the <tt>\settobox...</tt>
+ commands behave similarly to the <tt>\settowidth</tt> (etc.)
+ commands. For example:
+ <pre>
+ \newsavebox{\mybox}
+ \newlength{\mylength}
+ \sbox{\mybox}{Hello World}
+ \settoboxwidth{\mylength}{\mybox}
+ </pre>
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/settobox.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/settobox.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2000/02/11 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
index 3ac99e78da4..d4652d414d7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: soulutf8.dtx
% Version: 2007/09/09 v1.0
-%
+% Info: Permit use of UTF-8 characters in soul
+%
% Copyright (C) 2007 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
@@ -15,24 +16,24 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file soulutf8.dtx
% and the derived files
% soulutf8.sty, soulutf8.pdf, soulutf8.ins, soulutf8.drv,
% soulutf8-test1.tex, soulutf8-test2.tex, soulutf8-test3.tex,
% soulutf8-test4.tex, soulutf8-test5.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/soulutf8.dtx
% CTAN:macros/latex/contrib/oberdiek/soulutf8.pdf
-%
+%
% Unpacking:
% (a) If soulutf8.ins is present:
% tex soulutf8.ins
@@ -41,7 +42,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{soulutf8.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If soulutf8.drv is present:
% latex soulutf8.drv
@@ -51,14 +52,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex soulutf8.dtx
% makeindex -s gind.ist soulutf8.idx
% pdflatex soulutf8.dtx
% makeindex -s gind.ist soulutf8.idx
% pdflatex soulutf8.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/soulutf8.sty
% TDS:doc/latex/oberdiek/soulutf8.pdf
@@ -84,7 +85,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: soulutf8 2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)}
+\Msg{* Package: soulutf8 2007/09/09 v1.0 Permit use of UTF-8 characters in soul (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -138,6 +139,10 @@ and the derived files
\file{soulutf8-test3.tex}{\from{soulutf8.dtx}{test3,utf8x}}%
\file{soulutf8-test4.tex}{\from{soulutf8.dtx}{test4,utf8,noetex}}%
\file{soulutf8-test5.tex}{\from{soulutf8.dtx}{test5,utf8x,noetex}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{soulutf8.xml}{\from{soulutf8.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -164,9 +169,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{soulutf8.drv}%
- [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)]%
+ [2007/09/09 v1.0 Permit use of UTF-8 characters in soul (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{soulutf8.dtx}%
\end{document}
@@ -343,7 +348,7 @@ and the derived files
\fi
\expandafter\x\csname ver@soulutf8.sty\endcsname
\ProvidesPackage{soulutf8}%
- [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)]%
+ [2007/09/09 v1.0 Permit use of UTF-8 characters in soul (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1847,24 +1852,63 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{soulutf8.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='soulutf8'>
+ <name>soulutf8</name>
+ <caption>Permit use of UTF-8 characters in soul.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package extends package <xref refid='soul'>soul</xref> and adds
+ some support for UTF-8. Namely the input encodings in
+ &#x2018;<tt>utf8.def</tt>&#x2019; from package
+ <xref refid='inputenc'>inputenc</xref> and
+ &#x2018;<tt>utf8x.def</tt>&#x2019; from package
+ <xref refid='unicode'>ucs</xref> are supported.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/soulutf8.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/soulutf8.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
-%
+%
% \bibitem{soul}
% Melchior Franz: \textit{The \xpackage{soul} package};
% 2003/11/17;\\
% \CTAN{macros/latex/contrib/soul/}.
-%
+%
% \bibitem{ucs}
% Dominique P. G. Unruh: \textit{\xpackage{ucs.sty} -- Unicode Support};
% 2004/10/17;\\
% \CTAN{macros/latex/contrib/unicode/}.
-%
+%
% \bibitem{utf8}
% Frank Mittelbach, Chris Rowley:
% \textit{Providing some UTF-8 support via \xpackage{inputenc}};
% 2006/03/30;\\
% \CTAN{macros/latex/base/utf8ienc.dtx}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
index a66e25adc1f..bf3894c6626 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: stackrel.dtx
% Version: 2007/11/11 v1.2
-%
+% Info: Adding subscript option to stackrel
+%
% Copyright (C) 2006, 2007 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
@@ -15,19 +16,19 @@
% 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 stackrel.dtx
% and the derived files
% stackrel.sty, stackrel.pdf, stackrel.ins, stackrel.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/stackrel.dtx
% CTAN:macros/latex/contrib/oberdiek/stackrel.pdf
-%
+%
% Unpacking:
% (a) If stackrel.ins is present:
% tex stackrel.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{stackrel.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If stackrel.drv is present:
% latex stackrel.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex stackrel.dtx
% makeindex -s gind.ist stackrel.idx
% pdflatex stackrel.dtx
% makeindex -s gind.ist stackrel.idx
% pdflatex stackrel.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/stackrel.sty
% TDS:doc/latex/oberdiek/stackrel.pdf
@@ -117,6 +118,10 @@ and the derived files
\file{stackrel.drv}{\from{stackrel.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{stackrel.sty}{\from{stackrel.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{stackrel.xml}{\from{stackrel.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -145,16 +150,16 @@ and the derived files
\ProvidesFile{stackrel.drv}%
[2007/11/11 v1.2 Adding subscript option to stackrel (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
\usepackage{amsmath}
-\usepackage{stackrel}
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{stackrel}[2007/11/11]
\begin{document}
\DocInput{stackrel.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{90}
+% \CheckSum{93}
%
% \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
@@ -472,6 +477,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{stackrel.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='stackrel'>
+ <name>stackrel</name>
+ <caption>Enhancement to the \stackrel command.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006,2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ This package adds an optional argument to <tt>\stackrel</tt> for
+ putting something below the relational symbol and defines
+ <tt>\stackbin</tt> for binary symbols.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/stackrel.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/stackrel.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2006/12/02 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx
index 732a1e48af4..a1f93e5591a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: stampinclude.dtx
% Version: 2008/07/14 v1.0
-%
+% Info: Include files based on time stamps
+%
% Copyright (C) 2008 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
@@ -15,19 +16,19 @@
% 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 stampinclude.dtx
% and the derived files
% stampinclude.sty, stampinclude.pdf, stampinclude.ins, stampinclude.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/stampinclude.dtx
% CTAN:macros/latex/contrib/oberdiek/stampinclude.pdf
-%
+%
% Unpacking:
% (a) If stampinclude.ins is present:
% tex stampinclude.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{stampinclude.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If stampinclude.drv is present:
% latex stampinclude.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex stampinclude.dtx
% makeindex -s gind.ist stampinclude.idx
% pdflatex stampinclude.dtx
% makeindex -s gind.ist stampinclude.idx
% pdflatex stampinclude.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/stampinclude.sty
% TDS:doc/latex/oberdiek/stampinclude.pdf
@@ -74,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: stampinclude 2008/07/14 v1.0 Time stamp based including (HO)}
+\Msg{* Package: stampinclude 2008/07/14 v1.0 Include files based on time stamps (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -117,6 +118,10 @@ and the derived files
\file{stampinclude.drv}{\from{stampinclude.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{stampinclude.sty}{\from{stampinclude.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{stampinclude.xml}{\from{stampinclude.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -143,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{stampinclude.drv}%
- [2008/07/14 v1.0 Time stamp based including (HO)]%
+ [2008/07/14 v1.0 Include files based on time stamps (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{stampinclude.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{118}
+% \CheckSum{120}
%
% \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
@@ -322,7 +327,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{stampinclude}
- [2008/07/14 v1.0 Time stamp based including (HO)]%
+ [2008/07/14 v1.0 Include files based on time stamps (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -614,19 +619,56 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{stampinclude.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='stampinclude'>
+ <name>stampinclude</name>
+ <caption>Inclusion based on .aux file date stamps.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ This package replaces <tt>\includeonly</tt> and selects the files for
+ <tt>\include</tt> by inspecting the timestamp of the <tt>.aux</tt> file.
+ The file is selected for inclusion if the <tt>.aux</tt> file does
+ not yet exist or is older than the corresponding <tt>.tex</tt> file.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/stampinclude.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/stampinclude.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{thebibliography}{9}
% \bibitem{askinclude}
% Pablo A. Straub, Heiko Oberdiek:
% \textit{The \xpackage{askinclude} package};
% 2007/10/23 v2.0;
% \CTAN{macros/latex/contrib/oberdiek/askinclude.pdf}.
-%
+%
% \bibitem{pdftexcmds}
% Heiko Oberdiek:
% \textit{The \xpackage{pdftexcmds} package};
% 2007/12/12 v0.3;
% \CTAN{macros/latex/contrib/oberdiek/pdftexcmds.pdf}.
-%
+%
% \end{thebibliography}
%
% \begin{History}
diff --git a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
index 7d20fef9f0d..0e8e8a0cbe7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: stringenc.dtx
-% Version: 2010/03/01 v1.8
-%
-% Copyright (C) 2007-2010 by
+% Version: 2011/12/02 v1.10
+% Info: Convert strings between diff. encodings
+%
+% Copyright (C) 2007-2011 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
@@ -15,14 +16,14 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file stringenc.dtx
% and the derived files
% stringenc.sty, stringenc.pdf, stringenc.ins, stringenc.drv,
@@ -39,11 +40,11 @@
% se-cp850.def, se-cp852.def, se-cp855.def, se-cp858.def,
% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/stringenc.dtx
% CTAN:macros/latex/contrib/oberdiek/stringenc.pdf
-%
+%
% Unpacking:
% (a) If stringenc.ins is present:
% tex stringenc.ins
@@ -52,7 +53,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{stringenc.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If stringenc.drv is present:
% latex stringenc.drv
@@ -62,14 +63,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex stringenc.dtx
% makeindex -s gind.ist stringenc.idx
% pdflatex stringenc.dtx
% makeindex -s gind.ist stringenc.idx
% pdflatex stringenc.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/stringenc.sty
% TDS:tex/generic/oberdiek/se-utf32be.def
@@ -132,7 +133,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: stringenc 2010/03/01 v1.8 Converts strings between encodings (HO)}
+\Msg{* Package: stringenc 2011/12/02 v1.10 Convert strings between diff. encodings (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -144,9 +145,9 @@
This is a generated file.
Project: stringenc
-Version: 2010/03/01 v1.8
+Version: 2011/12/02 v1.10
-Copyright (C) 2007-2010 by
+Copyright (C) 2007-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -234,6 +235,10 @@ and the derived files
\usedir{doc/latex/oberdiek/test}%
\file{stringenc-test1.tex}{\from{stringenc.dtx}{test1}}%
\file{stringenc-test2.tex}{\from{stringenc.dtx}{test2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{stringenc.xml}{\from{stringenc.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -272,9 +277,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{stringenc.drv}%
- [2010/03/01 v1.8 Converts strings between encodings (HO)]%
+ [2011/12/02 v1.10 Convert strings between diff. encodings (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage{longtable}
\begin{document}
\DocInput{stringenc.dtx}%
@@ -282,7 +287,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{6179}
+% \CheckSum{6178}
%
% \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
@@ -303,7 +308,7 @@ and the derived files
% \GetFileInfo{stringenc.drv}
%
% \title{The \xpackage{stringenc} package}
-% \date{2010/03/01 v1.8}
+% \date{2011/12/02 v1.10}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -328,7 +333,7 @@ and the derived files
% This can be prevented by \eTeX's \cs{detokenize}:
%\begin{quote}
%\begin{verbatim}
-%\expandafter\StringEncodingConvert\expandafter\Result\expandafter{%
+%\StringEncodingConvert\Result{%
% \detokenize{Hello \textbf{world}!}%
%}{ascii}{utf8}
%\end{verbatim}
@@ -429,6 +434,7 @@ and the derived files
% & MAC OS Cyrillic\\
% \xoption{mac-roman}, \xoption{applemac} & MAC OS Roman\\
% \xoption{nextstep}, \xoption{next} & NextStep Encoding\\
+% \xoption{pdfdoc} & PDFDocEncoding\\
% \xoption{utf8}, \xoption{utf-8} & UTF-8\\
% \xoption{utf16be}, \xoption{utf-16be}, \xoption{utf16}, \xoption{utf-16}
% & UTF-16BE\\
@@ -519,7 +525,7 @@ and the derived files
\fi
\expandafter\x\csname ver@stringenc.sty\endcsname
\ProvidesPackage{stringenc}%
- [2010/03/01 v1.8 Converts strings between encodings (HO)]%
+ [2011/12/02 v1.10 Convert strings between diff. encodings (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -967,7 +973,7 @@ and the derived files
% \begin{macrocode}
\def\SE@Nibble@NumToHex#1{%
$ \ifcase\numexpr#1\relax
-& \expandafter\ifcase\expandafter\ltx@firstofone\expandafter{\number#1} %
+& \ifcase\expandafter\ltx@firstofone\expandafter{\number#1} %
0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or
8\or 9\or A\or B\or C\or D\or E\or F%
\fi
@@ -978,7 +984,6 @@ $ \ifcase\numexpr#1\relax
% \begin{macrocode}
\def\SE@Nibble@NumToBin#1{%
$ \ifcase\numexpr#1\relax
-& \expandafter
& \ifcase\expandafter\ltx@firstofone\expandafter{\number#1} %
0000\or
0001\or
@@ -1500,8 +1505,8 @@ $ \fi
%
% \begin{macrocode}
%<*utf32>
-%<utf32be>\ProvidesFile{se-utf32be.def}[2010/03/01 v1.8 stringenc: UTF-32BE]
-%<utf32le>\ProvidesFile{se-utf32le.def}[2010/03/01 v1.8 stringenc: UTF-32LE]
+%<utf32be>\ProvidesFile{se-utf32be.def}[2011/12/02 v1.10 stringenc: UTF-32BE]
+%<utf32le>\ProvidesFile{se-utf32le.def}[2011/12/02 v1.10 stringenc: UTF-32LE]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1659,7 +1664,7 @@ $ \fi
%
% \begin{macrocode}
%<*utf8>
-\ProvidesFile{se-utf8.def}[2010/03/01 v1.8 stringenc: UTF-8]
+\ProvidesFile{se-utf8.def}[2011/12/02 v1.10 stringenc: UTF-8]
% \end{macrocode}
%
% \noindent
@@ -1999,7 +2004,7 @@ $ \fi
%
% \begin{macrocode}
%<*utf16le>
-\ProvidesFile{se-utf16le.def}[2010/03/01 v1.8 stringenc: UTF-16LE]
+\ProvidesFile{se-utf16le.def}[2011/12/02 v1.10 stringenc: UTF-16LE]
% \end{macrocode}
%
% \begin{macrocode}
@@ -2039,7 +2044,7 @@ $ \fi
%
% \begin{macrocode}
%<*pdfdoc>
-\ProvidesFile{se-pdfdoc.def}[2010/03/01 v1.8 stringenc: PDFDocEncoding]
+\ProvidesFile{se-pdfdoc.def}[2011/12/02 v1.10 stringenc: PDFDocEncoding]
% \end{macrocode}
%
% Pass ranges 32..126 and 160..255 through and use
@@ -2170,7 +2175,7 @@ $ \fi
%
% \begin{macrocode}
%<*iso-8859-1>
-\ProvidesFile{se-iso-8859-1.def}[2010/03/01 v1.8 stringenc: ISO-8859-1]
+\ProvidesFile{se-iso-8859-1.def}[2011/12/02 v1.10 stringenc: ISO-8859-1]
% \end{macrocode}
%
% Excluded area: 0x80..0x9F
@@ -2240,7 +2245,7 @@ $ \fi
%
% \begin{macrocode}
%<*cp1252>
-\ProvidesFile{se-cp1252.def}[2010/03/01 v1.8 stringenc: cp1252]
+\ProvidesFile{se-cp1252.def}[2011/12/02 v1.10 stringenc: cp1252]
% \end{macrocode}
%
% \begin{macrocode}
@@ -2341,7 +2346,7 @@ $ \fi
%
% \begin{macrocode}
%<*ascii>
-\ProvidesFile{se-ascii.def}[2010/03/01 v1.8 stringenc: US-ASCII]
+\ProvidesFile{se-ascii.def}[2011/12/02 v1.10 stringenc: US-ASCII]
% \end{macrocode}
%
% \begin{macrocode}
@@ -2390,7 +2395,7 @@ $ \fi
% \begin{macrocode}
%<*ascii-print>
\ProvidesFile{se-ascii-print.def}%
- [2010/03/01 v1.8 stringenc: Printable ASCII characters]%
+ [2011/12/02 v1.10 stringenc: Printable ASCII characters]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -2453,7 +2458,7 @@ $ \fi
%
% \begin{macrocode}
%<*clean7bit>
-\ProvidesFile{se-clean7bit.def}[2010/03/01 v1.8 stringenc: Clean7Bit]
+\ProvidesFile{se-clean7bit.def}[2011/12/02 v1.10 stringenc: Clean7Bit]
% \end{macrocode}
%
% \begin{macrocode}
@@ -2539,123 +2544,123 @@ $ \fi
%
% \begin{macrocode}
%<*iso-8859-2>
-\ProvidesFile{se-iso-8859-2.def}[2010/03/01 v1.8 stringenc: ISO-8859-2]
+\ProvidesFile{se-iso-8859-2.def}[2011/12/02 v1.10 stringenc: ISO-8859-2]
\def\SE@this{iso-8859-2}
%</iso-8859-2>
%<*iso-8859-3>
-\ProvidesFile{se-iso-8859-3.def}[2010/03/01 v1.8 stringenc: ISO-8859-3]
+\ProvidesFile{se-iso-8859-3.def}[2011/12/02 v1.10 stringenc: ISO-8859-3]
\def\SE@this{iso-8859-3}
%</iso-8859-3>
%<*iso-8859-4>
-\ProvidesFile{se-iso-8859-4.def}[2010/03/01 v1.8 stringenc: ISO-8859-4]
+\ProvidesFile{se-iso-8859-4.def}[2011/12/02 v1.10 stringenc: ISO-8859-4]
\def\SE@this{iso-8859-4}
%</iso-8859-4>
%<*iso-8859-5>
-\ProvidesFile{se-iso-8859-5.def}[2010/03/01 v1.8 stringenc: ISO-8859-5]
+\ProvidesFile{se-iso-8859-5.def}[2011/12/02 v1.10 stringenc: ISO-8859-5]
\def\SE@this{iso-8859-5}
%</iso-8859-5>
%<*iso-8859-6>
-\ProvidesFile{se-iso-8859-6.def}[2010/03/01 v1.8 stringenc: ISO-8859-6]
+\ProvidesFile{se-iso-8859-6.def}[2011/12/02 v1.10 stringenc: ISO-8859-6]
\def\SE@this{iso-8859-6}
%</iso-8859-6>
%<*iso-8859-7>
-\ProvidesFile{se-iso-8859-7.def}[2010/03/01 v1.8 stringenc: ISO-8859-7]
+\ProvidesFile{se-iso-8859-7.def}[2011/12/02 v1.10 stringenc: ISO-8859-7]
\def\SE@this{iso-8859-7}
%</iso-8859-7>
%<*iso-8859-8>
-\ProvidesFile{se-iso-8859-8.def}[2010/03/01 v1.8 stringenc: ISO-8859-8]
+\ProvidesFile{se-iso-8859-8.def}[2011/12/02 v1.10 stringenc: ISO-8859-8]
\def\SE@this{iso-8859-8}
%</iso-8859-8>
%<*iso-8859-9>
-\ProvidesFile{se-iso-8859-9.def}[2010/03/01 v1.8 stringenc: ISO-8859-9]
+\ProvidesFile{se-iso-8859-9.def}[2011/12/02 v1.10 stringenc: ISO-8859-9]
\def\SE@this{iso-8859-9}
%</iso-8859-9>
%<*iso-8859-10>
-\ProvidesFile{se-iso-8859-10.def}[2010/03/01 v1.8 stringenc: ISO-8859-10]
+\ProvidesFile{se-iso-8859-10.def}[2011/12/02 v1.10 stringenc: ISO-8859-10]
\def\SE@this{iso-8859-10}
%</iso-8859-10>
%<*iso-8859-11>
-\ProvidesFile{se-iso-8859-11.def}[2010/03/01 v1.8 stringenc: ISO-8859-11]
+\ProvidesFile{se-iso-8859-11.def}[2011/12/02 v1.10 stringenc: ISO-8859-11]
\def\SE@this{iso-8859-11}
%</iso-8859-11>
%<*iso-8859-13>
-\ProvidesFile{se-iso-8859-13.def}[2010/03/01 v1.8 stringenc: ISO-8859-13]
+\ProvidesFile{se-iso-8859-13.def}[2011/12/02 v1.10 stringenc: ISO-8859-13]
\def\SE@this{iso-8859-13}
%</iso-8859-13>
%<*iso-8859-14>
-\ProvidesFile{se-iso-8859-14.def}[2010/03/01 v1.8 stringenc: ISO-8859-14]
+\ProvidesFile{se-iso-8859-14.def}[2011/12/02 v1.10 stringenc: ISO-8859-14]
\def\SE@this{iso-8859-14}
%</iso-8859-14>
%<*iso-8859-15>
-\ProvidesFile{se-iso-8859-15.def}[2010/03/01 v1.8 stringenc: ISO-8859-15]
+\ProvidesFile{se-iso-8859-15.def}[2011/12/02 v1.10 stringenc: ISO-8859-15]
\def\SE@this{iso-8859-15}
%</iso-8859-15>
%<*iso-8859-16>
-\ProvidesFile{se-iso-8859-16.def}[2010/03/01 v1.8 stringenc: ISO-8859-16]
+\ProvidesFile{se-iso-8859-16.def}[2011/12/02 v1.10 stringenc: ISO-8859-16]
\def\SE@this{iso-8859-16}
%</iso-8859-16>
%<*koi8-r>
-\ProvidesFile{se-koi8-r.def}[2010/03/01 v1.8 stringenc: KOI8-R]
+\ProvidesFile{se-koi8-r.def}[2011/12/02 v1.10 stringenc: KOI8-R]
\def\SE@this{koi8-r}
%</koi8-r>
%<*nextstep>
-\ProvidesFile{se-nextstep.def}[2010/03/01 v1.8 stringenc: NextStep]
+\ProvidesFile{se-nextstep.def}[2011/12/02 v1.10 stringenc: NextStep]
\def\SE@this{nextstep}
%</nextstep>
%<*mac-centeuro>
-\ProvidesFile{se-mac-centeuro.def}[2010/03/01 v1.8 stringenc: Mac OS Central European]
+\ProvidesFile{se-mac-centeuro.def}[2011/12/02 v1.10 stringenc: Mac OS Central European]
\def\SE@this{mac-centeuro}
%</mac-centeuro>
%<*mac-cyrillic>
-\ProvidesFile{se-mac-cyrillic.def}[2010/03/01 v1.8 stringenc: Mac OS Cyrillic]
+\ProvidesFile{se-mac-cyrillic.def}[2011/12/02 v1.10 stringenc: Mac OS Cyrillic]
\def\SE@this{mac-cyrillic}
%</mac-cyrillic>
%<*mac-roman>
-\ProvidesFile{se-mac-roman.def}[2010/03/01 v1.8 stringenc: Mac OS Roman]
+\ProvidesFile{se-mac-roman.def}[2011/12/02 v1.10 stringenc: Mac OS Roman]
\def\SE@this{mac-roman}
%</mac-roman>
%<*dec-mcs>
-\ProvidesFile{se-dec-mcs.def}[2010/03/01 v1.8 stringenc: DEC-MCS]
+\ProvidesFile{se-dec-mcs.def}[2011/12/02 v1.10 stringenc: DEC-MCS]
\def\SE@this{dec-mcs}
%</dec-mcs>
%<*cp437>
-\ProvidesFile{se-cp437.def}[2010/03/01 v1.8 stringenc: cp437]
+\ProvidesFile{se-cp437.def}[2011/12/02 v1.10 stringenc: cp437]
\def\SE@this{cp437}
%</cp437>
%<*cp850>
-\ProvidesFile{se-cp850.def}[2010/03/01 v1.8 stringenc: cp850]
+\ProvidesFile{se-cp850.def}[2011/12/02 v1.10 stringenc: cp850]
\def\SE@this{cp850}
%</cp850>
%<*cp852>
-\ProvidesFile{se-cp852.def}[2010/03/01 v1.8 stringenc: cp852]
+\ProvidesFile{se-cp852.def}[2011/12/02 v1.10 stringenc: cp852]
\def\SE@this{cp852}
%</cp852>
%<*cp855>
-\ProvidesFile{se-cp855.def}[2010/03/01 v1.8 stringenc: cp855]
+\ProvidesFile{se-cp855.def}[2011/12/02 v1.10 stringenc: cp855]
\def\SE@this{cp855}
%</cp855>
%<*cp858>
-\ProvidesFile{se-cp858.def}[2010/03/01 v1.8 stringenc: cp858]
+\ProvidesFile{se-cp858.def}[2011/12/02 v1.10 stringenc: cp858]
\def\SE@this{cp858}
%</cp858>
%<*cp865>
-\ProvidesFile{se-cp865.def}[2010/03/01 v1.8 stringenc: cp865]
+\ProvidesFile{se-cp865.def}[2011/12/02 v1.10 stringenc: cp865]
\def\SE@this{cp865}
%</cp865>
%<*cp866>
-\ProvidesFile{se-cp866.def}[2010/03/01 v1.8 stringenc: cp866]
+\ProvidesFile{se-cp866.def}[2011/12/02 v1.10 stringenc: cp866]
\def\SE@this{cp866}
%</cp866>
%<*cp1250>
-\ProvidesFile{se-cp1250.def}[2010/03/01 v1.8 stringenc: cp1250]
+\ProvidesFile{se-cp1250.def}[2011/12/02 v1.10 stringenc: cp1250]
\def\SE@this{cp1250}
%</cp1250>
%<*cp1251>
-\ProvidesFile{se-cp1251.def}[2010/03/01 v1.8 stringenc: cp1251]
+\ProvidesFile{se-cp1251.def}[2011/12/02 v1.10 stringenc: cp1251]
\def\SE@this{cp1251}
%</cp1251>
%<*cp1257>
-\ProvidesFile{se-cp1257.def}[2010/03/01 v1.8 stringenc: cp1257]
+\ProvidesFile{se-cp1257.def}[2011/12/02 v1.10 stringenc: cp1257]
\def\SE@this{cp1257}
%</cp1257>
% \end{macrocode}
@@ -6143,7 +6148,7 @@ $ \fi
\catcode`\%=14 %
\catcode`\ =10 %
\catcode13=5 %
- \usepackage{stringenc}[2010/03/01]%
+ \usepackage{stringenc}[2011/12/02]%
\RestoreCatcodes
}
\Test
@@ -6194,7 +6199,7 @@ $ \fi
\let\SavedNumexpr\numexpr
\let\numexpr\relax
\fi
-\usepackage{stringenc}[2010/03/01]
+\usepackage{stringenc}[2011/12/02]
\ifx\plainmode Y
\let\numexpr\SavedNumexpr
\fi
@@ -6780,6 +6785,43 @@ $ \fi
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{stringenc.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='stringenc'>
+ <name>stringenc</name>
+ <caption>Converting a string between different encodings.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007-2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ This package provides <tt>\StringEncodingConvert</tt> for converting
+ a string between different encodings.
+ Both <xref refid='latex'>LaTeX</xref> and
+ <xref refid='plain'>plain-TeX</xref> are supported.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/stringenc.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/stringenc.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/06/14 v1.0}
% \item
@@ -6826,6 +6868,16 @@ $ \fi
% \item
% Use of package \xpackage{ltxcmds}.
% \end{Version}
+% \begin{Version}{2011/07/26 v1.9}
+% \item
+% Documentation: \xoption{pdfdoc} added in encoding list.
+% \end{Version}
+% \begin{Version}{2011/12/02 v1.10}
+% \item
+% Small improvement for \cs{SE@Nibble@NumToBin} and
+% \cs{SE@Nibble@NumToHex} if \hologo{eTeX} is not available
+% (thanks Bruno Le Floch).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
index 694c279731f..683813d487f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: tabularht.dtx
% Version: 2007/04/11 v2.5
-%
-% Copyright (C) 2005, 2006, 2007 by
+% Info: Tabular with height specified
+%
+% Copyright (C) 2005-2007 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
@@ -15,20 +16,20 @@
% 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 tabularht.dtx
% and the derived files
% tabularht.sty, tabularht.pdf, tabularht.ins, tabularht.drv,
% tabularht-example1.tex, tabularht-example2.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/tabularht.dtx
% CTAN:macros/latex/contrib/oberdiek/tabularht.pdf
-%
+%
% Unpacking:
% (a) If tabularht.ins is present:
% tex tabularht.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{tabularht.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If tabularht.drv is present:
% latex tabularht.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex tabularht.dtx
% makeindex -s gind.ist tabularht.idx
% pdflatex tabularht.dtx
% makeindex -s gind.ist tabularht.idx
% pdflatex tabularht.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/tabularht.sty
% TDS:doc/latex/oberdiek/tabularht.pdf
@@ -77,7 +78,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: tabularht 2007/04/11 v2.5 Tabular with height specification (HO)}
+\Msg{* Package: tabularht 2007/04/11 v2.5 Tabular with height specified (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -91,7 +92,7 @@ This is a generated file.
Project: tabularht
Version: 2007/04/11 v2.5
-Copyright (C) 2005, 2006, 2007 by
+Copyright (C) 2005-2007 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -124,6 +125,10 @@ and the derived files
\usedir{doc/latex/oberdiek}%
\file{tabularht-example1.tex}{\from{tabularht.dtx}{example1}}%
\file{tabularht-example2.tex}{\from{tabularht.dtx}{example2}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{tabularht.xml}{\from{tabularht.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -150,16 +155,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{tabularht.drv}%
- [2007/04/11 v2.5 Tabular with height specification (HO)]%
+ [2007/04/11 v2.5 Tabular with height specified (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{tabularht.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{650}
+% \CheckSum{654}
%
% \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
@@ -401,7 +406,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tabularht}%
- [2007/04/11 v2.5 Tabular with height specification (HO)]
+ [2007/04/11 v2.5 Tabular with height specified (HO)]
% \end{macrocode}
%
% \subsection{Environments}
@@ -1161,6 +1166,51 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{tabularht.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='tabularht'>
+ <name>tabularht</name>
+ <caption>Tabular environments with height specified.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005-2007'/>
+ <license type='lppl1.3'/>
+ <version number='2.5'/>
+ <description>
+ The tabularht package defines some environments that add a height
+ specification to tabular and array environments. The default set
+ of new environments take a value for their height in the first
+ argument: defined environments are: <tt>tabularht</tt>,
+ <tt>tabularht*</tt> and <tt>arrayht</tt>. If package
+ <xref refid='tabularx'>tabularx</xref> is also loaded,
+ the package also defines environments <tt>tabularxht</tt> and
+ <tt>tabularxht*</tt>.
+ <p/>
+ The places where stretching is to happen are signalled by<br/>
+ <tt>\noalign{\vfill}</tt><br/>
+ immediately after the <tt>\\</tt> that ends a row of the table or
+ array.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/tabularht.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/tabularht.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2005/09/22 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
index 628dfeadd06..ffe6f12756c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: tabularkv.dtx
% Version: 2006/02/20 v1.1
-%
+% Info: Tabular with key value interface
+%
% Copyright (C) 2005, 2006 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
@@ -15,20 +16,20 @@
% 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 tabularkv.dtx
% and the derived files
% tabularkv.sty, tabularkv.pdf, tabularkv.ins, tabularkv.drv,
% tabularkv-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/tabularkv.dtx
% CTAN:macros/latex/contrib/oberdiek/tabularkv.pdf
-%
+%
% Unpacking:
% (a) If tabularkv.ins is present:
% tex tabularkv.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{tabularkv.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If tabularkv.drv is present:
% latex tabularkv.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex tabularkv.dtx
% makeindex -s gind.ist tabularkv.idx
% pdflatex tabularkv.dtx
% makeindex -s gind.ist tabularkv.idx
% pdflatex tabularkv.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/tabularkv.sty
% TDS:doc/latex/oberdiek/tabularkv.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: tabularkv 2006/02/20 v1.1 Key value interface for tabular parameters (HO)}
+\Msg{* Package: tabularkv 2006/02/20 v1.1 Tabular with key value interface (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{tabularkv.sty}{\from{tabularkv.dtx}{package}}%
\usedir{doc/latex/oberdiek}%
\file{tabularkv-example.tex}{\from{tabularkv.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{tabularkv.xml}{\from{tabularkv.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,9 +153,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{tabularkv.drv}%
- [2006/02/20 v1.1 Key value interface for tabular parameters (HO)]%
+ [2006/02/20 v1.1 Tabular with key value interface (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{tabularkv.dtx}%
\end{document}
@@ -253,7 +258,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tabularkv}%
- [2006/02/20 v1.1 Key value interface for tabular parameters (HO)]
+ [2006/02/20 v1.1 Tabular with key value interface (HO)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -478,6 +483,44 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{tabularkv.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='tabularkv'>
+ <name>tabularkv</name>
+ <caption>Tabular environments with key-value interface.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2005,2006'/>
+ <license type='lppl1.3'/>
+ <version number='1.1'/>
+ <description>
+ The tabularkv package creates an environment <tt>tabularkv</tt>, whose
+ arguments are specified in key-value form. The arguments chosen
+ determine which other type of tabular is to be used (whether
+ standard LaTeX ones, or environments from the
+ <xref refid='tabularx'>tabularx</xref> or the
+ <xref refid='tabularht'>tabularx</xref> package).
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/tabularkv.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/tabularkv.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2005/09/22 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
index f47d9a6877e..a3e7e84ed9d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: telprint.dtx
% Version: 2008/08/11 v1.10
-%
+% Info: Format German phone numbers
+%
% Copyright (C) 1996, 1997, 2004-2008 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
@@ -15,23 +16,23 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file telprint.dtx
% and the derived files
% telprint.sty, telprint.pdf, telprint.ins, telprint.drv,
% telprint-test1.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/telprint.dtx
% CTAN:macros/latex/contrib/oberdiek/telprint.pdf
-%
+%
% Unpacking:
% (a) If telprint.ins is present:
% tex telprint.ins
@@ -40,7 +41,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{telprint.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If telprint.drv is present:
% latex telprint.drv
@@ -50,14 +51,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex telprint.dtx
% makeindex -s gind.ist telprint.idx
% pdflatex telprint.dtx
% makeindex -s gind.ist telprint.idx
% pdflatex telprint.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/telprint.sty
% TDS:doc/latex/oberdiek/telprint.pdf
@@ -79,7 +80,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: telprint 2008/08/11 v1.10 Formatting of German phone numbers (HO)}
+\Msg{* Package: telprint 2008/08/11 v1.10 Format German phone numbers (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -128,6 +129,10 @@ and the derived files
\file{telprint.sty}{\from{telprint.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{telprint-test1.tex}{\from{telprint.dtx}{test1}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{telprint.xml}{\from{telprint.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -154,9 +159,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{telprint.drv}%
- [2008/08/11 v1.10 Formatting of German phone numbers (HO)]%
+ [2008/08/11 v1.10 Format German phone numbers (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\usepackage[ngerman,english]{babel}
\begin{document}
\DocInput{telprint.dtx}%
@@ -164,7 +169,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{601}
+% \CheckSum{602}
%
% \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
@@ -404,7 +409,7 @@ and the derived files
\fi
\expandafter\x\csname ver@telprint.sty\endcsname
\ProvidesPackage{telprint}%
- [2008/08/11 v1.10 Formatting of German phone numbers (HO)]%
+ [2008/08/11 v1.10 Format German phone numbers (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -908,6 +913,41 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{telprint.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='telprint'>
+ <name>telprint</name>
+ <caption>Format German phone numbers.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1996,1997,2004-2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.10'/>
+ <description>
+ The package provides a command <tt>\telprint</tt> for formatting
+ German telephone numbers.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/telprint.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/telprint.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1996/11/28 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx b/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx
new file mode 100644
index 00000000000..7278d84a1ef
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx
@@ -0,0 +1,1590 @@
+% \iffalse meta-comment
+%
+% File: thepdfnumber.dtx
+% Version: 2011/11/24 v1.0
+% Info: Print PDF numbers with minimal digits
+%
+% Copyright (C) 2011 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.
+%
+% The Base Interpreter refers to any `TeX-Format',
+% because some files are installed in TDS:tex/generic//.
+%
+% This work consists of the main source file thepdfnumber.dtx
+% and the derived files
+% thepdfnumber.sty, thepdfnumber.pdf, thepdfnumber.ins, thepdfnumber.drv,
+% thepdfnumber-test1.tex, thepdfnumber-test2.tex,
+% thepdfnumber-test3.tex.
+%
+% Distribution:
+% CTAN:macros/latex/contrib/oberdiek/thepdfnumber.dtx
+% CTAN:macros/latex/contrib/oberdiek/thepdfnumber.pdf
+%
+% Unpacking:
+% (a) If thepdfnumber.ins is present:
+% tex thepdfnumber.ins
+% (b) Without thepdfnumber.ins:
+% tex thepdfnumber.dtx
+% (c) If you insist on using LaTeX
+% latex \let\install=y\input{thepdfnumber.dtx}
+% (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+% (a) If thepdfnumber.drv is present:
+% latex thepdfnumber.drv
+% (b) Without thepdfnumber.drv:
+% latex thepdfnumber.dtx; ...
+% The class ltxdoc loads the configuration file ltxdoc.cfg
+% if available. Here you can specify further options, e.g.
+% use A4 as paper format:
+% \PassOptionsToClass{a4paper}{article}
+%
+% Programm calls to get the documentation (example):
+% pdflatex thepdfnumber.dtx
+% makeindex -s gind.ist thepdfnumber.idx
+% pdflatex thepdfnumber.dtx
+% makeindex -s gind.ist thepdfnumber.idx
+% pdflatex thepdfnumber.dtx
+%
+% Installation:
+% TDS:tex/generic/oberdiek/thepdfnumber.sty
+% TDS:doc/latex/oberdiek/thepdfnumber.pdf
+% TDS:doc/latex/oberdiek/test/thepdfnumber-test1.tex
+% TDS:doc/latex/oberdiek/test/thepdfnumber-test2.tex
+% TDS:doc/latex/oberdiek/test/thepdfnumber-test3.tex
+% TDS:source/latex/oberdiek/thepdfnumber.dtx
+%
+%<*ignore>
+\begingroup
+ \catcode123=1 %
+ \catcode125=2 %
+ \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+ \ifx\csname processbatchFile\endcsname\relax\else1\fi
+ \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: thepdfnumber 2011/11/24 v1.0 Print PDF numbers with minimal digits (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\let\MetaPrefix\relax
+\preamble
+
+This is a generated file.
+
+Project: thepdfnumber
+Version: 2011/11/24 v1.0
+
+Copyright (C) 2011 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.
+
+The Base Interpreter refers to any `TeX-Format',
+because some files are installed in TDS:tex/generic//.
+
+This work consists of the main source file thepdfnumber.dtx
+and the derived files
+ thepdfnumber.sty, thepdfnumber.pdf, thepdfnumber.ins, thepdfnumber.drv,
+ thepdfnumber-test1.tex, thepdfnumber-test2.tex,
+ thepdfnumber-test3.tex.
+
+\endpreamble
+\let\MetaPrefix\DoubleperCent
+
+\generate{%
+ \file{thepdfnumber.ins}{\from{thepdfnumber.dtx}{install}}%
+ \file{thepdfnumber.drv}{\from{thepdfnumber.dtx}{driver}}%
+ \usedir{tex/generic/oberdiek}%
+ \file{thepdfnumber.sty}{\from{thepdfnumber.dtx}{package}}%
+ \usedir{doc/latex/oberdiek/test}%
+ \file{thepdfnumber-test1.tex}{\from{thepdfnumber.dtx}{test1}}%
+ \file{thepdfnumber-test2.tex}{\from{thepdfnumber.dtx}{test2}}%
+ \file{thepdfnumber-test3.tex}{\from{thepdfnumber.dtx}{test2,active}}%
+}
+
+\catcode32=13\relax% active space
+\let =\space%
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* thepdfnumber.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `thepdfnumber.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{thepdfnumber.drv}%
+ [2011/11/24 v1.0 Print PDF numbers with minimal digits (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}[2011/11/22]
+\usepackage{csquotes}
+\usepackage[
+ bibencoding=ascii,
+ alldates=iso8601,
+]{biblatex}[2011/11/13]
+\bibliography{oberdiek-source}
+\begin{document}
+ \DocInput{thepdfnumber.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{1146}
+%
+% \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
+% Lower-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
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+% \GetFileInfo{thepdfnumber.drv}
+%
+% \title{The \xpackage{thepdfnumber} package}
+% \date{2011/11/24 v1.0}
+% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% The package converts real numbers to a minimal representation
+% that is stripped from leading or trailing zeros,
+% plus signs and decimal point if not necessary.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% \subsection{Introduction}
+%
+% Dealing with the PDF format, there is sometimes the need to write
+% some low level PDF stuff. In case of numbers, the numbers can
+% arise from user input (e.g. color or transparency specifications)
+% or can be calculated. For example, \hologo{LaTeX}'s \cs{strip@pt}
+% makes a good job to output a real number. It automatically suppresses
+% the decimal part if the number is an integer. However it leaves
+% a leading zero for numbers greater zero and smaller one.
+% Thus the package provides macros that can be used with different
+% formats, even with \hologo{iniTeX} and generates numbers that
+% are valid numbers of the PDF format and whose length is minimal.
+%
+% \subsection{Usage}
+%
+% The package \xpackage{thepdfnumber} can be used with \hologo{LaTeX},
+% \hologo{plainTeX} or even with \hologo{iniTeX}:
+% \begin{quote}
+% |\RequirePackage{thepdfnumber}| \textit{\% \hologo{LaTeX}}\\
+% |\input thepdfnumber.sty| \textit{\% \hologo{plainTeX}/\hologo{iniTeX}}
+% \end{quote}
+% The package does not need and have package options.
+%
+% \subsection{User macros}
+%
+% All user macros are expandable in exact two expansion steps.
+%
+% \begin{declcs}{thepdfnumber} \M{number}
+% \end{declcs}
+% Macro \cs{thepdfnumber} takes a number
+% as argument and expands to a minimal representation of that number.
+% Some examples:
+% \begin{quote}
+% \begin{tabular}{r@{.: }>{\ttfamily}l@{ $\rightarrow$\ }>{\ttfamily}l@{}}
+% 1& +123 & 123\\
+% 2& --123 & 123\\
+% 3& -01 & -1\\
+% 4& 0045 & 45\\
+% 5& 1.0 & 1\\
+% 6& 1.20 & 1.2\\
+% 7& 0.0 & 0\\
+% 8& 0.78 & .78\\
+% 9& +012.340 & 12.34\\
+% \end{tabular}
+% \end{quote}
+% It reduces the length of the number representation:
+% \begin{itemize}
+% \item The signs are collapsed and only one minus sign
+% is output if the number is negative (see examples 1, 2, 3, 9).
+% \item Leading zeros are removed (4, 8, 9) unless the number is zero (7).
+% \item The decimal part is omitted, if the number is an integer (5, 7).
+% \item Trailing zeros from the decimal part are stripped (5, 6, 7, 9).
+% \end{itemize}
+% The resulting number representation can be catched with one of the
+% following Perl regular expressions:
+% \begin{itemize}
+% \item |^0$| (zero)
+% \item |^-?[1-9][0-9]*$| (integer)
+% \item |^-?[0-9]*\.[0-9]*[1-9]$| (real)
+% \end{itemize}
+% This is a valid numeric object of the PDF specification \cite[``7.3.3~Numeric Objects'']{pdfspec-iso32000-1}.
+%
+% \begin{declcs}{thepdfnumberNormZeroOne}
+% \end{declcs}
+% There are various places in the PDF specification where the
+% number is in the domain 0.0 upto 1.0. Macro thepdfnumberNormZeroOne
+% automatically adjusts the number to fit into that range. Negative
+% numbers are mapped to |0| and numbers greater than one are
+% replaced by |1|. Thus the result fits one of the following regular
+% expressions:
+% \begin{itemize}
+% \item |^0$|
+% \item |^\.[0-9]*[1-9]$|
+% \item |^1$|
+% \end{itemize}
+% Examples:
+% \begin{quote}
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$\ }>{\ttfamily}l@{}}
+% -456 & 0\\
+% -0.001 & 0\\
+% 0.0 & 0\\
+% 0.010 & .01\\
+% 0.456 & .456\\
+% 1.0 & 1\\
+% 01.001 & 1\\
+% 4 & 1\\
+% \end{tabular}
+% \end{quote}
+%
+% \subsection{Input number}
+%
+% The user macros expect a number as argument. The number can either
+% be given explicitely or as macro that expands in one step
+% to an explicite number, because the first token of the argument
+% is expanded once.
+%
+% The explicite number consists of
+% \begin{itemize}
+% \item optional signs `\texttt{+}' and `\texttt{-}',
+% \item digits `\texttt{0}' upto `\texttt{9}' and
+% \item an optional dot `\texttt{.}'.
+% \end{itemize}
+% All tokens must have catcode 12 (other), the default catcodes
+% for these characters in \hologo{LaTeX}, \hologo{plainTeX} or
+% \hologo{iniTeX}. As Perl regular expression the number is expected
+% in one of the following forms:
+% \begin{itemize}
+% \item |^[+-]*[0-9]+$|
+% \item |^[+-]*[0-9]*\.[0-9]*$|
+% \end{itemize}
+% At least one digit or the dot must be present.
+%
+% \subsection{Error handling}
+%
+% The package is not intended for validating numbers or to
+% decide if an argument is a number. Therefore it is an usage
+% error to use the user macros with arguments that are not
+% explicite numbers as specified in the previous sections.
+% Nevertheless some error conditions are sometimes recognized.
+% Errors are given in form of an undefined command sequence.
+% It is the only way to notify \hologo{TeX} in expandable context.
+% Expanding to some error text would invalidate the output.
+% Currently the following errors are thrown:
+% \begin{description}
+% \item[\cs{thepdfnumber@ErrorEndMarker}:]
+% Internally the argument parsing uses an end marker that
+% is never called directly. If it is called with valid
+% user input, then this is a bug. Otherwise it means the user input
+% contains nasty stuff.
+% \item[\cs{thepdfnumber@ErrorUnexpectedEnd}:] The macros expect at least one digit
+% or the dot, otherwise if the argument is empty or only contains
+% signs, then this error is called.
+% \item[\cs{thepdfnumber@ErrorInvalidToken}:] It is called if the number
+% contains other tokens than signs, digits or the dot or the
+% token at the wrong place (e.g. a sign after a digit).
+% In case of \cs{thepdfnumberNormZeroOne} this error condition might
+% not always be detected, because the number parsing might stop
+% at an early point, when the result is already clear (e.g.
+% if the number is negative or will be greater than one).
+% \item[Improper alphabetic constant:] This error might be
+% thrown by \hologo{TeX}, if the number contains
+% command tokens instead of characters.
+% \end{description}
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+%
+% \subsection{Reload check and package identification}
+% Reload check, especially if the package is not used with \LaTeX.
+% \begin{macrocode}
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+ \catcode13=5 % ^^M
+ \endlinechar=13 %
+ \catcode35=6 % #
+ \catcode39=12 % '
+ \catcode44=12 % ,
+ \catcode45=12 % -
+ \catcode46=12 % .
+ \catcode58=12 % :
+ \catcode64=11 % @
+ \catcode123=1 % {
+ \catcode125=2 % }
+ \expandafter\let\expandafter\x\csname ver@thepdfnumber.sty\endcsname
+ \ifx\x\relax % plain-TeX, first loading
+ \else
+ \def\empty{}%
+ \ifx\x\empty % LaTeX, first loading,
+ % variable is initialized, but \ProvidesPackage not yet seen
+ \else
+ \expandafter\ifx\csname PackageInfo\endcsname\relax
+ \def\x#1#2{%
+ \immediate\write-1{Package #1 Info: #2.}%
+ }%
+ \else
+ \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
+ \fi
+ \x{thepdfnumber}{The package is already loaded}%
+ \aftergroup\endinput
+ \fi
+ \fi
+\endgroup%
+% \end{macrocode}
+% Package identification:
+% \begin{macrocode}
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+ \catcode13=5 % ^^M
+ \endlinechar=13 %
+ \catcode35=6 % #
+ \catcode39=12 % '
+ \catcode40=12 % (
+ \catcode41=12 % )
+ \catcode44=12 % ,
+ \catcode45=12 % -
+ \catcode46=12 % .
+ \catcode47=12 % /
+ \catcode58=12 % :
+ \catcode64=11 % @
+ \catcode91=12 % [
+ \catcode93=12 % ]
+ \catcode123=1 % {
+ \catcode125=2 % }
+ \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+ \def\x#1#2#3[#4]{\endgroup
+ \immediate\write-1{Package: #3 #4}%
+ \xdef#1{#4}%
+ }%
+ \else
+ \def\x#1#2[#3]{\endgroup
+ #2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
+ \ifx#1\relax
+ \xdef#1{#3}%
+ \fi
+ }%
+ \fi
+\expandafter\x\csname ver@thepdfnumber.sty\endcsname
+\ProvidesPackage{thepdfnumber}%
+ [2011/11/24 v1.0 Print PDF numbers with minimal digits (HO)]%
+% \end{macrocode}
+%
+% \subsection{Catcodes}
+%
+% \begin{macrocode}
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+ \catcode13=5 % ^^M
+ \endlinechar=13 %
+ \catcode123=1 % {
+ \catcode125=2 % }
+ \catcode64=11 % @
+ \def\x{\endgroup
+ \expandafter\edef\csname ThPdNu@AtEnd\endcsname{%
+ \endlinechar=\the\endlinechar\relax
+ \catcode13=\the\catcode13\relax
+ \catcode32=\the\catcode32\relax
+ \catcode35=\the\catcode35\relax
+ \catcode61=\the\catcode61\relax
+ \catcode64=\the\catcode64\relax
+ \catcode123=\the\catcode123\relax
+ \catcode125=\the\catcode125\relax
+ }%
+ }%
+\x\catcode61\catcode48\catcode32=10\relax%
+\catcode13=5 % ^^M
+\endlinechar=13 %
+\catcode35=6 % #
+\catcode64=11 % @
+\catcode123=1 % {
+\catcode125=2 % }
+\def\TMP@EnsureCode#1#2{%
+ \edef\ThPdNu@AtEnd{%
+ \ThPdNu@AtEnd
+ \catcode#1=\the\catcode#1\relax
+ }%
+ \catcode#1=#2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{38}{4}% &
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{96}{12}% `
+\edef\ThPdNu@AtEnd{\ThPdNu@AtEnd\noexpand\endinput}
+% \end{macrocode}
+%
+% \subsection{Helper macros}
+%
+% \begin{macro}{\ThPdNu@FIN}
+% \begin{macrocode}
+\def\ThPdNu@FIN{\thepdfnumber@ErrorEndMarker}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@space}
+% \begin{macrocode}
+\def\ThPdNu@space{ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@zero}
+% \begin{macrocode}
+\chardef\ThPdNu@zero=0 %
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@one}
+% \begin{macrocode}
+\chardef\ThPdNu@one=1 %
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@firstoftwo}
+% \begin{macrocode}
+\long\def\ThPdNu@firstoftwo#1#2{#1}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@secondoftwo}
+% \begin{macrocode}
+\long\def\ThPdNu@secondoftwo#1#2{#2}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Detect \hologo{eTeX}}
+%
+% \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname detokenize\endcsname\relax
+ \catcode`\&=14 %
+ \catcode`\$=9 %
+\else
+ \catcode`\&=9 %
+ \catcode`\$=14 %
+\fi
+% \end{macrocode}
+%
+% \subsection{User macro \cs{thepdfnumber}}
+%
+% \begin{macro}{\thepdfnumber}
+% \begin{macrocode}
+\def\thepdfnumber#1{%
+ \romannumeral
+& \iftrue\expandafter\ThPdNu@State@Plus\expandafter\fi
+& \detokenize\expandafter{#1}%
+& \ThPdNu@FIN
+$ \ifx\ThPdNu@FIN#1\ThPdNu@FIN
+$ \expandafter\ThPdNu@firstoftwo
+$ \else
+$ \expandafter\ThPdNu@secondoftwo
+$ \fi
+$ {%
+$ \ThPdNu@zero
+$ 0\thepdfnumber@ErrorUnexpectedEnd
+$ }{%
+$ \iftrue\expandafter\ThPdNu@State@Plus\expandafter\fi#1\ThPdNu@FIN
+$ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{State definitions for sign}
+%
+% \begin{macro}{\ThPdNu@State@Plus}
+% \begin{macrocode}
+\def\ThPdNu@State@Plus#1\fi#2{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#2%
+ 0%
+& \else\ifx-#2%
+$ \else\ifnum`#2=45 % -
+ 1%
+ \else\ifx0#2%
+ 2%
+ \else\ifnum`#2>48 %
+ \ifnum`#2<58 %
+ 3%
+ \else
+ 9%
+ \fi
+& \else\ifx.#2%
+$ \else\ifnum`#2=46 % .
+ 4%
+& \else\ifx+#2%
+$ \else\ifnum`#2=43 % +
+ 5%
+ \else
+ 9%
+ \fi\fi\fi\fi\fi\fi\ThPdNu@space
+ \expandafter\ThPdNu@zero
+ \expandafter0%
+ \expandafter\thepdfnumber@ErrorUnexpectedEnd
+ \or
+ \ThPdNu@State@Minus
+ \or
+ \ThPdNu@State@SkipZeros!%
+ \or
+ \ThPdNu@State@Int!#2!%
+ \or
+ \ThPdNu@State@Dot!\ThPdNu@zero*\ThPdNu@zero!!%
+ \or
+ \ThPdNu@State@Plus
+ \else
+ \ThPdNu@ReturnError{0}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@State@Minus}
+% \begin{macrocode}
+\def\ThPdNu@State@Minus#1\fi#2{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#2%
+ 0%
+ \else\ifx0#2%
+ 1%
+ \else\ifnum`#2>48 %
+ \ifnum`#2<58 %
+ 2%
+ \else
+ 9%
+ \fi
+& \else\ifx.#2%
+$ \else\ifnum`#2=46 % .
+ 3%
+& \else\ifx-#2%
+$ \else\ifnum`#2=45 % -
+ 4%
+& \else\ifx+#2%
+$ \else\ifnum`#2=43 % +
+ 5%
+ \else
+ 9%
+ \fi\fi\fi\fi\fi\fi\ThPdNu@space
+ \expandafter\ThPdNu@zero
+ \expandafter0%
+ \expandafter\thepdfnumber@ErrorUnexpectedEnd
+ \or
+ \ThPdNu@State@SkipZeros-!%
+ \or
+ \ThPdNu@State@Int-!#2!%
+ \or
+ \ThPdNu@State@Dot-!\ThPdNu@zero*\ThPdNu@zero!!%
+ \or
+ \ThPdNu@State@Plus
+ \or
+ \ThPdNu@State@Minus
+ \else
+ \ThPdNu@ReturnError{0}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@ReturnError}
+% \begin{macrocode}
+\def\ThPdNu@ReturnError#1#2\fi#3\ThPdNu@FIN{%
+ \fi
+ \ThPdNu@zero
+ #1%
+ \thepdfnumber@ErrorInvalidToken
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{State definitions for integer part}
+%
+% \begin{macro}{\ThPdNu@State@SkipZeros}
+% \begin{macrocode}
+\def\ThPdNu@State@SkipZeros#1!#2\fi#3{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#3%
+ 0%
+ \else\ifx0#3%
+ 1%
+ \else\ifnum`#3>48 %
+ \ifnum`#3<58 %
+ 2%
+ \else
+ 9%
+ \fi
+& \else\ifx.#3%
+$ \else\ifnum`#3=46 % .
+ 3%
+ \else
+ 9%
+ \fi\fi\fi\fi\ThPdNu@space
+ \expandafter\ThPdNu@zero
+ \expandafter0%
+ \or
+ \ThPdNu@State@SkipZeros#1!%
+ \or
+ \ThPdNu@State@Int#1!#3!%
+ \or
+ \ThPdNu@State@Dot#1!\ThPdNu@zero*\ThPdNu@zero!!%
+ \else
+ \ThPdNu@ReturnError{0}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@State@Int}
+% \begin{macrocode}
+\def\ThPdNu@State@Int#1!#2!#3\fi#4{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#4%
+ 0%
+ \else\ifnum`#4>47 %
+ \ifnum`#4<58 %
+ 1%
+ \else
+ 9%
+ \fi
+& \else\ifx.#4%
+$ \else\ifnum`#4=46 % .
+ 2%
+ \else
+ 9%
+ \fi\fi\fi\ThPdNu@space
+ \ThPdNu@ReturnInt{#1#2}%
+ \or
+ \ThPdNu@State@Int#1!#2#4!%
+ \or
+ \ThPdNu@State@Dot#1!\ThPdNu@one#2*\ThPdNu@zero!!%
+ \else
+ \ThPdNu@ReturnError{#1#2}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@ReturnInt}
+% \begin{macrocode}
+\def\ThPdNu@ReturnInt#1#2\fi{%
+ \fi
+ \ThPdNu@zero
+ #1%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{State definitions for decimal digits}
+%
+% \begin{macro}{\ThPdNu@State@Dot}
+% \begin{macrocode}
+\def\ThPdNu@State@Dot#1*#2#3!#4!#5\fi#6{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#6%
+ 0%
+ \else\ifnum`#6>48 %
+ \ifnum`#6<58 %
+ 1%
+ \else
+ 9%
+ \fi
+ \else\ifx0#6%
+ 2%
+ \else
+ 9%
+ \fi\fi\fi\ThPdNu@space
+ \ThPdNu@ReturnNumber#1*#2#3!%
+ \or
+ \ThPdNu@State@Dot#1*\ThPdNu@one#3#4#6!!%
+ \or
+ \ThPdNu@State@DotZero#1*#2#3!#4#6!%
+ \else
+ \ThPdNu@ReturnNumberInvalid#1*#2#3!%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@State@DotZero}
+% \begin{macrocode}
+\def\ThPdNu@State@DotZero#1*#2#3!#4!#5\fi#6{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#6%
+ 0%
+ \else\ifnum`#6>48 %
+ \ifnum`#6<58 %
+ 1%
+ \else
+ 9%
+ \fi
+ \else\ifx0#6%
+ 2%
+ \else
+ 9%
+ \fi\fi\fi\ThPdNu@space
+ \ThPdNu@ReturnNumber#1*#2#3!%
+ \or
+ \ThPdNu@State@Dot#1*\ThPdNu@one#3#4#6!!%
+ \or
+ \ThPdNu@State@DotZero#1*#2#3!#4#6!%
+ \else
+ \ThPdNu@ReturnNumber#1*#2#3!%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@ReturnNumber}
+% \begin{macrocode}
+\def\ThPdNu@ReturnNumber#1!#2#3*#4#5!#6\fi{%
+ \fi
+ \ifcase#2%
+ \expandafter\ThPdNu@firstoftwo
+ \else
+ \expandafter\ThPdNu@secondoftwo
+ \fi
+ {%
+ \ifcase#4%
+ \expandafter\ThPdNu@firstoftwo
+ \else
+ \expandafter\ThPdNu@secondoftwo
+ \fi
+ {\ThPdNu@zero 0}%
+ {\ThPdNu@zero #1.#5}%
+ }{%
+ \ifcase#4%
+ \expandafter\ThPdNu@firstoftwo
+ \else
+ \expandafter\ThPdNu@secondoftwo
+ \fi
+ {\ThPdNu@zero #1#3}%
+ {\ThPdNu@zero #1#3.#5}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@ReturnNumberInvalid}
+% \begin{macrocode}
+\def\ThPdNu@ReturnNumberInvalid#1*#2!#3\fi#4\ThPdNu@FIN{%
+ \fi
+ \iftrue\ThPdNu@ReturnNumber#1*#2!\fi
+ \thepdfnumber@ErrorInvalidToken
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Norm macro}
+%
+% \begin{macro}{\thepdfnumberNormZeroOne}
+% \begin{macrocode}
+\def\thepdfnumberNormZeroOne#1{%
+ \romannumeral
+& \iftrue\expandafter\ThPbNu@StateN@Plus\expandafter\fi
+& \detokenize\expandafter{#1}%
+& \ThPdNu@FIN
+$ \ifx\ThPdNu@FIN#1\ThPdNu@FIN
+$ \expandafter\ThPdNu@firstoftwo
+$ \else
+$ \expandafter\ThPdNu@secondoftwo
+$ \fi
+$ {%
+$ \ThPdNu@zero
+$ 0\thepdfnumber@ErrorUnexpectedEnd
+$ }{%
+$ \iftrue\expandafter\ThPbNu@StateN@Plus\expandafter\fi#1\ThPdNu@FIN
+$ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{State definitions for sign}
+%
+% \begin{macro}{\ThPbNu@StateN@Plus}
+% \begin{macrocode}
+\def\ThPbNu@StateN@Plus#1\fi#2{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#2%
+ 0%
+& \else\ifx-#2%
+$ \else\ifnum`#2=45 % -
+ 1%
+ \else\ifx0#2%
+ 2%
+ \else\ifnum`#2>48 %
+ \ifnum`#2<58 %
+ 3%
+ \else
+ 9%
+ \fi
+& \else\ifx.#2%
+$ \else\ifnum`#2=46 % .
+ 4%
+& \else\ifx+#2%
+$ \else\ifnum`#2=43 % +
+ 5%
+ \else
+ 9%
+ \fi\fi\fi\fi\fi\fi\ThPdNu@space
+ \expandafter\ThPdNu@zero
+ \expandafter0%
+ \expandafter\thepdfnumber@ErrorUnexpectedEnd
+ \or
+ \ThPbNu@StateN@Minus
+ \or
+ \ThPbNu@StateN@SkipZeros
+ \or
+ \ThPdNu@ReturnAndSkip{1}%
+ \or
+ \ThPbNu@StateN@Dot\ThPdNu@zero!!%
+ \or
+ \ThPbNu@StateN@Plus
+ \else
+ \ThPdNu@ReturnError{0}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPbNu@StateN@Minus}
+% \begin{macrocode}
+\def\ThPbNu@StateN@Minus#1\fi#2{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#2%
+ 0%
+ \else\ifnum`#2>47 %
+ \ifnum`#2<58 %
+ 1%
+ \else
+ 9%
+ \fi
+& \else\ifx.#2%
+$ \else\ifnum`#2=46 % .
+ 1%
+& \else\ifx-#2%
+$ \else\ifnum`#2=45 % -
+ 2%
+& \else\ifx+#2%
+$ \else\ifnum`#2=43 % +
+ 3%
+ \else
+ 9%
+ \fi\fi\fi\fi\fi\ThPdNu@space
+ \expandafter\ThPdNu@zero
+ \expandafter0%
+ \expandafter\thepdfnumber@ErrorUnexpectedEnd
+ \or
+ \ThPdNu@ReturnAndSkip{0}%
+ \or
+ \ThPbNu@StateN@Plus
+ \or
+ \ThPbNu@StateN@Minus
+ \else
+ \ThPdNu@ReturnError{0}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@ReturnAndSkip}
+% \begin{macrocode}
+\def\ThPdNu@ReturnAndSkip#1#2\fi#3\ThPdNu@FIN{%
+ \fi
+ \ThPdNu@zero
+ #1%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{State definitions for integer part}
+%
+% \begin{macro}{\ThPbNu@StateN@SkipZeros}
+% \begin{macrocode}
+\def\ThPbNu@StateN@SkipZeros#1\fi#2{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#2%
+ 0%
+ \else\ifx0#2%
+ 1%
+ \else\ifnum`#2>48 %
+ \ifnum`#2<58 %
+ 2%
+ \else
+ 9%
+ \fi
+& \else\ifx.#2%
+$ \else\ifnum`#2=46 % .
+ 3%
+ \else
+ 9%
+ \fi\fi\fi\fi\ThPdNu@space
+ \expandafter\ThPdNu@zero
+ \expandafter0%
+ \or
+ \ThPbNu@StateN@SkipZeros%
+ \or
+ \ThPdNu@ReturnAndSkip{1}%
+ \or
+ \ThPbNu@StateN@Dot\ThPdNu@zero!!%
+ \else
+ \ThPdNu@ReturnError{0}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{State definitions for decimal digits}
+%
+% \begin{macro}{\ThPbNu@StateN@Dot}
+% \begin{macrocode}
+\def\ThPbNu@StateN@Dot#1#2!#3!#4\fi#5{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#5%
+ 0%
+ \else\ifnum`#5>48 %
+ \ifnum`#5<58 %
+ 1%
+ \else
+ 9%
+ \fi
+ \else\ifx0#5%
+ 2%
+ \else
+ 9%
+ \fi\fi\fi\ThPdNu@space
+ \ThPdNu@ReturnFracNumber#1#2!%
+ \or
+ \ThPbNu@StateN@Dot\ThPdNu@one#2#3#5!!%
+ \or
+ \ThPbNu@StateN@DotZero#1#2!#3#5!%
+ \else
+ \ThPdNu@ReturnFracNumberInvalid#1#2!%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPbNu@StateN@DotZero}
+% \begin{macrocode}
+\def\ThPbNu@StateN@DotZero#1#2!#3!#4\fi#5{%
+ \fi
+ \ifcase\ifx\ThPdNu@FIN#5%
+ 0%
+ \else\ifnum`#5>48 %
+ \ifnum`#5<58 %
+ 1%
+ \else
+ 9%
+ \fi
+ \else\ifx0#5%
+ 2%
+ \else
+ 9%
+ \fi\fi\fi\ThPdNu@space
+ \ThPdNu@ReturnFracNumber#1#2!%
+ \or
+ \ThPbNu@StateN@Dot\ThPdNu@one#2#3#5!!%
+ \or
+ \ThPbNu@StateN@DotZero#1#2!#3#5!%
+ \else
+ \ThPdNu@ReturnFracNumberInvalid#1#2!%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@ReturnFracNumber}
+% \begin{macrocode}
+\def\ThPdNu@ReturnFracNumber#1#2!#3\fi{%
+ \fi
+ \ifcase#1%
+ \expandafter\ThPdNu@firstoftwo
+ \else
+ \expandafter\ThPdNu@secondoftwo
+ \fi
+ {\ThPdNu@zero 0}%
+ {\ThPdNu@zero .#2}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ThPdNu@ReturnFracNumberInvalid}
+% \begin{macrocode}
+\def\ThPdNu@ReturnFracNumberInvalid#1!#2\fi#3\ThPdNu@FIN{%
+ \fi
+ \iftrue\ThPdNu@ReturnFracNumber#1!\fi
+ \thepdfnumber@ErrorInvalidToken
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\ThPdNu@AtEnd%
+%</package>
+% \end{macrocode}
+%
+% \section{Test}
+%
+% \subsection{Catcode checks for loading}
+%
+% \begin{macrocode}
+%<*test1>
+% \end{macrocode}
+% \begin{macrocode}
+\catcode`\{=1 %
+\catcode`\}=2 %
+\catcode`\#=6 %
+\catcode`\@=11 %
+\expandafter\ifx\csname count@\endcsname\relax
+ \countdef\count@=255 %
+\fi
+\expandafter\ifx\csname @gobble\endcsname\relax
+ \long\def\@gobble#1{}%
+\fi
+\expandafter\ifx\csname @firstofone\endcsname\relax
+ \long\def\@firstofone#1{#1}%
+\fi
+\expandafter\ifx\csname loop\endcsname\relax
+ \expandafter\@firstofone
+\else
+ \expandafter\@gobble
+\fi
+{%
+ \def\loop#1\repeat{%
+ \def\body{#1}%
+ \iterate
+ }%
+ \def\iterate{%
+ \body
+ \let\next\iterate
+ \else
+ \let\next\relax
+ \fi
+ \next
+ }%
+ \let\repeat=\fi
+}%
+\def\RestoreCatcodes{}
+\count@=0 %
+\loop
+ \edef\RestoreCatcodes{%
+ \RestoreCatcodes
+ \catcode\the\count@=\the\catcode\count@\relax
+ }%
+\ifnum\count@<255 %
+ \advance\count@ 1 %
+\repeat
+
+\def\RangeCatcodeInvalid#1#2{%
+ \count@=#1\relax
+ \loop
+ \catcode\count@=15 %
+ \ifnum\count@<#2\relax
+ \advance\count@ 1 %
+ \repeat
+}
+\def\RangeCatcodeCheck#1#2#3{%
+ \count@=#1\relax
+ \loop
+ \ifnum#3=\catcode\count@
+ \else
+ \errmessage{%
+ Character \the\count@\space
+ with wrong catcode \the\catcode\count@\space
+ instead of \number#3%
+ }%
+ \fi
+ \ifnum\count@<#2\relax
+ \advance\count@ 1 %
+ \repeat
+}
+\def\space{ }
+\expandafter\ifx\csname LoadCommand\endcsname\relax
+ \def\LoadCommand{\input thepdfnumber.sty\relax}%
+\fi
+\def\Test{%
+ \RangeCatcodeInvalid{0}{47}%
+ \RangeCatcodeInvalid{58}{64}%
+ \RangeCatcodeInvalid{91}{96}%
+ \RangeCatcodeInvalid{123}{255}%
+ \catcode`\@=12 %
+ \catcode`\\=0 %
+ \catcode`\%=14 %
+ \LoadCommand
+ \RangeCatcodeCheck{0}{36}{15}%
+ \RangeCatcodeCheck{37}{37}{14}%
+ \RangeCatcodeCheck{38}{47}{15}%
+ \RangeCatcodeCheck{48}{57}{12}%
+ \RangeCatcodeCheck{58}{63}{15}%
+ \RangeCatcodeCheck{64}{64}{12}%
+ \RangeCatcodeCheck{65}{90}{11}%
+ \RangeCatcodeCheck{91}{91}{15}%
+ \RangeCatcodeCheck{92}{92}{0}%
+ \RangeCatcodeCheck{93}{96}{15}%
+ \RangeCatcodeCheck{97}{122}{11}%
+ \RangeCatcodeCheck{123}{255}{15}%
+ \RestoreCatcodes
+}
+\Test
+\csname @@end\endcsname
+\end
+% \end{macrocode}
+% \begin{macrocode}
+%</test1>
+% \end{macrocode}
+%
+% \subsection{Macro tests}
+%
+% \subsubsection{Preamble}
+%
+% \begin{macrocode}
+%<*test2>
+\catcode`\{=1
+\catcode`\}=2
+\catcode`\#=6
+\catcode`\@=11
+\errorcontextlines=10000 %
+\def\msg#{\immediate\write16}
+\def\space{ }
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input thepdfnumber.sty\relax
+\else
+ \RequirePackage{thepdfnumber}[2011/11/24]%
+\fi
+% \end{macrocode}
+%
+% \begin{macro}{\Test}
+% \begin{macrocode}
+\def\Test#1#2{%
+ \def\TestExpected{#2}%
+%<*active>
+ \edef\TestExpected{\TestExpected}%
+%</active>
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\TestResult
+ \expandafter\expandafter\expandafter{%
+ \TestCommand{#1}%
+ }%
+ \begingroup
+ \toks0\expandafter{\TestResult}%
+ \toks2\expandafter{\TestExpected}%
+ \ifx\TestResult\TestExpected
+ \msg{* OK: #1 => \the\toks0}%
+ \else
+ \errmessage{FAILED: #1 => \the\toks0\space(\the\toks2)}%
+ \fi
+ \endgroup
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\let\thepdfnumber@ErrorUnexpectedEnd\relax
+\let\thepdfnumber@ErrorInvalidToken\relax
+% \end{macrocode}
+%
+% \subsubsection{Test with active catcodes}
+%
+% \begin{macrocode}
+%<*active>
+\catcode`\~=13 %
+\def\ThPdNu@Temp#1{%
+ \begingroup
+ \lccode`\~=`#1 %
+ \lowercase{\endgroup
+ \edef~%
+ }{\string#1}%
+ \catcode`#1=13 %
+}
+\ThPdNu@Temp{.}
+\ThPdNu@Temp{-}
+\ThPdNu@Temp{+}
+%</active>
+% \end{macrocode}
+%
+% \subsubsection{Test cases for \cs{thepdfnumber}}
+%
+% \begin{macro}{\TestCommand}
+% \begin{macrocode}
+\let\TestCommand\thepdfnumber
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\Test{0}{0}
+\Test{1}{1}
+\Test{23}{23}
+\Test{0045}{45}
+\Test{4500}{4500}
+\Test{-0}{0}
+\Test{-1}{-1}
+\Test{-00002}{-2}
+\Test{-010203}{-10203}
+\Test{+0}{0}
+\Test{+123}{123}
+
+\Test{+-4}{-4}
+\Test{+-+-4}{4}
+\Test{++--++--++4}{4}
+\Test{+++---+++---+++---4}{-4}
+
+\Test{.}{0}
+\Test{0.}{0}
+\Test{.0}{0}
+\Test{0.}{0}
+\Test{-.}{0}
+\Test{-0.}{0}
+\Test{-.0}{0}
+\Test{-0.}{0}
+\Test{010.020}{10.02}
+\Test{123.456}{123.456}
+\Test{12.}{12}
+\Test{.123}{.123}
+\Test{.0001}{.0001}
+\Test{.00100}{.001}
+\Test{.12003400560078009}{.12003400560078009}
+\Test{-.12003400560078009}{-.12003400560078009}
+\Test{04.0500000}{4.05}
+
+\Test{}{0\thepdfnumber@ErrorUnexpectedEnd}
+\Test{+}{0\thepdfnumber@ErrorUnexpectedEnd}
+\Test{-}{0\thepdfnumber@ErrorUnexpectedEnd}
+\Test{a}{0\thepdfnumber@ErrorInvalidToken}
+\Test{0x1}{0\thepdfnumber@ErrorInvalidToken}
+\Test{4x56}{4\thepdfnumber@ErrorInvalidToken}
+\Test{012,34}{12\thepdfnumber@ErrorInvalidToken}
+\Test{0.12x4}{.12\thepdfnumber@ErrorInvalidToken}
+% \end{macrocode}
+%
+% \subsubsection{Test cases for \cs{thepdfnumberNormZeroOne}}
+%
+% \begin{macro}{\TestCommand}
+% \begin{macrocode}
+\let\TestCommand\thepdfnumberNormZeroOne
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\Test{0}{0}
+\Test{1}{1}
+\Test{23}{1}
+\Test{12}{1}
+\Test{10}{1}
+\Test{0045}{1}
+\Test{001}{1}
+\Test{-0}{0}
+\Test{-1}{0}
+\Test{-01}{0}
+\Test{-4}{0}
+
+\Test{+-0}{0}
+\Test{+-+-1}{1}
+\Test{++--++--++1}{1}
+\Test{+++---+++---+++---1}{0}
+
+\Test{.}{0}
+\Test{0.}{0}
+\Test{.0}{0}
+\Test{0.}{0}
+\Test{-.}{0}
+\Test{-0.}{0}
+\Test{-.0}{0}
+\Test{-0.}{0}
+\Test{010.020}{1}
+\Test{123.456}{1}
+\Test{12.}{1}
+\Test{.123}{.123}
+\Test{.0001}{.0001}
+\Test{.00100}{.001}
+\Test{.12003400560078009}{.12003400560078009}
+\Test{-.12003400560078009}{0}
+\Test{04.0500000}{1}
+\Test{0.1200340056}{.1200340056}
+\Test{1.05}{1}
+
+\Test{}{0\thepdfnumber@ErrorUnexpectedEnd}
+\Test{+}{0\thepdfnumber@ErrorUnexpectedEnd}
+\Test{-}{0\thepdfnumber@ErrorUnexpectedEnd}
+\Test{a}{0\thepdfnumber@ErrorInvalidToken}
+\Test{0x1}{0\thepdfnumber@ErrorInvalidToken}
+\Test{4x56}{1}
+\Test{012,34}{1}
+\Test{.012x4}{.012\thepdfnumber@ErrorInvalidToken}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\csname @@end\endcsname\end
+%</test2>
+% \end{macrocode}
+%
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/thepdfnumber.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/thepdfnumber.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \end{description}
+% \emph{TDS} refers to the standard ``A Directory Structure
+% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
+% with \xfile{texmf} in their name are usually organized this way.
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+% |unzip oberdiek.tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+% \verb|tex thepdfnumber.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \def\t{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
+% thepdfnumber.sty & tex/generic/oberdiek/thepdfnumber.sty\\
+% thepdfnumber.pdf & doc/latex/oberdiek/thepdfnumber.pdf\\
+% test/thepdfnumber-test1.tex & doc/latex/oberdiek/test/thepdfnumber-test1.tex\\
+% test/thepdfnumber-test2.tex & doc/latex/oberdiek/test/thepdfnumber-test2.tex\\
+% test/thepdfnumber-test3.tex & doc/latex/oberdiek/test/thepdfnumber-test3.tex\\
+% thepdfnumber.dtx & source/latex/oberdiek/thepdfnumber.dtx\\
+% \end{tabular}^^A
+% }^^A
+% \sbox0{\t}^^A
+% \ifdim\wd0>\linewidth
+% \begingroup
+% \advance\linewidth by\leftmargin
+% \advance\linewidth by\rightmargin
+% \edef\x{\endgroup
+% \def\noexpand\lw{\the\linewidth}^^A
+% }\x
+% \def\lwbox{^^A
+% \leavevmode
+% \hbox to \linewidth{^^A
+% \kern-\leftmargin\relax
+% \hss
+% \usebox0
+% \hss
+% \kern-\rightmargin\relax
+% }^^A
+% }^^A
+% \ifdim\wd0>\lw
+% \sbox0{\small\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\footnotesize\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\scriptsize\t}^^A
+% \ifdim\wd0>\linewidth
+% \ifdim\wd0>\lw
+% \sbox0{\tiny\t}^^A
+% \ifdim\wd0>\linewidth
+% \lwbox
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \else
+% \lwbox
+% \fi
+% \else
+% \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+% \verb|pdftk thepdfnumber.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+% \verb|latex \let\install=y\input{thepdfnumber.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+% \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex thepdfnumber.dtx
+%makeindex -s gind.ist thepdfnumber.idx
+%pdflatex thepdfnumber.dtx
+%makeindex -s gind.ist thepdfnumber.idx
+%pdflatex thepdfnumber.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \printbibliography[
+% heading=bibnumbered,
+% ]
+%
+% \begin{History}
+% \begin{Version}{2011/11/24 v1.0}
+% \item
+% First version.
+% \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
index c59cc5363e3..275487a2f4b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: transparent.dtx
% Version: 2007/01/08 v1.0
-%
+% Info: Transparency via pdfTeX's color stack
+%
% Copyright (C) 2007 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
@@ -15,20 +16,20 @@
% 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 transparent.dtx
% and the derived files
% transparent.sty, transparent.pdf, transparent.ins, transparent.drv,
% transparent-example.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/transparent.dtx
% CTAN:macros/latex/contrib/oberdiek/transparent.pdf
-%
+%
% Unpacking:
% (a) If transparent.ins is present:
% tex transparent.ins
@@ -37,7 +38,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{transparent.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If transparent.drv is present:
% latex transparent.drv
@@ -47,14 +48,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex transparent.dtx
% makeindex -s gind.ist transparent.idx
% pdflatex transparent.dtx
% makeindex -s gind.ist transparent.idx
% pdflatex transparent.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/transparent.sty
% TDS:doc/latex/oberdiek/transparent.pdf
@@ -76,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: transparent 2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)}
+\Msg{* Package: transparent 2007/01/08 v1.0 Transparency via pdfTeX's color stack (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -122,6 +123,10 @@ and the derived files
\file{transparent.sty}{\from{transparent.dtx}{package}}%
\usedir{doc/latex/oberdiek}%
\file{transparent-example.tex}{\from{transparent.dtx}{example}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{transparent.xml}{\from{transparent.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -148,9 +153,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{transparent.drv}%
- [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]%
+ [2007/01/08 v1.0 Transparency via pdfTeX's color stack (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{transparent.dtx}%
\end{document}
@@ -236,7 +241,7 @@ Hello World
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{transparent}%
- [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]%
+ [2007/01/08 v1.0 Transparency via pdfTeX's color stack (HO)]%
% \end{macrocode}
%
% \subsection{Initial checks}
@@ -568,6 +573,42 @@ Hello World
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{transparent.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='transparent'>
+ <name>transparent</name>
+ <caption>Using a color stack for transparency with pdfTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2007'/>
+ <license type='lppl1.3'/>
+ <version number='1.0'/>
+ <description>
+ Since version 1.40 <xref refid='pdftex'>pdfTeX</xref> supports
+ several color stacks. This package shows how a separate colour stack
+ can be used for transparency, a property other than colour.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/transparent.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/transparent.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2007/01/08 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
index d4ba443b540..f53e4c46de5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: twoopt.dtx
% Version: 2008/08/11 v1.5
-%
+% Info: Definitions with two optional arguments
+%
% Copyright (C) 1999, 2006, 2008 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
@@ -15,19 +16,19 @@
% 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 twoopt.dtx
% and the derived files
% twoopt.sty, twoopt.pdf, twoopt.ins, twoopt.drv.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/twoopt.dtx
% CTAN:macros/latex/contrib/oberdiek/twoopt.pdf
-%
+%
% Unpacking:
% (a) If twoopt.ins is present:
% tex twoopt.ins
@@ -36,7 +37,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{twoopt.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If twoopt.drv is present:
% latex twoopt.drv
@@ -46,14 +47,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex twoopt.dtx
% makeindex -s gind.ist twoopt.idx
% pdflatex twoopt.dtx
% makeindex -s gind.ist twoopt.idx
% pdflatex twoopt.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/twoopt.sty
% TDS:doc/latex/oberdiek/twoopt.pdf
@@ -117,6 +118,10 @@ and the derived files
\file{twoopt.drv}{\from{twoopt.dtx}{driver}}%
\usedir{tex/latex/oberdiek}%
\file{twoopt.sty}{\from{twoopt.dtx}{package}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{twoopt.xml}{\from{twoopt.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -145,14 +150,14 @@ and the derived files
\ProvidesFile{twoopt.drv}%
[2008/08/11 v1.5 Definitions with two optional arguments (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{twoopt.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{105}
+% \CheckSum{108}
%
% \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
@@ -556,6 +561,41 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{twoopt.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='twoopt'>
+ <name>twoopt</name>
+ <caption>Definitions with two optional arguments.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='1999,2006,2008'/>
+ <license type='lppl1.3'/>
+ <version number='1.5'/>
+ <description>
+ Variants of <tt>\newcommand</tt>, <tt>\renewcommand</tt> and
+ <tt>\providecommand</tt> are provided.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/twoopt.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/twoopt.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{1998/10/30 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx b/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx
index 0251888cfb6..5b64e6d6708 100644
--- a/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: uniquecounter.dtx
% Version: 2011/01/30 v1.2
-%
+% Info: Provide unlimited unique counter
+%
% Copyright (C) 2009, 2011 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
@@ -15,25 +16,25 @@
% 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.
-%
+%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
-%
+%
% This work consists of the main source file uniquecounter.dtx
% and the derived files
% uniquecounter.sty, uniquecounter.pdf, uniquecounter.ins,
% uniquecounter.drv, uniquecounter-example.tex,
% uniquecounter-test1.tex, uniquecounter-test2.tex,
% uniquecounter-test3.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/uniquecounter.dtx
% CTAN:macros/latex/contrib/oberdiek/uniquecounter.pdf
-%
+%
% Unpacking:
% (a) If uniquecounter.ins is present:
% tex uniquecounter.ins
@@ -42,7 +43,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{uniquecounter.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If uniquecounter.drv is present:
% latex uniquecounter.drv
@@ -52,14 +53,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex uniquecounter.dtx
% makeindex -s gind.ist uniquecounter.idx
% pdflatex uniquecounter.dtx
% makeindex -s gind.ist uniquecounter.idx
% pdflatex uniquecounter.dtx
-%
+%
% Installation:
% TDS:tex/generic/oberdiek/uniquecounter.sty
% TDS:doc/latex/oberdiek/uniquecounter.pdf
@@ -84,7 +85,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: uniquecounter 2011/01/30 v1.2 Provides unlimited unique counter (HO)}
+\Msg{* Package: uniquecounter 2011/01/30 v1.2 Provide unlimited unique counter (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -139,6 +140,10 @@ and the derived files
\file{uniquecounter-test1.tex}{\from{uniquecounter.dtx}{test1}}%
\file{uniquecounter-test2.tex}{\from{uniquecounter.dtx}{test2}}%
\file{uniquecounter-test3.tex}{\from{uniquecounter.dtx}{test3}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{uniquecounter.xml}{\from{uniquecounter.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -165,9 +170,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{uniquecounter.drv}%
- [2011/01/30 v1.2 Provides unlimited unique counter (HO)]%
+ [2011/01/30 v1.2 Provide unlimited unique counter (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\begin{document}
\DocInput{uniquecounter.dtx}%
\end{document}
@@ -202,7 +207,7 @@ and the derived files
%
% \begin{abstract}
% This package provides a kind of counter that provides unique
-% number values. Several counter can be created by different names.
+% number values. Several counters can be created by different names.
% The numeric values are not limited.
% \end{abstract}
%
@@ -341,7 +346,7 @@ and the derived files
\fi
\expandafter\x\csname ver@uniquecounter.sty\endcsname
\ProvidesPackage{uniquecounter}%
- [2011/01/30 v1.2 Provides unlimited unique counter (HO)]%
+ [2011/01/30 v1.2 Provide unlimited unique counter (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -986,6 +991,42 @@ and the derived files
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{uniquecounter.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='uniquecounter'>
+ <name>uniquecounter</name>
+ <caption>Provides unlimited unique counter.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2009,2011'/>
+ <license type='lppl1.3'/>
+ <version number='1.2'/>
+ <description>
+ This package provides a kind of counter that provides unique
+ number values. Several counters can be created with different names.
+ The numeric values are not limited.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/uniquecounter.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/uniquecounter.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \begin{History}
% \begin{Version}{2009/09/11 v1.0}
% \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
index f677354b025..6b30275cf7e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
-%
+%
% File: zref.dtx
-% Version: 2011/03/18 v2.21
-%
-% Copyright (C) 2006-2011 by
+% Version: 2012/04/04 v2.24
+% Info: A new reference scheme for LaTeX
+%
+% Copyright (C) 2006-2012 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
@@ -15,11 +16,11 @@
% 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,
@@ -33,11 +34,11 @@
% zref-example-nextpage.tex, zref-test1.tex,
% zref-test-base.tex, zref-test-runs.tex,
% zref-test-titleref-memoir.tex.
-%
+%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/zref.dtx
% CTAN:macros/latex/contrib/oberdiek/zref.pdf
-%
+%
% Unpacking:
% (a) If zref.ins is present:
% tex zref.ins
@@ -46,7 +47,7 @@
% (c) If you insist on using LaTeX
% latex \let\install=y\input{zref.dtx}
% (quote the arguments according to the demands of your shell)
-%
+%
% Documentation:
% (a) If zref.drv is present:
% latex zref.drv
@@ -56,14 +57,14 @@
% if available. Here you can specify further options, e.g.
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
-%
+%
% Programm calls to get the documentation (example):
% pdflatex zref.dtx
% makeindex -s gind.ist zref.idx
% pdflatex zref.dtx
% makeindex -s gind.ist zref.idx
% pdflatex zref.dtx
-%
+%
% Installation:
% TDS:tex/latex/oberdiek/zref.sty
% TDS:tex/latex/oberdiek/zref-base.sty
@@ -111,7 +112,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: zref 2011/03/18 v2.21 New reference scheme for LaTeX2e (HO)}
+\Msg{* Package: zref 2012/04/04 v2.24 A new reference scheme for LaTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -123,9 +124,9 @@
This is a generated file.
Project: zref
-Version: 2011/03/18 v2.21
+Version: 2012/04/04 v2.24
-Copyright (C) 2006-2011 by
+Copyright (C) 2006-2012 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
This work may be distributed and/or modified under the
@@ -193,6 +194,10 @@ and the derived files
\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}}%
+ \nopreamble
+ \nopostamble
+ \usedir{source/latex/oberdiek/catalogue}%
+ \file{zref.xml}{\from{zref.dtx}{catalogue}}%
}
\catcode32=13\relax% active space
@@ -225,9 +230,9 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{zref.drv}%
- [2011/03/18 v2.21 New reference scheme for LaTeX2e (HO)]%
+ [2012/04/04 v2.24 A new reference scheme for LaTeX (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
\setlength{\emergencystretch}{1em}
\begin{document}
\DocInput{zref.dtx}%
@@ -235,7 +240,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{3468}
+% \CheckSum{4013}
%
% \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
@@ -256,7 +261,7 @@ and the derived files
% \GetFileInfo{zref.drv}
%
% \title{The \xpackage{zref} package}
-% \date{2011/03/18 v2.21}
+% \date{2012/04/04 v2.24}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -447,19 +452,27 @@ and the derived files
% Declares a new empty property list.
%
% \begin{declcs}{zref@addprop}
-% \M{listname} \M{propname list}
+% \M{listname} \M{propname}\\
+% \cs{zref@localaddprop} \M{listname} \M{propname}
% \end{declcs}
-% Adds the properties of \meta{propname list} (comma separated)
+% Adds the property \meta{propname}
% 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 list}
+% The addition is global by \cs{zref@addprop} and limited to
+% local scope by \cs{zref@localaddprop}.
+% Between 2010/04/19 v2.13 and 2010/10/22 v2.19 a comma separated list
+% of properties could be used as argument \meta{propname}.
+% Since 2010/10/22 v2.19 the addition of several properties
+% at once is supported by \cs{zref@addprops}.
+%
+% \begin{declcs}{zref@addprops}
+% \M{listname} \M{propname list}\\
+% \cs{zref@localaddprops} \M{listname} \M{propname list}
% \end{declcs}
-% Local variant of \cs{zref@addprop}.
+% These macros add a comma separated list of properties
+% \meta{propname list} to list \meta{listname}.
+% \cs{zref@addprops} works globally and \cs{zref@localaddprops}
+% locally. Since 2010/10/22 v2.19.
%
% \begin{declcs}{zref@listexists}
% \M{listname} \M{then}
@@ -601,10 +614,22 @@ and the derived files
% mark their use outside by \cs{zref@refused}, see the example
% file.
%
+% \begin{declcs}{zref@def@extract}%
+% \M{cmd} \M{refname} \M{propname}\\
+% \cs{zref@def@extractdefault}
+% \M{cmd} \M{refname} \M{propname} \M{default}
+% \end{declcs}
+% Both macros extract the property \meta{propname} from the reference
+% \meta{refname} the same way as macros \cs{zref@extract} and
+% \cs{zref@extractdefault}. The result is stored in macro \meta{cmd}.
+% Also \cs{zref@refused} is called to notify \hologo{LaTeX} that
+% the reference \meta{refname} is used. Added in 2011/10/04 v2.22.
+%
% \begin{declcs}{zref@ifrefundefined}\markexp
% \M{refname} \M{then} \M{else}
% \end{declcs}
-% A possibility to check whether a reference exists.
+% Macro \cs{zref@ifrefundefined} calls arguments \meta{then} or \meta{else}
+% dependent on the existence of the reference \meta{refname}.
%
% \begin{declcs}{zifrefundefined}
% \M{refname} \M{then} \M{else}
@@ -914,7 +939,7 @@ and the derived files
\newcounter{foo}
\renewcommand*{\thefoo}{\Alph{foo}}
-\usepackage{zref-lastpage,zref-user}[2011/03/18]
+\usepackage{zref-lastpage,zref-user}[2012/04/04]
\makeatletter
\zref@newprop{thefoo}{\thefoo}
@@ -1028,7 +1053,7 @@ and the derived files
%<<END_EXAMPLE
\documentclass{book}
-\usepackage{zref-nextpage}[2011/03/18]
+\usepackage{zref-nextpage}[2012/04/04]
\znextpagesetup
{\thepage}% next page is unknown
{\thepage\ (#1)}% this page is last page
@@ -1262,6 +1287,14 @@ and the derived files
% The reference stores the location where \cs{zsavepos}
% is executed in properties |posx| and |posy|.
%
+% \begin{declcs}{zsaveposx}
+% \M{refname}\\
+% \cs{zsaveposy}
+% \M{refname}
+% \end{declcs}
+% Same as \cs{zsavepos} except that only the |x| or |y| component
+% of the position is stored. Since 2011/12/05 v2.23.
+%
% \begin{declcs}{zposx}\markexp
% \M{refname}\\
% \SpecialUsageIndex{\zposy}\cs{zposy}\markexp \M{refname}
@@ -1291,7 +1324,10 @@ and the derived files
% by calling \cs{pdfsavepos} (if \xext{aux} files are writable).
%
% Thus \cs{zsavepos} is basically \cs{zref@savepos} followed
-% by |\zreflabelbylist{|\texttt{\meta{refname}}|}{savepos}|.
+% by |\zref@labelbylist{|\texttt{\meta{refname}}|}{savepos}|.
+% If \cs{TeXXeTstate} is detected and enabled, \cs{savepos}
+% also adds \cs{zref@savepos} at the end to support \cs{beginR}
+% where the whatits are processed in reverse order.
% The property list |savepos| contains the properties |posx|
% and |posy|.
%
@@ -1587,13 +1623,13 @@ the height difference of the two baselines is
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref}
- [2011/03/18 v2.21 New reference scheme for LaTeX2e (HO)]%
+ [2012/04/04 v2.24 A new reference scheme for LaTeX (HO)]%
% \end{macrocode}
%
% \subsubsection{Load basic module}
%
% \begin{macrocode}
-\RequirePackage{zref-base}[2011/03/18]
+\RequirePackage{zref-base}[2012/04/04]
% \end{macrocode}
% Abort package loading if \xpackage{zref-base} could not be
% loaded successfully.
@@ -1608,7 +1644,7 @@ the height difference of the two baselines is
\def\ZREF@temp#1{%
\DeclareOption{#1}{%
\AtEndOfPackage{%
- \RequirePackage{zref-#1}[2011/03/18]%
+ \RequirePackage{zref-#1}[2012/04/04]%
}%
}%
}
@@ -1674,13 +1710,13 @@ the height difference of the two baselines is
%<*base>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-base}%
- [2011/03/18 v2.21 Module base for zref (HO)]%
+ [2012/04/04 v2.24 Module base for zref (HO)]%
% \end{macrocode}
%
% \subsubsection{Utilities}
%
% \begin{macrocode}
-\RequirePackage{ltxcmds}[2010/03/01]
+\RequirePackage{ltxcmds}[2010/12/02]
\RequirePackage{infwarerr}[2010/04/08]
\RequirePackage{kvsetkeys}[2010/03/01]
\RequirePackage{kvdefinekeys}[2010/03/01]
@@ -2249,6 +2285,41 @@ the height difference of the two baselines is
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\zref@showprop}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@showprop#1{%
+ \zref@ifpropundefined{#1}{%
+ \@PackageInfoNoLine{\ZREF@name}{%
+ Show property `#1': <undefined>%
+ }%
+ }{%
+ \begingroup
+ \toks@\expandafter\expandafter\expandafter{%
+ \csname Z@C@#1\endcsname
+ }%
+ \edef\ZREF@value{\the\toks@}%
+ \ltx@onelevel@sanitize\ZREF@value
+ \toks@\expandafter\expandafter\expandafter{%
+ \csname Z@D@#1\endcsname
+ }%
+ \edef\ZREF@default{\the\toks@}%
+ \ltx@onelevel@sanitize\ZREF@default
+ \@PackageInfoNoLine{\ZREF@name}{%
+ Show property `#1':\MessageBreak
+ \expandafter\ifx\csname Z@X@#1\endcsname\ltx@empty
+ Immediate %
+ \else
+ Delayed %
+ \fi
+ value: [\ZREF@value]\MessageBreak
+ Default: [\ZREF@default]%
+ }%
+ \endgroup
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\zref@setcurrent}
% \cs{zref@setcurrent} sets the current value for a property.
% \begin{macrocode}
@@ -2693,6 +2764,45 @@ the height difference of the two baselines is
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\zref@def@extract}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@def@extract#1{%
+ \zref@wrapper@babel{\ZREF@def@extract{#1}}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@def@extract}
+% \begin{macrocode}
+\def\ZREF@def@extract#1#2#3{%
+ \zref@refused{#2}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{%
+ \zref@extract{#2}{#3}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\zref@def@extractdefault}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@def@extractdefault#1{%
+ \zref@wrapper@babel{\ZREF@def@extractdefault{#1}}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@def@extractdefault}
+% \begin{macrocode}
+\def\ZREF@def@extractdefault#1#2#3#4{%
+ \zref@refused{#2}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{%
+ \zref@extractdefault{#2}{#3}{#4}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\ZREF@wrapper@unexpanded}
% \begin{macrocode}
\ZREF@Robust{\long\def}\ZREF@wrapper@unexpanded#1{%
@@ -2783,9 +2893,9 @@ the height difference of the two baselines is
% \begin{macro}{\ZREF@number}
% \begin{macrocode}
\ltx@IfUndefined{numexpr}{%
- \let\ZREF@number\number
+ \def\ZREF@number#1{\number#1}%
}{%
- \def\ZREF@number#1{\the\numexpr#1}%
+ \def\ZREF@number#1{\the\numexpr(#1)\relax}%
}
% \end{macrocode}
% \end{macro}
@@ -2884,6 +2994,14 @@ the height difference of the two baselines is
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\ZREF@NewPropPageValue}
+% \begin{macrocode}
+\def\ZREF@NewPropPageValue{%
+ \zref@newprop*{pagevalue}[0]{\number\c@page}%
+ \global\let\ZREF@NewPropPageValue\relax
+}
+% \end{macrocode}
+% \end{macro}
%
% \paragraph{Mark successful loading}
%
@@ -2899,8 +3017,8 @@ the height difference of the two baselines is
%<*user>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-user}%
- [2011/03/18 v2.21 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -2990,8 +3108,8 @@ the height difference of the two baselines is
%<*abspage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspage}%
- [2011/03/18 v2.21 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3002,7 +3120,7 @@ the height difference of the two baselines is
% to the \verb|main| property list for absolute page numbers.
% These are recorded by the help of package \xpackage{atbegshi}.
% \begin{macrocode}
-\RequirePackage{atbegshi}%
+\RequirePackage{atbegshi}[2011/10/05]%
% \end{macrocode}
% The counter \verb|abspage| must not go in the clear list
% of \verb|@ckpt| that is used to set counters in
@@ -3038,8 +3156,8 @@ the height difference of the two baselines is
%<*counter>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-counter}%
- [2011/03/18 v2.21 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3078,9 +3196,9 @@ the height difference of the two baselines is
%<*lastpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-lastpage}%
- [2011/03/18 v2.21 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
-\RequirePackage{zref-abspage}[2011/03/18]
+ [2012/04/04 v2.24 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
+\RequirePackage{zref-abspage}[2012/04/04]
\RequirePackage{atveryend}[2009/12/07]
\ifx\ZREF@base@ok Y%
\else
@@ -3150,8 +3268,8 @@ the height difference of the two baselines is
%<*thepage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-thepage}%
- [2011/03/18 v2.21 Module thepage for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module thepage for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3159,14 +3277,24 @@ the height difference of the two baselines is
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{atbegshi}
-\RequirePackage{zref-abspage}[2011/03/18]
+\RequirePackage{atbegshi}[2011/10/05]
+\RequirePackage{zref-abspage}[2012/04/04]
% \end{macrocode}
% \begin{macrocode}
\zref@newlist{thepage}
\zref@addprop{thepage}{page}
+\ZREF@NewPropPageValue
+% \end{macrocode}
+% \begin{macro}{\zref@thepage@atbegshi@hook}
+% \begin{macrocode}
+\let\zref@thepage@atbegshi@hook\ltx@empty
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+\zref@addprop{thepage}{pagevalue}
\AtBeginShipout{%
- \zref@wrapper@immediate{%
+ \AtBeginShipoutAddToBox{%
+ \zref@thepage@atbegshi@hook
\zref@labelbylist{thepage\the\value{abspage}}{thepage}%
}%
}
@@ -3215,8 +3343,8 @@ the height difference of the two baselines is
%<*nextpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-nextpage}%
- [2011/03/18 v2.21 Module nextpage for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module nextpage for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3224,9 +3352,9 @@ the height difference of the two baselines is
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2011/03/18]
-\RequirePackage{zref-thepage}[2011/03/18]
-\RequirePackage{zref-lastpage}[2011/03/18]
+\RequirePackage{zref-abspage}[2012/04/04]
+\RequirePackage{zref-thepage}[2012/04/04]
+\RequirePackage{zref-lastpage}[2012/04/04]
\RequirePackage{uniquecounter}[2009/12/18]
% \end{macrocode}
% \begin{macrocode}
@@ -3319,8 +3447,8 @@ the height difference of the two baselines is
%<*totpages>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-totpages}%
- [2011/03/18 v2.21 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3330,8 +3458,8 @@ the height difference of the two baselines is
% The absolute page number of the last page is the total
% page number.
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2011/03/18]
-\RequirePackage{zref-lastpage}[2011/03/18]
+\RequirePackage{zref-abspage}[2012/04/04]
+\RequirePackage{zref-lastpage}[2012/04/04]
% \end{macrocode}
%
% \begin{macro}{\ztotpages}
@@ -3361,8 +3489,8 @@ the height difference of the two baselines is
%<*pagelayout>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-pagelayout}%
- [2011/03/18 v2.21 Module pagelayout for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module pagelayout for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3370,11 +3498,13 @@ the height difference of the two baselines is
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{zref-thepage}[2011/03/18]
+\RequirePackage{zref-thepage}[2012/04/04]
\RequirePackage{ifluatex}[2010/03/01]
\RequirePackage{atveryend}[2010/03/24]
% \end{macrocode}
%
+% \subsubsection{Support for \hologo{LuaTeX}}
+%
% \begin{macrocode}
\ifluatex
\ifnum\luatexversion<39 %
@@ -3407,6 +3537,8 @@ the height difference of the two baselines is
\fi
% \end{macrocode}
%
+% \subsubsection{Define layout properties}
+%
% \begin{macrocode}
\def\ZREF@temp#1{%
\begingroup
@@ -3415,8 +3547,8 @@ the height difference of the two baselines is
\edef\x{%
\endgroup
\noexpand\zref@newprop*{\string#1}%
- [\number\noexpand#1]% hash-ok
- {\number\noexpand#1}%
+ [\noexpand\number\noexpand#1]% hash-ok
+ {\noexpand\number\noexpand#1}%
\noexpand\zref@addprop{thepage}{\string#1}%
}%
\x
@@ -3425,8 +3557,10 @@ the height difference of the two baselines is
\ZREF@temp\mag
\ZREF@temp\paperwidth
\ZREF@temp\paperheight
-\ZREF@temp\stockwidth
-\ZREF@temp\stockheight
+\ZREF@temp\stockwidth % memoir.cls, crop.sty
+\ZREF@temp\stockheight % memoir.cls, crop.sty
+\ZREF@temp\mediawidth % VTeX
+\ZREF@temp\mediaheight % VTeX
\ZREF@temp\pdfpagewidth
\ZREF@temp\pdfpageheight
\ZREF@temp\pdfhorigin
@@ -3445,6 +3579,25 @@ the height difference of the two baselines is
\ZREF@temp\marginparsep
\ZREF@temp\columnwidth
\ZREF@temp\columnsep
+\ZREF@temp\trimedge % memoir.cls
+\ZREF@temp\spinemargin % memoir.cls
+\ZREF@temp\foremargin % memoir.cls
+\ZREF@temp\trimtop % memoir.cls
+\ZREF@temp\uppermargin % memoir.cls
+\ZREF@temp\headmargin % memoir.cls
+% \end{macrocode}
+%
+% \begin{macrocode}
+\zref@newprop*{outputboxwd}[0pt]{\AtBeginShipoutBoxWidth}
+% \end{macrocode}
+% \begin{macrocode}
+\zref@newprop*{outputboxht}[0pt]{\AtBeginShipoutBoxHeight}
+% \end{macrocode}
+% \begin{macrocode}
+\zref@newprop*{outputboxdp}[0pt]{\AtBeginShipoutBoxDepth}
+% \end{macrocode}
+% \begin{macrocode}
+\zref@addprops{thepage}{outputboxwd,outputboxht,outputboxdp}
% \end{macrocode}
%
% \begin{macro}{\ifZREF@pl@list}
@@ -3508,6 +3661,8 @@ the height difference of the two baselines is
\ZREF@pl@ListEntry{paperheight}%
\ZREF@pl@ListEntry{stockwidth}%
\ZREF@pl@ListEntry{stockheight}%
+ \ZREF@pl@ListEntry{mediawidth}%
+ \ZREF@pl@ListEntry{mediaheight}%
\ZREF@pl@ListEntry{pdfpagewidth}%
\ZREF@pl@ListEntry{pdfpageheight}%
\ZREF@pl@ListEntry{pdfhorigin}%
@@ -3526,6 +3681,12 @@ the height difference of the two baselines is
\ZREF@pl@ListEntry{marginparsep}%
\ZREF@pl@ListEntry{columnwidth}%
\ZREF@pl@ListEntry{columnsep}%
+ \ZREF@pl@ListEntry{trimedge}%
+ \ZREF@pl@ListEntry{spinemargin}%
+ \ZREF@pl@ListEntry{foremargin}%
+ \ZREF@pl@ListEntry{trimtop}%
+ \ZREF@pl@ListEntry{uppermargin}%
+ \ZREF@pl@ListEntry{headmargin}%
}%
}%
}\x
@@ -3558,6 +3719,7 @@ the height difference of the two baselines is
\ZREF@pl@AfterLastShipout
}
% \end{macrocode}
+%
% \begin{macrocode}
%</pagelayout>
% \end{macrocode}
@@ -3569,8 +3731,8 @@ the height difference of the two baselines is
%<*pageattr>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-pageattr}%
- [2011/03/18 v2.21 Module pageattr for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module pageattr for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3620,7 +3782,7 @@ the height difference of the two baselines is
\def\zref@pdfpageattr#1{}%
\def\zref@pdfpageattr@used#1{}%
}{%
- \RequirePackage{zref-thepage}[2011/03/18]%
+ \RequirePackage{zref-thepage}[2012/04/04]%
\zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}%
\zref@addprop{thepage}{pdfpageattr}%
\let\ZREF@temp=Y%
@@ -3632,7 +3794,7 @@ the height difference of the two baselines is
\def\zref@pdfpagesattr{}%
\def\zref@pdfpagesattr@used{}%
}{%
- \RequirePackage{zref-lastpage}[2011/03/18]%
+ \RequirePackage{zref-lastpage}[2012/04/04]%
\zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}%
\zref@addprop{LastPage}{pdfpagesattr}%
\let\ZREF@temp=Y%
@@ -3644,7 +3806,7 @@ the height difference of the two baselines is
\fi
% \end{macrocode}
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2011/03/18]
+\RequirePackage{zref-abspage}[2012/04/04]
\RequirePackage{atveryend}[2010/03/24]
\RequirePackage{pdftexcmds}[2010/04/01]
\let\ZREF@temp=Y%
@@ -3714,7 +3876,7 @@ the height difference of the two baselines is
% \begin{macrocode}
\def\zref@pageattr#1{%
\zref@unhex{%
- \zref@extract{thepage\ZREF@number#1}{pdfpageattr}%
+ \zref@extract{thepage\ZREF@number{#1}}{pdfpageattr}%
}%
}
% \end{macrocode}
@@ -3722,7 +3884,7 @@ the height difference of the two baselines is
% \begin{macro}{\zref@pageattr@used}
% \begin{macrocode}
\ZREF@Robust\def\zref@pageattr@used#1{%
- \zref@refused{thepage\ZREF@number#1}%
+ \zref@refused{thepage\ZREF@number{#1}}%
}
% \end{macrocode}
% \end{macro}
@@ -3794,8 +3956,8 @@ the height difference of the two baselines is
%<*marks>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-marks}%
- [2011/03/18 v2.21 Module marks for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module marks for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3805,7 +3967,7 @@ the height difference of the two baselines is
% \begin{macrocode}
\newcommand*{\zref@marks@register}[3][]{%
\edef\ZREF@TempName{#1}%
- \edef\ZREF@TempNum{\ZREF@number#2}%
+ \edef\ZREF@TempNum{\ZREF@number{#2}}%
\ifnum\ZREF@TempNum<\ltx@zero %
\PackageError\ZREF@name{%
\string\zref@marks@register\ltx@space is called with invalid%
@@ -3900,7 +4062,7 @@ the height difference of the two baselines is
%<*runs>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-runs}%
- [2011/03/18 v2.21 Module runs for zref (HO)]%
+ [2012/04/04 v2.24 Module runs for zref (HO)]%
% \end{macrocode}
%
% \begin{macro}{\zruns}
@@ -3932,8 +4094,8 @@ the height difference of the two baselines is
%<*perpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-perpage}%
- [2011/03/18 v2.21 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -3948,14 +4110,14 @@ the height difference of the two baselines is
% For detecting changed pages module \xmodule{abspage}
% is loaded.
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2011/03/18]
+\RequirePackage{zref-abspage}[2012/04/04]
% \end{macrocode}
%
% We group the properties for the needed references
% in the property list |perpage|. The property |pagevalue|
% records the correct value of the page counter.
% \begin{macrocode}
-\zref@newprop*{pagevalue}[0]{\number\c@page}
+\ZREF@NewPropPageValue
\zref@newlist{perpage}
\zref@addprops{perpage}{abspage,page,pagevalue}
% \end{macrocode}
@@ -4099,8 +4261,8 @@ the height difference of the two baselines is
%<*titleref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-titleref}%
- [2011/03/18 v2.21 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -4421,6 +4583,17 @@ the height difference of the two baselines is
\ZREF@org@ttl@sect@i{#1}{#2}[{#3}]{#4}%
}%
}%
+ \ZREF@patch{ttl@straight@i}{%
+ \def\ttl@straight@i#1[#2]#3{%
+ \def\ZREF@temp{#2}%
+ \ifx\ZREF@temp\ltx@empty
+ \zref@titleref@setcurrent{#3}%
+ \else
+ \zref@titleref@setcurrent{#2}%
+ \fi
+ \ZREF@org@ttl@straight@i{#1}[{#2}]{#3}%
+ }%
+ }%
}{}%
% \end{macrocode}
%
@@ -4501,8 +4674,8 @@ the height difference of the two baselines is
%<*xr>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-xr}%
- [2011/03/18 v2.21 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -5037,8 +5210,8 @@ the height difference of the two baselines is
%<*hyperref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-hyperref}%
- [2011/03/18 v2.21 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -5067,8 +5240,8 @@ the height difference of the two baselines is
%<*savepos>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-savepos}%
- [2011/03/18 v2.21 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -5130,18 +5303,52 @@ the height difference of the two baselines is
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ZREF@zsavepos}
+% \begin{macrocode}
+\def\ZREF@zsavepos#1#2#3{%
+ \@bsphack
+ \if@filesw
+ \zref@savepos
+ #1{#3}{#2}%
+ \ltx@IfUndefined{TeXXeTstate}{%
+ }{%
+ \ifnum\TeXXeTstate=\ltx@zero
+ \else
+ \zref@savepos
+ \fi
+ }%
+ \fi
+ \@esphack
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\zsavepos}
% The current location is stored in a reference with the
% given name.
% \begin{macrocode}
\ZREF@IfDefinable\zsavepos\def{%
- #1{%
- \@bsphack
- \if@filesw
- \zref@savepos
- \zref@labelbylist{#1}{savepos}%
- \fi
- \@esphack
+ {%
+ \ZREF@zsavepos\zref@labelbylist{savepos}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zsaveposx}
+% \begin{macrocode}
+\ZREF@IfDefinable\zsaveposx\def{%
+ {%
+ \ZREF@zsavepos\zref@labelbyprops{posx}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\zsaveposy}
+% \begin{macrocode}
+\ZREF@IfDefinable\zsaveposy\def{%
+ {%
+ \ZREF@zsavepos\zref@labelbyprops{posy}%
}%
}
% \end{macrocode}
@@ -5192,8 +5399,8 @@ the height difference of the two baselines is
%<*abspos>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspos}%
- [2011/03/18 v2.21 Module abspos for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module abspos for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -5201,18 +5408,616 @@ the height difference of the two baselines is
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{zref-savepos}[2011/03/18]
+\RequirePackage{zref-savepos}[2012/04/04]
\ifx\ZREF@savepos@ok Y%
\else
\expandafter\endinput
\fi
% \end{macrocode}
% \begin{macrocode}
-\RequirePackage{zref-pagelayout}[2011/03/18]
+\RequirePackage{zref-pagelayout}[2012/04/04]
\zref@addprop{savepos}{abspage}
% \end{macrocode}
%
% \begin{macrocode}
+\RequirePackage{ifpdf}[2010/09/13]
+% \end{macrocode}
+%
+% \begin{macro}{\zref@absposx}
+% \begin{macrocode}
+\newcommand*{\zref@absposx}[3]{%
+ \number
+ \expandafter\zref@absposnumx\expandafter{%
+ \number\zref@extractdefault{#1}{abspage}{0}%
+ }{#2}{#3}%
+ \ltx@space
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@absposy}
+% \begin{macrocode}
+\newcommand*{\zref@absposy}[3]{%
+ \number
+ \expandafter\zref@absposnumy\expandafter{%
+ \number\zref@extractdefault{#1}{abspage}{0}%
+ }{#2}{#3}%
+ \ltx@space
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@absposnumx}
+% \begin{macrocode}
+\newcommand*{\zref@absposnumx}[3]{%
+ \number
+% \ifnum#1>\ltx@zero
+% \zref@ifrefundefined{thepage#1}{%
+% 0%
+% }{%
+ \numexpr\ZREF@absposnum{thepage#1}{#2}{x}{#3}\relax
+% }%
+% \else
+% 0%
+% \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@absposnumy}
+% \begin{macrocode}
+\newcommand*{\zref@absposnumy}[3]{%
+ \number
+% \ifnum#1>\ltx@zero
+% \zref@ifrefundefined{thepage#1}{%
+% 0%
+% }{%
+ \numexpr\ZREF@absposnum{thepage#1}{#2}{y}{#3}\relax
+% }%
+% \else
+% 0%
+% \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@absposnum}
+% \begin{macrocode}
+\def\ZREF@absposnum#1#2#3#4{%
+ \ltx@ifundefined{ZREF@abspos@#2@#3@#4}{%
+ 0%
+ }{%
+ \csname ZREF@abspos@#2@#3@#4\endcsname{#1}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@def@absposx}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@def@absposx#1{%
+ \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposx}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@def@absposy}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@def@absposy#1{%
+ \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposy}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@def@absposnumx}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@def@absposnumx#1{%
+ \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposnumx}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@def@absposnumy}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@def@absposnumy#1{%
+ \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposnumy}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@def@abspos}
+% \begin{macrocode}
+\def\ZREF@def@absposnumy#1#2#3#4#5{%
+ \edef#1{#2{#3}{#4}{#5}}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@absposused}
+% \begin{macrocode}
+\ZREF@Robust\def\zref@absposused{%
+ \zref@wrapper@babel\ZREF@abspos@used
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@used}
+% \begin{macrocode}
+\def\ZREF@abspos@used#1{%
+ \zref@refused{#1}%
+ \zref@ifrefundefined{#1}{%
+ }{%
+ \begingroup
+ \edef\ZREF@temp{%
+ \zref@extractdefault{#1}{abspage}{0}%
+ }%
+ \ifnum\ZREF@temp>\ltx@zero
+ \zref@refused{thepage\ZREF@temp}%
+ \else
+ \@PackageError{zref-abspos}{%
+ \string\zref@pos@label@used\ltx@space
+ needs property `abspage'\MessageBreak
+ in label `#1'%
+ }\@ehc
+ \fi
+ \endgroup
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@absposnumused}
+% \begin{macrocode}
+\newcommand*{\zref@absposnumused}[1]{%
+ \ifnum#1>\ltx@zero
+ \zref@refused{thepage\number#1}%
+ \else
+ \@PackageError{zref-abspos}{%
+ Invalid absolute page number (#1)\MessageBreak
+ for \string\zref@pos@num@used.\MessageBreak
+ A positive integer is expected%
+ }\@ehc
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@ifabsposundefined}
+% \begin{macrocode}
+\def\zref@ifabsposundefined#1{%
+ \zref@ifrefundefined{#1}\ltx@firsttwo{%
+ \expandafter\zref@ifabsposnumundefined\expandafter{%
+ \number\zref@extractdefault{#1}{abspage}{0}%
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\zref@ifabsposnumundefined}
+% \begin{macrocode}
+\def\zref@ifabsposnumundefined#1{%
+ \ifnum\ZREF@number{#1}>\ltx@zero
+ \zref@ifrefundefined{thepage#1}%
+ \ltx@firstoftwo\ltx@secondoftwo
+ \else
+ \expandafter\ltx@firstoftwo
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Media}
+%
+% \begin{macro}{\ZREF@abspos@media@width}
+% \begin{macrocode}
+\edef\ZREF@abspos@media@width{%
+ \ltx@ifundefined{pdfpagewidth}{%
+ \ltx@ifundefined{mediawidth}{%
+ \ltx@ifundefined{stockwidth}{%
+ paperwidth%
+ }{%
+ stockwidth%
+ }%
+ }{%
+ mediawidth%
+ }%
+ }{%
+ pdfpagewidth%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@media@height}
+% \begin{macrocode}
+\edef\ZREF@abspos@media@height{%
+ \ltx@ifundefined{pdfpageheight}{%
+ \ltx@ifundefined{mediaheight}{%
+ \ltx@ifundefined{stockheight}{%
+ paperheight%
+ }{%
+ stockheight%
+ }%
+ }{%
+ mediaheight%
+ }%
+ }{%
+ \noexpand\ifcase\pdfpageheight
+ \ltx@ifundefined{stockheight}{%
+ paperheight%
+ }{%
+ stockheight%
+ }%
+ \noexpand\else
+ pdfpageheight%
+ \noexpand\fi
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@media@x@left}
+% \begin{macrocode}
+\def\ZREF@abspos@media@x@left#1{%
+ 0%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@media@x@right}
+% \begin{macrocode}
+\def\ZREF@abspos@media@x@right#1{%
+ \zref@extract{#1}\ZREF@abspos@media@width
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@media@x@center}
+% \begin{macrocode}
+\def\ZREF@abspos@media@x@center#1{%
+ \ZREF@abspos@media@x@left{#1}%
+ +\zref@extract{#1}\ZREF@abspos@media@width/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@media@y@top}
+% \begin{macrocode}
+\def\ZREF@abspos@media@y@top#1{%
+ \zref@extract{#1}\ZREF@abspos@media@height
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@media@y@bottom}
+% \begin{macrocode}
+\def\ZREF@abspos@media@y@bottom#1{%
+ 0%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@media@y@center}
+% \begin{macrocode}
+\def\ZREF@abspos@media@y@center#1{%
+ \zref@extract{#1}\ZREF@abspos@media@height/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Paper}
+%
+% \begin{macro}{\ZREF@abspos@paper@x@left}
+% \begin{macrocode}
+\def\ZREF@abspos@paper@x@left#1{%
+ 0%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@paper@x@right}
+% \begin{macrocode}
+\def\ZREF@abspos@paper@x@right#1{%
+ \zref@extract{#1}{paperwidth}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@paper@x@center}
+% \begin{macrocode}
+\def\ZREF@abspos@paper@x@center#1{%
+ \zref@extract{#1}{paperwidth}/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@paper@y@top}
+% \begin{macrocode}
+\let\ZREF@abspos@paper@y@top\ZREF@abspos@media@y@top
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@paper@y@bottom}
+% \begin{macrocode}
+\def\ZREF@abspos@paper@y@bottom#1{%
+ \ZREF@abspos@paper@y@top{#1}%
+ -\zref@extract{#1}{paperheight}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@paper@y@center}
+% \begin{macrocode}
+\def\ZREF@abspos@paper@y@center#1{%
+ \ZREF@abspos@paper@y@top{#1}%
+ -\zref@extract{#1}{paperheight}/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Origin}
+%
+% \begin{macro}{\ZREF@abspos@origin@x}
+% \begin{macrocode}
+\let\ZREF@temp\ltx@two
+\ltx@IfUndefined{pdfhorigin}{}{%
+ \ifpdf
+ \let\ZREF@temp\ltx@zero
+ \fi
+}
+\ifx\ZREF@temp\ltx@two
+ \ifnum\mag=1000 %
+ \let\ZREF@temp\ltx@one
+ \fi
+\fi
+\ifcase\ZREF@temp
+ \def\ZREF@abspos@origin@x#1{%
+ \zref@extract{#1}{pdfhorigin}%
+ }%
+\or
+ \def\ZREF@abspos@origin@x#1{%
+ 4736286%
+ }%
+\or
+ \def\ZREF@abspos@origin@x#1{%
+ \numexpr\mag/1000*\dimexpr 1truein\relax\relax
+ }%
+\fi
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@origin@y}
+% \begin{macrocode}
+\let\ZREF@temp\ltx@two
+\ltx@IfUndefined{pdfvorigin}{}{%
+ \ifpdf
+ \let\ZREF@temp\ltx@zero
+ \fi
+}
+\ifx\ZREF@temp\ltx@two
+ \ifnum\mag=1000 %
+ \let\ZREF@temp\ltx@one
+ \fi
+\fi
+\ifcase\ZREF@temp
+ \def\ZREF@abspos@origin@y#1{%
+ \zref@extract{#1}{pdfvorigin}%
+ }%
+\or
+ \def\ZREF@abspos@origin@y#1{%
+ 4736286%
+ }%
+\or
+ \def\ZREF@abspos@origin@y#1{%
+ \numexpr\mag/1000*\dimexpr 1truein\relax\relax
+ }%
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Header}
+%
+% \begin{macro}{\ZREF@abspos@head@x@left}
+% \begin{macrocode}
+\def\ZREF@abspos@head@x@left#1{%
+ \ZREF@abspos@paper@x@left{#1}%
+ +\ZREF@abspos@origin@x{#1}%
+ +\zref@extract{#1}{hoffset}%
+ +\ifodd\zref@extractdefault{#1}{pagevalue}{\number\c@page} %
+ \zref@extract{#1}{oddsidemargin}%
+ \else
+ \zref@extract{#1}{evensidemargin}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@head@x@right}
+% \begin{macrocode}
+\def\ZREF@abspos@head@x@right#1{%
+ \ZREF@abspos@head@x@left{#1}%
+ +\zref@extract{#1}{textwidth}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@head@x@center}
+% \begin{macrocode}
+\def\ZREF@abspos@head@x@center#1{%
+ \ZREF@abspos@head@x@left{#1}%
+ +\zref@extract{#1}{textwidth}/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@head@y@top}
+% \begin{macrocode}
+\def\ZREF@abspos@head@y@top#1{%
+ \ZREF@abspos@paper@y@top{#1}%
+ -\ZREF@abspos@origin@y{#1}%
+ -\zref@extract{#1}{voffset}%
+ -\zref@extract{#1}{topmargin}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@head@y@bottom}
+% \begin{macrocode}
+\def\ZREF@abspos@head@y@bottom#1{%
+ \ZREF@abspos@head@y@top{#1}%
+ -\zref@extract{#1}{headheight}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@head@y@center}
+% \begin{macrocode}
+\def\ZREF@abspos@head@y@center#1{%
+ \ZREF@abspos@head@y@top{#1}%
+ -\zref@extract{#1}{headheight}/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Body}
+%
+% \begin{macro}{\ZREF@abspos@body@x@left}
+% \begin{macrocode}
+\let\ZREF@abspos@body@x@left\ZREF@abspos@head@x@left
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@body@x@right}
+% \begin{macrocode}
+\let\ZREF@abspos@body@x@right\ZREF@abspos@head@x@right
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@body@x@center}
+% \begin{macrocode}
+\let\ZREF@abspos@body@x@center\ZREF@abspos@head@x@center
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@body@y@top}
+% \begin{macrocode}
+\def\ZREF@abspos@body@y@top#1{%
+ \ZREF@abspos@head@y@bottom{#1}%
+ -\zref@extract{#1}{headsep}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@body@y@bottom}
+% \begin{macrocode}
+\def\ZREF@abspos@body@y@bottom#1{%
+ \ZREF@abspos@body@y@top{#1}%
+ -\zref@extract{#1}{textheight}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@body@y@center}
+% \begin{macrocode}
+\def\ZREF@abspos@body@y@center#1{%
+ \ZREF@abspos@body@y@top{#1}%
+ -\zref@extract{#1}{textheight}/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Footer}
+%
+% \begin{macro}{\ZREF@abspos@foot@x@left}
+% \begin{macrocode}
+\let\ZREF@abspos@foot@x@left\ZREF@abspos@head@x@left
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@foot@x@right}
+% \begin{macrocode}
+\let\ZREF@abspos@foot@x@right\ZREF@abspos@head@x@right
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@foot@x@center}
+% \begin{macrocode}
+\let\ZREF@abspos@foot@x@center\ZREF@abspos@head@x@center
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@foot@y@bottom}
+% \begin{macrocode}
+\def\ZREF@abspos@foot@y@bottom#1{%
+ \ZREF@abspos@body@y@bottom{#1}%
+ -\zref@extract{#1}{footskip}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Marginal notes}
+%
+% \begin{macro}{\ZREF@abspos@marginpar@x@left}
+% \begin{macrocode}
+\def\ZREF@abspos@marginpar@x@left#1{%
+ \ifodd\zref@extractdefault{#1}{pagevalue}{\number\c@page} %
+ \ZREF@abspos@body@x@right{#1}%
+ +\zref@extract{#1}{marginparsep}%
+ \else
+ \ZREF@abspos@body@x@left{#1}%
+ -\zref@extract{#1}{marginparsep}%
+ -\zref@extract{#1}{marginparwidth}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@marginpar@x@right}
+% \begin{macrocode}
+\def\ZREF@abspos@marginpar@x@right#1{%
+ \ZREF@abspos@marginpar@x@left{#1}%
+ +\zref@extract{#1}{marginparwidth}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@marginpar@x@center}
+% \begin{macrocode}
+\def\ZREF@abspos@marginpar@x@center#1{%
+ \ZREF@abspos@marginpar@x@left{#1}%
+ +\zref@extract{#1}{marginparwidth}/2%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@marginpar@y@top}
+% \begin{macrocode}
+\let\ZREF@abspos@marginpar@y@top\ZREF@abspos@body@y@top
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@marginpar@y@bottom}
+% \begin{macrocode}
+\let\ZREF@abspos@marginpar@y@bottom\ZREF@abspos@body@y@bottom
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@marginpar@y@center}
+% \begin{macrocode}
+\let\ZREF@abspos@marginpar@y@center\ZREF@abspos@body@y@center
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Stock paper}
+%
+% \begin{macro}{\ZREF@abspos@stock@x@left}
+% \begin{macrocode}
+\let\ZREF@abspos@stock@x@left\ZREF@abspos@paper@x@left
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@stock@x@right}
+% \begin{macrocode}
+\let\ZREF@abspos@stock@x@right\ZREF@abspos@paper@x@right
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@stock@x@center}
+% \begin{macrocode}
+\let\ZREF@abspos@stock@x@center\ZREF@abspos@paper@x@center
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ZREF@abspos@stock@y@top}
+% \begin{macrocode}
+\let\ZREF@abspos@stock@y@top\ZREF@abspos@paper@y@top
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@stock@y@bottom}
+% \begin{macrocode}
+\let\ZREF@abspos@stock@y@bottom\ZREF@abspos@paper@y@bottom
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ZREF@abspos@stock@y@center}
+% \begin{macrocode}
+\let\ZREF@abspos@stock@y@center\ZREF@abspos@paper@y@center
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
%</abspos>
% \end{macrocode}
%
@@ -5223,8 +6028,8 @@ the height difference of the two baselines is
%<*dotfill>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-dotfill}%
- [2011/03/18 v2.21 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -5234,7 +6039,7 @@ the height difference of the two baselines is
% For measuring the width of \cs{zdotfill} we use the features
% provided by module \xmodule{savepos}.
% \begin{macrocode}
-\RequirePackage{zref-savepos}[2011/03/18]
+\RequirePackage{zref-savepos}[2012/04/04]
% \end{macrocode}
% For automatically generated label names we use the unique
% counter of module \xmodule{base}.
@@ -5323,8 +6128,8 @@ the height difference of the two baselines is
%<*env>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-env}%
- [2011/03/18 v2.21 Module env for zref (HO)]%
-\RequirePackage{zref-base}[2011/03/18]
+ [2012/04/04 v2.24 Module env for zref (HO)]%
+\RequirePackage{zref-base}[2012/04/04]
\ifx\ZREF@base@ok Y%
\else
\expandafter\endinput
@@ -5369,7 +6174,7 @@ the height difference of the two baselines is
\NeedsTeXFormat{LaTeX2e}
\nofiles
\documentclass{article}
-\usepackage{zref-base}[2011/03/18]
+\usepackage{zref-base}[2012/04/04]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -5409,7 +6214,7 @@ the height difference of the two baselines is
%<*test-base>
\NeedsTeXFormat{LaTeX2e}
\documentclass{article}
-\usepackage{zref-base,zref-titleref}[2011/03/18]
+\usepackage{zref-base,zref-titleref}[2012/04/04]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -5468,7 +6273,7 @@ the height difference of the two baselines is
%<*test-runs>
\NeedsTeXFormat{LaTeX2e}
\documentclass{article}
-\usepackage{zref-runs}[2011/03/18]
+\usepackage{zref-runs}[2012/04/04]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -5497,7 +6302,7 @@ the height difference of the two baselines is
%<*test-titleref-memoir>
\NeedsTeXFormat{LaTeX2e}
\documentclass{memoir}
-\usepackage{zref-titleref}[2011/03/18]
+\usepackage{zref-titleref}[2012/04/04]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -5761,12 +6566,51 @@ the height difference of the two baselines is
%\end{verbatim}
% \end{quote}
%
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{zref.xml}.
+% \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='zref'>
+ <name>zref</name>
+ <caption>A new reference scheme for LaTeX.</caption>
+ <authorref id='auth:oberdiek'/>
+ <copyright owner='Heiko Oberdiek' year='2006-2012'/>
+ <license type='lppl1.3'/>
+ <version number='2.24'/>
+ <description>
+ This package offers a means to remove the limitation, of only two
+ properties, that is inherent in the way LaTeX&#x2019;s reference system
+ works. The package implements an extensible referencing system,
+ where properties are handled in a more flexible way. It provides
+ an interface for macro programmers to access the new reference
+ scheme and some applications that use it.
+ <p/>
+ The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+ bundle.
+ </description>
+ <documentation details='Package documentation'
+ href='ctan:/macros/latex/contrib/oberdiek/zref.pdf'/>
+ <ctan file='true' path='/macros/latex/contrib/oberdiek/zref.dtx'/>
+ <miktex location='oberdiek'/>
+ <texlive location='oberdiek'/>
+ <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+% \end{macrocode}
+%
% \newcommand*{\bibpackage}[4]{^^A
% \bibitem{#1}
% Package \xpackage{#1}, #2, #3.^^A
% \ifx\\#4\\\else#4\fi\par
% }
-%
+%
% \begin{thebibliography}{99}
% \bibpackage{footmisc}{Robin Fairbairns}{2004/01/23 v5.3a}
% {\CTAN{macros/latex/contrib/footmisc/footmisc.dtx}}
@@ -6016,6 +6860,28 @@ the height difference of the two baselines is
% \item
% Fix for \cs{zref@localaddprop} (probably since v2.19).
% \end{Version}
+% \begin{Version}{2011/10/05 v2.22}
+% \item
+% Documentation fixed for \cs{zref@(local)addprop(s)}.
+% \item
+% Module \xmodule{base}: \cs{zref@def@extract}, \cs{zref@def@extractdefault}
+% added.
+% \item
+% Fix in module \xmodule{pagelayout}: Because of missing \cs{noexpand}
+% commands the values of the pagelayout properties on all pages were
+% the values at package loading.
+% \item
+% Module \xmodule{base}: \cs{zref@showprop} added.
+% \end{Version}
+% \begin{Version}{2011/12/05 v2.23}
+% \item
+% Module \xmodule{savepos}: \cs{zsaveposx} and \cs{zsaveposy} added.
+% \end{Version}
+% \begin{Version}{2012/04/04 v2.24}
+% \item
+% Module \xmodule{titleref}, package \xpackage{titlesec}:
+% some support for class `straight' (\cs{ttl@straight@i}) added.
+% \end{Version}
% \end{History}
%
% \PrintIndex