summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools/calc.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-28 15:28:40 +0000
committerKarl Berry <karl@freefriends.org>2009-09-28 15:28:40 +0000
commit0ca968cf4811fe9dee1a22dfbd031510dbcbda70 (patch)
treeea5a997fcee434f40f13fc8951e00255b7d521de /Master/texmf-dist/tex/latex/tools/calc.sty
parenta7413da58c33f9b31d87d35b556eb455cefa06eb (diff)
tools (latex core) update via latex-tds (25sep09)
git-svn-id: svn://tug.org/texlive/trunk@15511 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools/calc.sty')
-rw-r--r--Master/texmf-dist/tex/latex/tools/calc.sty11
1 files changed, 7 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/calc.sty b/Master/texmf-dist/tex/latex/tools/calc.sty
index cf08c19eb48..050015dfece 100644
--- a/Master/texmf-dist/tex/latex/tools/calc.sty
+++ b/Master/texmf-dist/tex/latex/tools/calc.sty
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -33,7 +34,7 @@
%% File `calc.dtx'.
%% Copyright (C) 1992--1995
%% Kresten Krab Thorup and Frank Jensen.
-%% Copyright (C) 1997--2005
+%% Copyright (C) 1997--2007
%% Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project.
%%
%% The original authors (fj@hugin.dk and krab@daimi.aau.dk) have
@@ -42,7 +43,7 @@
%% the normal LaTeX bug report address.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{calc}
- [2005/08/06 v4.2 Infix arithmetic (KKT,FJ)]
+ [2007/08/22 v4.3 Infix arithmetic (KKT,FJ)]
\def\calc@assign@generic#1#2#3#4{\let\calc@A#1\let\calc@B#2%
\calc@open(#4!%
\global\calc@A\calc@B\endgroup#3\calc@B}
@@ -139,7 +140,9 @@
\ifx#1*\let\calc@next\calc@multiplyx \else
\ifx#1/\let\calc@next\calc@dividex \else
\ifx#1)\let\calc@next\calc@close \else
- \calc@error#1%
+ \ifx#1\relax\let\calc@next\calc@post@scan \else
+ \def\calc@next{\calc@error#1}%
+ \fi
\fi
\fi
\fi