summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pst-arrow/Changes4
-rw-r--r--Master/texmf-dist/doc/generic/pst-arrow/README2
-rw-r--r--Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.pdfbin212416 -> 212452 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.tex4
-rw-r--r--Master/texmf-dist/tex/generic/pst-arrow/pst-arrow.tex49
-rw-r--r--Master/texmf-dist/tex/latex/pst-arrow/pst-arrow.sty2
6 files changed, 36 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-arrow/Changes b/Master/texmf-dist/doc/generic/pst-arrow/Changes
index 8a372eff9b9..bfb9b33776e 100644
--- a/Master/texmf-dist/doc/generic/pst-arrow/Changes
+++ b/Master/texmf-dist/doc/generic/pst-arrow/Changes
@@ -1,9 +1,11 @@
-%% $Id: Changes 134 2021-07-23 06:33:54Z herbert $
+%% $Id: Changes 136 2021-07-28 09:39:03Z herbert $
%%
pst-arrow.sty -----------
v. 0.01 2016-09-09 initial version
pst-arrow.tex ----------- (hv)
+ v. 0.03 2021-07-28 - fix introduced bug for linecolor which schould not
+ be affected by tipcolor
v. 0.02 2021-07-23 - added tipcolor option
v. 0.01 2016-09-09 initial version
diff --git a/Master/texmf-dist/doc/generic/pst-arrow/README b/Master/texmf-dist/doc/generic/pst-arrow/README
index 83bfbe91468..71fa819e8e8 100644
--- a/Master/texmf-dist/doc/generic/pst-arrow/README
+++ b/Master/texmf-dist/doc/generic/pst-arrow/README
@@ -15,4 +15,4 @@ Then do not forget to run texhash to update this tree.
hvoss@tug.org
-# $Id: README 134 2021-07-23 06:33:54Z herbert $
+# $Id: README 136 2021-07-28 09:39:03Z herbert $
diff --git a/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.pdf b/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.pdf
index 6ea4f09fd86..19928822476 100644
--- a/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.tex b/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.tex
index 9547db542cc..79ac2d4085e 100644
--- a/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-arrow/pst-arrow-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-arrow-doc.tex 134 2021-07-23 06:33:54Z herbert $
+%% $Id: pst-arrow-doc.tex 136 2021-07-28 09:39:03Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV14,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,twoside]{pst-doc}
\usepackage[utf8]{inputenc}
@@ -353,7 +353,7 @@ It is possible to change the color of the arrow tip by setting \Lkeyword{tipcolo
\begin{center}
\bgroup
- \psset{linecolor=green,linewidth=1pt,arrowscale=2}%
+ \psset{linecolor=black,linewidth=1pt,arrowscale=2}%
\begin{tabular}{lp{2.8cm}}%
Value & Example \\[2pt]\hline
\rlap{\texttt{\textbackslash psset\{tipcolor=red\}}}\\
diff --git a/Master/texmf-dist/tex/generic/pst-arrow/pst-arrow.tex b/Master/texmf-dist/tex/generic/pst-arrow/pst-arrow.tex
index f236aedfb6a..d5bd965bba9 100644
--- a/Master/texmf-dist/tex/generic/pst-arrow/pst-arrow.tex
+++ b/Master/texmf-dist/tex/generic/pst-arrow/pst-arrow.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-arrow.tex 134 2021-07-23 06:33:54Z herbert $
+%% $Id: pst-arrow.tex 136 2021-07-28 09:39:03Z herbert $
%%
%% This is file `pst-arrow.tex',
%%
@@ -22,17 +22,26 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{0.02}
-\def\filedate{2021/07/21}
+\def\fileversion{0.03}
+\def\filedate{2021/07/28}
\message{`pst-arrow' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst@addfams{pst-arrow}
%
-\define@key[psset]{pst-arrow}{tipcolor}[black]{\pst@getcolor{#1}\psk@tipcolor}
-\psset[pst-arrow]{tipcolor=black}
+\define@key[psset]{pst-arrow}{tipcolor}[black]{\def\pst@tipcolor{#1}}
+\psset[pst-arrow]{tipcolor=}
+\def\ps@check@tipcolor{%
+ \expandafter\if\expandafter$\pst@tipcolor$
+ \pst@usecolor\pslinecolor
+ \else
+ \pst@usecolor\pst@tipcolor
+ \fi
+}
%
+\def\tx@EndDot{ \ps@check@tipcolor\space EndDot }
+
\def\psBigArrow{\pst@object{psBigArrow}}
\def\psBigArrow@i(#1)(#2){%
\addbefore@par{doublesep=1cm}
@@ -109,25 +118,25 @@
x y L % point #3
{ closepath gsave fill grestore } if % if filled : close and fill
\@nameuse{psls@\psarrowlinestyle}
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
stroke % draw line
0 t { y 2 mul } { 0 } ifelse moveto> % if outside : twice longer line
% VeeArrow : filled? outside? (total) angle (projected) length (arrow) line width
-\@namedef{psas@|}{\pst@usecolor\psk@tipcolor \psk@tbarsize \tx@Tbar}
+\@namedef{psas@|}{\ps@check@tipcolor \psk@tbarsize \tx@Tbar}
\@namedef{psas@v}{%
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
false false \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
\@namedef{psas@V}{%
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
false true \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
\@namedef{psas@f}{%
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
true false \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
\@namedef{psas@F}{%
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
true true \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
% And An another arrowhead
@@ -149,13 +158,13 @@
y neg y moveto % point #1
y y neg L % point #2
\@nameuse{psls@\psarrowlinestyle}
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
stroke % draw line
0 0 moveto> % origin
-\@namedef{psas@t}{ \pst@usecolor\psk@tipcolor\space false \psk@tickarrowlength \psk@tickarrowlinewidth \tx@TickArrow }
-\@namedef{psas@T}{ \pst@usecolor\psk@tipcolor\space true \psk@tickarrowlength \psk@tickarrowlinewidth \tx@TickArrow }
+\@namedef{psas@t}{ \ps@check@tipcolor\space false \psk@tickarrowlength \psk@tickarrowlinewidth \tx@TickArrow }
+\@namedef{psas@T}{ \ps@check@tipcolor\space true \psk@tickarrowlength \psk@tickarrowlinewidth \tx@TickArrow }
\pst@def{ArrowD}< % the sides are drawn as curves (hv 20071211)
CLW mul add dup
@@ -175,7 +184,7 @@
w h curveto % upper left of >
w neg Inset neg rlineto % move to x=0 and inset
gsave
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
fill grestore >
%
\pst@def{ArrowT}< % like tikz
@@ -196,7 +205,7 @@
% CLW SLW
% 1 0 0 setrgbcolor
2 setlinejoin
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
stroke
0 0 moveto >
%
@@ -223,7 +232,7 @@
stroke
0 y moveto % define current point
} def
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
\pst@number\pshooklength
\pst@number\pshookwidth
\tx@RHook
@@ -237,7 +246,7 @@
/a ED
w neg h abs moveto 0 0 L
gsave
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
stroke grestore
} def
0 \psk@arrowlength \psk@arrowsize \tx@Rhook
@@ -254,14 +263,14 @@
/a ED { 0 h T 1 -1 scale } if
gsave
\ifpsArrowFill\else\pst@number\pslinewidth \pst@arrowscale\space div SLW \fi
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
w neg h moveto
0 0 L w h L w neg a neg rlineto
\ifpsArrowFill gsave
\tx@setStrokeTransparency
fill
grestore \else gsave closepath
- \pst@usecolor\psk@tipcolor
+ \ps@check@tipcolor
stroke grestore \fi
grestore
0 h a sub moveto
diff --git a/Master/texmf-dist/tex/latex/pst-arrow/pst-arrow.sty b/Master/texmf-dist/tex/latex/pst-arrow/pst-arrow.sty
index b5b34b705ee..534b06ef54b 100644
--- a/Master/texmf-dist/tex/latex/pst-arrow/pst-arrow.sty
+++ b/Master/texmf-dist/tex/latex/pst-arrow/pst-arrow.sty
@@ -1,4 +1,4 @@
-%% $Id: pst-arrow.sty 134 2021-07-23 06:33:54Z herbert $
+%% $Id: pst-arrow.sty 136 2021-07-28 09:39:03Z herbert $
%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives