summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-11 22:44:51 +0000
committerKarl Berry <karl@freefriends.org>2015-09-11 22:44:51 +0000
commita179b00ec6a89e8c00663e1c50bc279caf319646 (patch)
treefe2b1fd36e8046c37d002b7f6dd1775791e9384b /Master/texmf-dist
parent9c19cecad3d56b56725b8378d8cf8fcd97c84c7c (diff)
pstricks (11sep15)
git-svn-id: svn://tug.org/texlive/trunk@38348 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/README2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news15.pdfbin279726 -> 279960 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news15.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/Changes4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/textures.cfg1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg12
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.con1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex38
15 files changed, 43 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 8d8076f353e..d6034fc8b25 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -2,6 +2,7 @@ pstricks.tex --------
versions like 2.47a have only changes in other files, but not
in this main package.
+2.63 2015-09-11 - fix for xetex and \psput@special
2.62a 2015-07-27 - upload the correct pstricks.sty
2.62 2015-07-24 - added optional argument bgcolor
2.61 2015-06-28 - added optional arguments precode and postcode
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index efcf531d19a..785c3da9c9b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -9,7 +9,7 @@ and Sebastian Rahtz <sebastian.rahtz@computing-services.oxford.ac.uk>
PSTricks 2004 is edited by Herbert Voss <hvoss@tug.org>
and Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
-PSTricks 2005-2015 is edited by Herbert Voss <hvoss@tug.org>
+PSTricks 2005- is edited by Herbert Voss <hvoss@tug.org>
-----------------------------------------------------------------------
For more informations go to http://tug.org/PSTricks _and_ read the
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
index a8590c0a1d9..e661e3eb9c0 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
index fe8ffe6fa84..0831398d4f9 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news15.tex 161 2015-07-25 17:43:11Z herbert $
+%% $Id: pst-news15.tex 163 2015-07-26 07:20:23Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
deleted file mode 100644
index 8bd09389cc7..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
+++ /dev/null
@@ -1,4 +0,0 @@
-some nonsense in this line ---time forcex forcey
-0 0.2
-1 1
-2 4
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/Changes b/Master/texmf-dist/tex/generic/pstricks/config/Changes
index 4f6c186db9c..638e3e806db 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/Changes
+++ b/Master/texmf-dist/tex/generic/pstricks/config/Changes
@@ -1,4 +1,6 @@
xdvipdfmx.con ------
+0.05 2015-09-11 - move the fix into pstricks.tex
+0.04 2015-09-11 - fix bug with wrong scaling for \psput@cartesian
0.03 2011-11-23 - fix bug with wrong scaling for nodes
0.02 2010-08-02 - uncomment redefinition of \pst@starbox
0.01 2007-03-11 - first CTAN version, must be renamed to pstricks.con
@@ -6,3 +8,5 @@ xdvipdfmx.con ------
vtex.con ------
0.02 2008-01-01 - disable transparent color setting
+
+% $Id: Changes 179 2015-09-11 09:58:42Z herbert $
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
index b44c2fb27bc..03151d0817b 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
@@ -1,3 +1,4 @@
+% $Id: distiller.cfg 177 2015-09-11 09:15:16Z herbert $
%% BEGIN: distiller.con (for distiller driver)
%%
%% Configuration file for PSTricks
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg
index 197ce54ace5..65b78b51e4e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg
@@ -1,3 +1,4 @@
+% $Id: dvips.cfg 179 2015-09-11 09:58:42Z herbert $
%% BEGIN: pstricks.con (for dvips driver)
%%
%% Configuration file for PSTricks
@@ -11,6 +12,7 @@
\def\pstunit{1bp}%
\def\pstVerb#1{\special{ps:#1}}% hv write it without a preceding space
\def\pstverbscale{SDict begin normalscale end}
+\def\pstnodescale{}% not needed for pdftex
% DG/SR modification begin - Apr. 28, 1997 (D. Carlisle + S. Rahtz)
% \def\pstheader#1{\special{header=#1}}
% We used to check for |\AtBeginDvi|, but that was broken in early release
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
index 4a90292dd00..b72e765dd10 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
@@ -1,3 +1,4 @@
+% $Id: dvipsone.cfg 177 2015-09-11 09:15:16Z herbert $
%% BEGIN pstricks.con (for DVIPSONE driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
index 06a92ce370f..774f0073fa8 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
@@ -1,3 +1,4 @@
+% $Id: gastex.cfg 177 2015-09-11 09:15:16Z herbert $
%% BEGIN: pstricks.con (for xdvipdfmx driver)
%%
%% Configuration file for PSTricks
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
index b126464a767..518365368ab 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
@@ -1,3 +1,4 @@
+% $Id: textures.cfg 177 2015-09-11 09:15:16Z herbert $
%% BEGIN pstricks.con (for Textures 1.7 and 1.8 driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
index 9f20fec6bb3..6baa3fe0238 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
@@ -1,3 +1,4 @@
+% $Id: vtex.cfg 177 2015-09-11 09:15:16Z herbert $
%% BEGIN: pstricks.con (for VTeX)
%%
%% Configuration file for PSTricks 97
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
index d7e179c34c5..8345020656f 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
@@ -1,13 +1,16 @@
+% $Id: xdvipdfmx.cfg 179 2015-09-11 09:58:42Z herbert $
+
%% BEGIN: pstricks.con (for xdvipdfmx driver)
%%
%% Configuration file for PSTricks
%%
-%% Version 0.03 (2011/11/23)
+%% Version 0.05 (2015/09/11)
%%
%% For use with xdvipdfmx
%% Created by SMiyata based on standard pstricks.con from TeXLive distribution.
%% This file may be distributed, used and modified freely.
-%
+%% Modified by Denis Girou, Herbert Voss
+%%
\def\pstdriver{xdvipdfmx}%
\def\pstverb#1{\special{pst: #1}}% Check catcode of "
\def\pstunit{1bp}%
@@ -27,7 +30,9 @@
\let\pstheader\Gin@PS@file@header%
\fi
\fi
-% DG/SR modification end
+% DG/SR modification end
+%
+%%
%%
%% In the following, CP is short for currentpoint.
%% The neg is necessary because dvips scales the coordinates by 1 -1.
@@ -36,6 +41,7 @@
%%
%% ****************** END xdvipdfmx *****************************
+
%%%%%%%%%%%%%%%%%%% !! CUSTOMIZATION STUFF GOES HERE: !! %%%%%%%%%%%%%%%%%%
%% If you want to include your own customizations to pstricks.tex, then
%% uncomment the \pstcustomize command, and include your modifications
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.con b/Master/texmf-dist/tex/generic/pstricks/pstricks.con
index 08f7a66be78..fa94f812175 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.con
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.con
@@ -11,6 +11,7 @@
\def\pstunit{1bp}%
\def\pstVerb#1{\special{ps:#1}}% hv write it without a preceding space
\def\pstverbscale{SDict begin normalscale end}
+\def\pstnodescale{}
% DG/SR modification begin - Apr. 28, 1997 (D. Carlisle + S. Rahtz)
% \def\pstheader#1{\special{header=#1}}
% We used to check for |\AtBeginDvi|, but that was broken in early release
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 802ea10fe22..7d9911402ca 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -116,8 +116,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.62}
-\def\filedate{2015/07/25}
+\def\fileversion{2.63}
+\def\filedate{2015/09/11}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -4086,7 +4086,7 @@ pop
}
\def\psput@special#1{%
\hbox{%
- \pst@Verb{{ \pst@coor } \tx@PutCoor \tx@PutBegin }%
+ \pst@Verb{{ \pst@coor \pstnodescale } \tx@PutCoor \tx@PutBegin }%
\box#1%
\pst@Verb{ \tx@PutEnd }%
}%
@@ -4223,31 +4223,31 @@ pop
\@ifnextchar({\uput@iv}{\uput@iv(\z@,\z@)}}
\def\uput@iv(#1){\pst@killglue\pst@makebox{\uput@v{#1}}}
\def\uput@v#1{%
- \begingroup%
- \use@par%
- \if@star\pst@starbox\fi%
+ \begingroup
+ \use@par
+ \if@star\pst@starbox\fi
\pstCheckCoorType{#1}% needed for \uput@vii
- \uput@vi%
- \psput@{#1}\pst@hbox%
- \endgroup%
+ \uput@vi
+ \psput@{#1}\pst@hbox
+ \endgroup
\ignorespaces}
%
\def\uput@vi{%
\ifx\psk@uputref\@empty\uput@vii\tx@UUput{}%
- \else%
- \ifx\psk@rot\@empty\expandafter\uput@viii\psk@uputref%
- \else\uput@vii\tx@UUput{}\fi%
+ \else
+ \ifx\psk@rot\@empty\expandafter\uput@viii\psk@uputref
+ \else\uput@vii\tx@UUput{}\fi
\fi}
%
\def\uput@vii#1#2{%
\edef\pst@coor{%
- \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pslabelsep \fi
+ \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pslabelsep \fi
% \pst@number\pslabelsep % \ifdim\pslabelsep<\z@ neg \fi
- #2
+ #2%
\pst@number{\wd\pst@hbox}%
\pst@number{\ht\pst@hbox}%
\pst@number{\dp\pst@hbox}%
- \ifnum\pst@C@@rType=7
+ \ifnum\pst@C@@rType=7\relax
ps@refangle % CHANGED (MJS) FROM \psk@refangle\space
\ifx\psk@rot\@empty\else ps@rot\space sub \fi
\else
@@ -4258,7 +4258,7 @@ pop
%\show\pst@coor
\setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
\setbox\pst@hbox=\psput@special\pst@hbox
- \ifnum\pst@C@@rType=7
+ \ifnum\pst@C@@rType=7\relax
\ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% CHANGED FROM \psk@rot (MJS)
\else
\ifx\psk@rot\@empty\else\pst@rotate{\psk@rot}\pst@hbox\fi%
@@ -4266,11 +4266,11 @@ pop
%
%
\def\uput@viii#1#2{%
- \ifnum#1>\z@\relax\ifnum#2>\z@\relax\pslabelsep=.707\pslabelsep\fi\fi%
+ \ifnum#1>\z@\relax\ifnum#2>\z@\relax\pslabelsep=.707\pslabelsep\fi\fi
\setbox\pst@hbox=\vbox to\z@{%
- \ifnum#2=1\relax\vskip\pslabelsep\else\vss\fi%
+ \ifnum#2=1\relax\vskip\pslabelsep\else\vss\fi
\hbox to\z@{%
- \ifnum#1=2\relax\hskip\pslabelsep \else\hss\fi%
+ \ifnum#1=2\relax\hskip\pslabelsep \else\hss\fi
\box\pst@hbox%
\ifnum#1=1\relax\hskip\pslabelsep\else\hss\fi}%
\ifnum#2=2\relax\vskip\pslabelsep\else\vss\fi}}