From 3fc9a1941b344fb51bfa1ccf4d59f63ba76a882b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 Mar 2015 22:08:28 +0000 Subject: etoolbox (10mar15) git-svn-id: svn://tug.org/texlive/trunk@36476 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/etoolbox/README | 78 ++++++++++++---------- Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf | Bin 188352 -> 219503 bytes Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex | 20 +++--- Master/texmf-dist/tex/latex/etoolbox/etoolbox.def | 5 +- Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty | 20 +++--- 5 files changed, 63 insertions(+), 60 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/etoolbox/README b/Master/texmf-dist/doc/latex/etoolbox/README index db96fdfc6cb..a2af5e0fcc6 100644 --- a/Master/texmf-dist/doc/latex/etoolbox/README +++ b/Master/texmf-dist/doc/latex/etoolbox/README @@ -1,39 +1,37 @@ -$Id: README,v 2.1 2011/01/03 19:14:10 lehman stable $ +# About -ABOUT - -The etoolbox package is a toolbox of programming facilities geared +The `etoolbox` package is a toolbox of programming facilities geared primarily towards LaTeX class and package authors. It provides LaTeX frontends to some of the new primitives provided by e-TeX as well as some generic tools which are not related to e-TeX but match the profile of this package. The package is work in progress. Note that previous versions of this package were released under the name -elatex. +`elatex`. -LICENSE +#License -Copyright (c) 2007-2010 Philipp Lehman. This package is author- -maintained. Permission is granted to copy, distribute and/or modify -this software under the terms of the LaTeX Project Public License -(LPPL), version 1.3. This software is provided 'as is', without -warranty of any kind, either expressed or implied, including, but -not limited to, the implied warranties of merchantability and -fitness for a particular purpose. +Copyright (c) 2007-2010 Philipp Lehman, 2015 Joseph Wright. +Permission is granted to copy, distribute and/or modify this +software under the terms of the LaTeX Project Public License (LPPL), +version 1.3c or any later version. This software is provided 'as +is', without warranty of any kind, either expressed or implied, +including, but not limited to, the implied warranties of +merchantability and fitness for a particular purpose. -REQUIREMENTS +#Requirements -- e-TeX -- etex.sty + - e-TeX + - etex.sty -AUTOMATIC INSTALLATION +#Automatic installation -TeX Live: The etoolbox package is included in TeX Live. +TeX Live: The `etoolbox` package is included in TeX Live. Use the TeX Live package manager to install it. -MiKTeX: The etoolbox package is included in MiKTeX. +MiKTeX: The `etoolbox` package is included in MiKTeX. Use the MiKTeX package manager to install it. -SEMI-AUTOMATIC INSTALLATION +#Semi-automatic installation 1. Download the file @@ -42,43 +40,51 @@ SEMI-AUTOMATIC INSTALLATION 2. Unpack the archive in the root directory of the local TeX installation tree, for example - /usr/local/share/texmf/ + /usr/local/share/texmf/ + or - /usr/share/texmf-local/ + + /usr/share/texmf-local/ + or - C:\Local TeX Files\ + + C:\Local TeX Files\ 3. Update the file hash tables (also known as the file name database). - On teTeX and TeX Live systems, run texhash as root ('sudo - texhash'). On MiKTeX, run 'initexmf --update-fndb' in a command + On teTeX and TeX Live systems, run `texhash` as root (`sudo + texhash`). On MiKTeX, run `initexmf --update-fndb` in a command window or use the 'Refresh FNDB' button of the MiKTeX Options window. -MANUAL INSTALLATION +#Manual installation -1. Copy the files 'etoolbox.sty' and 'etoolbox.def' to +1. Copy the files `etoolbox.sty` and `etoolbox.def` to - /tex/latex/etoolbox/ + /tex/latex/etoolbox/ - where denotes the root of the local TeX installation + where `` denotes the root of the local TeX installation tree, for example - /usr/local/share/texmf/ + /usr/local/share/texmf/ + or - /usr/share/texmf-local/ + + /usr/share/texmf-local/ + or - C:\Local TeX Files\ -2. The file 'etoolbox.pdf' goes to + C:\Local TeX Files\ + +2. The file `etoolbox.pdf` goes to - /doc/latex/etoolbox/ + /doc/latex/etoolbox/ 3. Update the file hash tables (also known as the file name database). - On teTeX and TeX Live systems, run texhash as root ('sudo - texhash'). On MiKTeX, run 'initexmf --update-fndb' in a command + On teTeX and TeX Live systems, run `texhash` as root (`sudo + texhash`). On MiKTeX, run `initexmf --update-fndb` in a command window or use the 'Refresh FNDB' button of the MiKTeX Options window. diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf index 78f8d15be9d..796e4b407aa 100644 Binary files a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf and b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex index 728f3d9dec1..d6af82b08ba 100644 --- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex +++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex @@ -1,4 +1,3 @@ -% $Id: etoolbox.tex,v 2.1 2011/01/03 19:14:10 lehman stable $ \documentclass{ltxdockit}[2010/09/26] \usepackage[latin9]{inputenc} \usepackage[american]{babel} @@ -8,21 +7,19 @@ \MakeAutoQuote*{<}{>} \MakeShortVerb{\|} -\rcsid{$Id: etoolbox.tex,v 2.1 2011/01/03 19:14:10 lehman stable $} - \titlepage{% title={The \sty{etoolbox} Package}, subtitle={An \etex Toolbox for Class and Package Authors}, url={http://www.ctan.org/tex-archive/macros/latex/contrib/etoolbox/}, - author={Philipp Lehman}, - email={plehman@gmx.net}, - revision={\rcsrevision}, - date={\rcstoday}} + author={Philipp Lehman, Joseph Wright}, + email={joseph.wright@morningstar2.co.uk}, + revision={v2.1a}, + date={2015/03/10}} \hypersetup{% pdftitle={The etoolbox Package}, pdfsubject={An e-TeX Toolbox for Class and Package Authors}, - pdfauthor={Philipp Lehman}, + pdfauthor={Philipp Lehman, Joseph Wright}, pdfkeywords={tex, e-tex, latex, class, package, programming}} \begin{document} @@ -39,7 +36,7 @@ The \sty{etoolbox} package is a toolbox of programming tools geared primarily to \subsection{License} -Copyright \textcopyright\ 2007--2011 Philipp Lehman. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt} This package is author"=maintained. +Copyright \textcopyright\ 2007--2011 Philipp Lehman, 2015 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or later.\fnurl{http://www.latex-project.org/lppl.txt} \section{User Commands} \label{use} @@ -1269,6 +1266,11 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.1a}{2015-03-10} +\item New maintainer: Joseph Wright +\item Skip loading \sty{etex} package with newer \latex kernel releases +\end{release} + \begin{release}{2.1}{2011-01-03} \item Added \cmd{AtBeginEnvironment}\see{use:env} \item Added \cmd{AtEndEnvironment}\see{use:env} diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def index 0102a515afb..2ba89d44136 100644 --- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def +++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def @@ -1,8 +1,5 @@ -% $Id: etoolbox.def,v 2.1 2011/01/03 19:14:10 lehman stable $ - \ProvidesFile{etoolbox.def} -[\csname etb@rcsid\endcsname $Id: etoolbox.def,v 2.1 2011/01/03 19:14:10 lehman stable $ - etoolbox debug messages] + [2015/03/10 v2.1a etoolbox debug messages (JAW)] \begingroup \makeatletter diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty index ae37d94c400..eb3ee715fd6 100644 --- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty +++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty @@ -1,25 +1,18 @@ -% $Id: etoolbox.sty,v 2.1 2011/01/03 19:14:10 lehman stable $ - % Copyright (c) 2007-2011 Philipp Lehman. +% (c) 2015 Joseph Wright % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License -% (LPPL), version 1.3. -% -% The LPPL maintenance status of this software is -% 'author-maintained'. +% (LPPL), version 1.3c or any later version. % % This software is provided 'as is', without warranty of any kind, % either expressed or implied, including, but not limited to, the % implied warranties of merchantability and fitness for a % particular purpose. -\def\etb@rcsid$#1: #2 #3 #4 #5${#4 v#3} - \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{etoolbox} -[\etb@rcsid $Id: etoolbox.sty,v 2.1 2011/01/03 19:14:10 lehman stable $ - e-TeX tools for LaTeX] + [2015/03/10 v2.1a e-TeX tools for LaTeX (JAW)] \begingroup \@ifundefined{eTeXversion} @@ -33,7 +26,12 @@ {} \endgroup -\RequirePackage{etex} +\ifdefined\extrafloats + \expandafter\@gobble +\else + \expandafter\@firstofone +\fi + {\RequirePackage{etex}} \def\etb@catcodes{\do\&\do\|\do\:\do\-\do\=\do\<\do\>} \def\do#1{\catcode\number`#1=\the\catcode`#1\relax} -- cgit v1.2.3