summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/xypic/xymatrix.tex')
-rw-r--r--Master/texmf-dist/tex/generic/xypic/xymatrix.tex42
1 files changed, 24 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/generic/xypic/xymatrix.tex b/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
index 1a66f80a1a8..fd15a38d54f 100644
--- a/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
@@ -1,11 +1,11 @@
-%% xymatrix.tex from $Id: xymatrix.doc,v 3.4 1997/05/18 01:14:25 krisrose Exp $
+%% xymatrix.tex from $Id: xymatrix.doc,v 3.8 2010/06/10 18:45:50 krisrose Exp $
%%
%% Xy-pic ``Matrix'' feature.
-%% Copyright (c) 1991-1997 Kristoffer H. Rose <krisrose@brics.dk>
+%% Copyright (c) 1991-1997 Kristoffer H. Rose <krisrose@tug.org>
%%
%% This file is part of the Xy-pic package for graphs and diagrams in TeX.
%% See the companion README and INSTALL files for further information.
-%% Copyright (c) 1991-1997 Kristoffer H. Rose <krisrose@brics.dk>
+%% Copyright (c) 1991-2010 Kristoffer H. Rose <krisrose@tug.org>
%%
%% The Xy-pic package is free software; you can redistribute it and/or modify
%% it under the terms of the GNU General Public License as published by the
@@ -18,12 +18,11 @@
%% for more details.
%%
%% You should have received a copy of the GNU General Public License along
-%% with this package; if not, write to the Free Software Foundation, Inc.,
-%% 675 Mass Ave, Cambridge, MA 02139, USA.
+%% with this package; if not, see http://www.gnu.org/licenses/.
%%
\ifx\xyloaded\undefined \input xy \fi
-\xyprovide{matrix}{Matrix feature}{\stripRCS$Revision: 3.4 $}%
- {Kristoffer H.~Rose}{krisrose@brics.dk}%
+\xyprovide{matrix}{Matrix feature}{\stripRCS$Revision: 3.8 $}%
+ {Kristoffer H.~Rose}{krisrose@tug.org}%
{BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
DK--8000 Aarhus~C}
\xynew@{count}\Row
@@ -384,7 +383,7 @@
\else\addPLUS@\ifx \next \let\next@=\xymatrix@addop
\else\addDASH@\ifx \next \let\next@=\xymatrix@addop
\else\addEQ@\ifx \next \let\next@=\xymatrix@addop
- \else\ifx 1\next \DN@1{\def\everyentry@{\vphantom(}%
+ \else\ifx 1\next \DN@1{%
\let\objectmargin@=\p@ \xyFN@\xymatrix@setup}%
\else\ifx R\next \def\xymatrix@addop@@{\xymatrix@R}\DN@ R{\xymatrix@addop}%
\else\ifx C\next \def\xymatrix@addop@@{\xymatrix@C}\DN@ C{\xymatrix@addop}%
@@ -395,7 +394,7 @@
\else\ifx *\next \DN@*{\xyFN@\xymatrix@mods}%
\else \DN@{\afterDIRECTIONorEMPTY
{\xymatrix@rotation \xyFN@\xymatrix@setup}{%
- \xyerror@{<addop> or <direction> or one of RCMLHW*! expected}{}%
+ \xyerror@{<addop> or <direction> or one of 1RCMLHW*! expected}{}%
\xyFN@\xymatrix@setup}}%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \next@}
\xydef@\xymatrix@fix{%
@@ -470,17 +469,24 @@
\xyerror@{Impossible @*<addop><size> <setup>.}{}\xyFN@\xymatrix@setup}
\xywarnifdefined\entrymodifiers
\expandafter\def\addEQ@\entrymodifiers#1{\def\entrymodifiers@{#1}\ignorespaces}
-\xydef@\entrymodifiers@{\entrybox}
+\xydef@\entrymodifiers@{!\entrybox}
\xydef@\entrybox#1{\hbox{\setbox\z@=\objectbox{#1}%
- \L@p=\wdz@ \D@p=\ht\z@ \advance\D@p\dp\z@
- \dimen@=\objectwidth@ \advance\dimen@-\L@p
- \ifdim\dimen@>\z@ \advance\L@p\dimen@ \R@p=.5\dimen@ \else \R@p=\z@ \fi
- \dimen@=\objectheight@ \advance\dimen@-\D@p
- \ifdim\dimen@>\z@ \advance\D@p\dimen@ \fi
- \dimen@=\objectmargin@ \advance\L@p2\dimen@ \advance\D@p2\dimen@
- \U@p=-.5\ht\z@ \advance\U@p.5\dp\z@ \advance\R@p\objectmargin@
+%% Old code:
+%%New code:
+ \A@=\wdz@ \R@p=\z@
+ \dimen@=\objectwidth@ \advance\dimen@-\A@
+ \ifdim\dimen@>\z@ \advance\A@\dimen@ \R@p=.5\dimen@ \fi
+ \dimen@=\objectmargin@ \advance\A@2\dimen@ \advance\R@p\dimen@
+ \B@=\ht\z@ \advance\B@\dp\z@ \U@p=-\fontdimen22\textfont\tw@
+ \dimen@=\objectheight@ \advance\dimen@-\B@
+ \ifdim\dimen@>\z@ \advance\B@\dimen@ \fi
+ \dimen@=\objectmargin@ \advance\B@2\dimen@
\setboxz@h{\kern\R@p \raise\U@p\boxz@}%
- \wdz@=\L@p \ht\z@=.5\D@p \dp\z@=.5\D@p \boxz@}}
+ \wdz@=\A@
+ \advance\B@-\ht\z@ \advance\B@-\dp\z@ \B@=.5\B@
+ \dimen@=\ht\z@ \advance\dimen@\B@ \ht\z@=\dimen@
+ \dimen@=\dp\z@ \advance\dimen@\B@ \dp\z@=\dimen@
+ \boxz@}}
\xywarnifdefined\everyentry
\expandafter\def\addEQ@\everyentry#1{\def\everyentry@{#1}\ignorespaces}
\xylet@\everyentry@=\empty