summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/nag
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/latex/nag')
-rw-r--r--Master/texmf-dist/doc/latex/nag/README2
-rw-r--r--Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg6
-rw-r--r--Master/texmf-dist/doc/latex/nag/nag.pdfbin141119 -> 172066 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nag/nag.sty233
4 files changed, 227 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/nag/README b/Master/texmf-dist/doc/latex/nag/README
index 5ec5063e3f9..662fddcb8a3 100644
--- a/Master/texmf-dist/doc/latex/nag/README
+++ b/Master/texmf-dist/doc/latex/nag/README
@@ -2,3 +2,5 @@ Old habits die hard. All the same, there are commands, classes and
packages which are outdated and superseded. nag provides routines to
warn the user about the use of those. As an example, we provide an
extension that detects many of the ``sins'' described in l2tabu.
+
+License: LaTeX Project Public License 1.3a or latex, maintained. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg b/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg
index bde36c3aae8..332cea5e34d 100644
--- a/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg
+++ b/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg
@@ -93,7 +93,11 @@
\ObsoletePackage{euler}{the eulervm package}
\ObsoletePackage{utopia}{the fourier package}
%% \S 3.1
-\g@addto@macro\nag@floats{,figure,table}%
+\NagDeclareFloat{figure}\NagDeclareFloat{table}%
+\g@addto@macro\nag@labels{,label}%
+%% The latter two are used by KOMA-Script.
+\g@addto@macro\nag@captions{,caption,captionabove,captionbelow}%
+
%% \S 3.2
\NotAnEnvironment{appendix}%
%% In the same vein:
diff --git a/Master/texmf-dist/doc/latex/nag/nag.pdf b/Master/texmf-dist/doc/latex/nag/nag.pdf
index e735cbd0f28..4749e18bc7c 100644
--- a/Master/texmf-dist/doc/latex/nag/nag.pdf
+++ b/Master/texmf-dist/doc/latex/nag/nag.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nag/nag.sty b/Master/texmf-dist/doc/latex/nag/nag.sty
index 2bbcd9721b5..72f4950f96d 100644
--- a/Master/texmf-dist/doc/latex/nag/nag.sty
+++ b/Master/texmf-dist/doc/latex/nag/nag.sty
@@ -20,18 +20,25 @@
%% http://www.latex-project.org/lppl.txt
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nag}[2006/07/08 0.5 warning about old commands (ulmi)]
+\ProvidesPackage{nag}[2007/02/25 0.52 warning about old commands (ulmi)]
\let\@xa\expandafter
\let\@nx\noexpand
\newcounter{nag@c}
\newcounter{nag@sins}
- \newcommand\nag@prepend[2]{%
- \@xa\let
+\newcommand\nag@prepend[2]{%
+ \@ifundefined{#1}{%
+ % if it doesn't exist, don't do anything.
+ \PackageInfo{nag}{%
+ Command \@backslashchar#1\space not defined, skipping amendment
+ }
+ }{%
+ \@xa\let
\csname nag@@#1@\thenag@c\@xa\endcsname
\csname #1\endcsname
- \@xa\nag@pr@p@nd\csname #1\@xa\endcsname
+ \@xa\nag@pr@p@nd\csname #1\@xa\endcsname
\csname nag@@#1@\thenag@c\endcsname{#2}%
\stepcounter{nag@c}%
+ }
}
\newcommand\nag@pr@p@nd[3]{%
\def#1{#3#2}%
@@ -60,11 +67,18 @@ Use #3 instead}%
\nag@ifcsname{ifcsname}{%
\renewcommand*\nag@ifcsname[3]{%
\begingroup
- \ifcsname #1\endcsname
+ % assume it won't be there.
+ \let\tmp@a\@secondoftwo
+ \ifcsname #1\endcsname
% It still might be relax from some other test. Thanks to J\"org
% Sommer for finding this bug.
- \@ifundefined{#1}{#3}{#2}%
- \else #3\fi
+ \expandafter\ifx\csname #1\endcsname\relax
+ \else
+ % it's there after all
+ \let\tmp@a\@firstoftwo
+ \fi
+ \fi
+ \tmp@a{#2}{#3}%
\endgroup
}%
\global\let\nag@ifcsname\nag@ifcsname
@@ -99,11 +113,15 @@ Use #3 instead}%
}
\nag@prepend{#1}{%
\@for\labelprovider:=\nag@labels\do{%
+ \ifx\labelprovider\@empty\else
\nag@prepend{\labelprovider}%
{\nag@captioncheck\nag@haslabeltrue}
+ \fi
}%
\@for\captionprovider:=\nag@captions\do{%
- \nag@prepend{\captionprovider}{\global\nag@hascaptiontrue}%
+ \ifx\captionprovider\@empty\else
+ \nag@prepend{\captionprovider}{\global\nag@hascaptiontrue}%
+ \fi
}%
\global\nag@haslabelfalse\global\nag@hascaptionfalse
}%
@@ -120,13 +138,14 @@ Use #3 instead}%
\protect\caption}%
\fi
}
-\def\nag@floats{nag@dummy}
-\def\nag@labels{label}
-%% The latter two are used by KOMA-Script.
-\def\nag@captions{caption,captionabove,captionbelow}
+\def\nag@floats{}
+\def\nag@labels{}
+\def\nag@captions{}
\newcommand\nag@floatsetup{%
\@for\flo:=\nag@floats\do{%
- \@xa\nag@hackfloat\@xa{\flo}%
+ \ifx\flo\@empty\else
+ \@xa\nag@hackfloat\@xa{\flo}%
+ \fi
}%
}
\AtBeginDocument{%
@@ -228,6 +247,194 @@ Use #3 instead}%
}%
}%
}
+\AtBeginDocument{%
+ \nag@ifcsname{ver@subfig.sty}{%
+ \PackageInfo{nag}{Attempting subfig hack\@gobble}%
+ \nag@maybehacksubfig
+ }{%
+ }%
+}
+\def\nag@maybehacksubfig{%
+ %
+ % of course, i need to touch the single longest definition in
+ % subfig.sty, to amend one single command...
+ %
+ % The definition is taken from subfig.sty 1.3 dated 2005/07/05 by
+ % S.D. Chochran, where it is called sf@@@subfloat, and appears here
+ % under the conditions of section 6 of the LPPL 1.3. The subfig
+ % package is available on a CTAN mirror near you.
+ %
+ \long\def\nag@@original@@sf@@@subfloat##1[##2][##3]##4{%
+ \@ifundefined{FBsc@max}{%
+ }{%
+ \FB@readaux{\let\FBsuboheight\relax}%
+ }%
+ \@tempcnta=\@ne
+ \if@minipage
+ \@tempcnta=\z@
+ \else\ifdim \lastskip=\z@ \else
+ \@tempcnta=\tw@
+ \fi\fi
+ \ifmaincaptiontop
+ \sf@top=\sf@nearskip
+ \sf@bottom=\sf@farskip
+ \else
+ \sf@top=\sf@farskip
+ \sf@bottom=\sf@nearskip
+ \fi
+ \leavevmode
+ \setbox\@tempboxa \hbox{%
+ ##4}%
+ \@tempdima=\wd\@tempboxa
+ \@ifundefined{FBsc@max}{%
+ }{%
+ \global\advance\Xhsize-\wd\@tempboxa
+ \dimen@=\ht\@tempboxa
+ \advance\dimen@\dp\@tempboxa
+ \ifdim\dimen@>\FBso@max
+ \global\FBso@max\dimen@
+ \fi
+ }%
+ \vtop\bgroup
+ \vbox\bgroup
+ \ifcase\@tempcnta
+ \@minipagefalse
+ \or
+ \vskip\sf@top
+ \or
+ \ifdim \lastskip=\z@ \else
+ \@tempskipb\sf@top\relax\@xaddvskip
+ \fi
+ \fi
+ \sf@ifpositiontop{%
+ \ifx \@empty##3\relax \else
+ \sf@subcaption{##1}{##2}{##3}%
+ \vskip\sf@capskip
+ \vskip\sf@captopadj
+ \fi\egroup
+ \hrule width0pt height0pt depth0pt
+ \box\@tempboxa
+ }{%
+ \@ifundefined{FBsc@max}{%
+ \box\@tempboxa
+ }{%
+ \ifx\FBsuboheight\relax
+ \box\@tempboxa
+ \else
+ \vbox to \FBsuboheight{\FBafil\box\@tempboxa\FBbfil}%
+ \fi}%
+ \egroup
+ \ifx \@empty##3\relax \else
+ \vskip\sf@capskip
+ \hrule width0pt height0pt depth0pt
+ \sf@subcaption{##1}{##2}{##3}%
+ \fi
+ }%
+ \vskip\sf@bottom
+ \egroup
+ \@ifundefined{FBsc@max}{%
+ }{%
+ \addtocounter{FRobj}{-1}%
+ \ifnum\c@FRobj=0\else
+ \subfloatrowsep
+ \fi
+ }%
+ \ifmaincaptiontop\else
+ \global\advance\@nameuse{c@\@captype}\m@ne
+ \fi
+ \endgroup\ignorespaces}%
+ %
+ \expandafter\ifx\csname sf@@@subfloat\endcsname\nag@@original@@sf@@@subfloat
+ % yup, that's it.
+ \PackageInfo{nag}{OK, equivalent to subfig 1.3, redefining
+ \@backslashchar sf@@@subfloat\@gobble}%
+ \global\long\def\sf@@@subfloat##1[##2][##3]##4{%
+ \@ifundefined{FBsc@max}{%
+ }{%
+ \FB@readaux{\let\FBsuboheight\relax}%
+ }%
+ \@tempcnta=\@ne
+ \if@minipage
+ \@tempcnta=\z@
+ \else\ifdim \lastskip=\z@ \else
+ \@tempcnta=\tw@
+ \fi\fi
+ \ifmaincaptiontop
+ \sf@top=\sf@nearskip
+ \sf@bottom=\sf@farskip
+ \else
+ \sf@top=\sf@farskip
+ \sf@bottom=\sf@nearskip
+ \fi
+ \leavevmode
+ \setbox\@tempboxa \hbox{%
+ %% ulmi: new 2007/02/25: #4 may contain label command
+ \csname nag@hascaptiontrue\endcsname
+ %% and that was it.
+ ##4}%
+ \@tempdima=\wd\@tempboxa
+ \@ifundefined{FBsc@max}{%
+ }{%
+ \global\advance\Xhsize-\wd\@tempboxa
+ \dimen@=\ht\@tempboxa
+ \advance\dimen@\dp\@tempboxa
+ \ifdim\dimen@>\FBso@max
+ \global\FBso@max\dimen@
+ \fi
+ }%
+ \vtop\bgroup
+ \vbox\bgroup
+ \ifcase\@tempcnta
+ \@minipagefalse
+ \or
+ \vskip\sf@top
+ \or
+ \ifdim \lastskip=\z@ \else
+ \@tempskipb\sf@top\relax\@xaddvskip
+ \fi
+ \fi
+ \sf@ifpositiontop{%
+ \ifx \@empty##3\relax \else
+ \sf@subcaption{##1}{##2}{##3}%
+ \vskip\sf@capskip
+ \vskip\sf@captopadj
+ \fi\egroup
+ \hrule width0pt height0pt depth0pt
+ \box\@tempboxa
+ }{%
+ \@ifundefined{FBsc@max}{%
+ \box\@tempboxa
+ }{%
+ \ifx\FBsuboheight\relax
+ \box\@tempboxa
+ \else
+ \vbox to \FBsuboheight{\FBafil\box\@tempboxa\FBbfil}%
+ \fi}%
+ \egroup
+ \ifx \@empty##3\relax \else
+ \vskip\sf@capskip
+ \hrule width0pt height0pt depth0pt
+ \sf@subcaption{##1}{##2}{##3}%
+ \fi
+ }%
+ \vskip\sf@bottom
+ \egroup
+ \@ifundefined{FBsc@max}{%
+ }{%
+ \addtocounter{FRobj}{-1}%
+ \ifnum\c@FRobj=0\else
+ \subfloatrowsep
+ \fi
+ }%
+ \ifmaincaptiontop\else
+ \global\advance\@nameuse{c@\@captype}\m@ne
+ \fi
+ \endgroup\ignorespaces}%
+ \else
+ \PackageInfo{nag}{Not redefining sf@@@subfloat, it looks odd\@gobble}
+ \fi
+}
+\newcommand*\NagDeclareFloat[1]{\g@addto@macro\nag@floats{,#1}}
\DeclareOption*{%
\InputIfFileExists{nag-\CurrentOption.cfg}{%
\PackageInfo{nag}{%