From 4f711ec63a6c65e74a08a634bc886ee54b2140fe Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 Apr 2010 21:56:00 +0000 Subject: oberdiek update (10apr10) git-svn-id: svn://tug.org/texlive/trunk@17792 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/oberdiek/bookmark.dtx | 28 +- .../texmf-dist/source/latex/oberdiek/catchfile.dtx | 18 +- Master/texmf-dist/source/latex/oberdiek/hologo.dtx | 1262 ++++++++++++++++++++ .../texmf-dist/source/latex/oberdiek/holtxdoc.dtx | 110 +- .../texmf-dist/source/latex/oberdiek/infwarerr.dtx | 29 +- .../texmf-dist/source/latex/oberdiek/ltxcmds.dtx | 69 +- .../texmf-dist/source/latex/oberdiek/oberdiek.ins | 3 +- .../texmf-dist/source/latex/oberdiek/oberdiek.tex | 31 +- .../source/latex/oberdiek/pdftexcmds.dtx | 74 +- Master/texmf-dist/source/latex/oberdiek/zref.dtx | 124 +- 10 files changed, 1526 insertions(+), 222 deletions(-) create mode 100644 Master/texmf-dist/source/latex/oberdiek/hologo.dtx (limited to 'Master/texmf-dist/source/latex/oberdiek') diff --git a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx index 24005447954..efc44290276 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx @@ -81,7 +81,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: bookmark 2010/04/04 v1.11 PDF bookmarks (HO)} +\Msg{* Package: bookmark 2010/04/08 v1.12 PDF bookmarks (HO)} \Msg{************************************************************************} \keepsilent @@ -164,7 +164,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bookmark.drv}% - [2010/04/04 v1.11 PDF bookmarks (HO)]% + [2010/04/08 v1.12 PDF bookmarks (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -194,7 +194,7 @@ and the derived files % \GetFileInfo{bookmark.drv} % % \title{The \xpackage{bookmark} package} -% \date{2010/04/04 v1.11} +% \date{2010/04/08 v1.12} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -573,7 +573,7 @@ and the derived files open, openlevel=2, atend -]{bookmark}[2010/04/04] +]{bookmark}[2010/04/08] \bookmarksetup{color=blue} @@ -676,7 +676,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2010/04/04 v1.11 PDF bookmarks (HO)]% + [2010/04/08 v1.12 PDF bookmarks (HO)]% % \end{macrocode} % % \subsubsection{Requirements} @@ -760,7 +760,7 @@ and the derived files \RequirePackage{kvoptions}[2009/08/13] \RequirePackage{hycolor}[2008/09/08] \RequirePackage{bitset} -\RequirePackage{ltxcmds}[2010/03/01] +\RequirePackage{ltxcmds}[2010/04/08] % \end{macrocode} % % \subsubsection{Package options} @@ -1651,7 +1651,7 @@ and the derived files %<*dvipdfm> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2010/04/04 v1.11 bookmark driver for dvipdfm (HO)]% + [2010/04/08 v1.12 bookmark driver for dvipdfm (HO)]% % \end{macrocode} % % \begin{macro}{\BKM@id} @@ -1824,7 +1824,7 @@ and the derived files %<*vtex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2010/04/04 v1.11 bookmark driver for VTeX (HO)]% + [2010/04/08 v1.12 bookmark driver for VTeX (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -2155,7 +2155,7 @@ and the derived files %<*pdftex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2010/04/04 v1.11 bookmark driver for pdfTeX (HO)]% + [2010/04/08 v1.12 bookmark driver for pdfTeX (HO)]% % \end{macrocode} % % \begin{macro}{\BKM@DO@entry} @@ -2278,7 +2278,7 @@ and the derived files %<*dvips> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2010/04/04 v1.11 bookmark driver for dvips (HO)]% + [2010/04/08 v1.12 bookmark driver for dvips (HO)]% % \end{macrocode} % \begin{macro}{\BKM@PSHeaderFile} % \begin{macrocode} @@ -2297,7 +2297,7 @@ and the derived files %<*dvipsone> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2010/04/04 v1.11 bookmark driver for dvipsone (HO)]% + [2010/04/08 v1.12 bookmark driver for dvipsone (HO)]% % \end{macrocode} % \begin{macro}{\BKM@PSHeaderFile} % \begin{macrocode} @@ -2316,7 +2316,7 @@ and the derived files %<*textures> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2010/04/04 v1.11 bookmark driver for textures (HO)]% + [2010/04/08 v1.12 bookmark driver for textures (HO)]% % \end{macrocode} % \begin{macro}{\BKM@PSHeaderFile} % \begin{macrocode} @@ -3049,6 +3049,10 @@ and the derived files % \item % Bug fix (introduced in v1.10). % \end{Version} +% \begin{Version}{2010/04/08 v1.12} +% \item +% Requires \xpackage{ltxcmds} 2010/04/08. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx index 226a9ffbafa..5067d0ae62f 100644 --- a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx @@ -79,7 +79,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: catchfile 2010/03/01 v1.3 Catches the contents of a file (HO)} +\Msg{* Package: catchfile 2010/04/08 v1.4 Catches the contents of a file (HO)} \Msg{************************************************************************} \keepsilent @@ -158,7 +158,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{catchfile.drv}% - [2010/03/01 v1.3 Catches the contents of a file (HO)]% + [2010/04/08 v1.4 Catches the contents of a file (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -167,7 +167,7 @@ and the derived files % % \fi % -% \CheckSum{589} +% \CheckSum{591} % % \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 @@ -188,7 +188,7 @@ and the derived files % \GetFileInfo{catchfile.drv} % % \title{The \xpackage{catchfile} package} -% \date{2010/03/01 v1.3} +% \date{2010/04/08 v1.4} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -291,7 +291,7 @@ and the derived files \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2010/03/01 v1.3 Catches the contents of a file (HO)] + [2010/04/08 v1.4 Catches the contents of a file (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -412,10 +412,10 @@ and the derived files \csname newread\endcsname\@inputcheck \fi \openin\@inputcheck#1\relax + \expandafter\closein\expandafter\@inputcheck \ifeof\@inputcheck \let\CatchFile@File\relax \else - \closein\@inputcheck \def\CatchFile@File{#1}% \fi }% @@ -624,7 +624,7 @@ and the derived files \nofiles \listfiles \documentclass{minimal} -\usepackage{catchfile}[2010/03/01] +\usepackage{catchfile}[2010/04/08] \makeatletter \def\mysetup{% \let\do\@makeother @@ -877,6 +877,10 @@ and the derived files % \item % Fix for unknown \cs{@PackageErrorNoLine}. % \end{Version} +% \begin{Version}{2010/04/08 v1.4} +% \item +% \cs{closein} also added if \cs{ifeof} is true. +% \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 new file mode 100644 index 00000000000..e73b149cf5f --- /dev/null +++ b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx @@ -0,0 +1,1262 @@ +% \iffalse meta-comment +% +% Copyright (C) 2010 by +% Heiko Oberdiek +% +% 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 hologo.dtx +% and the derived files +% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.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 +% (b) Without hologo.ins: +% tex hologo.dtx +% (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 +% (b) Without hologo.drv: +% latex hologo.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 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:tex/generic/oberdiek/hologo-test1.tex +% TDS:doc/latex/oberdiek/hologo.pdf +% TDS:source/latex/oberdiek/hologo.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 +% +%<*install> +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation} +\Msg{* Package: hologo 2010/04/08 v1.0 Logo collection (HO)} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\let\MetaPrefix\relax +\preamble + +This is a generated file. + +Copyright (C) 2010 by + Heiko Oberdiek + +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 hologo.dtx +and the derived files + hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex. + +\endpreamble +\let\MetaPrefix\DoubleperCent + +\generate{% + \file{hologo.ins}{\from{hologo.dtx}{install}}% + \file{hologo.drv}{\from{hologo.dtx}{driver}}% + \usedir{tex/generic/oberdiek}% + \file{hologo.sty}{\from{hologo.dtx}{package}}% + \file{hologo-test1.tex}{\from{hologo.dtx}{test1}}% +} + +\catcode32=13\relax% active space +\let =\space% +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* files into a directory searched by TeX:} +\Msg{*} +\Msg{* hologo.sty, hologo-test1.tex} +\Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} +\Msg{* To produce the documentation run the file `hologo.drv'} +\Msg{* through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +% +%<*ignore> +\fi +% +%<*driver> +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{hologo.drv}% + [2010/04/08 v1.0 Logo collection (HO)]% +\documentclass{ltxdoc} +\usepackage{holtxdoc}[2008/08/11] +\usepackage{hologo}[2010/04/08] +\usepackage{longtable} +\usepackage{array} +\begin{document} + \DocInput{hologo.dtx}% +\end{document} +% +% \fi +% +% \CheckSum{810} +% +% \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{hologo.drv} +% +% \title{The \xpackage{hologo} package} +% \date{2010/04/08 v1.0} +% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} +% +% \maketitle +% +% \begin{abstract} +% This package starts a collection of logos with support for bookmarks +% strings. +% \end{abstract} +% +% \tableofcontents +% +% \section{Documentation} +% +% \begin{declcs}{hologo} \M{name} +% \end{declcs} +% Macro \cs{hologo} sets the logo with name \meta{name}. +% The following table shows the supported names. +% +% \tracingmacros=1 +% \newcommand*{\entry}{} +% \def\entry#1[#2]{#1&\hologo{#1}\tabularnewline} +% \begin{longtable}{>{\ttfamily}lll} +% \rmfamily\bfseries{name} & \bfseries logo & \bfseries since\\ +% \hline +% \endhead +% \entry{eTeX}[2010/04/08] +% \entry{LaTeX}[2010/04/08] +% \entry{LaTeX2e}[2010/04/08] +% \entry{LaTeXe}[2010/04/08] +% \entry{LuaLaTeX}[2010/04/08] +% \entry{LuaTeX}[2010/04/08] +% \entry{pdfTeX}[2010/04/08] +% \entry{pdfLaTeX}[2010/04/08] +% \entry{plainTeX}[2010/04/08] +% \entry{TeX}[2010/04/08] +% \entry{XeLaTeX}[2010/04/08] +% \entry{XeTeX}[2010/04/08] +% \end{longtable} +% +% \StopEventually{ +% } +% +% \section{Implementation} +% \begin{macrocode} +%<*package> +% \end{macrocode} +% Reload check, especially if the package is not used with \LaTeX. +% \begin{macrocode} +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } + \expandafter\let\expandafter\x\csname ver@hologo.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 + \catcode35 6 % # + \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{hologo}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup +% \end{macrocode} +% Package identification: +% \begin{macrocode} +\begingroup + \catcode35 6 % # + \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@hologo.sty\endcsname +\ProvidesPackage{hologo}% + [2010/04/08 v1.0 Logo collection (HO)] +% \end{macrocode} +% +% \begin{macrocode} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname HOLOGO@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # +\catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } +\def\TMP@EnsureCode#1#2{% + \edef\HOLOGO@AtEnd{% + \HOLOGO@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{59}{12}% ; +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{63}{12}% ? +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{95}{8}% _ (subscript) +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{124}{12}% | +\edef\HOLOGO@AtEnd{% + \HOLOGO@AtEnd + \escapechar\the\escapechar\relax + \noexpand\endinput +} +\escapechar=92 % +% \end{macrocode} +% +% \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 pdftexcmds.sty\relax + \input ifpdf.sty\relax + \input ifluatex.sty\relax + \input ifxetex.sty\relax + \input ifvtex.sty\relax +\else + \RequirePackage{ltxcmds}[2010/04/08]% + \RequirePackage{infwarerr}[2010/04/08]% + \RequirePackage{kvsetkeys}[2010/03/01]% + \RequirePackage{pdftexcmds}[2010/04/01]% + \RequirePackage{ifpdf}[2010/01/28]% + \RequirePackage{ifluatex}[2010/03/01]% + \RequirePackage{ifxetex}[2009/01/23]% + \RequirePackage{ifvtex}[2010/03/01]% +\fi +% \end{macrocode} +% +% \begin{macro}{\HOLOGO@IfDefined} +% \begin{macrocode} +\def\HOLOGO@IfExists#1{% + \ifx\@undefined#1% + \expandafter\ltx@secondoftwo + \else + \ifx\relax#1% + \expandafter\ltx@secondoftwo + \else + \expandafter\expandafter\expandafter\ltx@firstoftwo + \fi + \fi +} +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{hologo}} +% +% \begin{macrocode} +\HOLOGO@IfExists\hologo{% + \@PackageError{hologo}{% + \string\hologo\ltx@space is already defined.\MessageBreak + Package loading is aborted% + }\@ehc + \HOLOGO@AtEnd +} +\HOLOGO@IfExists\hologorobust{% + \@PackageError{hologo}{% + \string\hologorobust\ltx@space is already defined.\MessageBreak + Package loading is aborted% + }\@ehc + \HOLOGO@AtEnd +} +% \end{macrocode} +% +% \begin{macro}{\hologorobust} +% \begin{macrocode} +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\hologorobust#1% + }{% + \DeclareRobustCommand*\hologorobust[1]% + }% +}{% + \protected\def\hologorobust#1% +}% +{% + \ltx@ifundefined{HoLogo@#1}{% + \@PackageError{hologo}{% + Unknown logo `#1'% + }\@ehc + ?#1?% + }{% + \csname HoLogo@#1\endcsname + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\hologo} +% \begin{macrocode} +\def\hologo#1{% + \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo + {% + \hologorobust{#1}% + }{% + \ltx@ifundefined{HoLogoBkm@#1}{% + \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + }{% + \csname HoLogoBkm@#1\endcsname + }% + }% +} +% \end{macrocode} +% \end{macro} +% +% \subsection{Helpers} +% +% \begin{macro}{\HOLOGO@PdfdocUnicode} +% \begin{macrocode} +\def\HOLOGO@PdfdocUnicode{% + \ifx\ifHy@unicode\iftrue + \expandafter\ltx@secondoftwo + \else + \expandafter\ltx@firstoftwo + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HOLOGO@Math} +% \begin{macrocode} +\def\HOLOGO@MathSetup{% + \mathsurround0pt\relax + \HOLOGO@IfExists\f@series{% + \if b\expandafter\ltx@car\f@series x\@nil + \csname boldmath\endcsname + \fi + }{}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HOLOGO@TempDimen} +% \begin{macrocode} +\dimendef\HOLOGO@TempDimen=\ltx@zero +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@NegativeKerning} +% \begin{macrocode} +\def\HOLOGO@NegativeKerning#1{% + \begingroup + \HOLOGO@TempDimen=0pt\relax + \comma@parse@normalized{#1}{% + \ifdim\HOLOGO@TempDimen=0pt % + \expandafter\HOLOGO@@NegativeKerning\comma@entry + \fi + \ltx@gobble + }% + \ifdim\HOLOGO@TempDimen<0pt % + \kern\HOLOGO@TempDimen + \fi + \endgroup +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@@NegativeKerning} +% \begin{macrocode} +\def\HOLOGO@@NegativeKerning#1#2{% + \setbox\ltx@zero\hbox{#1#2}% + \HOLOGO@TempDimen=\wd\ltx@zero + \setbox\ltx@zero\hbox{#1\kern0pt#2}% + \advance\HOLOGO@TempDimen by -\wd\ltx@zero +} +% \end{macrocode} +% \end{macro} +% +% +% \subsection{\hologo{TeX} and friends} +% +% \subsubsection{\hologo{TeX}} +% +% \begin{macro}{\HoLogo@TeX} +% Source: \hologo{LaTeX} kernel. +% \begin{macrocode} +\def\HoLogo@TeX{% + T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000 % +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{plainTeX}} +% +% \begin{macro}{\HoLogo@plainTeX} +% Source: ``The \hologo{TeX}book'' +% \begin{macrocode} +\def\HoLogo@plainTeX{% + plain \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@plainTeX} +% \begin{macrocode} +\def\HoLogoBkm@plainTeX{% + plain \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{LaTeX}} +% +% \begin{macro}{\HoLogo@LaTeX} +% Source: \hologo{LaTeX} kernel. +% \begin{macrocode} +\def\HoLogo@LaTeX{% + L% + \kern-.36em% + \begingroup + \setbox\ltx@zero\hbox{T}% + \vbox to\ht\ltx@zero{% + \hbox{% + \ltx@ifundefined{check@mathfonts}{% + \csname sevenrm\endcsname + }{% + \check@mathfonts + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + }% + A% + }% + \vss + }% + \endgroup + \kern-.15em% + \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{LaTeXe}} +% +% \begin{macro}{\HoLogo@LaTeXe} +% Source: \hologo{LaTeX} kernel +% \begin{macrocode} +\def\HoLogo@LaTeXe{% + \hologo{LaTeX}% + \kern.15em% + \hbox{% + \HOLOGO@MathSetup + 2% + $_{\textstyle\varepsilon}$% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogoBkm@LaTeXe} +% \begin{macrocode} +\def\HoLogoBkm@LaTeXe{% + \hologo{LaTeX}% + 2% + \HOLOGO@PdfdocUnicode{e}{\textepsilon}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@LaTeX2e} +% \begin{macrocode} +\expandafter\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@LaTeX2e} +% \begin{macrocode} +\expandafter\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{eTeX}} +% +% \begin{macro}{\HoLogo@eTeX} +% Source: package \xpackage{etex} +% \begin{macrocode} +\def\HoLogo@eTeX{% + \leavevmode + \hbox{% + \HOLOGO@MathSetup + $\varepsilon$% + -% + \HOLOGO@NegativeKerning{-T,T-,To}% + \hologo{TeX}% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HoLogoBkm@eTeX} +% \begin{macrocode} +\def\HoLogoBkm@eTeX{% + \HOLOGO@PdfdocUnicode{e}{\textepsilon}% + -% + \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{LuaTeX}} +% +% \begin{macro}{\HoLogo@LuaTeX} +% The kerning is an idea of Hans Hagen, see mailing list +% `luatex at tug dot org' in March 2010. +% \begin{macrocode} +\def\HoLogo@LuaTeX{% + Lua% + \HOLOGO@NegativeKerning{aT,oT,To}% + \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{LuaLaTeX}} +% +% \begin{macro}{\HoLogo@LuaLaTeX} +% \begin{macrocode} +\def\HoLogo@LuaLaTeX{% + Lua% + \hologo{LaTeX}% +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{XeTeX}, \hologo{XeLaTeX}} +% +% \begin{macro}{\HoLogo@Xe} +% Source: package \xpackage{dtklogos} +% \begin{macrocode} +\def\HoLogo@Xe{% + X% + \kern-.1em\relax + \ltx@IfUndefined{HOLOGO@ReflectBox}\ltx@firstoftwo{% + \ltx@IfUndefined{HOLOGO@ReflectBox@\hologodriver}% + \ltx@firstoftwo\ltx@secondoftwo + }% + {e}{% + \lower.5ex\hbox{% + \HOLOGO@ReflectBox{E}% + }% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@XeTeX} +% \begin{macrocode} +\def\HoLogo@XeTeX{% + \hologo{Xe}% + \kern-.15em\relax + \hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogoBkm@XeTeX} +% \begin{macrocode} +\def\HoLogoBkm@XeTeX{XeTeX} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@XeLaTeX} +% \begin{macrocode} +\def\HoLogo@XeLaTeX{% + \hologo{Xe}% + \hologo{LaTeX}% +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{\hologo{pdfTeX}, \hologo{pdfLaTeX}} +% +% \begin{macro}{\HoLogo@pdfTeX} +% \begin{macrocode} +\def\HoLogo@pdfTeX{% + pdf\hologo{TeX}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HoLogo@pdfLaTeX} +% \begin{macrocode} +\def\HoLogo@pdfLaTeX{% + pdf\hologo{LaTeX}% +} +% \end{macrocode} +% \end{macro} +% +% \subsection{Driver detection} +% +% \begin{macrocode} +\HOLOGO@IfExists\InputIfFileExists{% + \InputIfFileExists{hologo.cfg}{}{}% +}{% + \ltx@IfUndefined{pdf@filesize}{% + \chardef\HOLOGO@temp=15 % + \def\HOLOGO@CheckRead{% + \ifeof\HOLOGO@temp + \else + \ifcase\HOLOGO@temp + \csname newread\endcsname\HOLOGO@temp + \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 + \fi + \fi + }% + \ifeof\HOLOGO@temp + \@PackageWarningNoLine{hologo}{% + Configuration file ignored, because\MessageBreak + a free read register could not be found% + }% + \else + \openin\HOLOGO@temp=hologo.cfg\relax + \ifeof\HOLOGO@temp + \closein\HOLOGO@temp + \else + \closein\HOLOGO@temp + \input hologo.cfg\relax + \fi + \fi + }{% + \edef\HOLOGO@temp{\pdf@filesize{hologo.cfg}}% + \ifx\HOLOGO@temp\ltx@empty + \else + \input hologo.cfg\relax + \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 + }% + \ProcessOptions*% +} +% \end{macrocode} +% +% \begin{macro}{\hologodriver} +% \begin{macrocode} +\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}{% + \@PackageWarningNoLine{hologo}{% + Cannot find \string\pdfliteral + }% + }{}% +\else + \ifxetex + \def\hologodriver{xetex}% + \else + \ifvtex + \def\hologodriver{vtex}% + \fi + \fi +\fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@ReflectBox} +% \begin{macrocode} +\ltx@IfUndefined{reflectbox}{}{% + \def\HOLOGO@ReflectBox{% + \reflectbox + }% + \HOLOGO@AtEnd +} +\ltx@ifundefined{hologodriver}{% + \def\hologodriver{dvips}% + \@PackageInfoNoLine{hologo}{Using default driver `\hologodriver'}% +}{% + \@PackageInfoNoLine{hologo}{Using driver `\hologodriver'}% +} +\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}% + }% + }% + \wd\ltx@two=\wd\ltx@zero + \box\ltx@two + \endgroup + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +\def\HOLOGO@temp#1{% + \begingroup + \def\x{#1}% + \expandafter\endgroup + \ifx\x\hologodriver + \expandafter\ltx@firstofone + \else + \expandafter\ltx@gobble + \fi +} +% \end{macrocode} +% \begin{macro}{\HOLOGO@ReflectBox@pdftex} +% \begin{macrocode} +\HOLOGO@temp{pdftex}{% + \def\HOLOGO@ReflectBox@pdftex#1{% + \HOLOGO@pdfliteral{% + q -1 0 0 1 0 0 cm% + }% + #1% + \HOLOGO@pdfliteral{% + Q% + }% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@ReflectBox@dvips} +% \begin{macrocode} +\HOLOGO@temp{dvips}{% + \def\HOLOGO@ReflectBox@dvips#1{% + \special{ps:% + gsave % + currentpoint % + currentpoint translate % + -1 1 scale % + neg exch neg exch translate% + }% + #1% + \special{ps:% + currentpoint % + grestore % + moveto% + }% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@ReflectBox@dvipdfm} +% \begin{macrocode} +\HOLOGO@temp{dvipdfm}{% + \let\HOLOGO@ReflectBox@dvipdfm\HOLOGO@ReflectBox@dvips +} +% \end{macrocode} +% \end{macro} +% Since \hologo{XeTeX} v0.6. +% \begin{macro}{\HOLOGO@ReflectBox@xetex} +% \begin{macrocode} +\HOLOGO@temp{xetex}{% + \def\HOLOGO@ReflectBox@xetex#1{% + \special{x:gsave}% + \special{x:scale -1 1}% + #1% + \special{x:grestore}% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HOLOGO@ReflectBox@vtex} +% \begin{macrocode} +\HOLOGO@temp{vtex}{% + \def\HOLOGO@ReflectBox@vtex#1{% + \special{r(-1,0,0,1,0,0}% + #1% + \special{r)}% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\HOLOGO@AtEnd +% +% \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 +} +\expandafter\ifx\csname LoadCommand\endcsname\relax + \def\LoadCommand{\input hologo.sty\relax}% +\fi +\def\Test{% + \RangeCatcodeInvalid{0}{47}% + \RangeCatcodeInvalid{58}{64}% + \RangeCatcodeInvalid{91}{96}% + \RangeCatcodeInvalid{123}{255}% + \catcode`\@=12 % + \catcode`\\=0 % + \catcode`\{=1 % + \catcode`\}=2 % + \catcode`\#=6 % + \catcode`\[=12 % + \catcode`\]=12 % + \catcode`\%=14 % + \catcode`\ =10 % + \catcode13=5 % + \LoadCommand + \RestoreCatcodes +} +\Test +\csname @@end\endcsname +\end +% \end{macrocode} +% \begin{macrocode} +% +% \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/hologo.dtx}] The source file. +% \item[\CTAN{macros/latex/contrib/oberdiek/hologo.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 hologo.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@{}} +% hologo.sty & tex/generic/oberdiek/hologo.sty\\ +% hologo-test1.tex & tex/generic/oberdiek/hologo-test1.tex\\ +% hologo.pdf & doc/latex/oberdiek/hologo.pdf\\ +% hologo.dtx & source/latex/oberdiek/hologo.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 hologo.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{hologo.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 hologo.dtx +%makeindex -s gind.ist hologo.idx +%pdflatex hologo.dtx +%makeindex -s gind.ist hologo.idx +%pdflatex hologo.dtx +%\end{verbatim} +% \end{quote} +% +% \begin{History} +% \begin{Version}{2010/04/08 v1.0} +% \item +% The first version. +% \end{Version} +% \end{History} +% +% \PrintIndex +% +% \Finale +\endinput diff --git a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx index 6b7e6582022..44287c5d7b3 100644 --- a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx @@ -71,7 +71,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: holtxdoc 2010/04/03 v0.16 Private additional ltxdoc support (HO)} +\Msg{* Package: holtxdoc 2010/04/08 v0.17 Private additional ltxdoc support (HO)} \Msg{************************************************************************} \keepsilent @@ -141,7 +141,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{holtxdoc.drv}% - [2010/04/03 v0.16 Private additional ltxdoc support (HO)]% + [2010/04/08 v0.17 Private additional ltxdoc support (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -150,7 +150,7 @@ and the derived files % % \fi % -% \CheckSum{406} +% \CheckSum{338} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -171,7 +171,7 @@ and the derived files % \GetFileInfo{holtxdoc.drv} % % \title{The \xpackage{holtxdoc} package} -% \date{2010/04/03 v0.16} +% \date{2010/04/08 v0.17} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -211,13 +211,16 @@ and the derived files % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2010/04/03 v0.16 Private additional ltxdoc support (HO)] + [2010/04/08 v0.17 Private additional ltxdoc support (HO)] % \end{macrocode} % % \begin{macrocode} +\PassOptionsToPackage{pdfencoding=auto}{hyperref} \RequirePackage[numbered]{hypdoc}[2010/03/26] +\RequirePackage{hyperref}[2010/03/30] \RequirePackage{pdftexcmds}[2010/04/01] \RequirePackage{ltxcmds}[2010/03/09] +\RequirePackage{hologo}[2010/04/08] \RequirePackage{array} % \end{macrocode} % @@ -424,93 +427,18 @@ and the derived files % \subsection{Names} % % \begin{macrocode} -\providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}} -\providecommand*{\pdfTeX}{pdf\TeX} -\providecommand*{\pdfLaTeX}{pdf\LaTeX} -% \end{macrocode} -% \begin{macro}{\LuaTeX} -% Hans Hagen has suggested to improve the `aT' kerning -% in the mailing list `luatex at tug.org' at 2010-03-09 19:59: -% \begin{quote} -% Actually we can make a nice definition using the RL typesetting -% \dots\ as not that many fonts have a proper `aT' kerning we can -% do the following: -%\begin{verbatim} -%\def\LuaTeX -% {\begingroup -% Lua% -% \setbox0\hbox{oT}% -% \setbox2\hbox{o\kern0ptT}% -% \ifdim\wd0=\wd2 -% \setbox0\hbox dir TRT{To}% -% \setbox2\hbox{T\kern0pto}% -% \hskip\dimexpr\wd0-\wd2\relax -% \fi -% \TeX -% \endgroup} -%\end{verbatim} -% Of course this ignores the fact that the a is not symmetrical which -% is why we use the o instead but it looks impressive (as the `T' -% normally is symmetrical we don't really need the need the dir). -%\end{quote} -% \begin{macrocode} -\providecommand*{\LuaTeX}{% - \begingroup - Lua% - \setbox0\hbox{aT}% - \setbox2\hbox{a\kern0ptT}% - \ifdim\wd0<\wd2 % - \else - \setbox0\hbox{oT}% - \setbox2\hbox{o\kern0ptT}% - \ifdim\wd0<\wd2 % - \else - \setbox0\hbox{To}% - \setbox2\hbox{T\kern0pto}% - \fi - \ifdim\wd0<\wd2 % - \dimen0=\wd0 % - \advance\dimen0-\wd2 % - \kern\dimen0 % - \fi - \fi - \TeX - \endgroup -} -% \end{macrocode} -% \end{macro} -% \begin{macrocode} -\def\@temp#1#2{% - \@ifundefined{\expandafter\@gobble\string#1}{% - \DeclareRobustCommand*{#1}{% - \texorpdfstring{% - \begingroup - X% - \kern-.1em\relax - \@ifundefined{rotatebox}{e}{% - \lower0.5ex\hbox{% - \setbox0=\hbox{E}% - \dimen0=\ht0 % - \advance\dimen0 by \dp0 % - \raise\dimen0\hbox{\rotatebox{180}{\box0}}% - }% - }% - }{Xe}% - \ifx\TeX#2\relax - \kern-.15em\relax - \fi - #2% - \endgroup - }% - }{}% -} -\@temp\XeTeX\TeX -\@temp\XeLaTeX\LaTeX +\def\eTeX{\hologo{eTeX}} +\def\pdfTeX{\hologo{pdfTeX}} +\def\pdfLaTeX{\hologo{pdfLaTeX}} +\def\LuaTeX{\hologo{LuaTeX}} +\def\LuaLaTeX{\hologo{LuaLaTeX}} +\def\XeTeX{\hologo{XeTeX}} +\def\XeLaTeX{\hologo{XeLaTeX}} +\def\plainTeX{\hologo{plainTeX}} \providecommand*{\teTeX}{te\TeX} \providecommand*{\mikTeX}{mik\TeX} \providecommand*{\MakeIndex}{\textsl{MakeIndex}} \providecommand*{\docstrip}{\textsf{docstrip}} -\providecommand*{\plainTeX}{\mbox{plain-\TeX}} \providecommand*{\iniTeX}{\mbox{ini-\TeX}} \providecommand*{\VTeX}{V\TeX} % \end{macrocode} @@ -787,6 +715,12 @@ and the derived files % \item % Use date and time of \xext{dtx} file. % \end{Version} +% \begin{Version}{2010/04/08 v0.17} +% \item +% Option \xoption{pdfencoding=auto} added for package \xpackage{hyperref}. +% \item +% Package \xpackage{hologo} added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx index ec433bdbfe9..97338751b90 100644 --- a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007 by +% Copyright (C) 2007, 2010 by % Heiko Oberdiek % % This work may be distributed and/or modified under the @@ -79,7 +79,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: infwarerr 2007/09/09 v1.2 Providing info/warning/message (HO)} +\Msg{* Package: infwarerr 2010/04/08 v1.3 Providing info/warning/message (HO)} \Msg{************************************************************************} \keepsilent @@ -90,7 +90,7 @@ This is a generated file. -Copyright (C) 2007 by +Copyright (C) 2007, 2010 by Heiko Oberdiek This work may be distributed and/or modified under the @@ -158,7 +158,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{infwarerr.drv}% - [2007/09/09 v1.2 Providing info/warning/message (HO)]% + [2010/04/08 v1.3 Providing info/warning/message (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -167,7 +167,7 @@ and the derived files % % \fi % -% \CheckSum{796} +% \CheckSum{799} % % \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 @@ -188,7 +188,7 @@ and the derived files % \GetFileInfo{infwarerr.drv} % % \title{The \xpackage{infwarerr} package} -% \date{2007/09/09 v1.2} +% \date{2010/04/08 v1.3} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -303,7 +303,7 @@ and the derived files \fi \expandafter\x\csname ver@infwarerr.sty\endcsname \ProvidesPackage{infwarerr}% - [2007/09/09 v1.2 Providing info/warning/message (HO)] + [2010/04/08 v1.3 Providing info/warning/message (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -498,6 +498,7 @@ and the derived files \def\@spaces{\space\space\space\space}% \def\MessageBreak{^^J#1}% \newlinechar=10 % + \escapechar=92 % \immediate\write-1{#2\on@line.}% \endgroup } @@ -513,6 +514,7 @@ and the derived files \def\@spaces{\space\space\space\space}% \def\MessageBreak{^^J#1}% \newlinechar=10 % + \escapechar=92 % \immediate\write\InfWarErr@unused{^^J#2\on@line.^^J}% \endgroup } @@ -525,13 +527,14 @@ and the derived files \InfWarErr@protected\def\InfWarErr@GenericError#1#2#3#4{% \begingroup \immediate\write\InfWarErr@unused{}% - \newlinechar=10 % \def\space{ }% \def\@spaces{\space\space\space\space}% \let\@ehc\InfWarErr@ehc \let\@ehd\InfWarErr@ehd \let\on@line\InfWarErr@online \def\MessageBreak{^^J}% + \newlinechar=10 % + \escapechar=92 % \edef\InfWarErr@help{\noexpand\errhelp{#4}}% \InfWarErr@help \def\MessageBreak{^^J#1}% @@ -747,7 +750,7 @@ and the derived files \let\OrgWrite\write \chardef\WriteUnused=16 % \def\msg#{\immediate\OrgWrite\WriteUnused} -\msg{File: infwarerr-test2.tex 2007/09/09 v1.2 Test file for plain-TeX} +\msg{File: infwarerr-test2.tex 2010/04/08 v1.3 Test file for plain-TeX} \catcode64=11 % % % \end{macrocode} @@ -755,8 +758,8 @@ and the derived files % \begin{macrocode} %<*test3> \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{infwarerr-test3.tex}[2007/09/09 v1.2 Test file for LaTeX] -\RequirePackage{infwarerr}[2007/09/09] +\ProvidesFile{infwarerr-test3.tex}[2010/04/08 v1.3 Test file for LaTeX] +\RequirePackage{infwarerr}[2010/04/08] \makeatletter \let\OrgWrite\write \chardef\WriteUnused=\@unused @@ -1146,6 +1149,10 @@ and the derived files % \item % Catcode section extended. % \end{Version} +% \begin{Version}{2010/04/08 v1.3} +% \item +% Ensure \cs{escapechar}=92 (backslash) for infos/warnings/errors. +% \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 55e941573ae..45d0174d420 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx @@ -76,7 +76,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: ltxcmds 2010/03/09 v1.4 LaTeX kernel commands for general use (HO)} +\Msg{* Package: ltxcmds 2010/04/08 v1.5 LaTeX kernel commands for general use (HO)} \Msg{************************************************************************} \keepsilent @@ -152,7 +152,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltxcmds.drv}% - [2010/03/09 v1.4 LaTeX kernel commands for general use (HO)]% + [2010/04/08 v1.5 LaTeX kernel commands for general use (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage{zref-savepos} @@ -162,7 +162,7 @@ and the derived files % % \fi % -% \CheckSum{679} +% \CheckSum{705} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -183,7 +183,7 @@ and the derived files % \GetFileInfo{ltxcmds.drv} % % \title{The \xpackage{ltxcmds} package} -% \date{2010/03/09 v1.4} +% \date{2010/04/08 v1.5} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -259,6 +259,20 @@ and the derived files % \cs{ltx@cdr} \M{1} \dots \cs{@nil} \TO \dots\\ % \end{declcs} % +% \begin{declcs}{ltx@cartwo} \M{1} \M{2} \dots \cs{@nil} \TO \meta{1}\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@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@cdrfour} \M{1} \M{2} \M{3} \M{4} \dots \cs{@nil} \TO \dots\\ +% \end{declcs} +% % \subsection{Tail recursion} % % \begin{declcs}{ltx@ReturnAfterFi} \M{1} \cs{fi} \TO \cs{fi} \meta{1}\\ @@ -478,7 +492,7 @@ and the derived files \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2010/03/09 v1.4 LaTeX kernel commands for general use (HO)] + [2010/04/08 v1.5 LaTeX kernel commands for general use (HO)] % \end{macrocode} % % \begin{macrocode} @@ -597,16 +611,49 @@ and the derived files % \end{macrocode} % \end{macro} % +% \begin{macro}{\ltx@cartwo} +% \begin{macrocode} +\long\def\ltx@cartwo#1#2#3\@nil{#1#2} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltx@cdrtwo} +% \begin{macrocode} +\long\def\ltx@cdrtwo#1#2#3\@nil{#3} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\ltx@carthree} +% \begin{macrocode} +\long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltx@cdrthree} +% \begin{macrocode} +\long\def\ltx@cdrthree#1#2#3#4\@nil{#4} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\ltx@carfour} +% \begin{macrocode} +\long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltx@cdrfour} +% \begin{macrocode} +\long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5} +% \end{macrocode} +% \end{macro} +% % \subsection{Tail recursion} % % \begin{macro}{\ltx@ReturnAfterFi} % \begin{macrocode} -\long\def\ltx@ReturnAfterFi#1\fi{#1} +\long\def\ltx@ReturnAfterFi#1\fi{\fi#1} % \end{macrocode} % \end{macro} % \begin{macro}{\ltx@ReturnAfterElseFi} % \begin{macrocode} -\long\def\ltx@ReturnAfterFi#1\else#2\fi{#1} +\long\def\ltx@ReturnAfterElseFi#1\else#2\fi{\fi#1} % \end{macrocode} % \end{macro} % @@ -1302,6 +1349,14 @@ and the derived files % \cs{ltx@pkgextension} and \cs{ltx@clsextension} are hardcoded to % avoid trouble with \cs{@onlypreamble}. % \end{Version} +% \begin{Version}{2010/04/08 v1.5} +% \item +% \cs{ltx@cartwo}, \cs{ltx@cdrtwo}, +% \cs{ltx@carthree}, \cs{ltx@cdrthree}, +% \cs{ltx@carfour}, \cs{ltx@cdrfour} added. +% \item +% \cs{ltx@ReturnAfterFi} and \cs{ltx@ReturnAfterElseFi} fixed. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index 6dfa260e98a..52addc76258 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2010/04/04 +% 2010/04/09 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek @@ -49,6 +49,7 @@ \batchinput{gettitlestring.dtx} \batchinput{grfext.dtx} \batchinput{grffile.dtx} +\batchinput{hologo.dtx} \batchinput{holtxdoc.dtx} \batchinput{hycolor.dtx} \batchinput{hypbmsec.dtx} diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 5a67ec2d008..900757dd665 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,9 +6,9 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{heiko.oberdiek at googlemail.com} -\newcommand*{\Date}{2010/04/04} +\newcommand*{\Date}{2010/04/09} -% Copyright (C) 2006 by +% Copyright (C) 2006-2010 by % Heiko Oberdiek % % This work may be distributed and/or modified under the @@ -35,6 +35,7 @@ \usepackage{longtable} \usepackage{color} \usepackage[ngerman,english]{babel} +\usepackage{hologo} \definecolor{link}{rgb}{1,0,0}% red \definecolor{file}{rgb}{0,0,1}% blue @@ -59,6 +60,7 @@ urlcolor=url, linkcolor=link, } +\usepackage{bookmark} \usepackage{hypdestopt} \setcounter{tocdepth}{1} \setcounter{secnumdepth}{1} @@ -186,9 +188,9 @@ [\entrysep] \entry{bmpsize}{2009/09/04}{1.6}{Extract size and resolution data from bitmap files}% [\entrysep] -\entry{bookmark}{2010/04/04}{1.11}{PDF bookmarks}% +\entry{bookmark}{2010/04/08}{1.12}{PDF bookmarks}% [\entrysep] -\entry{catchfile}{2010/03/01}{1.3}{Catches the contents of a file}% +\entry{catchfile}{2010/04/08}{1.4}{Catches the contents of a file}% [\entrysep] \entry{centernot}{2010/03/29}{1.2}{Centers the not symbol horizontally}% [\entrysep] @@ -216,7 +218,9 @@ [\entrysep] \entry{grffile}{2010/01/28}{1.11}{Extended file name support for graphics}% [\entrysep] -\entry{holtxdoc}{2010/04/03}{0.16}{Private additional ltxdoc support}% +\entry{hologo}{2010/04/08}{1.0}{Logo collection}% +[\entrysep] +\entry{holtxdoc}{2010/04/08}{0.17}{Private additional ltxdoc support}% [\entrysep] \entry{hycolor}{2009/12/12}{1.6}{Color options of hyperref/bookmark}% [\entrysep] @@ -242,7 +246,7 @@ [\entrysep] \entry{ifvtex}{2010/03/01}{1.5}{Switches for detecting VTeX and its modes}% [\entrysep] -\entry{infwarerr}{2007/09/09}{1.2}{Providing info/warning/message}% +\entry{infwarerr}{2010/04/08}{1.3}{Providing info/warning/message}% [\entrysep] \entry{inputenx}{2010/01/11}{1.6}{Enhanced input encoding handling}% [\entrysep] @@ -258,7 +262,7 @@ [\entrysep] \entry{listingsutf8}{2007/11/11}{1.1}{Adding support for UTF-8 to listings}% [\entrysep] -\entry{ltxcmds}{2010/03/09}{1.4}{\LaTeX{} kernel commands for general use}% +\entry{ltxcmds}{2010/04/08}{1.5}{\LaTeX{} kernel commands for general use}% [\entrysep] \entry{luacolor}{2010/03/09}{1.2}{Coloring based on LuaTeX's node attributes}% [\entrysep] @@ -330,7 +334,7 @@ [\entrysep] \entry{uniquecounter}{2009/12/18}{1.1}{Provides unlimited unique counter}% [\entrysep] -\entry{zref}{2010/03/29}{2.9}{New reference scheme for \LaTeXe{}}% +\entry{zref}{2010/04/08}{2.10}{New reference scheme for \LaTeXe{}}% \end{overview} \section{Packages} @@ -619,6 +623,15 @@ contain spaces. \end{abstract} \tocinclude{grffile} +\newpage +\subsection{\pkgsectformat{hologo}} +\label{hologo} +\begin{abstract} +This package starts a collection of logos with support for bookmarks +strings. +\end{abstract} +\tocinclude{hologo} + \newpage \subsection{\pkgsectformat{holtxdoc}} \label{holtxdoc} @@ -997,7 +1010,7 @@ provides an interface for setting these parameters. \subsection{\pkgsectformat{pdftexcmds}} \label{pdftexcmds} \begin{abstract} -\LuaTeX\ provides most of the commands of \pdfTeX\ 1.40. However +\hologo{LuaTeX} provides most of the commands of \hologo{pdfTeX} 1.40. However a number of utility functions are removed. This package tries to fill the gap and implements some of the missing primitive using Lua. \end{abstract} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx index 3d8813d1d44..52752d99621 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx @@ -206,7 +206,7 @@ and the derived files % \maketitle % % \begin{abstract} -% \LuaTeX\ provides most of the commands of \pdfTeX\ 1.40. However +% \hologo{LuaTeX} provides most of the commands of \hologo{pdfTeX} 1.40. However % a number of utility functions are removed. This package tries to fill % the gap and implements some of the missing primitive using Lua. % \end{abstract} @@ -217,9 +217,9 @@ and the derived files % % \section{Documentation} % -% Some primitives of \pdfTeX\ are not defined by \LuaTeX. +% Some primitives of \hologo{pdfTeX} are not defined by \hologo{LuaTeX}. % This package implements macro based solutions using Lua code -% for the following missing \pdfTeX\ primitives; +% for the following missing \hologo{pdfTeX} primitives; % \begin{compactitem} % \item \cs{pdfstrcmp} % \item \cs{pdfunescapehex} @@ -255,7 +255,7 @@ and the derived files % \end{quote} % \end{itemize} % -% \LuaTeX\ isn't stable yet and thus the status of this package is +% \hologo{LuaTeX} isn't stable yet and thus the status of this package is % \emph{experimental}. Feedback is welcome. % % \subsection{General principles} @@ -263,21 +263,21 @@ and the derived files % \begin{description} % \item[Naming convention:] % Usually this package defines a macro |\pdf@|\meta{cmd} if -% \pdfTeX\ provides |\pdf|\meta{cmd}. +% \hologo{pdfTeX} provides |\pdf|\meta{cmd}. % \item[Arguments:] The order of arguments in |\pdf@|\meta{cmd} -% is the same as for the corresponding primitive of \pdfTeX. -% The arguments are ordinary undelimited \TeX\ arguments, +% is the same as for the corresponding primitive of \hologo{pdfTeX}. +% The arguments are ordinary undelimited \hologo{TeX} arguments, % no \meta{general text} and without additional keywords. % \item[Expandibility:] % The macro |\pdf@|\meta{cmd} is expandable if the -% corresponding \pdfTeX\ primitive has this property. +% corresponding \hologo{pdfTeX} primitive has this property. % Exact two expansion steps are necessary (first is the macro % expansion) except for \cs{pdf@primitive} and \cs{pdf@ifprimitive}. % The latter ones are not macros, but have the direct meaning of the % primitive. -% \item[Without \LuaTeX:] +% \item[Without \hologo{LuaTeX}:] % The macros |\pdf@|\meta{cmd} are mapped to the commands -% of \pdfTeX\ if they are available. Otherwise they are undefined. +% of \hologo{pdfTeX} if they are available. Otherwise they are undefined. % \item[Availability:] % The macros that the packages provides are undefined, if % the necessary primitives are not found and cannot be @@ -301,7 +301,7 @@ and the derived files % \cs{pdf@escapestring} \M{string}\\ % \cs{pdf@escapename} \M{string} % \end{declcs} -% Same as the primitives of \pdfTeX. However \pdfTeX\ does not +% Same as the primitives of \hologo{pdfTeX}. However \hologo{pdfTeX} does not % know about characters with codes 256 and larger. Thus the % string is treated as byte string, characters with more than % eight bits are ignored. @@ -318,7 +318,7 @@ and the derived files % \end{declcs} % Same as |\pdffiledump offset| \meta{offset} |length| \meta{length} % |{|\meta{filename}|}|. Both \meta{offset} and \meta{length} must -% not be empty, but must be a valid \TeX\ number. +% not be empty, but must be a valid \hologo{TeX} number. % % \begin{declcs}{pdf@mdfivesum} \M{string} % \end{declcs} @@ -332,15 +332,15 @@ and the derived files % \begin{declcs}{pdf@shellescape} % \end{declcs} % Same as |\pdfshellescape|. It expands to |1| if external -% commands can be executed and |0| otherwise. In \pdfTeX\ external +% commands can be executed and |0| otherwise. In \hologo{pdfTeX} external % commands must be enabled first by command line option or -% configuration option. In \LuaTeX\ option |--safer| disables +% configuration option. In \hologo{LuaTeX} option |--safer| disables % the execution of external commands. % % \begin{declcs}{pdf@system} \M{cmdline} % \end{declcs} -% It is a wrapper for |\immediate\write18| in \pdfTeX\ or -% |os.execute| in \LuaTeX. +% It is a wrapper for |\immediate\write18| in \hologo{pdfTeX} or +% |os.execute| in \hologo{LuaTeX}. % % In theory |os.execute| % returns a status number. But its meaning is quite @@ -350,13 +350,15 @@ and the derived files % % \begin{declcs}{pdf@primitive} \csi{cmd} % \end{declcs} -% Same as \cs{pdfprimitive} in \pdfTeX\ or \LuaTeX. In \XeTeX\ the +% Same as \cs{pdfprimitive} in \hologo{pdfTeX} or \hologo{LuaTeX}. +% In \hologo{XeTeX} the % primitive is called \cs{primitive}. Despite the current definition % of the command \csi{cmd}, it's meaning as primitive is used. % % \begin{declcs}{pdf@ifprimitive} \csi{cmd} % \end{declcs} -% Same as \cs{ifpdfprimitive} in \pdfTeX\ or \LuaTeX. \XeTeX\ calls +% Same as \cs{ifpdfprimitive} in \hologo{pdfTeX} or +% \hologo{LuaTeX}. \hologo{XeTeX} calls % it \cs{ifprimitive}. It is a switch that checks if the command % \csi{cmd} has it's primitive meaning. % @@ -368,8 +370,8 @@ and the derived files % of \csi{cmd2}, then the argument \meta{true} is executed, otherwise % \meta{false}. The macro \cs{pdf@isprimitive} is expandable. % Internally it checks the result of \cs{meaning} and is therefore -% available for all \TeX\ variants, even the original \TeX. -% Example with \LaTeX: +% available for all \hologo{TeX} variants, even the original \hologo{TeX}. +% Example with \hologo{LaTeX}: %\begin{quote} %\begin{verbatim} %\makeatletter @@ -390,11 +392,11 @@ and the derived files % \cs{pdf@mdfivesumnative} \M{string} % \end{declcs} % The variants without |native| in the macro name are supposed to -% be compatible with \pdfTeX. However characters with more than -% eight bits are not supported and are ignored. If \LuaTeX\ is +% be compatible with \hologo{pdfTeX}. However characters with more than +% eight bits are not supported and are ignored. If \hologo{LuaTeX} is % running, then its UTF-8 coded strings are used. Thus the full % unicode character range is supported. However the result -% differs from \pdfTeX\ for characters with eight or more bits. +% differs from \hologo{pdfTeX} for characters with eight or more bits. % % \begin{declcs}{pdf@pipe} \M{cmdline} % \end{declcs} @@ -550,7 +552,7 @@ and the derived files \fi % \end{macrocode} % -% \subsection{Without \LuaTeX} +% \subsection{Without \hologo{LuaTeX}} % % \begin{macrocode} \ifluatex @@ -622,12 +624,12 @@ and the derived files % % \subsection{\cs{pdf@primitive}, \cs{pdf@ifprimitive}} % -% Since version 1.40.0 \pdfTeX\ has \cs{pdfprimitive} and +% Since version 1.40.0 \hologo{pdfTeX} has \cs{pdfprimitive} and % \cs{ifpdfprimitive}. And \cs{pdfprimitive} was fixed in % version 1.40.4. % -% \XeTeX\ provides them under the name \cs{primitive} and -% \cs{ifprimitive}. \LuaTeX\ knows both name variants, +% \hologo{XeTeX} provides them under the name \cs{primitive} and +% \cs{ifprimitive}. \hologo{LuaTeX} knows both name variants, % but they have possibly to be enabled first (|tex.enableprimitives|). % % Depending on the format TeX Live uses a prefix |luatex|. @@ -635,7 +637,7 @@ and the derived files % Caution: \cs{let} must be used for the definition of % the macros, especially because of \cs{ifpdfprimitive}. % -% \subsubsection{Using \LuaTeX's \texttt{tex.enableprimitives}} +% \subsubsection{Using \hologo{LuaTeX}'s \texttt{tex.enableprimitives}} % % \begin{macrocode} \ifluatex @@ -752,7 +754,7 @@ and the derived files \endgroup % \end{macrocode} % -% \subsection{Xe\TeX} +% \subsection{\hologo{XeTeX}} % % Look for primitives \cs{shellescape}, \cs{strcmp}. % \begin{macrocode} @@ -1131,7 +1133,7 @@ function escapehex(str, mode) ))) end % \end{macrocode} -% See procedure |unescapehex| in file \xfile{utils.c} of \pdfTeX. +% See procedure |unescapehex| in file \xfile{utils.c} of \hologo{pdfTeX}. % Caution: |tex.write| ignores leading spaces. % \begin{macrocode} function unescapehex(str, mode) @@ -1183,7 +1185,7 @@ function unescapehex(str, mode) tex.settoks(toks, string.char(unpack(result))) end % \end{macrocode} -% See procedure |escapestring| in file \xfile{utils.c} of \pdfTeX. +% See procedure |escapestring| in file \xfile{utils.c} of \hologo{pdfTeX}. % \begin{macrocode} function escapestring(str, mode) if mode == "byte" then @@ -1206,7 +1208,7 @@ function escapestring(str, mode) ))) end % \end{macrocode} -% See procedure |escapename| in file \xfile{utils.c} of \pdfTeX. +% See procedure |escapename| in file \xfile{utils.c} of \hologo{pdfTeX}. % \begin{macrocode} function escapename(str, mode) if mode == "byte" then @@ -1247,7 +1249,7 @@ function filesize(filename) end end % \end{macrocode} -% See procedure |makepdftime| in file \xfile{utils.c} of \pdfTeX. +% See procedure |makepdftime| in file \xfile{utils.c} of \hologo{pdfTeX}. % \begin{macrocode} function filemoddate(filename) local foundfile = kpse.find_file(filename, "tex", true) @@ -1719,13 +1721,13 @@ end % \begin{Version}{2009/04/10 v0.4} % \item % Adaptation for syntax change of \cs{directlua} in -% \LuaTeX\ 0.36. +% \hologo{LuaTeX} 0.36. % \end{Version} % \begin{Version}{2009/09/22 v0.5} % \item % \cs{pdf@primitive}, \cs{pdf@ifprimitive} added. % \item -% \XeTeX's variants are detected for +% \hologo{XeTeX}'s variants are detected for % \cs{pdf@shellescape}, \cs{pdf@strcmp}, \cs{pdf@primitive}, % \cs{pdf@ifprimitive}. % \end{Version} @@ -1744,7 +1746,7 @@ end % \begin{Version}{2010/04/01 v0.9} % \item % Use \cs{ifeof18} for defining \cs{pdf@shellescape} between -% \pdfTeX\ 1.21a (inclusive) and 1.30.0 (exclusive). +% \hologo{pdfTeX} 1.21a (inclusive) and 1.30.0 (exclusive). % \end{Version} % \end{History} % diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx index 8735a037298..6226af914cd 100644 --- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx @@ -100,7 +100,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: zref 2010/03/29 v2.9 New reference scheme for LaTeX2e (HO)} +\Msg{* Package: zref 2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)} \Msg{************************************************************************} \keepsilent @@ -206,7 +206,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{zref.drv}% - [2010/03/29 v2.9 New reference scheme for LaTeX2e (HO)]% + [2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -215,7 +215,7 @@ and the derived files % % \fi % -% \CheckSum{2001} +% \CheckSum{2027} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -236,7 +236,7 @@ and the derived files % \GetFileInfo{zref.drv} % % \title{The \xpackage{zref} package} -% \date{2010/03/29 v2.9} +% \date{2010/04/08 v2.10} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -948,7 +948,7 @@ and the derived files %< \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/03/29 v2.9 New reference scheme for LaTeX2e (HO)]% + [2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)]% % \end{macrocode} % % \subsubsection{Load basic module} % % \begin{macrocode} -\RequirePackage{zref-base}[2010/03/29] +\RequirePackage{zref-base}[2010/04/08] % \end{macrocode} % Abort package loading if \xpackage{zref-base} could not be % loaded successfully. @@ -1445,7 +1447,7 @@ the height difference of the two baselines is \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/03/29]% + \RequirePackage{zref-#1}[2010/04/08]% }% }% } @@ -1505,7 +1507,7 @@ the height difference of the two baselines is %<*base> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2010/03/29 v2.9 Module base for zref (HO)]% + [2010/04/08 v2.10 Module base for zref (HO)]% % \end{macrocode} % % \subsubsection{Utilities} @@ -2285,8 +2287,8 @@ the height difference of the two baselines is %<*user> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/03/29 v2.9 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2360,8 +2362,8 @@ the height difference of the two baselines is %<*abspage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/03/29 v2.9 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2405,8 +2407,8 @@ the height difference of the two baselines is %<*counter> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/03/29 v2.9 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2442,9 +2444,9 @@ the height difference of the two baselines is %<*lastpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/03/29 v2.9 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] -\RequirePackage{zref-abspage}[2010/03/29] + [2010/04/08 v2.10 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/08] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} @@ -2511,14 +2513,14 @@ the height difference of the two baselines is %<*thepage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/03/29 v2.9 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % \begin{macrocode} \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/03/29] +\RequirePackage{zref-abspage}[2010/04/08] % \end{macrocode} % \begin{macrocode} \zref@newlist{thepage} @@ -2571,15 +2573,15 @@ the height difference of the two baselines is %<*nextpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/03/29 v2.9 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/03/29] -\RequirePackage{zref-thepage}[2010/03/29] -\RequirePackage{zref-lastpage}[2010/03/29] +\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-thepage}[2010/04/08] +\RequirePackage{zref-lastpage}[2010/04/08] \RequirePackage{uniquecounter}[2009/12/18] % \end{macrocode} % \begin{macrocode} @@ -2672,16 +2674,16 @@ the height difference of the two baselines is %<*totpages> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/03/29 v2.9 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % The absolute page number of the last page is the total % page number. % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/03/29] -\RequirePackage{zref-lastpage}[2010/03/29] +\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-lastpage}[2010/04/08] % \end{macrocode} % % \begin{macro}{\ztotpages} @@ -2711,8 +2713,8 @@ the height difference of the two baselines is %<*marks> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2010/03/29 v2.9 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2815,7 +2817,7 @@ the height difference of the two baselines is %<*runs> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/03/29 v2.9 Module runs for zref (HO)]% + [2010/04/08 v2.10 Module runs for zref (HO)]% % \end{macrocode} % % \begin{macro}{\zruns} @@ -2847,8 +2849,8 @@ the height difference of the two baselines is %<*perpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/03/29 v2.9 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2860,7 +2862,7 @@ the height difference of the two baselines is % For detecting changed pages module \xmodule{abspage} % is loaded. % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/03/29] +\RequirePackage{zref-abspage}[2010/04/08] % \end{macrocode} % % We group the properties for the needed references @@ -3004,8 +3006,8 @@ the height difference of the two baselines is %<*titleref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/03/29 v2.9 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] % \end{macrocode} @@ -3322,8 +3324,8 @@ the height difference of the two baselines is %<*xr> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/03/29 v2.9 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % \begin{macrocode} @@ -3336,7 +3338,9 @@ the height difference of the two baselines is % \begin{macrocode} \zref@newprop{url}{}% % \end{macrocode} -% +% \begin{macrocode} +\zref@newprop{externaldocument}{}% +% \end{macrocode} % % Most code, especially the handling of the \xfile{.aux} % files are taken from David Carlisle's \xpackage{xr} package. @@ -3395,7 +3399,8 @@ the height difference of the two baselines is \def\ZREF@xr@externaldocument[#1]#2{% \def\ZREF@xr@prefix{#1}% \let\ZREF@xr@filelist\@empty - \edef\ZREF@xr@file{#2.aux}% + \edef\ZREF@xr@externalfile{#2}% + \edef\ZREF@xr@file{\ZREF@xr@externalfile.aux}% \filename@parse{#2}% \@testopt\ZREF@xr@graburl{#2.\zref@xr@ext}% }% @@ -3499,6 +3504,12 @@ the height difference of the two baselines is \expandafter\ZREF@xr@checklist\x\ZREF@nil \expandafter\global\expandafter\let \csname \ZREF@xr@refname\endcsname\x + \expandafter\g@addto@macro + \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile + }% + }% \fi \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% }{% @@ -3522,6 +3533,12 @@ the height difference of the two baselines is \expandafter\g@addto@macro \csname\ZREF@xr@refname\endcsname{\theotype{#4}}% \fi + \expandafter\g@addto@macro + \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile + }% + }% \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% }{% \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}% @@ -3666,8 +3683,8 @@ the height difference of the two baselines is %<*hyperref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/03/29 v2.9 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -3695,8 +3712,8 @@ the height difference of the two baselines is %<*savepos> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/03/29 v2.9 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -3798,15 +3815,15 @@ the height difference of the two baselines is %<*dotfill> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/03/29 v2.9 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/03/29] + [2010/04/08 v2.10 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/04/08] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % For measuring the width of \cs{zdotfill} we use the features % provided by module \xmodule{savepos}. % \begin{macrocode} -\RequirePackage{zref-savepos}[2010/03/29] +\RequirePackage{zref-savepos}[2010/04/08] % \end{macrocode} % For automatically generated label names we use the unique % counter of module \xmodule{base}. @@ -3895,7 +3912,7 @@ the height difference of the two baselines is \NeedsTeXFormat{LaTeX2e} \nofiles \documentclass{article} -\usepackage{zref-base}[2010/03/29] +\usepackage{zref-base}[2010/04/08] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -3925,7 +3942,7 @@ the height difference of the two baselines is %<*test-runs> \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{zref-runs}[2010/03/29] +\usepackage{zref-runs}[2010/04/08] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -4297,6 +4314,11 @@ the height difference of the two baselines is % \item % Useless \cs{ZREF@ErrorNoLine} removed. % \end{Version} +% \begin{Version}{2010/04/08 v2.10} +% \item +% Module \xmodule{xr} remembers the external document name +% in property `externaldocument'. +% \end{Version} % \end{History} % % \PrintIndex -- cgit v1.2.3