From f9523cf9e9c9a51a7fe6f2830db39e7ab73de1a0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 26 Dec 2006 23:33:29 +0000 Subject: subfigure update (without ltxdoc.cfg in runtime) git-svn-id: svn://tug.org/texlive/trunk@2957 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/subfigure/README | 116 ++++++++++++--------- Master/texmf-dist/doc/latex/subfigure/ltxdoc.cfg | 6 +- .../texmf-dist/doc/latex/subfigure/subfigure.pdf | Bin 0 -> 384647 bytes Master/texmf-dist/doc/latex/subfigure/test4.pdf | Bin 24739 -> 0 bytes Master/texmf-dist/doc/latex/subfigure/test5.tex | 72 +++++++++++++ 5 files changed, 140 insertions(+), 54 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/subfigure/subfigure.pdf delete mode 100644 Master/texmf-dist/doc/latex/subfigure/test4.pdf create mode 100644 Master/texmf-dist/doc/latex/subfigure/test5.tex (limited to 'Master/texmf-dist/doc/latex/subfigure') diff --git a/Master/texmf-dist/doc/latex/subfigure/README b/Master/texmf-dist/doc/latex/subfigure/README index 3f21c8065a1..12a329c1178 100644 --- a/Master/texmf-dist/doc/latex/subfigure/README +++ b/Master/texmf-dist/doc/latex/subfigure/README @@ -1,51 +1,65 @@ -README ------- - -This directory contains version 2.1.4 of the subfigure package. -Use `make' to extract the subfigure package and run the local tests. - -MANIFEST: ---------- -Makefile UNIX makefile to extract the subfigure package - and related material. -README This file. -subfigure.dtx The documented subfigure package. -subfigure.ins The subfigure package installation file. -test.tex Test one: Mixed tables and figures. -test2.tex Test two: Check for extra space around figure -test3.tex Test four: Test of optional args and \subref. -test4.tex Test four: Test of interaction with hyperref. - -FILES AFTER `make': -------------------- -Makefile UNIX makefile to extract the subfigure package - and related material. -README This file. -ltxdoc.cfg Configuration file to print change history and - index on the subfigure package documentation. -subfigure.cfg Set the preferred options for subfigure version 2.1. -subfigure.dtx The documented subfigure package. -subfigure.ins The subfigure package installation file. -subfigure.ps Subfigure package documentation. -subfigure.sty The subfigure package -test.ps Results of test one. -test.tex Test one: Mixed tables and figures. -test2.ps Results of test two. -test2.tex Test two: Check for extra space around figure -test3.ps Results of test three. -test3.tex Test four: Test of optional args and \subref. -test4.pdf Results of test four. -test4.tex Test four: Test of interaction with hyperref. - -NOTES: ------- - -By default, the subfigure.sty file acts like the older versions of the -subfigure package. To make the preferred options default move the -subfigure.cfg file into the standard TEXINPUTS path along with the -subfigure.sty file. This reduces the whitespace around the subfigures -and subtables and sets the table style to have the captions and -subcaptions preceed the table and subtables. - -To verify the results of the tests, compare with the tests found at -http://www.cs.cmu.edu/~sdc/latex/subfigure.214/ +README +------ + + The subfigure package has been superseded by the subfig package. + The reason for the name change is that the new subfig package is not + exactly backward compatible with this package; although, it comes + with a configuration file that *almost* allows backward + compatibility, the difference is that exact spacing and layout of + the subfloats are not preserved. + + The newer (subfig) package is an improvement over this package and + although this package will continue to be supported, it will no longer + be updated. + +This directory contains version 2.1.5 of the subfigure package. +Use `make' to extract the subfigure package and run the local tests. + +MANIFEST: +--------- +Makefile UNIX makefile to extract the subfigure package + and related material. +README This file. +subfigure.dtx The documented subfigure package. +subfigure.ins The subfigure package installation file. +subfigure.pdf Subfigure package documentation (as PDF). +test.tex Test one: Mixed tables and figures. +test2.tex Test two: Check for extra space around figure +test3.tex Test four: Test of optional args and \subref. +test4.tex Test four: Test of interaction with hyperref. +test5.tex Test five: Test for class \let of \endfigure, etc. + +FILES AFTER `make': +------------------- +Makefile UNIX makefile to extract the subfigure package + and related material. +README This file. +ltxdoc.cfg Configuration file to print change history and + index on the subfigure package documentation. +subfigure.cfg Set the preferred options for subfigure version 2.1. +subfigure.dtx The documented subfigure package. +subfigure.ins The subfigure package installation file. +subfigure.pdf Subfigure package documentation (as PDF). +subfigure.ps Subfigure package documentation (as PostScript). +subfigure.sty The subfigure package +test.ps Results of test one. +test.tex Test one: Mixed tables and figures. +test2.ps Results of test two. +test2.tex Test two: Check for extra space around figure +test3.ps Results of test three. +test3.tex Test four: Test of optional args and \subref. +test4.pdf Results of test four. +test4.tex Test four: Test of interaction with hyperref. +test5.tex Test five: Test for class \let of \endfigure, etc. +test5a.ps Results of test five (log file). +test5b.ps Results of test five (output). + +NOTES: +------ + +By default, the subfigure.sty file acts like the older versions of the +subfigure package. To make the preferred options default move the +subfigure.cfg file into the standard TEXINPUTS path along with the +subfigure.sty file. This reduces the whitespace around the subfigures +and subtables and sets the table style to have the captions and +subcaptions preceed the table and subtables. diff --git a/Master/texmf-dist/doc/latex/subfigure/ltxdoc.cfg b/Master/texmf-dist/doc/latex/subfigure/ltxdoc.cfg index bd6881ac0c2..eabf8ae6f36 100644 --- a/Master/texmf-dist/doc/latex/subfigure/ltxdoc.cfg +++ b/Master/texmf-dist/doc/latex/subfigure/ltxdoc.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/doc/latex/subfigure/subfigure.pdf b/Master/texmf-dist/doc/latex/subfigure/subfigure.pdf new file mode 100644 index 00000000000..3bdbbd9f32d Binary files /dev/null and b/Master/texmf-dist/doc/latex/subfigure/subfigure.pdf differ diff --git a/Master/texmf-dist/doc/latex/subfigure/test4.pdf b/Master/texmf-dist/doc/latex/subfigure/test4.pdf deleted file mode 100644 index 3fd726f5fb0..00000000000 Binary files a/Master/texmf-dist/doc/latex/subfigure/test4.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/subfigure/test5.tex b/Master/texmf-dist/doc/latex/subfigure/test5.tex new file mode 100644 index 00000000000..350617afacf --- /dev/null +++ b/Master/texmf-dist/doc/latex/subfigure/test5.tex @@ -0,0 +1,72 @@ +\documentclass{article} + +\makeatletter +%% We pretend that we are a naughty class and are \let'ting our +%% \endfigure to the \end@float, etc. + +\def\thefigure{\@arabic\c@figure} +\def\fps@figure{tbp} +\def\ftype@figure{1} +\def\ext@figure{lof} +\def\fnum@figure{Fig.~\thefigure} +\def\figure{\@float{figure}} +\let\endfigure\end@float +\@namedef{figure*}{\@dblfloat{figure}} +\@namedef{endfigure*}{\end@dblfloat} + +\def\thetable{\@Roman\c@table} +\def\fps@table{tbp} +\def\ftype@table{2} +\def\ext@table{lot} +\def\fnum@table{TABLE~\thetable} +\def\table{% + \def\@floatboxreset{\reset@font\footnotesize\@setminipage}% + \@float{table}} +\let\endtable\end@float +\@namedef{table*}{% + \def\@floatboxreset{\reset@font\footnotesize\@setminipage}% + \@dblfloat{table}} +\@namedef{endtable*}{\end@dblfloat} +\makeatother + +% Next we load the subfigure package and see if it finds the problem. +% To check this test result, you need to see the TTY listing or check +% the test5.log (which we save as test5B.ps). +\usepackage[FIGTOPCAP]{subfigure} +\setcounter{lofdepth}{2} + +\newcommand{\figbox}[1]{% + \fbox{% + \vbox to 1in{% + \vfil + \hbox to 2in{% + \hfil + #1% + \hfil}% + \vfil}}} + +\newcommand{\goodgap}{% + \hspace{\subfigcapskip}} + +\begin{document} +\listoffigures +\newpage +\section{Fifth Test} +This test checks to see if the subfigure package reacts correctly to +the known sort of problem class. We check that the list-of-figures +page has the two subcaptions in addition to the main caption. If not, +than the nasty class has zapped us. + +(We also need to check the test5.log file to insure that the problem +was identified by the subfigure package and a warning was issued.) + +\begin{figure}% + \centering + \caption{Figure One.}% + \label{fig:first}% + \subfigure[One subone.\label{fig:first:A}]{\figbox{One subone}}% + \goodgap + \subfigure[One subtwo.\label{fig:first:B}]{\figbox{One subtwo}}% +\end{figure} + +\end{document} \ No newline at end of file -- cgit v1.2.3