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 --- Build/cdbuild/ctan2tds.pl | 1 + Build/tools/tpm-ctan-check | 12 +- 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 +++++++ Master/texmf-dist/source/latex/subfigure/Makefile | 233 +++++++++++---------- .../source/latex/subfigure/subfigure.dtx | 79 +++++-- .../texmf-dist/tex/latex/subfigure/subfigure.cfg | 6 +- .../texmf-dist/tex/latex/subfigure/subfigure.sty | 33 ++- Master/texmf-dist/tpm/subfigure.tpm | 11 +- Master/texmf/lists/subfigure | 3 +- 13 files changed, 371 insertions(+), 201 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 diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl index 9df15d1ee0b..7baeb97c814 100755 --- a/Build/cdbuild/ctan2tds.pl +++ b/Build/cdbuild/ctan2tds.pl @@ -703,6 +703,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$'; 'spotcolor', 'spotcolor*.tex', 'startex', '\.tex', 'subfig', '\.sty|[^c]\.cfg', # omit ltxdoc.cfg, would be system-wide + 'subfigure', '\.sty|[^c]\.cfg', # omit ltxdoc.cfg, would be system-wide 'syntax', 'syntax\.tex', 'tabvar', '\.sty|\.cfg|\.[0-9]', 'taylor', 'diagrams.tex', diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check index 1f79fc80025..4f92f5f082d 100755 --- a/Build/tools/tpm-ctan-check +++ b/Build/tools/tpm-ctan-check @@ -5,7 +5,7 @@ use File::Basename; -#amscls amsltx2 amsmath +# euenc my @WorkingTPM = qw( 12many a0poster aastex abbr abc abstract accfonts acmtrans acronym @@ -34,7 +34,7 @@ my @WorkingTPM = qw( engrec enumitem envbig epiolmec eplain epsf epslatex-fr eqparbox es-tex-faq ESIEEcv esint esint-type1 eskd eskdx eso-pic etaremune - ethiop ethiop-t1 euenc euro europecv eurosans everypage exam + ethiop ethiop-t1 euro europecv eurosans everypage exam examdesign examplep exercise expressg extarrows exteps extpfeil extract extsizes faktor fancyhdr fancynum fancyref fax featpost filecontents fixme @@ -94,7 +94,7 @@ my @WorkingTPM = qw( snapshot songbook sort-by-letters soul sparklines spie splines splitbib splitindex spotcolor sprite srcltx sseq ssqquote stack stage stdclsdv stdpage stellenbosch struktex - sttools subeqn subeqnarray subfig subfloat substr sudoku + sttools subeqn subeqnarray subfig subfigure subfloat substr sudoku sudokubundle sugconf supertabular svgcolor svn svn-multi svninfo swebib syntax syntrace synttree t-angles Tabbing tableaux tabulary tabvar talk tamethebeast @@ -109,12 +109,14 @@ my @WorkingTPM = qw( vancouver variations varindex vector velthuis verse versions vhistory visualfaq vmargin volumes vpe wallpaper warning warpcol williams wordlike wrapfig - xcolor xifthen xkeyval xltxtra xq xtab xyling xypic-tut-pt + xcolor xifthen xkeyval xq xtab xyling xypic-tut-pt xytree york-thesis ); #abstyles not updated but too old to matter +#amscls amsltx2 amsmath - AMS packages come from tds zips, all very weird #beebe needs more work +#euenc - xetex people don't keep ctan up to date #logic/gn-logic14 conflicts with logic font #lshort-russian # only zip files on CTAN #malayalam # missing C sources on CTAN wrote author 5jun05. @@ -122,9 +124,9 @@ my @WorkingTPM = qw( #mpattern # not up-to-date on CTAN wrote author 28may05. #plnfss # only a zip file on CTAN #slidenotes # non-free: ALl rights reserved, nothing else! -#subfigure # installs ltxdoc.cfg!!! #shortlst # works, but license: no profit! needs catalogue update #sae # works, no profit license! +#xltxtra - xetex people don't keep ctan up to date chomp (my $mydir = `dirname $0`); chomp ($mydir = `cd $mydir && pwd`); 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 diff --git a/Master/texmf-dist/source/latex/subfigure/Makefile b/Master/texmf-dist/source/latex/subfigure/Makefile index d867fd067e7..57a584fef98 100644 --- a/Master/texmf-dist/source/latex/subfigure/Makefile +++ b/Master/texmf-dist/source/latex/subfigure/Makefile @@ -1,110 +1,123 @@ -PACKAGE = subfigure -######################################################################## -## LaTeX2e Makefile -## -## Update the following defines for your local configuration, -## -CONTRIB = /usr/local/lib/texmf/tex/contrib -## -DVIPS = dvips -GZIP = gzip -LATEX = latex -PDFLATEX = pdflatex -MAKEINDEX = makeindex -######################################################################## -## make [all] Generates the style (.sty) file and the -## documentation (.ps). If you don't have the -## required MAKEINDEX (along with `gglo.ist' and -## `gind.ist'), then change the first dependency -## of "all" from "fullps" to "ps" below. -## make [un]install Install or uninstall the style (.sty) file from -## the CONTRIB area. -## make [very]clean Clean out various auxillary files. "veryclean" -## cleans out more stuff. -######################################################################## -## make dvi Generate the *.dvi version of the documentation. -## make [full]ps Generate the documentation. The "fullps" version -## adds the change log and the cross-references. -## make idx Generate the change log and the cross-references -## (for fullps -- requires MAKEINDEX). -## make sty Generate the style (.sty) file. -######################################################################## -## make test Runs test program(s). -## make distribtion Builds a distribution (.tar.gz) file. -######################################################################## - -all: fullps test clean - -install: sty - cp $(PACKAGE).sty $(CONTRIB) -uninstall: ; rm $(CONTRIB)/$(PACKAGE).sty -clean: ; -rm -f *.dvi *.log *.aux *.lof *.lot *.toc - -rm -f *.idx *.ind *.glo *.gls *.ilg *.out *~ -veryclean: clean - -rm -f *.sty *.cls *.ps *.pdf *.gz *pk ltxdoc.cfg - - -dvi: $(PACKAGE).dvi -fullps: dvi idx ps -idx: $(PACKAGE).ind $(PACKAGE).gls - $(LATEX) $(PACKAGE).dtx -ps: $(PACKAGE).ps -sty: $(PACKAGE).sty -test: test1 test2 test3 test4 - -distribution: ; mkdir $(PACKAGE) - cp -p README Makefile $(PACKAGE) - cp -p $(PACKAGE).dtx $(PACKAGE).ins $(PACKAGE) - cp -p test*.tex $(PACKAGE) - tar -cvf $(PACKAGE).tar ./$(PACKAGE) - rm -rf $(PACKAGE) - $(GZIP) -9 $(PACKAGE).tar - - -$(PACKAGE).aux: $(PACKAGE).dtx $(PACKAGE).sty - $(LATEX) $(PACKAGE).dtx - -$(PACKAGE).dvi: $(PACKAGE).dtx $(PACKAGE).sty $(PACKAGE).aux - $(LATEX) $(PACKAGE).dtx - $(LATEX) $(PACKAGE).dtx - $(LATEX) $(PACKAGE).dtx - -$(PACKAGE).glo: $(PACKAGE).dtx $(PACKAGE).sty - $(LATEX) $(PACKAGE).dtx - -$(PACKAGE).gls: $(PACKAGE).glo - $(MAKEINDEX) -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo - -$(PACKAGE).idx: $(PACKAGE).dtx $(PACKAGE).sty - $(LATEX) $(PACKAGE).dtx - -$(PACKAGE).ind: $(PACKAGE).idx - $(MAKEINDEX) -s gind.ist $(PACKAGE).idx - -$(PACKAGE).ps: $(PACKAGE).dvi - $(DVIPS) -o $(PACKAGE).ps $(PACKAGE).dvi - -$(PACKAGE).sty: $(PACKAGE).dtx $(PACKAGE).ins - $(LATEX) $(PACKAGE).ins - -test1: $(PACKAGE).sty - $(LATEX) test.tex - $(LATEX) test.tex - $(LATEX) test.tex - $(DVIPS) -o test.ps test.dvi - -test2: $(PACKAGE).sty - $(LATEX) test2.tex - $(LATEX) test2.tex - $(DVIPS) -o test2.ps test2.dvi - -test3: $(PACKAGE).sty - $(LATEX) test3.tex - $(LATEX) test3.tex - $(LATEX) test3.tex - $(DVIPS) -o test3.ps test3.dvi - -test4: $(PACKAGE).sty - $(PDFLATEX) test4.tex - $(PDFLATEX) test4.tex - $(PDFLATEX) test4.tex +PACKAGE = subfigure +######################################################################## +## LaTeX2e Makefile +## +## Update the following defines for your local configuration, +## +CONTRIB = /usr/local/lib/texmf/tex/subfigure +## +A2PS = a2ps +CP = cp +DVIPS = dvips -t letter +GZIP = gzip +LATEX = latex +MAKEINDEX = makeindex +PDFLATEX = pdflatex +PS2PDF = ps2pdf +RM = rm +TAR = tar +######################################################################## +## make [all] Generates the style (.sty) file, the doc and +## test files (.ps) and cleans up the directory. +## make [un]install Install or uninstall the style (.sty) file from +## the CONTRIB area. +## make [very]clean Clean out various auxillary files. "veryclean" +## cleans out more stuff. +######################################################################## +## make dvi Generate the *.dvi version of the documentation. +## make [full]ps Generate the documentation. The "fullps" version +## adds the change log and the cross-references. +## make idx Generate the change log and the cross-references +## (for fullps -- requires MAKEINDEX). +## make sty Generate the style (.sty) file. +## make pdf Generate the *.pdf version of the documentation. +######################################################################## +## make test Runs test program(s). +## make distribtion Builds a distribution (.tar.gz) file. +######################################################################## + +all: pdf test clean + +install: sty + $(CP) $(PACKAGE).sty $(CONTRIB) +uninstall: ; -$(RM) -f $(CONTRIB)/$(PACKAGE).sty +clean: ; -$(RM) -f *.dvi *.log *.aux *.lof *.lot *.lom *.toc + -$(RM) -f *.idx *.ind *.glo *.gls *.ilg *.out *~ +veryclean: clean + -$(RM) -f *.sty *.cls *.ps *.pdf *.gz *pk ltxdoc.cfg + +dvi: $(PACKAGE).dvi +fullps: dvi idx ps +idx: $(PACKAGE).ind $(PACKAGE).gls + $(LATEX) $(PACKAGE).dtx + $(LATEX) $(PACKAGE).dtx +ps: $(PACKAGE).ps +sty: $(PACKAGE).sty +pdf: fullps + $(PS2PDF) $(PACKAGE).ps > $(PACKAGE).pdf + +test: test1 test2 test3 test4 test5 + +distribution: ; mkdir $(PACKAGE) + $(CP) -p README Makefile $(PACKAGE).pdf $(PACKAGE) + $(CP) -p $(PACKAGE).dtx $(PACKAGE).ins $(PACKAGE) + $(CP) -p test*.tex $(PACKAGE) + $(TAR) -cvf $(PACKAGE).tar ./$(PACKAGE) + $(RM) -rf $(PACKAGE) + $(GZIP) -9 $(PACKAGE).tar + +$(PACKAGE).aux: $(PACKAGE).dtx $(PACKAGE).sty + $(LATEX) $(PACKAGE).dtx + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).dvi: $(PACKAGE).dtx $(PACKAGE).sty $(PACKAGE).aux + $(LATEX) $(PACKAGE).dtx + $(LATEX) $(PACKAGE).dtx + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).glo: $(PACKAGE).dtx $(PACKAGE).sty + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).gls: $(PACKAGE).glo + -$(MAKEINDEX) -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo + +$(PACKAGE).idx: $(PACKAGE).dtx $(PACKAGE).sty + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).ind: $(PACKAGE).idx + -$(MAKEINDEX) -s gind.ist $(PACKAGE).idx + +$(PACKAGE).ps: $(PACKAGE).dvi + $(DVIPS) -o $(PACKAGE).ps $(PACKAGE).dvi + +$(PACKAGE).sty: $(PACKAGE).dtx $(PACKAGE).ins + $(LATEX) $(PACKAGE).ins + +test1: $(PACKAGE).sty + $(LATEX) test.tex + $(LATEX) test.tex + $(LATEX) test.tex + $(DVIPS) -o test.ps test.dvi + +test2: $(PACKAGE).sty + $(LATEX) test2.tex + $(LATEX) test2.tex + $(DVIPS) -o test2.ps test2.dvi + +test3: $(PACKAGE).sty + $(LATEX) test3.tex + $(LATEX) test3.tex + $(LATEX) test3.tex + $(DVIPS) -o test3.ps test3.dvi + +test4: $(PACKAGE).sty + $(PDFLATEX) test4.tex + $(PDFLATEX) test4.tex + $(PDFLATEX) test4.tex + +test5: $(PACKAGE).sty + $(LATEX) test5.tex + $(LATEX) test5.tex + $(A2PS) -o test5a.ps test5.log + $(DVIPS) -o test5b.ps test5.dvi + diff --git a/Master/texmf-dist/source/latex/subfigure/subfigure.dtx b/Master/texmf-dist/source/latex/subfigure/subfigure.dtx index 035d4b17d2b..269b4d5d423 100644 --- a/Master/texmf-dist/source/latex/subfigure/subfigure.dtx +++ b/Master/texmf-dist/source/latex/subfigure/subfigure.dtx @@ -19,9 +19,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 @@ -46,7 +46,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesFile{subfigure.dtx} \documentclass{ltxdoc} -\usepackage[tight,TABTOPCAP]{subfigure}[2002/03/15] +\usepackage[tight,TABTOPCAP]{subfigure}[2005/04/29] \setlength\hfuzz{100pt} \setlength\vfuzz{100pt} \clubpenalty=10000 @@ -177,7 +177,7 @@ % \DoNotIndex{\typeout,\undefined,\upshape,\usebox,\vbox,\vskip,\vspace} % \DoNotIndex{\vtop,\wd,\xdef,\z@,\z@skip} % -% \CheckSum{745}% +% \CheckSum{787}% % ^ Allow a little more freedom in typesetting floats. % \setcounter{topnumber}{8} % \def\topfraction{.8} @@ -217,9 +217,9 @@ % % \makeatother % -% \def\docdate{2002/07/02} -% \def\fileversion{v2.1.4} -% \def\filedate{2002/07/30} +% \def\docdate{2005/03/15} +% \def\fileversion{v2.1.5} +% \def\filedate{2002/03/15} % \def\filename{subfigure.dtx} % % \title{The \Lpack{subfigure} Package\footnote{This paper documents @@ -2341,7 +2341,8 @@ % problems when using the \Lpack{hyperref} package with PDF\LaTeX. % \item{\bf Frederic Darboux} for searching out and finding several % incompatibilities with other packages. -% +% \item{\bf David Kastrup} for the code to check for class or packages +% using \cmd{\let} on \cmd{\end@float} and the like. % \end{itemize} % % \newpage^finalhack @@ -2405,6 +2406,8 @@ % (Available from CTAN as file \texttt{float.dtx}.) % \end{thebibliography}} % +% \newpage^finalhack +% % \section{The Code} % \iffalse %<*package> @@ -2419,9 +2422,53 @@ % % \begin{macrocode} \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] +% \end{macrocode} +% +% \subsection{Check for Nasty Classes} +% \changes{v2.1.5}{29 Apr 2005}{At the request of David Kastrup, added +% code to check for classes that use \cmd{\let} on \cmd{\end@figure} +% and similar; and to print a warning and fix the problem if detected.} +% +% \begin{macro}{\sf@floatfix} +% +% Some ``broken'' document classes use \cmd{\let} on \cmd{\end@figure} +% and similar, which are used as hooks in the end-processing of, in +% this case, figures. The following code, courtesy of David Kastrup +% (dak\@gnu.org) fixes the problem and prints a warning. +% \begin{macrocode} +\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} % \end{macrocode} % +% \begin{macrocode} +\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 +% \end{macrocode} +% +% \end{macro} +% % \subsection{Check for the \Lpack{hyperref} Package} % % \changes{v2.1.4}{02 Jul 2002}{Added the \cmd{\theHsubfigure} and @@ -3070,8 +3117,6 @@ \DeclareOption{TABTOPCAP}{\ExecuteOptions{tabtopcap}\subtabletopcaptrue} % \end{macrocode} % -% \newpage^finalhack -% % \begin{macro}{\subfigtopskip} % \begin{macro}{\subfigcapskip} % \begin{macro}{\subfigcaptopadj} @@ -3178,6 +3223,8 @@ % \end{macrocode} % \end{macro} % +% \newpage^finalhack +% % \subsection{Execution of Options} % \label{sec:startup} % @@ -3267,8 +3314,6 @@ % \end{macro} % % -% \enlargethispage{-24pt}^finalhack -% % \begin{macro}{\@subfigure} % \changes{v2.1.4}{07 Jun 2002}{Added curly brackets around the % argument when passing it on as an optional argument.} @@ -3691,6 +3736,7 @@ % \end{macro} % % \newpage^finalhack +% \enlargethispage{3\baselineskip}^finalhack % % \begin{macro}{\subfig@oldcaption} % \begin{macro}{\@caption} @@ -3777,8 +3823,6 @@ % \end{macro} % \end{macro} % -% \newpage^finalhack -% % \begin{macro}{\sf@sub@label} % % \changes{v2.1.4}{02 Jul 2002}{Moved \cmd{\relax} from the @@ -3852,9 +3896,6 @@ % % \end{macro} % -% \enlargethispage{24pt}^finalhack -% \vspace{-10pt}^finalhack -% % \begin{macro}{\subref} % % The |\subref| command is the same as the |\ref| command except that 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}{% diff --git a/Master/texmf-dist/tpm/subfigure.tpm b/Master/texmf-dist/tpm/subfigure.tpm index f065cb8b7d2..4806cb23237 100644 --- a/Master/texmf-dist/tpm/subfigure.tpm +++ b/Master/texmf-dist/tpm/subfigure.tpm @@ -3,7 +3,7 @@ subfigure Package - 2006/01/11 23:58:07 + 2006/12/26 23:33:06 1.0 rahtz Figures divided into subfigures. @@ -24,21 +24,22 @@ subfig instead. 235144 - + texmf-dist/tex/latex/subfigure/subfigure.cfg texmf-dist/tex/latex/subfigure/subfigure.sty texmf-dist/tpm/subfigure.tpm - + texmf-dist/doc/latex/subfigure/README texmf-dist/doc/latex/subfigure/ltxdoc.cfg +texmf-dist/doc/latex/subfigure/subfigure.pdf texmf-dist/doc/latex/subfigure/test.tex texmf-dist/doc/latex/subfigure/test2.tex texmf-dist/doc/latex/subfigure/test3.tex -texmf-dist/doc/latex/subfigure/test4.pdf texmf-dist/doc/latex/subfigure/test4.tex +texmf-dist/doc/latex/subfigure/test5.tex - + texmf-dist/source/latex/subfigure/Makefile texmf-dist/source/latex/subfigure/subfigure.dtx texmf-dist/source/latex/subfigure/subfigure.ins diff --git a/Master/texmf/lists/subfigure b/Master/texmf/lists/subfigure index bfae63744e6..f4c0c039531 100644 --- a/Master/texmf/lists/subfigure +++ b/Master/texmf/lists/subfigure @@ -1,10 +1,11 @@ texmf-dist/doc/latex/subfigure/README texmf-dist/doc/latex/subfigure/ltxdoc.cfg +texmf-dist/doc/latex/subfigure/subfigure.pdf texmf-dist/doc/latex/subfigure/test.tex texmf-dist/doc/latex/subfigure/test2.tex texmf-dist/doc/latex/subfigure/test3.tex -texmf-dist/doc/latex/subfigure/test4.pdf texmf-dist/doc/latex/subfigure/test4.tex +texmf-dist/doc/latex/subfigure/test5.tex texmf-dist/source/latex/subfigure/Makefile texmf-dist/source/latex/subfigure/subfigure.dtx texmf-dist/source/latex/subfigure/subfigure.ins -- cgit v1.2.3