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.tex46
1 files changed, 27 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/generic/xypic/xymatrix.tex b/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
index 8ce58c934e5..9cdf39b8d71 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.9 2010/07/27 09:49:34 krisrose Exp $
+%% xymatrix.tex from $Id: xymatrix.doc,v 3.14 2011/03/31 06:10:57 krisrose Exp $
%%
%% Xy-pic ``Matrix'' feature.
-%% Copyright (c) 1991-1997 Kristoffer H. Rose <krisrose@tug.org>
+%% Copyright (c) 1991-2011 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-2010 Kristoffer H. Rose <krisrose@tug.org>
+%% Copyright (c) 1991-2011 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
@@ -21,7 +21,7 @@
%% with this package; if not, see http://www.gnu.org/licenses/.
%%
\ifx\xyloaded\undefined \input xy \fi
-\xyprovide{matrix}{Matrix feature}{\stripRCS$Revision: 3.9 $}%
+\xyprovide{matrix}{Matrix feature}{\stripRCS$Revision: 3.14 $}%
{Kristoffer H.~Rose}{krisrose@tug.org}%
{IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
\xynew@{count}\Row
@@ -468,23 +468,31 @@
\xyerror@{Impossible @*<addop><size> <setup>.}{}\xyFN@\xymatrix@setup}
\xywarnifdefined\entrymodifiers
\expandafter\def\addEQ@\entrymodifiers#1{\def\entrymodifiers@{#1}\ignorespaces}
-\xydef@\entrymodifiers@{!\entrybox}
+\xydef@\entrymodifiers@{!V\entrybox}
\xydef@\entrybox#1{\hbox{\setbox\z@=\objectbox{#1}%
-%% 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@
+%%
+%% \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@
+%% \setboxz@h{\kern\R@p \raise\U@p\boxz@}%
+%% \wdz@=\L@p \ht\z@=.5\D@p \dp\z@=.5\D@p
+ \L@p=\wdz@ \R@p=\z@
+ \dimen@=\objectwidth@ \advance\dimen@-\L@p
+ \ifdim\dimen@>\z@ \advance\L@p\dimen@ \R@p=.5\dimen@ \fi
+ \dimen@=\objectmargin@ \advance\L@p2\dimen@ \advance\R@p\dimen@
+ \D@p=\ht\z@ \advance\D@p\dp\z@ \U@p=-\fontdimen22\textfont\tw@
+ \dimen@=\objectheight@ \advance\dimen@-\D@p
+ \ifdim\dimen@>\z@ \advance\D@p\dimen@ \fi
+ \dimen@=\objectmargin@ \advance\D@p2\dimen@
\setboxz@h{\kern\R@p \raise\U@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@
+ \wdz@=\L@p
+ \advance\D@p-\ht\z@ \advance\D@p-\dp\z@ \D@p=.5\D@p
+ \dimen@=\ht\z@ \advance\dimen@\D@p \ht\z@=\dimen@
+ \dimen@=\dp\z@ \advance\dimen@\D@p \dp\z@=\dimen@
\boxz@}}
\xywarnifdefined\everyentry
\expandafter\def\addEQ@\everyentry#1{\def\everyentry@{#1}\ignorespaces}