summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/diagbox
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-02 23:50:34 +0000
committerKarl Berry <karl@freefriends.org>2017-01-02 23:50:34 +0000
commitca6bd5c649d7419cedbe72ae2d151cb7709d646c (patch)
treee960eab4bb6aa5c055ee4635ade6e202a268c336 /Master/texmf-dist/tex/latex/diagbox
parenta4a76e83143e53a7a889c2a18d2d4f82ae48f259 (diff)
diagbox (28dec16)
git-svn-id: svn://tug.org/texlive/trunk@42843 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/diagbox')
-rw-r--r--Master/texmf-dist/tex/latex/diagbox/diagbox.sty36
1 files changed, 19 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/diagbox/diagbox.sty b/Master/texmf-dist/tex/latex/diagbox/diagbox.sty
index 34cb4ecdd37..caf817c584c 100644
--- a/Master/texmf-dist/tex/latex/diagbox/diagbox.sty
+++ b/Master/texmf-dist/tex/latex/diagbox/diagbox.sty
@@ -20,11 +20,12 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{diagbox}
- [2016/02/24 v2.1 Making table heads with diagonal lines]
+ [2016/12/28 v2.2 Making table heads with diagonal lines]
\RequirePackage{keyval}
\RequirePackage{pict2e}
-\PassOptionsToPackage{nomessages}{fp}
\RequirePackage{fp}
+\FPmessagesfalse
+\RequirePackage{calc}
\RequirePackage{array}
\newbox\diagbox@boxa
\newbox\diagbox@boxb
@@ -48,32 +49,32 @@
\PackageWarning{diagbox}%
{You should not set width/innerwidth option more than once.}%
\fi
- \setlength{\diagbox@wd}{\dimexpr#1\relax}}
+ \setlength{\diagbox@wd}{#1}}
\define@key{diagbox}{height}{%
- \begingroup
- \def\line{\normalbaselineskip}%
- \edef\x{\noexpand\setlength{\diagbox@ht}{\the\dimexpr#1\relax}}%
- \expandafter\endgroup\x}
+ \let\diagbox@save@line\line
+ \def\line{\normalbaselineskip}%
+ \setlength{\diagbox@ht}{#1}%
+ \let\line\diagbox@save@line}
\define@key{diagbox}{innerleftsep}{%
- \setlength{\diagbox@insepl}{\dimexpr#1\relax}}
+ \setlength{\diagbox@insepl}{#1}}
\define@key{diagbox}{innerrightsep}{%
- \setlength{\diagbox@insepr}{\dimexpr#1\relax}}
+ \setlength{\diagbox@insepr}{#1}}
\define@key{diagbox}{innerwidth}{%
\unless\ifdim\diagbox@wd=\z@
\PackageWarning{diagbox}%
{You should not set width/innerwidth option more than once.}%
\fi
- \setlength{\diagbox@wd}{\dimexpr#1+\diagbox@insepl+\diagbox@insepr\relax}}
+ \setlength{\diagbox@wd}{#1+\diagbox@insepl+\diagbox@insepr}}
\define@key{diagbox}{outerleftsep}{%
- \setlength{\diagbox@outsepl}{\dimexpr#1\relax}}
+ \setlength{\diagbox@outsepl}{#1}}
\define@key{diagbox}{outerrightsep}{%
- \setlength{\diagbox@outsepr}{\dimexpr#1\relax}}
+ \setlength{\diagbox@outsepr}{#1}}
\define@key{diagbox}{leftsep}{%
- \setlength{\diagbox@insepl}{\dimexpr#1\relax}%
- \setlength{\diagbox@outsepl}{-\dimexpr#1\relax}}
+ \setlength{\diagbox@insepl}{#1}%
+ \setlength{\diagbox@outsepl}{-(#1)}}
\define@key{diagbox}{rightsep}{%
- \setlength{\diagbox@insepr}{\dimexpr#1\relax}%
- \setlength{\diagbox@outsepr}{-\dimexpr#1\relax}}
+ \setlength{\diagbox@insepr}{#1}%
+ \setlength{\diagbox@outsepr}{-(#1)}}
\define@key{diagbox}{trim}{%
\@tfor\@reserveda:=#1\do{%
\ifcsname diagbox@insep\@reserveda\endcsname
@@ -93,7 +94,8 @@
\let\diagbox@dir@NE\relax
\let\diagbox@dir@NW\relax
\define@key{diagbox}{linewidth}{%
- \linethickness{\dimexpr#1\relax}}
+ \setlength{\@tempskipa}{#1}%
+ \linethickness{\@tempskipa}}
\define@key{diagbox}{linecolor}{%
\def\diagbox@setlinecolor{\color{#1}}}
\let\diagbox@setlinecolor\empty