summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-03-25 21:27:48 +0000
committerKarl Berry <karl@freefriends.org>2007-03-25 21:27:48 +0000
commit8fe42a1ed6634a816e74e6ad05b4c891fcc28b1d (patch)
treeea8b289f8f7f095d07aead274aa4b486002c5c4d
parent9750f56e87a034309cf698fd9daf2fc1432a7449 (diff)
nag update, including nag.sty in runtime (dak mail 23mar07)
git-svn-id: svn://tug.org/texlive/trunk@4083 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/cdbuild/ctan2tds.pl2
-rw-r--r--Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg6
-rw-r--r--Master/texmf-dist/doc/latex/nag/nag.pdfbin172066 -> 170338 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nag/nagdemo.tex16
-rw-r--r--Master/texmf-dist/source/latex/nag/nag.dtx34
-rw-r--r--Master/texmf-dist/tex/latex/nag/nag.sty (renamed from Master/texmf-dist/doc/latex/nag/nag.sty)8
-rw-r--r--Master/texmf-dist/tpm/nag.tpm14
-rw-r--r--Master/texmf/lists/nag2
8 files changed, 60 insertions, 22 deletions
diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index 408b0576d89..936c4cd9053 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -687,7 +687,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$';
'minitoc', "\.ml[do]|$standardtex",
'misc', '\.sty|\.ltx|\.cls',
'msg', "$standardtex|-msg\.tex",
- 'nag', '\.nag',
+ 'nag', '\.sty|\.nag',
'ntheorem', '\.sty|\.std',
'ofs', '^ofs\.tex|ofsdef\.tex|ofs-.*\.tex|\.sty|a.*\.tex|.*fn\.tex',
'patch', '\.tex',
diff --git a/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg b/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg
index 332cea5e34d..48ae1474d6e 100644
--- a/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg
+++ b/Master/texmf-dist/doc/latex/nag/nag-l2tabu.cfg
@@ -20,7 +20,7 @@
%% http://www.latex-project.org/lppl.txt
%%
\ProvidesFile{nag-l2tabu.cfg}
- [2006/04/19 v1.8 l2tabu rules for nag.sty (ulmi)]
+ [2007/03/21 v1.8b l2tabu rules for nag.sty (ulmi)]
%%
%% The sins.
%%
@@ -95,8 +95,8 @@
%% \S 3.1
\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}%
+%% The latter two are used by KOMA-Script, the last by hypcap.
+\g@addto@macro\nag@captions{,caption,captionabove,captionbelow,hc@caption,topcaption}%
%% \S 3.2
\NotAnEnvironment{appendix}%
diff --git a/Master/texmf-dist/doc/latex/nag/nag.pdf b/Master/texmf-dist/doc/latex/nag/nag.pdf
index 4749e18bc7c..6fb94df3b65 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/nagdemo.tex b/Master/texmf-dist/doc/latex/nag/nagdemo.tex
index afb54fca744..bd17016207c 100644
--- a/Master/texmf-dist/doc/latex/nag/nagdemo.tex
+++ b/Master/texmf-dist/doc/latex/nag/nagdemo.tex
@@ -62,6 +62,22 @@
Foo.
\end{figure}
+\typeout{Next: no complaint about subfloat and topcapt}
+\begin{figure}
+ \subfloat{\label{sf:1}Subfig with label.}
+ \caption{Figure}
+\end{figure}
+
+\begin{figure}
+ \topcaption{Figure}
+ \subfloat{\label{sf:2}Subfig with label.}
+\end{figure}
+
+\typeout{Next: no robustness issues}
+\begin{minipage}{5cm}
+ foo\footnote{bar}
+\end{minipage}
+
\typeout{Next: appendix complaints}
\begin{appendix}
\begin{center}
diff --git a/Master/texmf-dist/source/latex/nag/nag.dtx b/Master/texmf-dist/source/latex/nag/nag.dtx
index c24f400190e..c55efeaa860 100644
--- a/Master/texmf-dist/source/latex/nag/nag.dtx
+++ b/Master/texmf-dist/source/latex/nag/nag.dtx
@@ -71,6 +71,23 @@
Foo.
\end{figure}
+\typeout{Next: no complaint about subfloat and topcapt}
+\begin{figure}
+ \subfloat{\label{sf:1}Subfig with label.}
+ \caption{Figure}
+\end{figure}
+
+\begin{figure}
+ \topcaption{Figure}
+ \subfloat{\label{sf:2}Subfig with label.}
+\end{figure}
+
+\typeout{Next: no robustness issues}
+\begin{minipage}{5cm}
+ foo\footnote{bar}
+\end{minipage}
+
+
\typeout{Next: appendix complaints}
\begin{appendix}
\begin{center}
@@ -209,7 +226,7 @@
% \begin{macrocode}
%<*l2tabunag>
\ProvidesFile{nag-l2tabu.cfg}
- [2006/04/19 v1.8 l2tabu rules for nag.sty (ulmi)]
+ [2007/03/21 v1.8b l2tabu rules for nag.sty (ulmi)]
%%
%% The sins.
%%
@@ -284,8 +301,10 @@
%% \S 3.1
\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}%
+%% The latter two are used by KOMA-Script, the last by hypcap.
+% \changes{0.53}{2007/03/21}{hypcap support. (H.G.Krauth\"auser)}
+% \changes{0.53}{2007/03/21}{topcapt support.}
+\g@addto@macro\nag@captions{,caption,captionabove,captionbelow,hc@caption,topcaption}%
%% \S 3.2
\NotAnEnvironment{appendix}%
@@ -362,7 +381,7 @@
% Identify ourselves.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nag}[2007/02/25 0.52 warning about old commands (ulmi)]
+\ProvidesPackage{nag}[2007/03/20 0.53 warning about old commands (ulmi)]
\let\@xa\expandafter
\let\@nx\noexpand
% \end{macrocode}
@@ -681,8 +700,9 @@
% nag-orthodox, where it checks for the justification environments.
%
% First of all, a helper macro we hinge upon:
+% \changes{0.53}{2007/03/20}{bugfix: more Robustness. (J\"org Sommer)}
% \begin{macrocode}
-\newcommand\nag@ifCurrentEnvironment[3]{%
+\DeclareRobustCommand\nag@ifCurrentEnvironment[3]{%
\bgroup
\def\tmp@a{#1}%
\ifx\@currenvir\tmp@a
@@ -725,7 +745,7 @@
% \foo...\endfoo way.
\newcommand\nag@envstack{\relax}
-\newcommand\nag@beginenv[1]{%
+\DeclareRobustCommand\nag@beginenv[1]{%
% push a begin-entry onto the stack. Form is
% |{\foo{lineno}}| for environment foo.
\xdef\nag@envstack{%
@@ -736,7 +756,7 @@
\@xa\@nx\nag@envstack
}%
}
-\newcommand\nag@endenv[1]{%
+\DeclareRobustCommand\nag@endenv[1]{%
% extract the first entry.
\@xa\nag@end@nv\nag@envstack\@nil #1\@nil
}
diff --git a/Master/texmf-dist/doc/latex/nag/nag.sty b/Master/texmf-dist/tex/latex/nag/nag.sty
index 72f4950f96d..302638cf3a3 100644
--- a/Master/texmf-dist/doc/latex/nag/nag.sty
+++ b/Master/texmf-dist/tex/latex/nag/nag.sty
@@ -20,7 +20,7 @@
%% http://www.latex-project.org/lppl.txt
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nag}[2007/02/25 0.52 warning about old commands (ulmi)]
+\ProvidesPackage{nag}[2007/03/20 0.53 warning about old commands (ulmi)]
\let\@xa\expandafter
\let\@nx\noexpand
\newcounter{nag@c}
@@ -161,7 +161,7 @@ Use #3 instead}%
\fi
}%
}
-\newcommand\nag@ifCurrentEnvironment[3]{%
+\DeclareRobustCommand\nag@ifCurrentEnvironment[3]{%
\bgroup
\def\tmp@a{#1}%
\ifx\@currenvir\tmp@a
@@ -186,7 +186,7 @@ Use #3 instead}%
}
\newcommand\nag@envstack{\relax}
-\newcommand\nag@beginenv[1]{%
+\DeclareRobustCommand\nag@beginenv[1]{%
% push a begin-entry onto the stack. Form is
% |{\foo{lineno}}| for environment foo.
\xdef\nag@envstack{%
@@ -197,7 +197,7 @@ Use #3 instead}%
\@xa\@nx\nag@envstack
}%
}
-\newcommand\nag@endenv[1]{%
+\DeclareRobustCommand\nag@endenv[1]{%
% extract the first entry.
\@xa\nag@end@nv\nag@envstack\@nil #1\@nil
}
diff --git a/Master/texmf-dist/tpm/nag.tpm b/Master/texmf-dist/tpm/nag.tpm
index 0b097140a42..6bc389653b7 100644
--- a/Master/texmf-dist/tpm/nag.tpm
+++ b/Master/texmf-dist/tpm/nag.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/nag.zip">
<TPM:Name>nag</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2007/02/28 01:31:51</TPM:Date>
+ <TPM:Date>2007/03/25 21:27:24</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>
@@ -18,20 +18,22 @@ l2tabu.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>186472</TPM:Size>
+ <TPM:Size>230953</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="1538">texmf-dist/tpm/nag.tpm</TPM:RunFiles>
- <TPM:DocFiles size="193185">
+ <TPM:RunFiles size="13309">
+texmf-dist/tex/latex/nag/nag.sty
+texmf-dist/tpm/nag.tpm
+ </TPM:RunFiles>
+ <TPM:DocFiles size="180097">
texmf-dist/doc/latex/nag/README
texmf-dist/doc/latex/nag/nag-abort.cfg
texmf-dist/doc/latex/nag/nag-l2tabu.cfg
texmf-dist/doc/latex/nag/nag-orthodox.cfg
texmf-dist/doc/latex/nag/nag.pdf
-texmf-dist/doc/latex/nag/nag.sty
texmf-dist/doc/latex/nag/nagdemo.tex
</TPM:DocFiles>
- <TPM:SourceFiles size="36230">
+ <TPM:SourceFiles size="36829">
texmf-dist/source/latex/nag/nag.dtx
texmf-dist/source/latex/nag/nag.ins
</TPM:SourceFiles>
diff --git a/Master/texmf/lists/nag b/Master/texmf/lists/nag
index 64134b4567a..45285aa0746 100644
--- a/Master/texmf/lists/nag
+++ b/Master/texmf/lists/nag
@@ -3,10 +3,10 @@ texmf-dist/doc/latex/nag/nag-abort.cfg
texmf-dist/doc/latex/nag/nag-l2tabu.cfg
texmf-dist/doc/latex/nag/nag-orthodox.cfg
texmf-dist/doc/latex/nag/nag.pdf
-texmf-dist/doc/latex/nag/nag.sty
texmf-dist/doc/latex/nag/nagdemo.tex
texmf-dist/source/latex/nag/nag.dtx
texmf-dist/source/latex/nag/nag.ins
+texmf-dist/tex/latex/nag/nag.sty
texmf-dist/tpm/nag.tpm
texmf/lists/nag