pict2e (5apr11)

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

16 files changed, 180 insertions, 78 deletions

diff --git a/Master/texmf-dist/doc/latex/pict2e/p2e-drivers.pdf b/Master/texmf-dist/doc/latex/pict2e/p2e-drivers.pdf
index d419588e434..b98e3ae5bb0 100644
--- a/Master/texmf-dist/doc/latex/pict2e/p2e-drivers.pdf
+++ b/Master/texmf-dist/doc/latex/pict2e/p2e-drivers.pdf
diff --git a/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf b/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf
index 1c704ec90d9..436a21ed26e 100644
--- a/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf
+++ b/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf
diff --git a/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx b/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx
index 09ee38deb0a..3766d98fc96 100644
--- a/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx
+++ b/Master/texmf-dist/source/latex/pict2e/p2e-drivers.dtx
@@ -1,10 +1,9 @@
 % \iffalse meta-comment
 %
 % p2e-drivers.dtx
-% Time-stamp: "p2e-drivers.dtx 2009-08-05 15:25:00 CEST JT"
 %
 %
-% Copyright (C) 2003, 2004, 2009
+% Copyright (C) 2003, 2004, 2009, 2011
 % Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 % Hubert Gaesslein, HubertJG@open.mind.de
 % Josef Tkadlec, j.tkadlec@email.cz
@@ -34,6 +33,7 @@
 %<pdftex,   >\ProvidesFile{p2e-pdftex.def}
 %<vtex,     >\ProvidesFile{p2e-vtex.def}
 %<dvipdfm,  >\ProvidesFile{p2e-dvipdfm.def}
+%<dvipdfmx, >\ProvidesFile{p2e-dvipdfmx.def}
 %<xetex,    >\ProvidesFile{p2e-xetex.def}
 %<textures, >\ProvidesFile{p2e-textures.def}
 %<pctexps,  >\ProvidesFile{p2e-pctexps.def}
@@ -45,7 +45,7 @@
 %</driver>
 %
 %<cfg>\ProvidesFile{pict2e.cfg}%
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
 %<*!cfg>
                           Driver-dependant file (RN,HjG,JT)]
 %</!cfg>
@@ -54,7 +54,7 @@
 %<*driver>
 \documentclass{ltxdoc}
   \GetFileInfo{p2e-drivers.dtx}
-  \def\docdate{2009/08/05}
+  \def\docdate{2011/04/05}
 \begin{document}
   \title{Graphics drivers for \textsf{pict2e}\thanks
     {This document corresponds to \textsf{\filename} \fileversion,
@@ -69,7 +69,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{111}
+% \CheckSum{122}
 %
 % \changes{v0.1g}{2003/11/07}{Translated documentation to English (HjG)}
 % \changes{v0.1g}{2003/11/07}{Added driver \texttt{dvipdfm} (RN)}
@@ -89,6 +89,7 @@
 % \changes{v0.1q}{2004/04/22}{Added lppl (RN/HjG)}
 % \changes{v0.1r}{2004/06/25}{Small fixes in documentation (HjG)}
 % \changes{v0.1s}{2009/08/05}{Support for xetex added (JT)}
+% \changes{v0.1t}{2011/04/05}{Support for dvipdfmx added (JT)}
 %
 % \newcommand*\PS{PostScript}
 % \newcommand*\PDF{PDF}
@@ -348,6 +349,31 @@
 % \end{macro}
 %
 %
+% \subsection{dvipdfmx}
+%
+% A \textsf{pict2e} driver file for the \textsf{dvipdfmx} driver.
+%
+% \begin{macro}{\pIIe@mode}
+% We are about to generate \PDF\ code.
+%    \begin{macrocode}
+%<*dvipdfmx>
+\def\pIIe@mode{2}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pIIe@code}
+%    \begin{macrocode}
+\def\pIIe@code#1{\special{pdf: content #1}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pIIe@pdfliteral}
+%    \begin{macrocode}
+\def\pIIe@pdfliteral#1{\special{pdf: literal #1}}
+%</dvipdfmx>
+%    \end{macrocode}
+% \end{macro}
+%
 %\iffalse
 % \subsection{xdvi}
 %
@@ -382,8 +408,7 @@
 %
 % \subsection{xetex}
 %
-% A \textsf{pict2e} driver file for the \textsf{xetex} driver
-% (submitted by Apostolos Syropoulos).
+% A \textsf{pict2e} driver file for the \textsf{xetex} driver.
 % \begin{macro}{\pIIe@mode}
 % We are about to generate \PDF\ code.
 %    \begin{macrocode}
@@ -395,10 +420,15 @@
 % \begin{macro}{\pIIe@code}
 %    \begin{macrocode}
 \def\pIIe@code#1{\special{pdf: literal q #1 Q}}
-%</xetex>
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\pIIe@pdfliteral}
+%    \begin{macrocode}
+\def\pIIe@pdfliteral#1{\special{pdf: literal #1}}
+%</xetex>
+%    \end{macrocode}
+% \end{macro}
 %
 % \subsection{dvipdf}
 %
diff --git a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
index d5c37a0db85..2d753d0e71b 100644
--- a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
+++ b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
@@ -2,7 +2,7 @@
 %
 %
 %
-% Copyright (C) 2003-2009
+% Copyright (C) 2003-2011
 % Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 % Hubert Gaesslein
 % Josef Tkadlec, j.tkadlec@email.cz
@@ -23,7 +23,7 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] 
 %<package>\ProvidesPackage{pict2e}
-%<package>  [2009/08/05 v0.2x Improved picture commands (HjG,RN,JT)]
+%<package>  [2011/04/05 v0.2y Improved picture commands (HjG,RN,JT)]
 %
 %<*driver>
 \listfiles
@@ -59,9 +59,9 @@
 % \fi
 %
 % \GetFileInfo{pict2e.sty}
-% \def\docdate{2009/08/05}
+% \def\docdate{2011/04/05}
 %
-% \CheckSum{2073}
+% \CheckSum{2135}
 %
 % ^^A ========
 %
@@ -180,6 +180,7 @@
 % \changes{v0.2v}{2008/07/19}{Improved internal division macro. (JT)}
 % \changes{v0.2w}{2008/07/22}{Number of points in \cmd{\qbezier} not ignored. (JT)}
 % \changes{v0.2x}{2009/08/05}{Support for xetex. (JT)}
+% \changes{v0.2y}{2011/04/05}{Support for dvipdfmx. (JT)}
 % \fi
 %
 % \changes{v0.1a}{2003/07/18}{First version. (RN)}
@@ -199,8 +200,10 @@
 %                             (2008/07/19 v0.2v). (JT)}
 % \changes{v0.2w}{2008/07/22}{Seventh release to CTAN
 %                             (2008/07/19 v0.2w). (JT)}
-% \changes{v0.2w}{2008/07/22}{Eigth release to CTAN
+% \changes{v0.2x}{2009/08/08}{Eigth release to CTAN
 %                             (2009/08/08 v0.2x). (JT)}
+% \changes{v0.2y}{2011/04/05}{Nineth release to CTAN
+%                             (2011/04/05 v0.2y). (JT)}
 %
 %
 % \DoNotIndex{\newcommand,\renewcommand,\newenvironment,\renewenvironment}
@@ -679,14 +682,14 @@
 %
 %  \begin{minipage}{.5\textwidth}
 %  \begin{tabular}{@{}lc@{\qquad\qquad}lc@{}}
-%    driver  & notes  &    driver   & notes\\ \hline
-%    dvips   &  x     &    dvipsone &  x? \\
-%    xdvi    &  x     &    dviwindo &  x? \\
-%    pdftex  &  x     &    dvipdf   &  x? \\
-%    vtex    &  x     &    textures &  x? \\
-%    dvipdfm &  x     &    pctexps  &  x? \\
-%    xetex   &  x     &    pctex32  &  x? \\
-%    oztex   & (x)    &             &     \\ \hline
+%    driver  & notes  & driver   & notes\\ \hline
+%    dvips   &  x     & oztex    & (x) \\
+%    xdvi    &  x     & dvipsone &  x? \\
+%    pdftex  &  x     & dviwindo &  x? \\
+%    vtex    &  x     & dvipdf   &  x? \\
+%    dvipdfm &  x     & textures &  x? \\
+%    dvipdfmx&  x     & pctexps  &  x? \\
+%    xetex   &  x     & pctex32  &  x? \\ \hline
 % ^^A emtex & --
 %  \end{tabular}
 %
@@ -1529,6 +1532,7 @@
 \DeclareOption{xdvi}{\ExecuteOptions{dvips}}
 \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}}
 \DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}}
+\DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}}
 \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}}
 \DeclareOption{xetex}{\def\Gin@driver{xetex.def}}
 \DeclareOption{dvipsone}{\def\Gin@driver{dvipsone.def}}
@@ -1544,6 +1548,38 @@
 %    \begin{macrocode}
 \DeclareOption{original}{\def\pIIe@mode{0}}
 %    \end{macrocode}
+%
+% \begin{macro}{\ifpIIe@pdfliteral@ok}
+% \begin{macro}{\pIIe@pdfliteral}
+% Check, whether if \cmd{\pIIe@pdfliteral} is given in the driver file or
+% \cmd{\pdfliteral} available directly.
+%    \begin{macrocode}
+\newif\ifpIIe@pdfliteral@ok
+\pIIe@pdfliteral@oktrue
+\ifx\pIIe@pdfliteral\@undefined
+  \ifx\pdfliteral\@undefined
+    \pIIe@pdfliteral@okfalse
+    \def\pIIe@pdfliteral#1{%
+      \PackageWarning{pict2e}{pdfliteral not supported}%
+    }%
+  \else
+    \let\pIIe@pdfliteral\pdfliteral
+  \fi
+\fi
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\pIIe@buttcap}
+% Do \cmd{\buttcap} only if available.
+%    \begin{macrocode}
+\def\pIIe@buttcap{%
+  \ifpIIe@pdfliteral@ok
+    \buttcap
+  \fi
+}
+%    \end{macrocode}
+% \end{macro}
 % Arrow shape options.
 % The values for \LaTeX-style arrows are ``hand optimized'';
 % they should be regarded as experimental,
@@ -2845,7 +2881,7 @@
 %    \begin{macrocode}
   \newcommand*\pIIe@circle[1]{%
     \begingroup
-    \buttcap
+    \pIIe@buttcap
     \pIIe@qcircle[1]\z@{#1}\pIIe@qcircle  \@ne{#1}%
     \pIIe@qcircle  \tw@{#1}\pIIe@qcircle\thr@@{#1}%
     \endgroup}
@@ -3066,7 +3102,7 @@
 %    \end{macrocode}
 % For the whole oval remove use the standard shape of ends.
 %    \begin{macrocode}
-    \ifnum15=\@tempcnta \buttcap \fi
+    \ifnum15=\@tempcnta \pIIe@buttcap \fi
 %    \end{macrocode}
 % ``\verb+@tempswa+ = false'' means, that we have to suppress the `moveto'
 % in the following quadrant.
@@ -3452,21 +3488,12 @@
     \def\roundjoin{\special{ps:: 1 setlinejoin}}
     \def\beveljoin{\special{ps:: 2 setlinejoin}}
   \or
-     \@ifundefined{XeTeXrevision}{%
-       \def\buttcap{\pdfliteral{0 J}}%
-       \def\roundcap{\pdfliteral{1 J}}%
-       \def\squarecap{\pdfliteral{2 J}}%
-       \def\miterjoin{\pdfliteral{0 j}}%
-       \def\roundjoin{\pdfliteral{1 j}}%
-       \def\beveljoin{\pdfliteral{2 j}}%
-      }{%
-       \def\buttcap{\special{pdf: literal 0 J}}%
-       \def\roundcap{\special{pdf: literal 1 J}}%
-       \def\squarecap{\special{pdf: literal 2 J}}%
-       \def\miterjoin{\special{pdf: literal 0 j}}%
-       \def\roundjoin{\special{pdf: literal 1 j}}%
-       \def\beveljoin{\special{pdf: literal 2 j}}%
-     }%
+     \def\buttcap{\pIIe@pdfliteral{0 J}}%
+     \def\roundcap{\pIIe@pdfliteral{1 J}}%
+     \def\squarecap{\pIIe@pdfliteral{2 J}}%
+     \def\miterjoin{\pIIe@pdfliteral{0 j}}%
+     \def\roundjoin{\pIIe@pdfliteral{1 j}}%
+     \def\beveljoin{\pIIe@pdfliteral{2 j}}%
   \fi
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/pict2e/pict2e.ins b/Master/texmf-dist/source/latex/pict2e/pict2e.ins
index 55b8af70aab..486c5ace00b 100644
--- a/Master/texmf-dist/source/latex/pict2e/pict2e.ins
+++ b/Master/texmf-dist/source/latex/pict2e/pict2e.ins
@@ -1,6 +1,5 @@
-% Time-stamp: "pict2e.ins Tue 2009-08-05 15:22:00 JT"
 %%
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -32,7 +31,7 @@
 
 \preamble
 
-Copyright (C) 2003, 2004, 2008, 2009
+Copyright (C) 2003, 2004, 2008, 2009, 2011
 Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 Hubert Gaesslein, HubertJG@open.mind.de
 Josef Tkadlec, j.tkadlec@email.cz
@@ -74,6 +73,8 @@ This work consists of all files listed in `manifest.txt'.
     \from{p2e-drivers.dtx}{vtex}}
   \file{p2e-dvipdfm.def}{%
     \from{p2e-drivers.dtx}{dvipdfm}}
+  \file{p2e-dvipdfmx.def}{%
+    \from{p2e-drivers.dtx}{dvipdfmx}}
   \file{p2e-xetex.def}{%
     \from{p2e-drivers.dtx}{xetex}}
   \file{p2e-textures.def}{%
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def
index e4ec2b27300..0ff32159bbc 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `dvipdfm')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-dvipdfm.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
 \def\pIIe@mode{2}
 \def\pIIe@code#1{\special{pdf: content #1}}
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def
new file mode 100644
index 00000000000..78d9496622b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvipdfmx.def
@@ -0,0 +1,34 @@
+%%
+%% This is file `p2e-dvipdfmx.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% p2e-drivers.dtx  (with options: `dvipdfmx')
+%% 
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
+%% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+%% Hubert Gaesslein, HubertJG@open.mind.de
+%% Josef Tkadlec, j.tkadlec@email.cz
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
+%% 
+%% This work consists of all files listed in `manifest.txt'.
+%% 
+\ProvidesFile{p2e-dvipdfmx.def}
+        [2011/04/05 v0.1t
+                          Driver-dependant file (RN,HjG,JT)]
+\def\pIIe@mode{2}
+\def\pIIe@code#1{\special{pdf: content #1}}
+\def\pIIe@pdfliteral#1{\special{pdf: literal #1}}
+\endinput
+%%
+%% End of file `p2e-dvipdfmx.def'.
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def b/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def
index a0ac44fc9dc..0ed1e8d8b83 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-dvips.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `dvips')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-dvips.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
 \def\pIIe@mode{1}
 \def\pIIe@code#1{%
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def b/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def
index a621a618695..f27cf7cad60 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pctex32.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `pctex32')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-pctex32.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
  % \def\pIIe@mode{-1}
  % \def\pIIe@code#1{}
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def b/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def
index 50d3c813218..8a3daa8e976 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pctexps.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `pctexps')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-pctexps.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
  % \def\pIIe@mode{-1}
  % \def\pIIe@code#1{}
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def b/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def
index 3347fbf1c47..cc5a2d1c639 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-pdftex.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `pdftex')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-pdftex.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
 \begingroup
   \@ifundefined{pdfoutput}{}{%
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def b/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def
index c7097ab1cfe..1360bbbc015 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-textures.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `textures')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-textures.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
  % \def\pIIe@mode{-1}
  % \def\pIIe@code#1{}
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def b/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def
index ef5a2e13722..a20fc85ff62 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-vtex.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `vtex')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-vtex.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
 \begingroup
   \@ifundefined{VTeXversion}{}{%
diff --git a/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def b/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def
index 5a6611800ed..e1546aa6883 100644
--- a/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def
+++ b/Master/texmf-dist/tex/latex/pict2e/p2e-xetex.def
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `xetex')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,10 +24,11 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{p2e-xetex.def}
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           Driver-dependant file (RN,HjG,JT)]
 \def\pIIe@mode{2}
 \def\pIIe@code#1{\special{pdf: literal q #1 Q}}
+\def\pIIe@pdfliteral#1{\special{pdf: literal #1}}
 \endinput
 %%
 %% End of file `p2e-xetex.def'.
diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg b/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg
index 36d5a6c1467..5669b4eb746 100644
--- a/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg
+++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.cfg
@@ -6,7 +6,7 @@
 %%
 %% p2e-drivers.dtx  (with options: `cfg')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -24,7 +24,7 @@
 %% This work consists of all files listed in `manifest.txt'.
 %% 
 \ProvidesFile{pict2e.cfg}%
-        [2009/08/05 v0.1s
+        [2011/04/05 v0.1t
                           pict2e configuration for teTeX/TeXLive]
 %% Select an appropriate default driver.
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
index 50d676a2394..2f764d3d90a 100644
--- a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
+++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
@@ -6,7 +6,7 @@
 %%
 %% pict2e.dtx  (with options: `package')
 %% 
-%% Copyright (C) 2003, 2004, 2008, 2009
+%% Copyright (C) 2003, 2004, 2008, 2009, 2011
 %% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 %% Hubert Gaesslein, HubertJG@open.mind.de
 %% Josef Tkadlec, j.tkadlec@email.cz
@@ -25,7 +25,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pict2e}
-  [2009/08/05 v0.2x Improved picture commands (HjG,RN,JT)]
+  [2011/04/05 v0.2y Improved picture commands (HjG,RN,JT)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
  \catcode`\noexpand\"\the\catcode`\"\relax
@@ -45,6 +45,7 @@
 \DeclareOption{xdvi}{\ExecuteOptions{dvips}}
 \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}}
 \DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}}
+\DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}}
 \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}}
 \DeclareOption{xetex}{\def\Gin@driver{xetex.def}}
 \DeclareOption{dvipsone}{\def\Gin@driver{dvipsone.def}}
@@ -55,6 +56,23 @@
 \DeclareOption{pctex32}{\def\Gin@driver{pctex32.def}}
 \DeclareOption{vtex}{\def\Gin@driver{vtex.def}}
 \DeclareOption{original}{\def\pIIe@mode{0}}
+\newif\ifpIIe@pdfliteral@ok
+\pIIe@pdfliteral@oktrue
+\ifx\pIIe@pdfliteral\@undefined
+  \ifx\pdfliteral\@undefined
+    \pIIe@pdfliteral@okfalse
+    \def\pIIe@pdfliteral#1{%
+      \PackageWarning{pict2e}{pdfliteral not supported}%
+    }%
+  \else
+    \let\pIIe@pdfliteral\pdfliteral
+  \fi
+\fi
+\def\pIIe@buttcap{%
+  \ifpIIe@pdfliteral@ok
+    \buttcap
+  \fi
+}
 \DeclareOption{ltxarrows}{\AtEndOfPackage{%
   \let\pIIe@vector=\pIIe@vector@ltx
   \def\pIIe@FAL{1.52}%
@@ -495,7 +513,7 @@
     \endgroup}
   \newcommand*\pIIe@circle[1]{%
     \begingroup
-    \buttcap
+    \pIIe@buttcap
     \pIIe@qcircle[1]\z@{#1}\pIIe@qcircle  \@ne{#1}%
     \pIIe@qcircle  \tw@{#1}\pIIe@qcircle\thr@@{#1}%
     \endgroup}
@@ -540,7 +558,7 @@
     \@xdim\@ovxx \advance\@xdim-\@tempdimc
     \@ydim\@ovyy \advance\@ydim-\@tempdimc
     \pIIe@get@quadrants{#3}%
-    \ifnum15=\@tempcnta \buttcap \fi
+    \ifnum15=\@tempcnta \pIIe@buttcap \fi
     \@tempswatrue
     \ifnum9=\@tempcnta
       \pIIe@qoval\z@{-\@ovyy}{\@xdim}{-\@ovyy}\thr@@\@tempdimc\@ovxx\z@
@@ -709,21 +727,12 @@
     \def\roundjoin{\special{ps:: 1 setlinejoin}}
     \def\beveljoin{\special{ps:: 2 setlinejoin}}
   \or
-     \@ifundefined{XeTeXrevision}{%
-       \def\buttcap{\pdfliteral{0 J}}%
-       \def\roundcap{\pdfliteral{1 J}}%
-       \def\squarecap{\pdfliteral{2 J}}%
-       \def\miterjoin{\pdfliteral{0 j}}%
-       \def\roundjoin{\pdfliteral{1 j}}%
-       \def\beveljoin{\pdfliteral{2 j}}%
-      }{%
-       \def\buttcap{\special{pdf: literal 0 J}}%
-       \def\roundcap{\special{pdf: literal 1 J}}%
-       \def\squarecap{\special{pdf: literal 2 J}}%
-       \def\miterjoin{\special{pdf: literal 0 j}}%
-       \def\roundjoin{\special{pdf: literal 1 j}}%
-       \def\beveljoin{\special{pdf: literal 2 j}}%
-     }%
+     \def\buttcap{\pIIe@pdfliteral{0 J}}%
+     \def\roundcap{\pIIe@pdfliteral{1 J}}%
+     \def\squarecap{\pIIe@pdfliteral{2 J}}%
+     \def\miterjoin{\pIIe@pdfliteral{0 j}}%
+     \def\roundjoin{\pIIe@pdfliteral{1 j}}%
+     \def\beveljoin{\pIIe@pdfliteral{2 j}}%
   \fi
   \AtBeginDocument{\@ifundefined{cbezier}{\newcommand}{\renewcommand}*%
       \cbezier[2][0]{\pIIe@@cbezier[#1]#2}%