diff options
author | Karl Berry <karl@freefriends.org> | 2015-03-10 22:08:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-03-10 22:08:28 +0000 |
commit | 3fc9a1941b344fb51bfa1ccf4d59f63ba76a882b (patch) | |
tree | b8501bc84d0710c7f3900c33d4fd63d33d4424d7 /Master/texmf-dist/tex | |
parent | 8333d638af410c3ad892c1b3583c2488ff57cc28 (diff) |
etoolbox (10mar15)
git-svn-id: svn://tug.org/texlive/trunk@36476 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/etoolbox/etoolbox.def | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty | 20 |
2 files changed, 10 insertions, 15 deletions
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} |