texlive[42843] Master/texmf-dist: diagbox (28dec16)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 3 00:50:35 CET 2017
Revision: 42843
http://tug.org/svn/texlive?view=revision&revision=42843
Author: karl
Date: 2017-01-03 00:50:34 +0100 (Tue, 03 Jan 2017)
Log Message:
-----------
diagbox (28dec16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/diagbox/diagbox.pdf
trunk/Master/texmf-dist/source/latex/diagbox/diagbox.dtx
trunk/Master/texmf-dist/tex/latex/diagbox/diagbox.sty
Modified: trunk/Master/texmf-dist/doc/latex/diagbox/diagbox.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/diagbox/diagbox.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/diagbox/diagbox.dtx 2017-01-02 23:50:18 UTC (rev 42842)
+++ trunk/Master/texmf-dist/source/latex/diagbox/diagbox.dtx 2017-01-02 23:50:34 UTC (rev 42843)
@@ -26,7 +26,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{diagbox}
%<*package>
- [2016/02/24 v2.1 Making table heads with diagonal lines]
+ [2016/12/28 v2.2 Making table heads with diagonal lines]
%</package>
%
%<*driver>
@@ -66,7 +66,7 @@
%</driver>
% \fi
%
-% \CheckSum{634}
+% \CheckSum{612}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -129,7 +129,7 @@
% compatible macros of \pkg{slashbox}, but the result is a little different.
%
% To use \pkg{diagbox}, \eTeX{} is needed. And \pkg{diagbox} requires
-% \pkg{pict2e}, \pkg{keyval} and \pkg{fp} packages.
+% \pkg{pict2e}, \pkg{keyval}, \pkg{calc}, and \pkg{fp} packages.
%
%
% \section{Usage}
@@ -387,8 +387,8 @@
% 作为 \pkg{slashbox} 的代替，\pkg{diagbox} 除了提供自己的新命令，也提供了
% \pkg{slashbox} 原有的两个命令，语法不变，编译结果略有区别。
%
-% \pkg{diagbox} 依赖 \eTeX{} 扩展（这在目前总是可用的），依赖 \pkg{pict2e},
-% \pkg{keyval} 和 \pkg{fp} 宏包。
+% \pkg{diagbox} 依赖 \eTeX{} 扩展（这在目前总是可用的），依赖 \pkg{pict2e}、
+% \pkg{keyval}、\pkg{calc} 和 \pkg{fp} 宏包。
%
% \section{用法说明}
%
@@ -632,10 +632,18 @@
\RequirePackage{pict2e}
% \end{macrocode}
% 计算依赖 \pkg{fp} 宏包。
+% \changes{v2.2}{2016/12/28}{避免 \pkg{fp} 包的 \texttt{nomessages} 选项在使用
+% \pkg{catoptions} 包时冲突}
% \begin{macrocode}
-\PassOptionsToPackage{nomessages}{fp}
\RequirePackage{fp}
+\FPmessagesfalse
% \end{macrocode}
+% 长度计算 \pkg{calc} 宏包。
+% \changes{v2.2}{2016/12/28}{使用 \pkg{calc} 包计算选项参数，以支持
+% \cs{widthof} 等命令。}
+% \begin{macrocode}
+\RequirePackage{calc}
+% \end{macrocode}
% 内部控制 \pkg{array} 宏包。
% \begin{macrocode}
\RequirePackage{array}
@@ -686,15 +694,15 @@
\PackageWarning{diagbox}%
{You should not set width/innerwidth option more than once.}%
\fi
- \setlength{\diagbox at wd}{\dimexpr#1\relax}}
+ \setlength{\diagbox at wd}{#1}}
% \end{macrocode}
% 斜线盒子的总高度，参数中可使用 "\line" 表示行高。
% \begin{macrocode}
\define at key{diagbox}{height}{%
- \begingroup
- \def\line{\normalbaselineskip}%
- \edef\x{\noexpand\setlength{\diagbox at ht}{\the\dimexpr#1\relax}}%
- \expandafter\endgroup\x}
+ \let\diagbox at save@line\line
+ \def\line{\normalbaselineskip}%
+ \setlength{\diagbox at ht}{#1}%
+ \let\line\diagbox at save@line}
% \end{macrocode}
%
% \changes{v2.1}{2014/08/15}{盒子内容与斜线框距离 \texttt{innerleftsep},
@@ -702,9 +710,9 @@
% 盒子内容与斜线框左右的距离。
% \begin{macrocode}
\define at key{diagbox}{innerleftsep}{%
- \setlength{\diagbox at insepl}{\dimexpr#1\relax}}
+ \setlength{\diagbox at insepl}{#1}}
\define at key{diagbox}{innerrightsep}{%
- \setlength{\diagbox at insepr}{\dimexpr#1\relax}}
+ \setlength{\diagbox at insepr}{#1}}
% \end{macrocode}
%
% \changes{v2.1}{2016/02/24}{盒子内容宽度 \texttt{innerwidth} 命令选项。}
@@ -720,7 +728,7 @@
\PackageWarning{diagbox}%
{You should not set width/innerwidth option more than once.}%
\fi
- \setlength{\diagbox at wd}{\dimexpr#1+\diagbox at insepl+\diagbox at insepr\relax}}
+ \setlength{\diagbox at wd}{#1+\diagbox at insepl+\diagbox at insepr}}
% \end{macrocode}
%
% \changes{v2.1}{2014/08/15}{斜线盒子与表格单元边框距离 \texttt{outerleftsep},
@@ -733,9 +741,9 @@
% \end{align*}
% \begin{macrocode}
\define at key{diagbox}{outerleftsep}{%
- \setlength{\diagbox at outsepl}{\dimexpr#1\relax}}
+ \setlength{\diagbox at outsepl}{#1}}
\define at key{diagbox}{outerrightsep}{%
- \setlength{\diagbox at outsepr}{\dimexpr#1\relax}}
+ \setlength{\diagbox at outsepr}{#1}}
% \end{macrocode}
%
% \changes{v2.1}{2014/08/15}{左右边距 \texttt{leftsep}, \texttt{rightsep} 命令
@@ -748,11 +756,11 @@
% \end{align*}
% \begin{macrocode}
\define at key{diagbox}{leftsep}{%
- \setlength{\diagbox at insepl}{\dimexpr#1\relax}%
- \setlength{\diagbox at outsepl}{-\dimexpr#1\relax}}
+ \setlength{\diagbox at insepl}{#1}%
+ \setlength{\diagbox at outsepl}{-(#1)}}
\define at key{diagbox}{rightsep}{%
- \setlength{\diagbox at insepr}{\dimexpr#1\relax}%
- \setlength{\diagbox at outsepr}{-\dimexpr#1\relax}}
+ \setlength{\diagbox at insepr}{#1}%
+ \setlength{\diagbox at outsepr}{-(#1)}}
% \end{macrocode}
%
% 盒子计算边界时是否忽略左右的空白。"trim=l" 效果等同于 "leftsep=0pt"；"trim=r"
@@ -787,7 +795,8 @@
% 斜线宽度与颜色。
% \begin{macrocode}
\define at key{diagbox}{linewidth}{%
- \linethickness{\dimexpr#1\relax}}
+ \setlength{\@tempskipa}{#1}%
+ \linethickness{\@tempskipa}}
\define at key{diagbox}{linecolor}{%
\def\diagbox at setlinecolor{\color{#1}}}
\let\diagbox at setlinecolor\empty
Modified: trunk/Master/texmf-dist/tex/latex/diagbox/diagbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/diagbox/diagbox.sty 2017-01-02 23:50:18 UTC (rev 42842)
+++ trunk/Master/texmf-dist/tex/latex/diagbox/diagbox.sty 2017-01-02 23:50:34 UTC (rev 42843)
@@ -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 at boxa
\newbox\diagbox at boxb
@@ -48,32 +49,32 @@
\PackageWarning{diagbox}%
{You should not set width/innerwidth option more than once.}%
\fi
- \setlength{\diagbox at wd}{\dimexpr#1\relax}}
+ \setlength{\diagbox at wd}{#1}}
\define at key{diagbox}{height}{%
- \begingroup
- \def\line{\normalbaselineskip}%
- \edef\x{\noexpand\setlength{\diagbox at ht}{\the\dimexpr#1\relax}}%
- \expandafter\endgroup\x}
+ \let\diagbox at save@line\line
+ \def\line{\normalbaselineskip}%
+ \setlength{\diagbox at ht}{#1}%
+ \let\line\diagbox at save@line}
\define at key{diagbox}{innerleftsep}{%
- \setlength{\diagbox at insepl}{\dimexpr#1\relax}}
+ \setlength{\diagbox at insepl}{#1}}
\define at key{diagbox}{innerrightsep}{%
- \setlength{\diagbox at insepr}{\dimexpr#1\relax}}
+ \setlength{\diagbox at insepr}{#1}}
\define at key{diagbox}{innerwidth}{%
\unless\ifdim\diagbox at wd=\z@
\PackageWarning{diagbox}%
{You should not set width/innerwidth option more than once.}%
\fi
- \setlength{\diagbox at wd}{\dimexpr#1+\diagbox at insepl+\diagbox at insepr\relax}}
+ \setlength{\diagbox at wd}{#1+\diagbox at insepl+\diagbox at insepr}}
\define at key{diagbox}{outerleftsep}{%
- \setlength{\diagbox at outsepl}{\dimexpr#1\relax}}
+ \setlength{\diagbox at outsepl}{#1}}
\define at key{diagbox}{outerrightsep}{%
- \setlength{\diagbox at outsepr}{\dimexpr#1\relax}}
+ \setlength{\diagbox at outsepr}{#1}}
\define at key{diagbox}{leftsep}{%
- \setlength{\diagbox at insepl}{\dimexpr#1\relax}%
- \setlength{\diagbox at outsepl}{-\dimexpr#1\relax}}
+ \setlength{\diagbox at insepl}{#1}%
+ \setlength{\diagbox at outsepl}{-(#1)}}
\define at key{diagbox}{rightsep}{%
- \setlength{\diagbox at insepr}{\dimexpr#1\relax}%
- \setlength{\diagbox at outsepr}{-\dimexpr#1\relax}}
+ \setlength{\diagbox at insepr}{#1}%
+ \setlength{\diagbox at outsepr}{-(#1)}}
\define at key{diagbox}{trim}{%
\@tfor\@reserveda:=#1\do{%
\ifcsname diagbox at insep\@reserveda\endcsname
@@ -93,7 +94,8 @@
\let\diagbox at dir@NE\relax
\let\diagbox at dir@NW\relax
\define at key{diagbox}{linewidth}{%
- \linethickness{\dimexpr#1\relax}}
+ \setlength{\@tempskipa}{#1}%
+ \linethickness{\@tempskipa}}
\define at key{diagbox}{linecolor}{%
\def\diagbox at setlinecolor{\color{#1}}}
\let\diagbox at setlinecolor\empty
More information about the tex-live-commits
mailing list