diff options
author | Karl Berry <karl@freefriends.org> | 2010-01-16 23:45:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-01-16 23:45:27 +0000 |
commit | 073661b413b5683c65ca049724362422a931bfd8 (patch) | |
tree | 38761986672f223c7af2b8985e651c18fffb2b56 /Master/texmf-dist/tex/latex/achemso/natmove.sty | |
parent | 4d12c3875aa543d42fc585b4771c9b9ef6981424 (diff) |
achemso update (16jan10)
git-svn-id: svn://tug.org/texlive/trunk@16750 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/achemso/natmove.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/achemso/natmove.sty | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/achemso/natmove.sty b/Master/texmf-dist/tex/latex/achemso/natmove.sty index 7de541d08f4..81822228f52 100644 --- a/Master/texmf-dist/tex/latex/achemso/natmove.sty +++ b/Master/texmf-dist/tex/latex/achemso/natmove.sty @@ -16,7 +16,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{natmove} - [2009/04/20 v1.1 Automatic citation moving with natbib] + [2010/01/15 v1.1a Automatic citation moving with natbib] \RequirePackage{natbib} \newcommand*\nmv@ifmtarg{} \newcommand*\nmv@xifmtarg{} @@ -39,7 +39,7 @@ \newcommand*\nmv@citex@moving{} \def\nmv@citex@moving[#1][#2]#3{% \leavevmode - \skip@\lastskip + \skip@\lastskip\relax \unskip \begingroup \def\nmv@after{\nmv@citex@nat[#1][#2]{#3}}% @@ -57,22 +57,24 @@ \let\nmv@citex@loop\nmv@citex@end \ifx\nmv@citex@next.\relax \ifnum\spacefactor<\nmv@citex@sfac\else - \let\nmv@citex@next\relax - \let\nmv@citex@loop\nmv@citex@get@next + \expandafter\expandafter\expandafter\nmv@citex@punct@undouble \fi \fi - \expandafter\nmv@citex@punct@aux\natmovechars\@empty + \expandafter\nmv@citex@punct@aux\natmovechars\@nil \nmv@citex@loop } +\newcommand*\nmv@citex@punct@undouble{% + \let\nmv@citex@next\relax + \let\nmv@citex@loop\nmv@citex@get@next +} \newcommand*\nmv@citex@loop{} -\newcommand*\nmv@citex@punct@aux{} -\def\nmv@citex@punct@aux#1#2\@empty{% +\newcommand*\nmv@citex@punct@aux[1]{% \ifx\nmv@citex@next#1\@empty #1% \let\nmv@citex@loop\nmv@citex@get@next \fi - \ifx\@empty#2\@empty\else - \expandafter\nmv@citex@punct@aux#2\@empty + \ifx#1\@nil\else + \expandafter\nmv@citex@punct@aux \fi } \mathchardef\nmv@citex@sfac3000\relax @@ -117,12 +119,12 @@ %% %% Originally developed by Mats Dahlgren %% Copyright (C) 1996-1998 by Mats Dahlgren -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% Part of this bundle is derived from cite.sty, to which the %% following license applies: -%% Copyright (C) 1989-2003 by Donald Arseneau +%% Copyright (C) 1989-2009 by Donald Arseneau %% These macros may be freely transmitted, reproduced, or %% modified provided that this notice is left intact. %% @@ -137,11 +139,11 @@ %% Joseph Wright. %% %% This work consists of the file achemso.dtx -%% and the derived files achemso.pdf, -%% achemso.bib, -%% achemso.cls, +%% and the derived files achemso.cls, %% achemso.ins, +%% achemso.pdf, %% achemso.sty, +%% achemso-demo.bib, %% achemso-demo.tex, %% natmove.sty and %% a number of configuration files. |