xypic 384 (13oct10)

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

16 files changed, 41 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/generic/xypic/xy.tex b/Master/texmf-dist/tex/generic/xypic/xy.tex
index 983af7c8fae..9f0e2ad2b7b 100644
--- a/Master/texmf-dist/tex/generic/xypic/xy.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xy.tex
@@ -1,4 +1,4 @@
-%% xy.tex from $Id: xy.doc,v 3.21 2010/06/17 22:39:25 krisrose Exp $
+%% xy.tex from $Id: xy.doc,v 3.24 2010/10/11 21:19:57 krisrose Exp $
 %%
 %% Basic Xy-pictures: Xy-pic bootstrap and kernel macros.
 %% Copyright (c) 1991-2010 Kristoffer H. Rose <krisrose@tug.org>
@@ -119,8 +119,8 @@
 \xydef@\stripRCS@#1: #2@ #3@@@{%
  \ifx @#2\string?\else\ifx :#2\else\stripRCS@@#2\fi\fi}
 \xydef@\stripRCS@@#1 #2: @{#1}
-\xydef@\xyversion{3.8.2}
-\edef\next{\stripRCS$Date: 2010/06/17 22:39:25 $}
+\xydef@\xyversion{3.8.4}
+\edef\next{\stripRCS$Date: 2010/10/11 21:19:57 $}
 \xylet@\xydate=\next
 \xydef@\Xygreet@{%
  \W@{}%
diff --git a/Master/texmf-dist/tex/generic/xypic/xyall.tex b/Master/texmf-dist/tex/generic/xypic/xyall.tex
index d874ff6948f..b0aad2dff18 100644
--- a/Master/texmf-dist/tex/generic/xypic/xyall.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xyall.tex
@@ -1,4 +1,4 @@
-%% xyall.tex from $Id: xyall.doc,v 3.6 2010/06/10 18:45:49 krisrose Exp $
+%% xyall.tex from $Id: xyall.doc,v 3.7 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``All features'' option.
 %% Copyright (c) 1993-1996 Kristoffer H. Rose <krisrose@tug.org>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{all}{All features}{\stripRCS$Revision: 3.6 $}%
+\xyprovide{all}{All features}{\stripRCS$Revision: 3.7 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xyrequire{curve}
 \xyrequire{frame}
 \xyrequire{cmtip}
diff --git a/Master/texmf-dist/tex/generic/xypic/xyarrow.tex b/Master/texmf-dist/tex/generic/xypic/xyarrow.tex
index 2e5e94ed374..cbe15db55d1 100644
--- a/Master/texmf-dist/tex/generic/xypic/xyarrow.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xyarrow.tex
@@ -1,4 +1,4 @@
-%% xyarrow.tex from $Id: xyarrow.doc,v 3.7 2010/06/10 18:45:49 krisrose Exp $
+%% xyarrow.tex from $Id: xyarrow.doc,v 3.8 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Arrows and Paths'' feature.
 %% Copyright (c) 1991-1997 Kristoffer H. Rose <krisrose@tug.org>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{arrow}{Arrow and Path feature}{\stripRCS$Revision: 3.7 $}%
+\xyprovide{arrow}{Arrow and Path 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}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \message{path,}
 \xydef@\PATH{\afterPATH{}}
 \xylet@\afterPATH@=\empty
diff --git a/Master/texmf-dist/tex/generic/xypic/xycmtip.tex b/Master/texmf-dist/tex/generic/xypic/xycmtip.tex
index fbad3532db9..7527ba0009a 100644
--- a/Master/texmf-dist/tex/generic/xypic/xycmtip.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xycmtip.tex
@@ -1,4 +1,4 @@
-%% xycmtip.tex from $Id: xycmtip.doc,v 3.5 2010/06/10 18:45:50 krisrose Exp $
+%% xycmtip.tex from $Id: xycmtip.doc,v 3.6 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Computer Modern tips'' extension.
 %% Copyright (c) 1992-1996 Kristoffer H. Rose <krisrose@tug.org>
@@ -20,10 +20,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{cmtip}{Computer Modern tip extension}{\stripRCS$Revision: 3.5 $}%
+\xyprovide{cmtip}{Computer Modern tip extension}{\stripRCS$Revision: 3.6 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xyrequire{tips}\xycatcodes
 \xydef@\UseComputerModernTips{\SelectTips{cm}{10}\UseTips}
 \xydef@\NoComputerModernTips{\NoTips}
diff --git a/Master/texmf-dist/tex/generic/xypic/xydummy.tex b/Master/texmf-dist/tex/generic/xypic/xydummy.tex
index 9e44bc525e6..44ee458b5b6 100644
--- a/Master/texmf-dist/tex/generic/xypic/xydummy.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xydummy.tex
@@ -1,4 +1,4 @@
-%% xydummy.tex from $Id: xydummy.doc,v 3.5 2010/06/10 18:45:50 krisrose Exp $
+%% xydummy.tex from $Id: xydummy.doc,v 3.6 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Dummy'' option.
 %% Copyright (c) 1993-1996 Kristoffer H. Rose <krisrose@tug.org>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{dummy}{Dummy option}{\stripRCS$Revision: 3.5 $}%
+\xyprovide{dummy}{Dummy option}{\stripRCS$Revision: 3.6 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xynew@{count}\xydummyrequires@@
 \xyeveryrequest{dummy}{\global\advance\xydummyrequires@@\@ne
  \W@{The `dummy' option was used \the\xydummyrequires@@\space times!}}
diff --git a/Master/texmf-dist/tex/generic/xypic/xyframe.tex b/Master/texmf-dist/tex/generic/xypic/xyframe.tex
index f94aad1ffac..a9d35dbfcba 100644
--- a/Master/texmf-dist/tex/generic/xypic/xyframe.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xyframe.tex
@@ -1,4 +1,4 @@
-%% xyframe.tex from $Id: xyframe.doc,v 3.11 2010/06/10 18:45:50 krisrose Exp $
+%% xyframe.tex from $Id: xyframe.doc,v 3.12 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Frames and Brackets'' extension.
 %% Copyright (c) 1991-1997 Kristoffer H. Rose <krisrose@tug.org>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{frame}{Frame and Bracket extension}{\stripRCS$Revision: 3.11 $}%
+\xyprovide{frame}{Frame and Bracket extension}{\stripRCS$Revision: 3.12 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xydef@\frm{\hbox{}\dimen@=\L@c \advance\dimen@\R@c \wdz@=\dimen@
  \ht\z@=\U@c \dp\z@=\D@c \dimen@=\U@c \advance\dimen@\D@c
  \ifdim\wdz@=\z@ \def\Leftness@{.5}\else \quotient@\Leftness@\L@c\wdz@ \fi
diff --git a/Master/texmf-dist/tex/generic/xypic/xygraph.tex b/Master/texmf-dist/tex/generic/xypic/xygraph.tex
index a4b4dbbd4d2..901e62ad247 100644
--- a/Master/texmf-dist/tex/generic/xypic/xygraph.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xygraph.tex
@@ -1,4 +1,4 @@
-%% xygraph.tex from $Id: xygraph.doc,v 3.9 2010/06/10 18:45:50 krisrose Exp $
+%% xygraph.tex from $Id: xygraph.doc,v 3.10 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Graph Combinator feature'' option.
 %% Copyright (c) 1994-1997 Kristoffer H. Rose <krisrose@tug.org>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{graph}{Graph feature}{\stripRCS$Revision: 3.9 $}%
+\xyprovide{graph}{Graph feature}{\stripRCS$Revision: 3.10 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xyrequire{arrow}\xycatcodes
 \xydef@\xygraph#1{\relax\graph#1\endgraph}
 \xydef@\graph{\if\inxy@ \DN@{\xy@@{\nter@{}}}%
diff --git a/Master/texmf-dist/tex/generic/xypic/xymatrix.tex b/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
index fd15a38d54f..8ce58c934e5 100644
--- a/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xymatrix.tex
@@ -1,4 +1,4 @@
-%% xymatrix.tex from $Id: xymatrix.doc,v 3.8 2010/06/10 18:45:50 krisrose Exp $
+%% xymatrix.tex from $Id: xymatrix.doc,v 3.9 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Matrix'' feature.
 %% Copyright (c) 1991-1997 Kristoffer H. Rose <krisrose@tug.org>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{matrix}{Matrix feature}{\stripRCS$Revision: 3.8 $}%
+\xyprovide{matrix}{Matrix feature}{\stripRCS$Revision: 3.9 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xynew@{count}\Row
 \xynew@{count}\Col
 \xydef@\maxrow@{0}
diff --git a/Master/texmf-dist/tex/generic/xypic/xymovie.tex b/Master/texmf-dist/tex/generic/xypic/xymovie.tex
index 28f632b477b..840d81fc7b6 100644
--- a/Master/texmf-dist/tex/generic/xypic/xymovie.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xymovie.tex
@@ -1,4 +1,4 @@
-%% xymovie.tex from $Id: xymovie.doc,v 3.7 2010/06/10 18:45:50 krisrose Exp $
+%% xymovie.tex from $Id: xymovie.doc,v 3.8 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Movie Storyboard extension'' option.
 %% Copyright (c) 1996-1997 Kristoffer H. Rose <krisrose@tug.org>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{movie}{Movie Storyboard extension}{\stripRCS$Revision: 3.7 $}%
+\xyprovide{movie}{Movie Storyboard extension}{\stripRCS$Revision: 3.8 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xynew@{dimen}\m@height
 \xynew@{dimen}\m@width
 \xydef@\extractparameterm@#1#2#3{%
diff --git a/Master/texmf-dist/tex/generic/xypic/xypdf-co.tex b/Master/texmf-dist/tex/generic/xypic/xypdf-co.tex
index 956c26f0206..e1bcd6b1ecb 100644
--- a/Master/texmf-dist/tex/generic/xypic/xypdf-co.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xypdf-co.tex
@@ -81,6 +81,7 @@
 \xP@newcolor\xP@colorname{\xP@colA,\xP@colB,\xP@colC,\xP@colD}{cmyk}\newxycolor
 \else
 \PackageError{xypdf}{Syntax error in \string\newxycolor}{}\fi
+\fi
 }
 \newcommand*\xP@gray{gray}
 \newcommand*\xP@rgb{rgb}
@@ -92,8 +93,7 @@
 \else\expandafter\addtotoks@\expandafter{\nextii@}\DN@{\xyFN@\OBJECT@}\fi \next@}
 \newcommand*\xP@checkcolor[1]{\@ifundefined{\string\color@\detokenize{#1}}{\OBJECT@shapei[#1]}{\xP@append\toks@{\noexpand\xP@color{{\detokenize{#1}}}}\xyFN@\OBJECT@
 }}
-\newcommand*\xP@color[1]{\def\preStyle@@{\styletoks@{\xP@protectedcolor#1}}\let\postStyle@@\@empty
-\modXYstyle@
+\newcommand*\xP@color[1]{\def\preStyle@@{\addtostyletoks@{\bgroup\xP@protectedcolor#1}}\def\postStyle@@{\addtostyletoks@{\egroup}}\modXYstyle@
 }
 \@ifdefinable\xP@protectedcolor\relax
 \protected\def\xP@protectedcolor{\@ifundefined{color}\xP@pdfcolor\color
diff --git a/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex b/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex
index 38bbe8247e0..784f1e9c11b 100644
--- a/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex
@@ -239,7 +239,7 @@
 \let\@tempa\xydashh@
 \xP@offsetellipse
 \xP@setsolidpat
-\xP@stroke{\xP@temppath\space\the\@temptokena h}}}
+\xP@stroke{\xP@temppath\space\the\@temptokena}}}
 \newcommand*\xP@offsetellipse{\xP@movetotrue
 \@temptokena{}\xP@offsetelliptseg\A@\z@\A@{\B@*173517671/654249180}{\A@*554561898/619869377}{\B@*34221476/65864945}{\A@*543339720/768398401}{\B@*543339720/768398401}\xP@offsetelliptseg{\A@*543339720/768398401}{\B@*543339720/768398401}{\A@*34221476/65864945}{\B@*554561898/619869377}{\A@*173517671/654249180}\B@\z@\B@
 \xP@mirrorpath
diff --git a/Master/texmf-dist/tex/generic/xypic/xypdf.tex b/Master/texmf-dist/tex/generic/xypic/xypdf.tex
index 5a573463545..a201d3cea50 100644
--- a/Master/texmf-dist/tex/generic/xypic/xypdf.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xypdf.tex
@@ -59,9 +59,9 @@
 %% 
 
 \ifx\xyloaded\undefined\input xy \fi
-\xyprovide{pdf}{PDF driver}{1.4}{Daniel M\"ullner\newline}{\url{http://www.math.uni-bonn.de/people/muellner}}{}
+\xyprovide{pdf}{PDF driver}{1.5}{Daniel M\"ullner\newline}{\url{http://www.math.uni-bonn.de/people/muellner}}{}
 \ifx\makeatletter\undefined\input miniltx \fi
-\newcommand*\xypdfdate{2010/05/13}
+\newcommand*\xypdfdate{2010/10/11}
 \newdriver{\xyaddsupport{pdf}\xP@pdf@on
 \xyaddsupport{color}\xP@color@on
 \xyaddsupport{curve}\xP@curve@on
diff --git a/Master/texmf-dist/tex/generic/xypic/xyps-ps.tex b/Master/texmf-dist/tex/generic/xypic/xyps-ps.tex
index e4c418c7f36..274c08afa28 100644
--- a/Master/texmf-dist/tex/generic/xypic/xyps-ps.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xyps-ps.tex
@@ -209,7 +209,7 @@
  \let\endXYdict@=\relax
  \PSdict@@@{\xyPS@@@ PS-Adobe-3.0 Resource-procset}|
  \PSdict@@@{\xyPS@@ Title: \xyPSdictname}|
- \PSdict@@@{\xyPS@@ Version: 3.8.3}|
+ \PSdict@@@{\xyPS@@ Version: 3.8.4}|
  \PSdict@@@{\xyPS@@ Creator: Xy-ps backend to Xy-pic}|
  \PSdict@@@{\xyPS@@ DocumentSuppliedProcSets: XYdict}|
  \ifx\dvitype@\undefined
diff --git a/Master/texmf-dist/tex/generic/xypic/xysmart.tex b/Master/texmf-dist/tex/generic/xypic/xysmart.tex
index 2baf70941b3..2022594bf16 100644
--- a/Master/texmf-dist/tex/generic/xypic/xysmart.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xysmart.tex
@@ -1,4 +1,4 @@
-%% xysmart.tex from $Id: xysmart.doc,v 3.4 2010/06/10 18:45:50 krisrose Exp $
+%% xysmart.tex from $Id: xysmart.doc,v 3.5 2010/07/27 10:04:17 krisrose Exp $
 %%
 %% Xy-pic ``Smart Path feature'' option.
 %% Copyright (c) 1998 George C. Necula <necula@cs.cmu.edu>
@@ -21,7 +21,7 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{smart}{Smart Path option}{\stripRCS$Revision: 3.4 $}%
+\xyprovide{smart}{Smart Path option}{\stripRCS$Revision: 3.5 $}%
  {George C. Necula}{necula@cs.cmu.edu}%
  {School of Computer Science,
  Carnegie Mellon University,
diff --git a/Master/texmf-dist/tex/generic/xypic/xytips.tex b/Master/texmf-dist/tex/generic/xypic/xytips.tex
index 2c53c464265..d86c772987b 100644
--- a/Master/texmf-dist/tex/generic/xypic/xytips.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xytips.tex
@@ -1,4 +1,4 @@
-%% xytips.tex from $Id: xytips.doc,v 3.7 2010/06/10 18:45:50 krisrose Exp $
+%% xytips.tex from $Id: xytips.doc,v 3.8 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``More Tips'' extension.
 %% Copyright (c) 1992-1996 Kristoffer H. Rose <kris@diku.dk>
@@ -20,10 +20,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{tips}{More Tips extension}{\stripRCS$Revision: 3.7 $}%
+\xyprovide{tips}{More Tips extension}{\stripRCS$Revision: 3.8 $}%
  {Kristoffer H.~Rose}{kris@diku.dk}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xylet@\tip@xy=\tip@
 \xylet@\atip@xy=\atip@
 \xylet@\btip@xy=\btip@
diff --git a/Master/texmf-dist/tex/generic/xypic/xyv2.tex b/Master/texmf-dist/tex/generic/xypic/xyv2.tex
index 05f98ba5962..81d581b8119 100644
--- a/Master/texmf-dist/tex/generic/xypic/xyv2.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xyv2.tex
@@ -1,4 +1,4 @@
-%% xyv2.tex from $Id: xyv2.doc,v 3.6 2010/06/10 18:45:50 krisrose Exp $
+%% xyv2.tex from $Id: xyv2.doc,v 3.7 2010/07/27 09:49:34 krisrose Exp $
 %%
 %% Xy-pic ``Version 2 compatibility'' feature.
 %% Copyright (c) 1993-1995 Kristoffer H. Rose <kris@diku.dk>
@@ -21,10 +21,9 @@
 %% with this package; if not, see http://www.gnu.org/licenses/.
 %%
 \ifx\xyloaded\undefined \input xy \fi
-\xyprovide{v2}{Version 2 Compatibility}{\stripRCS$Revision: 3.6 $}%
+\xyprovide{v2}{Version 2 Compatibility}{\stripRCS$Revision: 3.7 $}%
  {Kristoffer H.~Rose}{krisrose@tug.org}%
- {BRICS/Computer Science, University of Aarhus, Ny Munkegade, building 540,
- DK--8000 Aarhus~C}
+ {IBM T.~ J.\ Watson Research Center, P.O.~Box 704, Yorktown Heights, NY 10598 (USA)}
 \xylet@\XY=\Xy
 \ifx\redefine\undefined \let\redefine=\def \fi
 \ifx\define\undefined \let\define=\xydef@ \fi