summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Clea F. Rees <cfrees@imapmail.org>2009-08-07 00:49:44 +0000
committerDr. Clea F. Rees <cfrees@imapmail.org>2009-08-07 00:49:44 +0000
commitb2c2a9d42122fca7e82db1534a6e9dba68560022 (patch)
treeebaf64a10cd35b55a90b78cd47a0e54a17e219d5
parentcd1824fb89aed341ebc0c0a7312207ccb880d4a6 (diff)
nag new version
git-svn-id: svn://tug.org/texlive/trunk@14564 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/nag/nag.pdfbin195726 -> 195841 bytes
-rw-r--r--Master/texmf-dist/source/latex/nag/nag.dtx30
-rw-r--r--Master/texmf-dist/tex/latex/nag/nag-experimental.cfg22
-rw-r--r--Master/texmf-dist/tex/latex/nag/nag-l2tabu.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/nag/nag.sty2
5 files changed, 45 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/nag/nag.pdf b/Master/texmf-dist/doc/latex/nag/nag.pdf
index a5c0d2beaf2..a55736a3780 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/source/latex/nag/nag.dtx b/Master/texmf-dist/source/latex/nag/nag.dtx
index 11b1dee7cfe..f5480010597 100644
--- a/Master/texmf-dist/source/latex/nag/nag.dtx
+++ b/Master/texmf-dist/source/latex/nag/nag.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2005-8 by Ulrich M. Schwarz
+% Copyright (C) 2005-9 by Ulrich M. Schwarz
%
% This file may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, either version 1.3a or, at your
@@ -485,7 +485,7 @@ unsuited for closing the center command above.
\ObsoletePackage{utopia}{the fourier package}
%% \S 3.1
\NagDeclareFloat{figure}\NagDeclareFloat{table}%
-\g@addto@macro\nag@labels{,label}%
+\g@addto@macro\nag@labels{,label,caption@xlabel}%
% \changes{0.60}{2007/03/31}{alternate center-in-float check, doesn't
% take up as many macro names}
\nag@prepend{endcenter}{%
@@ -577,13 +577,16 @@ unsuited for closing the center command above.
% Functionality that needs more testing.
% \begin{macrocode}
\ProvidesFile{nag-experimental.cfg}
- [2008/02/02 v0.1d experimental additions to nag (ulmi)]
+ [2009/07/04 v0.62alpha2 experimental additions to nag (ulmi)]
% \end{macrocode}
% Check if a float that may be positioned b is actually small
% enough for bottomfraction etc.
+% \changes{0.62alpha1}{2008/03/19}{Bigger warning if all float positions fail}
+% \changes{0.62alpha2}{2009/07/04}{Fix for marginpar etc which don't have fps}
% \begin{macrocode}
\let\@xa\expandafter
\newif\ifnag@dofloatsizecheck
+\newif\ifnag@allfloatpositionsfailed
\newcommand\nag@allfloatsizechecks{}%
\newcommand\nag@onefloatsizecheck[2]{%
% #1 is size fraction of textheight,
@@ -594,6 +597,8 @@ unsuited for closing the center command above.
\PackageInfo{nag}{Float too large for #2 by \the\@tempdima}%
% note we do not truncate.
% also, it's too late to add "p" now.
+ \else
+ \nag@allfloatpositionsfailedfalse
\fi
}
% \@currbox is current float box,
@@ -607,8 +612,12 @@ unsuited for closing the center command above.
\fi
%% the preceding is the original check.
\nag@dofloatsizechecktrue
+ \nag@allfloatpositionsfailedtrue
\def\nag@allfloatsizechecks{}%
- \@xa\@tfor\@xa\nag@fltsz@tmp\@xa:\@xa=\@fps\do{%
+ \@xa\@xa\@xa\@tfor\@xa\@xa\@xa\nag@fltsz@tmp\@xa\@xa\@xa:\@xa\@xa\@xa=\csname @fps\endcsname\do{%
+ \ifx\nag@fltsz@tmp\relax
+ \nag@dofloatsizecheckfalse
+ \fi
\if\nag@fltsz@tmp !
\nag@dofloatsizecheckfalse
\else
@@ -619,11 +628,20 @@ unsuited for closing the center command above.
\if\nag@fltsz@tmp b
\g@addto@macro\nag@allfloatsizechecks
{\nag@onefloatsizecheck{\bottomfraction}{bottom of page}}%
+ \else
+ \if\nag@fltsz@tmp p
+ \nag@allfloatpositionsfailedfalse
+ \fi
\fi
\fi
\fi
}%
- \ifnag@dofloatsizecheck\nag@allfloatsizechecks\fi
+ \ifnag@dofloatsizecheck
+ \nag@allfloatsizechecks
+ \ifnag@allfloatpositionsfailed
+ \nag@warn{All float specifiers `\@fps' won't work}%
+ \fi
+ \fi
}%
% \end{macrocode}
% More experimental code: warning about files that were
@@ -675,7 +693,7 @@ unsuited for closing the center command above.
% Identify ourselves.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nag}[2008/02/10 0.61 warning about old commands (ulmi)]
+\ProvidesPackage{nag}[2009/07/30 0.62 warning about old commands (ulmi)]
\let\@xa\expandafter
\let\@nx\noexpand
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/nag/nag-experimental.cfg b/Master/texmf-dist/tex/latex/nag/nag-experimental.cfg
index d52da9f9571..330b792be6b 100644
--- a/Master/texmf-dist/tex/latex/nag/nag-experimental.cfg
+++ b/Master/texmf-dist/tex/latex/nag/nag-experimental.cfg
@@ -20,9 +20,10 @@
%% http://www.latex-project.org/lppl.txt
%%
\ProvidesFile{nag-experimental.cfg}
- [2008/02/02 v0.1d experimental additions to nag (ulmi)]
+ [2009/07/04 v0.62alpha2 experimental additions to nag (ulmi)]
\let\@xa\expandafter
\newif\ifnag@dofloatsizecheck
+\newif\ifnag@allfloatpositionsfailed
\newcommand\nag@allfloatsizechecks{}%
\newcommand\nag@onefloatsizecheck[2]{%
% #1 is size fraction of textheight,
@@ -33,6 +34,8 @@
\PackageInfo{nag}{Float too large for #2 by \the\@tempdima}%
% note we do not truncate.
% also, it's too late to add "p" now.
+ \else
+ \nag@allfloatpositionsfailedfalse
\fi
}
\renewcommand\@largefloatcheck{%
@@ -44,8 +47,12 @@
\fi
%% the preceding is the original check.
\nag@dofloatsizechecktrue
+ \nag@allfloatpositionsfailedtrue
\def\nag@allfloatsizechecks{}%
- \@xa\@tfor\@xa\nag@fltsz@tmp\@xa:\@xa=\@fps\do{%
+ \@xa\@xa\@xa\@tfor\@xa\@xa\@xa\nag@fltsz@tmp\@xa\@xa\@xa:\@xa\@xa\@xa=\csname @fps\endcsname\do{%
+ \ifx\nag@fltsz@tmp\relax
+ \nag@dofloatsizecheckfalse
+ \fi
\if\nag@fltsz@tmp !
\nag@dofloatsizecheckfalse
\else
@@ -56,11 +63,20 @@
\if\nag@fltsz@tmp b
\g@addto@macro\nag@allfloatsizechecks
{\nag@onefloatsizecheck{\bottomfraction}{bottom of page}}%
+ \else
+ \if\nag@fltsz@tmp p
+ \nag@allfloatpositionsfailedfalse
+ \fi
\fi
\fi
\fi
}%
- \ifnag@dofloatsizecheck\nag@allfloatsizechecks\fi
+ \ifnag@dofloatsizecheck
+ \nag@allfloatsizechecks
+ \ifnag@allfloatpositionsfailed
+ \nag@warn{All float specifiers `\@fps' won't work}%
+ \fi
+ \fi
}%
\def\@input#1{%
\IfFileExists{#1}{\@@input\@filef@und}{%
diff --git a/Master/texmf-dist/tex/latex/nag/nag-l2tabu.cfg b/Master/texmf-dist/tex/latex/nag/nag-l2tabu.cfg
index 7d1a632ce85..7e3f6a18f33 100644
--- a/Master/texmf-dist/tex/latex/nag/nag-l2tabu.cfg
+++ b/Master/texmf-dist/tex/latex/nag/nag-l2tabu.cfg
@@ -180,7 +180,7 @@
\ObsoletePackage{utopia}{the fourier package}
%% \S 3.1
\NagDeclareFloat{figure}\NagDeclareFloat{table}%
-\g@addto@macro\nag@labels{,label}%
+\g@addto@macro\nag@labels{,label,caption@xlabel}%
\nag@prepend{endcenter}{%
\ifx\@captype\@undefined\else
\nag@warn{\lq center\rq\space environment in \@captype.\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/nag/nag.sty b/Master/texmf-dist/tex/latex/nag/nag.sty
index 224d86ffc0a..22da9a3f43c 100644
--- a/Master/texmf-dist/tex/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}[2008/02/10 0.61 warning about old commands (ulmi)]
+\ProvidesPackage{nag}[2009/07/30 0.62 warning about old commands (ulmi)]
\let\@xa\expandafter
\let\@nx\noexpand
\newcounter{nag@c}