summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/etoolbox/README2
-rw-r--r--Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdfbin165847 -> 166178 bytes
-rw-r--r--Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex13
-rw-r--r--Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty343
4 files changed, 186 insertions, 172 deletions
diff --git a/Master/texmf-dist/doc/latex/etoolbox/README b/Master/texmf-dist/doc/latex/etoolbox/README
index 9a20118b0a9..34f858271aa 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/README
+++ b/Master/texmf-dist/doc/latex/etoolbox/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.3 2007/10/08 17:42:31 lehman stable $
+$Id: README,v 1.4 2008/01/24 22:25:08 lehman stable $
ABOUT
diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 1d6461d6314..e62400ba915 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
+++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
index 4def0cad123..1a9bf266fbb 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
+++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
@@ -1,4 +1,9 @@
-% $Id: etoolbox.tex,v 1.3 2007/10/08 17:42:31 lehman stable $
+% $Id: etoolbox.tex,v 1.4 2008/01/24 22:25:08 lehman stable $
+%
+% This is the source of etoolbox.pdf. This file is primarily included
+% in the distribution for legal reasons. It will not compile as is
+% because it depends on unpublished classes and packages.
+%
\documentclass{latexdoc}
\usepackage[latin9]{inputenc}
\usepackage[american]{babel}
@@ -6,7 +11,7 @@
\MakeAutoQuote{«}{»}
\MakeAutoQuote*{<}{>}
-\rcsid{$Id: etoolbox.tex,v 1.3 2007/10/08 17:42:31 lehman stable $}
+\rcsid{$Id: etoolbox.tex,v 1.4 2008/01/24 22:25:08 lehman stable $}
\titlepage{%
title={The \sty{etoolbox} package},
@@ -656,6 +661,10 @@ Any invalid tokens in the \ltxarg{numeral} argument are silently ignored and hav
\begin{changelog}
+\begin{release}{1.4}{2007-01-24}
+\item Resolved conflict with \sty{tex4ht}
+\end{release}
+
\begin{release}{1.3}{2007-10-08}
\item Renamed package from \sty{elatex} to \sty{etoolbox}\see{int}
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
index 197ab51651c..8cce5f241be 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
@@ -1,6 +1,6 @@
-% $Id: etoolbox.sty,v 1.3 2007/10/08 17:42:31 lehman stable $
+% $Id: etoolbox.sty,v 1.4 2008/01/24 22:25:08 lehman stable $
-% Copyright (c) 2007 Philipp Lehman, author-maintained.
+% Copyright (c) 2007--2008 Philipp Lehman, author-maintained.
%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License
@@ -12,7 +12,7 @@
% purpose.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{etoolbox}[2007/10/08 v1.3 eTeX tools for LaTeX]
+\ProvidesPackage{etoolbox}[2008/01/24 v1.4 eTeX tools for LaTeX]
\begingroup
\@ifundefined{eTeXversion}
@@ -28,30 +28,30 @@
\RequirePackage{etex}
-\edef\elx@restore{%
+\edef\etb@restore{%
\catcode\number`\&=\the\catcode`\&\relax
\catcode\number`\|=\the\catcode`\|\relax}
\catcode`\&=3
\catcode`\|=3
\AtEndOfPackage{%
- \elx@restore
- \undef\elx@restore}
+ \etb@restore
+ \undef\etb@restore}
% {<cstoken>}[<arguments>][<optarg default>]{<definition>}
\newcommand*{\newrobustcmd}{}
\protected\def\newrobustcmd{%
\@ifstar
- {\let\l@ngrel@x\protected\elx@new@command}
- {\def\l@ngrel@x{\protected\long}\elx@new@command}}
+ {\let\l@ngrel@x\protected\etb@new@command}
+ {\def\l@ngrel@x{\protected\long}\etb@new@command}}
-\def\elx@new@command#1{\@testopt{\elx@newcommand#1}0}
-\def\elx@newcommand#1[#2]{%
+\def\etb@new@command#1{\@testopt{\etb@newcommand#1}0}
+\def\etb@newcommand#1[#2]{%
\@ifnextchar[%]
- {\elx@xargdef#1[#2]}
+ {\etb@xargdef#1[#2]}
{\@argdef#1[#2]}}
-\long\def\elx@xargdef#1[#2][#3]#4{%
+\long\def\etb@xargdef#1[#2][#3]#4{%
\@ifdefinable#1{%
\expandafter\protected
\expandafter\def
@@ -66,10 +66,10 @@
\newrobustcmd*{\renewrobustcmd}{%
\@ifstar
- {\let\l@ngrel@x\protected\elx@renew@command}
- {\def\l@ngrel@x{\protected\long}\elx@renew@command}}
+ {\let\l@ngrel@x\protected\etb@renew@command}
+ {\def\l@ngrel@x{\protected\long}\etb@renew@command}}
-\def\elx@renew@command#1{%
+\def\etb@renew@command#1{%
\begingroup
\escapechar\m@ne
\xdef\@gtempa{{\string#1}}%
@@ -78,23 +78,23 @@
{\@latex@error{\noexpand#1undefined}\@ehc}
{}%
\let\@ifdefinable\@rc@ifdefinable
- \elx@new@command#1}
+ \etb@new@command#1}
% {<cstoken>}[<arguments>][<optarg default>]{<definition>}
\newrobustcmd*{\providerobustcmd}{%
\@ifstar
- {\let\l@ngrel@x\protected\elx@provide@command}
- {\def\l@ngrel@x{\protected\long}\elx@provide@command}}
+ {\let\l@ngrel@x\protected\etb@provide@command}
+ {\def\l@ngrel@x{\protected\long}\etb@provide@command}}
-\def\elx@provide@command#1{%
+\def\etb@provide@command#1{%
\begingroup
\escapechar\m@ne
\xdef\@gtempa{{\string#1}}%
\endgroup
\expandafter\@ifundefined\@gtempa
- {\def\reserved@a{\elx@new@command#1}}
- {\def\reserved@a{\elx@renew@command\reserved@a}}%
+ {\def\reserved@a{\etb@new@command#1}}
+ {\def\reserved@a{\etb@renew@command\reserved@a}}%
\reserved@a}%
% {<cstoken>}
@@ -104,22 +104,22 @@
\ifundef#1%
{\@latex@error{\string#1 undefined}\@ehc}
{\begingroup
- \edef\elx@resrvda{\meaning#1}%
- \edef\elx@resrvdb{%
+ \edef\etb@resrvda{\meaning#1}%
+ \edef\etb@resrvdb{%
\noexpand\protect\expandafter\noexpand
\csname\expandafter\@gobble\string#1 \endcsname}%
- \edef\elx@resrvdb{\meaning\elx@resrvdb}%
- \ifx\elx@resrvda\elx@resrvdb
+ \edef\etb@resrvdb{\meaning\etb@resrvdb}%
+ \ifx\etb@resrvda\etb@resrvdb
\letcs#1{\expandafter\@gobble\string#1 }%
- \cslet{\expandafter\@gobble\string#1 }\@undefined
+ \global\csundef{\expandafter\@gobble\string#1 }%
\fi
- \edef\elx@resrvda{%
- \def\noexpand\elx@resrvda####1\detokenize{macro:}####2->####3&{%
+ \edef\etb@resrvda{%
+ \def\noexpand\etb@resrvda####1\detokenize{macro:}####2->####3&{%
\protected####1\def\detokenize{#1}####2{####3}}%
- \edef\noexpand\elx@resrvda{%
- \noexpand\elx@resrvda\meaning#1&}}%
- \elx@resrvda
- \elx@scantoks\endgroup\elx@resrvda}}
+ \edef\noexpand\etb@resrvda{%
+ \noexpand\etb@resrvda\meaning#1&}}%
+ \etb@resrvda
+ \etb@scantoks\endgroup\etb@resrvda}}
% {<cstoken>}{<true>}{<false>}
@@ -224,16 +224,16 @@
% {<string>}{<true>}{<false>}
\newcommand{\ifblank}[1]{% from url.sty
- \elx@ifblank@i#1&&\@secondoftwo\@firstoftwo:}
-\long\def\elx@ifblank@i#1#2&#3#4#5:{#4}
+ \etb@ifblank@i#1&&\@secondoftwo\@firstoftwo:}
+\long\def\etb@ifblank@i#1#2&#3#4#5:{#4}
% {<string1>}{<string2>}{<true>}{<false>}
\newrobustcmd{\ifstrequal}[2]{%
\begingroup
- \edef\elx@tempa{\detokenize{#1}}%
- \edef\elx@tempb{\detokenize{#2}}%
- \ifx\elx@tempa\elx@tempb
+ \edef\etb@tempa{\detokenize{#1}}%
+ \edef\etb@tempb{\detokenize{#2}}%
+ \ifx\etb@tempa\etb@tempb
\aftergroup\@firstoftwo
\else
\aftergroup\@secondoftwo
@@ -251,9 +251,9 @@
{\expandafter\newif\csname if#1\endcsname}
{\begingroup
\edef\@tempa{\expandafter\meaning\csname if#1\endcsname}%
- \ifx\@tempa\elx@isfalse
+ \ifx\@tempa\etb@isfalse
\else
- \ifx\@tempa\elx@istrue
+ \ifx\@tempa\etb@istrue
\else
\@latex@error{`\@backslashchar if#1' defined
but not a switch}\@eha
@@ -261,24 +261,24 @@
\fi
\endgroup}}
-\edef\elx@istrue{\meaning\iftrue}
-\edef\elx@isfalse{\meaning\iffalse}
+\edef\etb@istrue{\meaning\iftrue}
+\edef\etb@isfalse{\meaning\iffalse}
\newrobustcmd*{\booltrue}[1]{%
\ifcsundef{if#1}
- {\elx@err@nobool{#1}}
+ {\etb@err@nobool{#1}}
{\csname#1true\endcsname}}
\newrobustcmd*{\boolfalse}[1]{%
\ifcsundef{if#1}
- {\elx@err@nobool{#1}}
+ {\etb@err@nobool{#1}}
{\csname#1false\endcsname}}
% {<name>}{<true}{<false>}
\newcommand*{\ifbool}[1]{%
\ifcsundef{if#1}
- {\elx@err@nobool{#1}\@gobbletwo}
+ {\etb@err@nobool{#1}\@gobbletwo}
{\csname if#1\endcsname
\expandafter\@firstoftwo
\else
@@ -289,54 +289,54 @@
\newcommand*{\notbool}[1]{%
\ifcsundef{if#1}
- {\elx@err@nobool{#1}\@gobbletwo}
+ {\etb@err@nobool{#1}\@gobbletwo}
{\csname if#1\endcsname
\expandafter\@secondoftwo
\else
\expandafter\@firstoftwo
\fi}}
-\protected\def\elx@err@nobool#1{%
+\protected\def\etb@err@nobool#1{%
\let\relax\relax
\@latex@error{Switch `\@backslashchar if#1' undefined}\@eha}
% {<name>}
\newrobustcmd*{\newtoggle}[1]{%
- \ifcsdef{elx@tgl@#1}
+ \ifcsdef{etb@tgl@#1}
{\@latex@error{Toggle `#1' already defined}\@eha}
- {\cslet{elx@tgl@#1}\@secondoftwo}}
+ {\cslet{etb@tgl@#1}\@secondoftwo}}
\newrobustcmd*{\providetoggle}[1]{%
- \ifcsdef{elx@tgl@#1}
+ \ifcsdef{etb@tgl@#1}
{}
- {\cslet{elx@tgl@#1}\@secondoftwo}}
+ {\cslet{etb@tgl@#1}\@secondoftwo}}
\newrobustcmd*{\toggletrue}[1]{%
- \ifcsdef{elx@tgl@#1}
- {\cslet{elx@tgl@#1}\@firstoftwo}
- {\elx@err@notoggle{#1}}}
+ \ifcsdef{etb@tgl@#1}
+ {\cslet{etb@tgl@#1}\@firstoftwo}
+ {\etb@err@notoggle{#1}}}
\newrobustcmd*{\togglefalse}[1]{%
- \ifcsdef{elx@tgl@#1}
- {\cslet{elx@tgl@#1}\@secondoftwo}
- {\elx@err@notoggle{#1}}}
+ \ifcsdef{etb@tgl@#1}
+ {\cslet{etb@tgl@#1}\@secondoftwo}
+ {\etb@err@notoggle{#1}}}
% {<name>}{<true}{<false>}
\newcommand*{\iftoggle}[1]{%
- \ifcsdef{elx@tgl@#1}
- {\csname elx@tgl@#1\endcsname}
- {\elx@err@notoggle{#1}\@gobbletwo}}
+ \ifcsdef{etb@tgl@#1}
+ {\csname etb@tgl@#1\endcsname}
+ {\etb@err@notoggle{#1}\@gobbletwo}}
% {<name>}{<not true}{<not false>}
\newcommand*{\nottoggle}[1]{%
- \ifcsdef{elx@tgl@#1}
- {\csname elx@tgl@#1\endcsname\@secondoftwo\@firstoftwo}
- {\elx@err@notoggle{#1}\@gobbletwo}}
+ \ifcsdef{etb@tgl@#1}
+ {\csname etb@tgl@#1\endcsname\@secondoftwo\@firstoftwo}
+ {\etb@err@notoggle{#1}\@gobbletwo}}
-\protected\def\elx@err@notoggle#1{%
+\protected\def\etb@err@notoggle#1{%
\let\relax\relax
\@latex@error{Toggle `#1' undefined}\@eha}
@@ -346,22 +346,22 @@
\newrobustcmd{\ifpatchable}{%
\begingroup
\@makeother\#%
- \elx@ifpatchable}
+ \etb@ifpatchable}
-\def\elx@ifpatchable#1#2{%
+\def\etb@ifpatchable#1#2{%
\endgroup
\ifundef{#1}
{\@firstoftwo}
{\begingroup
- \edef\elx@resrvda{%
- \def\noexpand\elx@resrvda####1->####2&{%
- \noexpand\elx@resrvdb####2\detokenize{#2}&}%
- \def\noexpand\elx@resrvdb####1\detokenize{#2}####2&{%
+ \edef\etb@resrvda{%
+ \def\noexpand\etb@resrvda####1->####2&{%
+ \noexpand\etb@resrvdb####2\detokenize{#2}&}%
+ \def\noexpand\etb@resrvdb####1\detokenize{#2}####2&{%
\endgroup\noexpand\noexpand\noexpand\ifblank{####2}}%
- \edef\noexpand\elx@resrvda{%
- \noexpand\elx@resrvda\meaning#1&}%
- \noexpand\elx@resrvda}%
- \elx@resrvda}
+ \edef\noexpand\etb@resrvda{%
+ \noexpand\etb@resrvda\meaning#1&}%
+ \noexpand\etb@resrvda}%
+ \etb@resrvda}
{\@secondoftwo}
{\@firstoftwo}}
@@ -371,29 +371,29 @@
\newrobustcmd*{\patchcmd}{%
\begingroup
\@makeother\#%
- \elx@patchcmd}
+ \etb@patchcmd}
-\newcommand{\elx@patchcmd}[4][########1]{%
- \elx@ifpatchable{#2}{#3}
+\newcommand{\etb@patchcmd}[4][########1]{%
+ \etb@ifpatchable{#2}{#3}
{\begingroup
- \edef\elx@resrvda{%
- \def\noexpand\elx@resrvda####1\detokenize{macro:}####2->####3&{%
- #1\def\detokenize{#2}####2{\noexpand\elx@resrvdb####3&}}%
- \def\noexpand\elx@resrvdb####1\detokenize{#3}####2&{%
+ \edef\etb@resrvda{%
+ \def\noexpand\etb@resrvda####1\detokenize{macro:}####2->####3&{%
+ #1\def\detokenize{#2}####2{\noexpand\etb@resrvdb####3&}}%
+ \def\noexpand\etb@resrvdb####1\detokenize{#3}####2&{%
####1\detokenize{#4}####2}%
- \edef\noexpand\elx@resrvda{%
- \noexpand\elx@resrvda\meaning#2&}}%
- \elx@resrvda
- \elx@scantoks\endgroup\elx@resrvda
+ \edef\noexpand\etb@resrvda{%
+ \noexpand\etb@resrvda\meaning#2&}}%
+ \etb@resrvda
+ \etb@scantoks\endgroup\etb@resrvda
\@firstoftwo}
{\@secondoftwo}}
-\def\elx@scantoks#1#2{%
+\def\etb@scantoks#1#2{%
\begingroup
- \edef\elx@resrvda{\endgroup
+ \edef\etb@resrvda{\endgroup
\unexpanded{#1\makeatletter\scantokens}{#2}%
\catcode\number`\@=\the\catcode`\@\relax}%
- \elx@resrvda}
+ \etb@resrvda}
% {<cstoken>}{<code>}
@@ -401,29 +401,29 @@
\newrobustcmd*{\apptocmd}{%
\begingroup
\@makeother\#%
- \elx@hooktocmd\elx@apptocmd}
+ \etb@hooktocmd\etb@apptocmd}
\@onlypreamble\pretocmd
\newrobustcmd*{\pretocmd}{%
\begingroup
\@makeother\#%
- \elx@hooktocmd\elx@pretocmd}
+ \etb@hooktocmd\etb@pretocmd}
-\long\def\elx@hooktocmd#1#2#3{%
+\long\def\etb@hooktocmd#1#2#3{%
\endgroup
\ifundef{#2}
{\def#2{#3}}
{\begingroup
- \edef\elx@resrvda{%
- \def\noexpand\elx@resrvda####1\detokenize{macro:}####2->####3&{%
+ \edef\etb@resrvda{%
+ \def\noexpand\etb@resrvda####1\detokenize{macro:}####2->####3&{%
####1\def\detokenize{#2}####2{#1{####3}{\detokenize{#3}}}}%
- \edef\noexpand\elx@resrvda{%
- \noexpand\elx@resrvda\meaning#2&}}%
- \elx@resrvda
- \elx@scantoks\endgroup\elx@resrvda}}
+ \edef\noexpand\etb@resrvda{%
+ \noexpand\etb@resrvda\meaning#2&}}%
+ \etb@resrvda
+ \etb@scantoks\endgroup\etb@resrvda}}
-\long\def\elx@apptocmd#1#2{#1#2}
-\long\def\elx@pretocmd#1#2{#2#1}
+\long\def\etb@apptocmd#1#2{#1#2}
+\long\def\etb@pretocmd#1#2{#2#1}
% {<cstoken>}
@@ -440,21 +440,21 @@
\newcommand*{\protecting}{}
\def\protecting#{%
\ifx\protect\@typeset@protect
- \elx@protecting\@firstofone
+ \etb@protecting\@firstofone
\fi
\ifx\protect\@unexpandable@protect
- \elx@protecting\elx@unexpandable
+ \etb@protecting\etb@unexpandable
\fi
\ifx\protect\noexpand
- \elx@protecting\unexpanded
+ \etb@protecting\unexpanded
\fi
\ifx\protect\string
- \elx@protecting\detokenize
+ \etb@protecting\detokenize
\fi
\relax\@firstofone}
-\def\elx@protecting#1#2\relax\@firstofone{\fi#1}
-\long\def\elx@unexpandable#1{\unexpanded{\protecting{#1}}}
+\def\etb@protecting#1#2\relax\@firstofone{\fi#1}
+\long\def\etb@unexpandable#1{\unexpanded{\protecting{#1}}}
% {<csname>}
@@ -462,10 +462,10 @@
\newrobustcmd*{\csedef}[1]{\expandafter\edef\csname#1\endcsname}
\newrobustcmd*{\csgdef}[1]{\expandafter\gdef\csname#1\endcsname}
\newrobustcmd*{\csxdef}[1]{\expandafter\xdef\csname#1\endcsname}
-\newrobustcmd*{\protected@csedef}{\elx@protected\csedef}
-\newrobustcmd*{\protected@csxdef}{\elx@protected\csxdef}
+\newrobustcmd*{\protected@csedef}{\etb@protected\csedef}
+\newrobustcmd*{\protected@csxdef}{\etb@protected\csxdef}
-\def\elx@protected{%
+\def\etb@protected{%
\let\@@protect\protect
\let\protect\@unexpandable@protect
\afterassignment\restore@protect}
@@ -503,8 +503,8 @@
\begingroup
\catcode`\%=11
-\protected\gdef\undef#1{\let#1\elx@un%de%fi%ned}
-\protected\gdef\csundef#1{\cslet{#1}\elx@un%de%fi%ned}
+\protected\gdef\undef#1{\let#1\etb@un%de%fi%ned}
+\protected\gdef\csundef#1{\cslet{#1}\etb@un%de%fi%ned}
\endgroup
@@ -527,8 +527,8 @@
{\xdef#1{#2}}
{\xdef#1{\expandonce#1#2}}}
-\newrobustcmd*{\protected@eappto}{\elx@protected\eappto}
-\newrobustcmd*{\protected@xappto}{\elx@protected\xappto}
+\newrobustcmd*{\protected@eappto}{\etb@protected\eappto}
+\newrobustcmd*{\protected@xappto}{\etb@protected\xappto}
% {<cstoken>}{<code>}
@@ -549,8 +549,8 @@
{\xdef#1{#2}}
{\xdef#1{#2\expandonce#1}}}
-\newrobustcmd*{\protected@epreto}{\elx@protected\epreto}
-\newrobustcmd*{\protected@xpreto}{\elx@protected\xpreto}
+\newrobustcmd*{\protected@epreto}{\etb@protected\epreto}
+\newrobustcmd*{\protected@xpreto}{\etb@protected\xpreto}
% {<csname>}{<code>}
@@ -558,8 +558,8 @@
\newrobustcmd*{\cseappto}[1]{\expandafter\eappto\csname#1\endcsname}
\newrobustcmd*{\csgappto}[1]{\expandafter\gappto\csname#1\endcsname}
\newrobustcmd*{\csxappto}[1]{\expandafter\xappto\csname#1\endcsname}
-\newrobustcmd*{\protected@cseappto}{\elx@protected\cseappto}
-\newrobustcmd*{\protected@csxappto}{\elx@protected\csxappto}
+\newrobustcmd*{\protected@cseappto}{\etb@protected\cseappto}
+\newrobustcmd*{\protected@csxappto}{\etb@protected\csxappto}
% {<csname>}{<code>}
@@ -567,8 +567,8 @@
\newrobustcmd*{\csepreto}[1]{\expandafter\epreto\csname#1\endcsname}
\newrobustcmd*{\csgpreto}[1]{\expandafter\gpreto\csname#1\endcsname}
\newrobustcmd*{\csxpreto}[1]{\expandafter\xpreto\csname#1\endcsname}
-\newrobustcmd*{\protected@csepreto}{\elx@protected\csepreto}
-\newrobustcmd*{\protected@csxpreto}{\elx@protected\csxpreto}
+\newrobustcmd*{\protected@csepreto}{\etb@protected\csepreto}
+\newrobustcmd*{\protected@csxpreto}{\etb@protected\csxpreto}
% {<cstoken>}{<numexpr>}
@@ -642,71 +642,71 @@
\catcode`\%=12
\catcode`\&=14
-\gdef\rmntonum#1{\number\numexpr\elx@rti@i#10%}
+\gdef\rmntonum#1{\number\numexpr\etb@rti@i#10%}
-\gdef\elx@rti@i#1#2{&
+\gdef\etb@rti@i#1#2{&
\expandafter\if\expandafter%\detokenize{#2}&
- +\elx@rti@ii{#1}\expandafter\relax
+ +\etb@rti@ii{#1}\expandafter\relax
\else
- \ifnum\elx@rti@ii{#1}<\elx@rti@ii{#2} &
- +\elx@rti@ii{#2}-\elx@rti@ii{#1}&
- \expandafter\expandafter\expandafter\elx@rti@i
+ \ifnum\etb@rti@ii{#1}<\etb@rti@ii{#2} &
+ +\etb@rti@ii{#2}-\etb@rti@ii{#1}&
+ \expandafter\expandafter\expandafter\etb@rti@i
\else
- +\elx@rti@ii{#1}&
- \expandafter\expandafter\expandafter\elx@rti@i
+ +\etb@rti@ii{#1}&
+ \expandafter\expandafter\expandafter\etb@rti@i
\expandafter\expandafter\expandafter#2&
\fi
\fi}
\endgroup
-\def\elx@rti@ii#1{%
- \ifcsname elx@rmn@\detokenize{#1}\endcsname
- \csname elx@rmn@\detokenize{#1}\expandafter\endcsname
+\def\etb@rti@ii#1{%
+ \ifcsname etb@rmn@\detokenize{#1}\endcsname
+ \csname etb@rmn@\detokenize{#1}\expandafter\endcsname
\else
\expandafter\z@
\fi}
-\def\elx@rmn@i{1}
-\def\elx@rmn@v{5}
-\def\elx@rmn@x{10}
-\def\elx@rmn@l{50}
-\def\elx@rmn@c{100}
-\def\elx@rmn@d{500}
-\def\elx@rmn@m{1000}
-
-\def\elx@rmn@I{1}
-\def\elx@rmn@V{5}
-\def\elx@rmn@X{10}
-\def\elx@rmn@L{50}
-\def\elx@rmn@C{100}
-\def\elx@rmn@D{500}
-\def\elx@rmn@M{1000}
+\def\etb@rmn@i{1}
+\def\etb@rmn@v{5}
+\def\etb@rmn@x{10}
+\def\etb@rmn@l{50}
+\def\etb@rmn@c{100}
+\def\etb@rmn@d{500}
+\def\etb@rmn@m{1000}
+
+\def\etb@rmn@I{1}
+\def\etb@rmn@V{5}
+\def\etb@rmn@X{10}
+\def\etb@rmn@L{50}
+\def\etb@rmn@C{100}
+\def\etb@rmn@D{500}
+\def\etb@rmn@M{1000}
% {<command>}{<separator>}
\newrobustcmd*{\DeclareListParser}[2]{%
\@ifdefinable#1{%
- \expandafter\expandafter\expandafter\elx@defparser
+ \expandafter\expandafter\expandafter\etb@defparser
\expandafter\expandafter\expandafter{%
\expandafter\@gobble\string#1}{#2}}}
-\def\elx@defparser#1#2{%
+\def\etb@defparser#1#2{%
\begingroup
\edef\@tempa{\endgroup
\long\csdef{#1}####1{\expandafter\noexpand
- \csname elx@dolist@#1\endcsname####1\noexpand#2&}%
- \long\csdef{elx@dolist@#1}####1\noexpand#2####2&{%
+ \csname etb@dolist@#1\endcsname####1\noexpand#2&}%
+ \long\csdef{etb@dolist@#1}####1\noexpand#2####2&{%
\noexpand\ifblank{####1}
{}
- {\noexpand\elx@doitem####1&}%
+ {\noexpand\etb@doitem####1&}%
\noexpand\ifblank{####2}
{\noexpand\listbreak}
{\expandafter\noexpand
- \csname elx@dolist@#1\endcsname####2}&}}%
+ \csname etb@dolist@#1\endcsname####2}&}}%
\@tempa}
-\long\def\elx@doitem#1#2&{\do{#1#2}}
+\long\def\etb@doitem#1#2&{\do{#1#2}}
\newcommand*{\listbreak}{}
\long\def\listbreak#1&{}
@@ -741,32 +741,32 @@
\newrobustcmd{\ifinlist}[2]{%
\begingroup
- \def\elx@tempa##1|#1|##2&{\endgroup
+ \def\etb@tempa##1|#1|##2&{\endgroup
\ifblank{##2}\@secondoftwo\@firstoftwo}%
- \expandafter\elx@tempa\expandafter|#2|#1|&}
+ \expandafter\etb@tempa\expandafter|#2|#1|&}
\newrobustcmd{\xifinlist}[1]{%
\begingroup
- \edef\elx@tempa{\endgroup\ifinlist{#1}}%
- \elx@tempa}
+ \edef\etb@tempa{\endgroup\ifinlist{#1}}%
+ \etb@tempa}
% {<string>}{<listcsname>}{<true>}{<false>}
\newrobustcmd{\ifinlistcs}[2]{%
- \expandafter\elx@ifinlistcs@i\csname #2\endcsname{#1}}
-\long\def\elx@ifinlistcs@i#1#2{\ifinlist{#2}{#1}}
+ \expandafter\etb@ifinlistcs@i\csname #2\endcsname{#1}}
+\long\def\etb@ifinlistcs@i#1#2{\ifinlist{#2}{#1}}
\newrobustcmd{\xifinlistcs}[1]{%
\begingroup
- \edef\elx@tempa{\endgroup\ifinlistcs{#1}}%
- \elx@tempa}
+ \edef\etb@tempa{\endgroup\ifinlistcs{#1}}%
+ \etb@tempa}
% {<listmacro>} => \do{<item1>}\do{<item2>}...
\newcommand*{\dolistloop}[1]{%
- \expandafter\elx@listloop\expandafter{#1}}
+ \expandafter\etb@listloop\expandafter{#1}}
-\DeclareListParser{\elx@listloop}{|}
+\DeclareListParser{\etb@listloop}{|}
% {<listcsname>} => \do{<item1>}\do{<item2>}...
@@ -784,14 +784,19 @@
{\endgroup
\let\AtEndPreamble\@firstofone
\@endpreamblehook
- \global\let\@endpreamblehook\@undefined}
+ \undef\@endpreamblehook}
{}
- {\PackageError{etoolbox}
- {Patching \string\document\space failed}
- {This is an internal error typically caused by a
- conflict\MessageBreak between etoolbox and at least
- one other package. Loading\MessageBreak the etoolbox
- package earlier may avoid this problem.}}
+ {\PackageInfo{etoolbox}{%
+ Patching \string\document\space failed.\MessageBreak
+ Will try to fork \string\document\@gobble}%
+ \let\etb@document\document
+ \def\document{%
+ \endgroup
+ \let\AtEndPreamble\@firstofone
+ \@endpreamblehook
+ \undef\@endpreamblehook
+ \begingroup
+ \etb@document}}
% {<code>}
@@ -807,11 +812,11 @@
{\PackageInfo{etoolbox}{%
Patching \string\enddocument\space failed.\MessageBreak
Will try to fork \string\@@end\@gobble}%
- \let\elx@@end\@@end
+ \let\etb@@end\@@end
\def\@@end{%
\let\AfterEndDocument\@firstofone
\@afterdocumenthook
- \elx@@end}}
+ \etb@@end}}
% {<code>}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 18:31:47 +0000