From b2c2a9d42122fca7e82db1534a6e9dba68560022 Mon Sep 17 00:00:00 2001 From: "Dr. Clea F. Rees" Date: Fri, 7 Aug 2009 00:49:44 +0000 Subject: nag new version git-svn-id: svn://tug.org/texlive/trunk@14564 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/nag/nag-experimental.cfg | 22 +++++++++++++++++++--- Master/texmf-dist/tex/latex/nag/nag-l2tabu.cfg | 2 +- Master/texmf-dist/tex/latex/nag/nag.sty | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex') 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} -- cgit v1.2.3