amscdx (2jul19)

git-svn-id: svn://tug.org/texlive/trunk@51532 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 23 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/amscdx/amscdx.sty b/Master/texmf-dist/tex/latex/amscdx/amscdx.sty
index 568ad5e8513..45f2c963a59 100644
--- a/Master/texmf-dist/tex/latex/amscdx/amscdx.sty
+++ b/Master/texmf-dist/tex/latex/amscdx/amscdx.sty
@@ -19,12 +19,21 @@
 %% 
 %% This work has the LPPL maintenance status `maintained'.
 %% 
-%% The Current Maintainer of this work is the LaTeX3 project.
+%% The Current Maintainer of this work is Martin Vermeer.
 %% 
 \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
 [1994/12/01]% LaTeX date must December 1994 or later
-\ProvidesPackage{amscdx}[2019/06/04 v2.1x AMS Commutative Diagrams]
+\ProvidesPackage{amscdx}[2019/07/02 v2.2x AMS Commutative Diagrams]
+
+\newif\iflyx\lyxfalse
+\DeclareOption{lyx}{\lyxtrue}
+
+\DeclareOption*{}
+\ProcessOptions*\relax
+
 \RequirePackage{amsgen}
+\RequirePackage{xcolor}
+\RequirePackage{graphicx}
 \@ifundefined{math@cr}{%
   \def\math@cr{{\ifnum0=`}\fi
     \@ifstar{\global\@eqpen\@M\math@cr@}%
@@ -73,20 +82,20 @@
     \hbox{$#1\mkern-2mu\box\z@\mkern-2mu$}\hfill
     \mkern-6mu\mathord\Rightarrow$}
 \def\rightdasharrowfill@#1{%
-    \m@th\setboxz@h{$#1\,\relbar\,$}\ht\z@\z@
+    \m@th\setboxz@h{$#1\:\relbar\:$}\ht\z@\z@
     $#1\copy\z@\mkern-6mu\cleaders
     \hbox{$#1\mkern-2mu\box\z@\mkern-2mu$}\hfill
-    \mkern-6mu\mathord\rightarrow$}
+    \mkern-2mu\mathord\rightarrow$}
 \def\leftdasharrowfill@#1{%
-    \m@th\setboxz@h{$#1\,\relbar\,$}\ht\z@\z@
-    $#1\mathord\leftarrow\mkern-6mu\cleaders%
+    \m@th\setboxz@h{$#1\:\relbar\:$}\ht\z@\z@
+    $#1\mathord\leftarrow\mkern-2mu\cleaders%
     \hbox{$#1\mkern-2mu\copy\z@\mkern-2mu$}\hfill
     \mkern-6mu\box\z@$}
   \def\leftrightdasharrowfill@#1{%
-    \m@th\setboxz@h{$#1\,\relbar\,$}\ht\z@\z@
-    $#1\mathord\leftarrow\mkern-6mu\cleaders
+    \m@th\setboxz@h{$#1\:\relbar\:$}\ht\z@\z@
+    $#1\mathord\leftarrow\mkern-2mu\cleaders
     \hbox{$#1\mkern-2mu\box\z@\mkern-2mu$}\hfill
-    \mkern-6mu\mathord\rightarrow$}
+    \mkern-2mu\mathord\rightarrow$}
 \def\atdef@#1{\expandafter\def\csname\space @\string#1\endcsname}
 \@ifundefined{Iat}{%
   \DeclareRobustCommand{\Iat}{\FN@\at@}
@@ -128,7 +137,8 @@ I'll assume you wanted @@ for a printed @.}}{}
 \minCDarrowwidth2.5pc
 \newif\ifCD@
 \let\ampersand@\relax
-\newenvironment{CD}{%
+\iflyx\else\newenvironment{CD}{}{}\fi
+\renewenvironment{CD}{%
   \CDat
   \bgroup\relax\iffalse{\fi\let\ampersand@&\iffalse}\fi
   \CD@true\vcenter\bgroup\let\\\math@cr\restore@math@cr\default@tag
@@ -190,19 +200,19 @@ I'll assume you wanted @@ for a printed @.}}{}
 \atdef@ A#1A#2A{\CD@check{A..A..A}{\color{\dye@}\llap{$\m@th\vcenter{\hbox
   {$\scriptstyle#1$}}$}
   \ifCDfat \Big\Uparrow \else
-  \ifCDash \vphantom{\Bigg\Updownarrow}\text{\rotatebox{90}{\clap{$\mkern8mu\mathop-\mathop-\mkern-2mu\rightarrow$}}}
+  \ifCDash \vphantom{\Bigg\Updownarrow}\text{\rotatebox{90}{\clap{$\mkern8mu\relbar\:\relbar\mkern-2mu\rightarrow$}}}
   \else \Big\uparrow \fi \fi
   \rlap{$\m@th\vcenter{\hbox{$\scriptstyle#2$}}$}&&}}
 \atdef@ V#1V#2V{\CD@check{V..V..V}{\color{\dye@}\llap{$\m@th\vcenter{\hbox
   {$\scriptstyle#1$}}$}
   \ifCDfat \Big\Downarrow \else
-  \ifCDash \vphantom{\Bigg\Updownarrow}\text{\rotatebox{270}{\clap{$\mkern-8mu\mathop-\mathop-\mkern-2mu\rightarrow$}}}
+  \ifCDash \vphantom{\Bigg\Updownarrow}\text{\rotatebox{270}{\clap{$\mkern-8mu\relbar\:-\mkern-2mu\rightarrow$}}}
   \else \Big\downarrow \fi \fi
   \rlap{$\m@th\vcenter{\hbox{$\scriptstyle#2$}}$}&&}}
 \atdef@ X#1X#2X{\CD@check{X..X..X}{\color{\dye@}\llap{$\m@th\vcenter{\hbox
   {$\scriptstyle#1$}}$}
   \ifCDfat \Big\Updownarrow \else
-  \ifCDash \vphantom{\Bigg\Updownarrow}\text{\rotatebox{90}{\clap{$\mkern8mu\leftarrow\mkern-2mu\mathop-\mkern-2mu\rightarrow$}}}
+  \ifCDash \vphantom{\Bigg\Updownarrow}\text{\rotatebox{90}{\clap{$\mkern8mu\leftarrow\mkern-2mu\relbar\mkern-2mu\rightarrow$}}}
   \else \Big\updownarrow \fi \fi
   \rlap{$\m@th\vcenter{\hbox{$\scriptstyle#2$}}$}&&}}
 \atdef@={\CD@check={\gdef\before@{\dye@}&\color{\before@}\enskip\mathrel