diff options
author | Karl Berry <karl@freefriends.org> | 2006-12-26 23:33:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-12-26 23:33:29 +0000 |
commit | f9523cf9e9c9a51a7fe6f2830db39e7ab73de1a0 (patch) | |
tree | bf0c5ffae6b2a746593c422470f0c206832cd571 /Master/texmf-dist/source | |
parent | 729ce53995492a87f35451ca5aa1075beca00c6b (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/source')
-rw-r--r-- | Master/texmf-dist/source/latex/subfigure/Makefile | 233 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/subfigure/subfigure.dtx | 79 |
2 files changed, 183 insertions, 129 deletions
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 |