summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/subfigure
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-26 23:33:29 +0000
committerKarl Berry <karl@freefriends.org>2006-12-26 23:33:29 +0000
commitf9523cf9e9c9a51a7fe6f2830db39e7ab73de1a0 (patch)
treebf0c5ffae6b2a746593c422470f0c206832cd571 /Master/texmf-dist/tex/latex/subfigure
parent729ce53995492a87f35451ca5aa1075beca00c6b (diff)
subfigure update (without ltxdoc.cfg in runtime)
git-svn-id: svn://tug.org/texlive/trunk@2957 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/subfigure')
-rw-r--r--Master/texmf-dist/tex/latex/subfigure/subfigure.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/subfigure/subfigure.sty33
2 files changed, 32 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/subfigure/subfigure.cfg b/Master/texmf-dist/tex/latex/subfigure/subfigure.cfg
index 332d4b3618a..bc47726380b 100644
--- a/Master/texmf-dist/tex/latex/subfigure/subfigure.cfg
+++ b/Master/texmf-dist/tex/latex/subfigure/subfigure.cfg
@@ -24,9 +24,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% @LaTeX-style-file{
%% author = "Steven Douglas Cochran",
-%% version = "2.1.4",
-%% date = "2002/07/30",
-%% time = "09:34:13",
+%% version = "2.1.5",
+%% date = "2005/04/29",
+%% time = "14:24:08",
%% filename = "subfigure.sty",
%% address = "Digital Mapping Laboratory, School of Computer Science
%% Carnegie-Mellon University, 5000 Forbes Avenue
diff --git a/Master/texmf-dist/tex/latex/subfigure/subfigure.sty b/Master/texmf-dist/tex/latex/subfigure/subfigure.sty
index fc209ad9c86..b4dbb5cff59 100644
--- a/Master/texmf-dist/tex/latex/subfigure/subfigure.sty
+++ b/Master/texmf-dist/tex/latex/subfigure/subfigure.sty
@@ -30,9 +30,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% @LaTeX-style-file{
%% author = "Steven Douglas Cochran",
-%% version = "2.1.4",
-%% date = "2002/07/30",
-%% time = "09:34:13",
+%% version = "2.1.5",
+%% date = "2005/04/29",
+%% time = "14:24:08",
%% filename = "subfigure.sty",
%% address = "Digital Mapping Laboratory, School of Computer Science
%% Carnegie-Mellon University, 5000 Forbes Avenue
@@ -53,7 +53,32 @@
%% }
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subfigure}[2002/07/30 v2.1.4 subfigure package]
+\ProvidesPackage{subfigure}[2002/03/15 v2.1.5 subfigure package]
+\def\sf@floatfix#1#2{%
+ \ifx#1#2%
+ \ifx#1\@undefined\else
+ \PackageWarningNoLine{subfigure}{%
+Your document class has a bad definition^^J
+of \string#1, most likely^^J
+\string\let\string#1=\string#2^^J
+which has now been changed to^^J
+\string\def\string#1{\string#2}^^J
+because otherwise subsequent changes to \string#2^^J
+(like done by several packages changing float behaviour)^^J
+can't take effect on \string#1.^^J
+Please complain to your document class author}%
+ \def#1{#2}%
+ \fi
+ \fi}
+\begingroup
+\def\next#1#2{%
+ \endgroup
+ \sf@floatfix\endfigure\end@float
+ \sf@floatfix\endtable\end@float
+ \sf@floatfix#1\end@dblfloat
+ \sf@floatfix#2\end@dblfloat}
+\expandafter\next\csname endfigure*\expandafter\endcsname
+ \csname endtable*\endcsname
\newif\ifhyperrefloaded
\AtBeginDocument{%
\@ifpackageloaded{hyperref}{%