From df6cfce397c37144838d66b3b464c97557bb86c1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Jul 2019 20:58:41 +0000 Subject: amscdx (2jul19) git-svn-id: svn://tug.org/texlive/trunk@51532 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/amscdx/amscdx.pdf | Bin 216025 -> 217270 bytes Master/texmf-dist/source/latex/amscdx/amscdx.dtx | 64 ++++++++++++++++------- Master/texmf-dist/source/latex/amscdx/amscdx.ins | 4 +- Master/texmf-dist/tex/latex/amscdx/amscdx.sty | 36 ++++++++----- 4 files changed, 70 insertions(+), 34 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/amscdx/amscdx.pdf b/Master/texmf-dist/doc/latex/amscdx/amscdx.pdf index 8648287274e..1b8e1ac33c0 100644 Binary files a/Master/texmf-dist/doc/latex/amscdx/amscdx.pdf and b/Master/texmf-dist/doc/latex/amscdx/amscdx.pdf differ diff --git a/Master/texmf-dist/source/latex/amscdx/amscdx.dtx b/Master/texmf-dist/source/latex/amscdx/amscdx.dtx index 0d27ffdadb1..1eac34bc31e 100644 --- a/Master/texmf-dist/source/latex/amscdx/amscdx.dtx +++ b/Master/texmf-dist/source/latex/amscdx/amscdx.dtx @@ -22,7 +22,8 @@ %\iffalse %<*driver> \documentclass{amsdtx} -\usepackage{amscdx,amsmath,xcolor,calc,graphicx} +\usepackage{amscdx} +\usepackage{amsmath,calc} \GetFileInfo{amscdx.sty} % Dummy citation to avoid error in an example. \bibcite{fre:cichon}{C} @@ -127,19 +128,34 @@ Frank Mittelbach, Rainer Sch\"opf and Michael Downes} % will only work if the state of the \verb+\CDfat+ flag be false. If both % \verb+\CDfat+ and \verb+\CDash+ are true, the \verb+CDfat+ flag takes % precedence. -% +% +% \subsection*{Dependencies} +% +% \begin{itemize} +% \item the \verb+xcolor+ package, for the color; +% \item the \verb+graphics+ package, if you want vertical dashed arrows, +% as this uses the \verb+\rotatebox+ command. +% \end{itemize} +% These are now required within the package. +% +% \subsection*{Option} +% The package takes one option: \verb+lyx+, to be issued if you use it +% in LyX. Place, in the preamble, the command \verb+\usepackage[lyx]{amscdx}+. +% This forces a \verb+\renewenvironment{CD}+ to be called instead of +% \verb+\newenvironment{CD}+, as \verb+CD+ is already defined. +% % A demonstration of some of the new capabilities (yes, this looks tacky): % \begin{equation} % \CDfattrue % \CDlor{green} % \begin{CD} % \text{Left header} @. \text{Right header} \\ -% TL @>\text{Atop}>{\hspace{4cm}}> TR \\ +% TL \CDfatfalse\CDashtrue @Z\text{Atop}Z{\hspace{4cm}}Z TR \\ % \CDfatfalse @X\text{Left}X{N_x}X % \CDfatfalse \CDashtrue % \CDlor{brown} @A{\scriptsize\begin{array}{r}\text{Right}\\ % \text{column}\end{array}}A{N^x}A \\ -% ML \CDfatfalse \CDashtrue \CDlor{lime} @<{xyz}<{pqr}< MR \\ +% ML \CDfatfalse \CDashtrue \CDlor{lime} @<{xyzxyzxyz}<{pqr}< MR \\ % \CDlor{red} @A{M^2}A\scriptsize\begin{array}{l}\text{Left}\\ % \text{column}\end{array}A @V+V{N_y}V \\ % BL \CDlor{purple} @Z\text{above}Z\text{below}Z BR \\ @@ -151,12 +167,12 @@ Frank Mittelbach, Rainer Sch\"opf and Michael Downes} % \CDlor{green} % \begin{CD} % \text{Left header} @. \text{Right header} \\ -% TL @>\text{Atop}>{\hspace{4cm}}> TR \\ +% TL \CDfatfalse\CDashtrue @Z\text{Atop}Z{\hspace{4cm}}Z TR \\ % \CDfatfalse @X\text{Left}X{N_x}X % \CDfatfalse \CDashtrue % \CDlor{brown} @A{\scriptsize\begin{array}{r}\text{Right}\\ % \text{column}\end{array}}A{N^x}A \\ -% ML \CDfatfalse \CDashtrue \CDlor{lime} @<{xyz}<{pqr}< MR \\ +% ML \CDfatfalse \CDashtrue \CDlor{lime} @<{xyzxyzxyz}<{pqr}< MR \\ % \CDlor{red} @A{M^2}A\scriptsize\begin{array}{l}\text{Left}\\ % \text{column}\end{array}A @V+V{N_y}V \\ % BL \CDlor{purple} @Z\text{above}Z\text{below}Z BR \\ @@ -172,10 +188,19 @@ Frank Mittelbach, Rainer Sch\"opf and Michael Downes} % \begin{macrocode} \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] % \end{macrocode} % \begin{macrocode} + +\newif\iflyx\lyxfalse +\DeclareOption{lyx}{\lyxtrue} + +\DeclareOption*{} +\ProcessOptions*\relax + \RequirePackage{amsgen} +\RequirePackage{xcolor} +\RequirePackage{graphicx} % \end{macrocode} % Better not to redefine \verb|\math@cr| if it is already defined, % because for CD use only we want to omit the part of the code @@ -253,20 +278,20 @@ Frank Mittelbach, Rainer Sch\"opf and Michael Downes} \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$} % \end{macrocode} % % \begin{macrocode} @@ -332,7 +357,8 @@ I'll assume you wanted @@ for a printed @.}}{} % Added \verb|\restore@math@cr\default@tag| to fix line numbering % problems, 7-JUN-1991. Suggested by I.~Zakharevich. % \begin{macrocode} -\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 @@ -429,21 +455,21 @@ 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$}}$}&&}} % @@ -472,5 +498,5 @@ I'll assume you wanted @@ for a printed @.}}{} \endinput % \end{macrocode} % -% \CheckSum{814} +% \CheckSum{829} % \Finale diff --git a/Master/texmf-dist/source/latex/amscdx/amscdx.ins b/Master/texmf-dist/source/latex/amscdx/amscdx.ins index 271d7a0a52e..d96ca975acd 100644 --- a/Master/texmf-dist/source/latex/amscdx/amscdx.ins +++ b/Master/texmf-dist/source/latex/amscdx/amscdx.ins @@ -12,7 +12,7 @@ %% %% 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. %% %% ==================================================================== @@ -37,7 +37,7 @@ version 2005/12/01 or later. 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. \endpreamble 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 -- cgit v1.2.3