pict2e update

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

1 files changed, 18 insertions, 9 deletions

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