pict2e update

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

3 files changed, 45 insertions, 27 deletions

diff --git a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
index 19d15341143..3f5c87ccb80 100644
--- a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
+++ b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
@@ -1,11 +1,10 @@
 % \iffalse meta-comment
 %
-% Time-stamp: "pict2e.dtx 2004-08-06 15:01:38 CEST Tuesday hubertjg"
 %
 %
-% Copyright (C) 2003, 2004
+% Copyright (C) 2003-2006
 % Rolf Niepraschk, Rolf.Niepraschk@ptb.de
-% Hubert Gaesslein, HubertJG@open.mind.de
+% Hubert Gaesslein
 %
 %
 % This work may be distributed and/or modified under the
@@ -21,9 +20,9 @@
 % This work consists of all files listed in manifest.txt.
 %
 %
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] % ???
+%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] 
 %<package>\ProvidesPackage{pict2e}
-%<package>  [2004/08/06 v0.2q Improved picture commands (HjG,RN)]
+%<package>  [2006/03/05 v0.2s Improved picture commands (HjG,RN)]
 %
 %<*driver>
 \listfiles
@@ -43,7 +42,7 @@
     top=20mm,bottom=30mm]{geometry}}{}
 \IfFileExists{url.sty}{\usepackage{url}}
   {\newcommand*\url[1]{\texttt{#1}}}
-%%\OnlyDescription
+\OnlyDescription
 %%\AlsoImplementation
 \EnableCrossrefs
 \CodelineIndex
@@ -61,7 +60,7 @@
 % \GetFileInfo{pict2e.sty}
 % \def\docdate{2004/08/06}
 %
-% \CheckSum{1499}
+% \CheckSum{1502}
 %
 % ^^A ========
 %
@@ -172,7 +171,7 @@
 % \changes{v0.2o}{2004/06/25}{Fix two bugs (HjG)}
 % \changes{v0.2o}{2004/06/25}{Numerous small fixes in documentation (HjG)}
 % \changes{v0.2p}{2004/07/06}{Small fixes in documentation (HjG)}
-%
+% \changes{v0.2s}{2006/03/05}{Wrong PSTricks-like arrows corrected (RN)}
 % \fi
 %
 % \changes{v0.1a}{2003/07/18}{First version. (RN)}
@@ -1413,10 +1412,17 @@
   }}
 \DeclareOption{pstarrows}{\AtEndOfPackage{%
   \let\pIIe@vector=\pIIe@vector@pst
-  \def\pIIe@FAL{1.4}%
-  \def\pIIe@FAW{2}%
-  \def\pIIe@CAW{1.5pt}%
-  \def\pIIe@FAI{0.4}%
+  \iffalse
+    \def\pIIe@FAL{1.4}%
+    \def\pIIe@FAW{2}%
+    \def\pIIe@CAW{1.5pt}%
+    \def\pIIe@FAI{0.4}%
+  \else % These are the ltxarrows values, which looks better. (RN)
+    \def\pIIe@FAL{1.52}%
+    \def\pIIe@FAW{3.2}%
+    \def\pIIe@CAW{1.5pt}%
+    \def\pIIe@FAI{0.25}%
+  \fi
   }}
 %    \end{macrocode}
 %
@@ -1972,6 +1978,7 @@
 % \]
 % and $t = x/s$  and  $\tau = 2(t-1/2)$.
 % \end{quote}
+% \changes{v0.2r}{2005/07/15}{Two wrong global assignment changed. (RN)}
 %    \begin{macrocode}
 \newcommand*\pIIe@pyth[3]{%
   \begingroup
@@ -1993,7 +2000,7 @@
 %    \end{macrocode}
 % $\cmd{\@tempdimc} = z = \sqrt{(x^2+y^2)}$
 %    \begin{macrocode}
-      \global\@tempdimc=\z@
+      \@tempdimc=\z@
     \else
 %    \end{macrocode}
 % $\cmd{\@tempdima} = 8 \times\mathrm{abs}(x)$
@@ -2033,8 +2040,8 @@
 %    \begin{macrocode}
       \global\divide\@tempdimc 8
     \fi
-  \endgroup
-  #3=\@tempdimc}
+    \edef\x{\endgroup#3=\the\@tempdimc}%
+  \x}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2240,6 +2247,7 @@
   \newcommand*\pIIe@FAL{}\newcommand*\pIIe@FAW{}\newcommand*\pIIe@CAW{}
   \newcommand*\pIIe@FAI{}
   \newcommand*\pIIe@@firstnum{}\newcommand*\pIIe@@secondnum{}
+  \iffalse% the pstricks values gives too small arrows. (RN) 
   \AtBeginDocument{%
     \@ifpackageloaded{pstricks}{%
       \def\pIIe@FAL{\psk@arrowlength}%
@@ -2250,6 +2258,7 @@
       \def\pIIe@@secondnum#1 #2 {#2}%
     }{}%
   }
+  \fi
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
index 8c35046c220..bdab3211eb5 100644
--- a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
+++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty
@@ -22,9 +22,9 @@
 %% 
 %% This work consists of all files listed in `manifest.txt'.
 %% 
-\NeedsTeXFormat{LaTeX2e}[1999/12/01] % ???
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pict2e}
-  [2004/08/06 v0.2q Improved picture commands (HjG,RN)]
+  [2006/03/05 v0.2s Improved picture commands (HjG,RN)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
  \catcode`\noexpand\"\the\catcode`\"\relax
@@ -62,10 +62,17 @@
   }}
 \DeclareOption{pstarrows}{\AtEndOfPackage{%
   \let\pIIe@vector=\pIIe@vector@pst
-  \def\pIIe@FAL{1.4}%
-  \def\pIIe@FAW{2}%
-  \def\pIIe@CAW{1.5pt}%
-  \def\pIIe@FAI{0.4}%
+  \iffalse
+    \def\pIIe@FAL{1.4}%
+    \def\pIIe@FAW{2}%
+    \def\pIIe@CAW{1.5pt}%
+    \def\pIIe@FAI{0.4}%
+  \else % These are the ltxarrows values, which looks better. (RN)
+    \def\pIIe@FAL{1.52}%
+    \def\pIIe@FAW{3.2}%
+    \def\pIIe@CAW{1.5pt}%
+    \def\pIIe@FAI{0.25}%
+  \fi
   }}
 \newcommand*\pIIe@debug@comment{}
 \DeclareOption{debug}{%
@@ -290,7 +297,7 @@
     \ifnum\@tempdimb<\z@\@tempdimb=-\@tempdimb\fi
     \advance\@tempdimb\@tempdima
     \ifnum\@tempdimb=\z@
-      \global\@tempdimc=\z@
+      \@tempdimc=\z@
     \else
       \multiply\@tempdima 8\relax
       \pIIe@@divide\@tempdima\@tempdimb
@@ -306,8 +313,8 @@
       \@tempdimc=\pIIe@tempa\@tempdimb
       \global\divide\@tempdimc 8
     \fi
-  \endgroup
-  #3=\@tempdimc}
+    \edef\x{\endgroup#3=\the\@tempdimc}%
+  \x}
 \newcommand*\pIIe@@pyth{%
   \pIIe@@divide\@tempdima\@dashdim
   \advance\@dashdim\@tempdimc
@@ -373,6 +380,7 @@
   \newcommand*\pIIe@FAL{}\newcommand*\pIIe@FAW{}\newcommand*\pIIe@CAW{}
   \newcommand*\pIIe@FAI{}
   \newcommand*\pIIe@@firstnum{}\newcommand*\pIIe@@secondnum{}
+  \iffalse% the pstricks values gives too small arrows. (RN)
   \AtBeginDocument{%
     \@ifpackageloaded{pstricks}{%
       \def\pIIe@FAL{\psk@arrowlength}%
@@ -383,6 +391,7 @@
       \def\pIIe@@secondnum#1 #2 {#2}%
     }{}%
   }
+  \fi
   \newcommand*\pIIe@vector@ltx{%
     \@ydim\pIIe@FAW\@wholewidth \advance\@ydim\pIIe@CAW\relax
     \@ovxx\pIIe@FAL\@ydim
diff --git a/Master/texmf-dist/tpm/pict2e.tpm b/Master/texmf-dist/tpm/pict2e.tpm
index ac8fa8c259e..9b53a7cc0da 100644
--- a/Master/texmf-dist/tpm/pict2e.tpm
+++ b/Master/texmf-dist/tpm/pict2e.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/pict2e.zip">
     <TPM:Name>pict2e</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:03:17</TPM:Date>
+    <TPM:Date>2006/03/05 10:57:00</TPM:Date>
     <TPM:Version>1.0</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>New implementation of picture commands.</TPM:Title>
@@ -22,7 +22,7 @@ the LaTeX picture environment.
     <TPM:Author>Hubert Glein and Rolf Niepraschk</TPM:Author>
     <TPM:Size>513610</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="30166">
+    <TPM:RunFiles size="30430">
 texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def
 texmf-dist/tex/latex/pict2e/p2e-dvips.def
 texmf-dist/tex/latex/pict2e/p2e-pctex32.def
@@ -40,7 +40,7 @@ texmf-dist/doc/latex/pict2e/manifest.txt
 texmf-dist/doc/latex/pict2e/p2e-drivers.pdf
 texmf-dist/doc/latex/pict2e/pict2e.pdf
     </TPM:DocFiles>
-    <TPM:SourceFiles size="127403">
+    <TPM:SourceFiles size="127718">
 texmf-dist/source/latex/pict2e/p2e-drivers.dtx
 texmf-dist/source/latex/pict2e/pict2e.dtx
 texmf-dist/source/latex/pict2e/pict2e.ins