summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-10-25 22:20:56 +0000
committerKarl Berry <karl@freefriends.org>2014-10-25 22:20:56 +0000
commit371d9c8b2b2915e7d51c91d7359815d48cc8f3ed (patch)
tree8d594447236130ccd570cf6f06087848770c604e /Master
parent343e1b1998de58c396efb4d2aced822714bbf682 (diff)
pstricks (25oct14)
git-svn-id: svn://tug.org/texlive/trunk@35439 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/README6
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news14.pdfbin77050 -> 83049 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg6
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex28
6 files changed, 24 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index ee0276af234..71eceb3a96d 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -2,7 +2,7 @@ pstricks.tex --------
versions like 2.47a have only changes in other files, but not
in this main package.
-
+2.60 2014-10-25 - make it compatible for using it with ConTeXt
2.57 2014-08-27 - take option correctAngle into account for \psellipticwedge
2.56 2014-07-31 - added gridstyleA and fixed bug with Ellipse and move
to start point
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index 993cb771801..b08d78e57c1 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,4 @@
-PSTricks 2014
+PSTricks 2015
-----------------------------------------------------------------------
PSTricks is the original work of Timothy van Zandt <tvz@econ.insead.fr>
@@ -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-2014 is edited by Herbert Voss <hvoss@tug.org>
+PSTricks 2005-\today is edited by Herbert Voss <hvoss@tug.org>
-----------------------------------------------------------------------
For more informations go to http://tug.org/PSTricks _and_ read the
@@ -105,4 +105,4 @@ The informations to subscribe to this list and to consult the archives can
be found on the Web page.
--
-Denis Girou, Sebastian Rahtz and Herbert Voss (updated Novermber 03, 2010)
+Denis Girou, Sebastian Rahtz and Herbert Voss (updated August 27, 2014)
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
index 736504dc193..9f5f7531f96 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
Binary files differ
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/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
index 717283eb3ae..d7e179c34c5 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
@@ -46,11 +46,11 @@
\def\c@lor@ps@hsb#1\@@{#1 sethsbcolor}%
\def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor}%
\def\c@lor@ps@gray#1\@@{#1 setgray}%
-\pstcustomize%
+\pstcustomize
\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}%
\def\@@scalebox{%
-\leavevmode
-\hbox{%
+ \leavevmode
+ \hbox{%
\ifdim\pst@tempd\p@<\z@
\pst@dimg=\pst@tempd\ht\pst@hbox
\pst@dimh=\pst@tempd\dp\pst@hbox
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 5aa9d422c40..c3585f72c56 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,7 +1,7 @@
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2014 Herbert Voss
+%% Copyright 2004-2015 Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,20 +18,27 @@
\csname PSTricksLoaded\endcsname
\let\PSTricksLoaded\endinput
%
-%% !! loading additional TeX packages see line 108 !!
-%% !! loading config file pstricks.con line 473 !!
-%% !! loading pro files line 486 !!
-%% !! fileversion and date see line 113 !!
+%% !! loading additional TeX packages see line 112 !!
+%% !! loading config file pstricks.con line 476 !!
+%% !! loading pro files line 489 !!
+%% !! fileversion and date see line 119 !!
%
\edef\PstAtCode{\the\catcode`\@}
\catcode`\@=11\relax
%
\expandafter\ifx\csname @latexerr\endcsname\relax% do we have LaTeX?
\def\typeout#1{\immediate\write\@unused{#1}}%
+ \gdef\ch@ck#1#2#3{\ifnum\count1#1<#2 \else\errmessage{No room for a new #3}\fi}
+ \countdef\allocationnumber=21
+ \chardef\sixt@@n=16
+ \def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne
+ \ch@ck#1#4#2% make sure there's still room
+ \allocationnumber\count1#1%
+ \global#3#5\allocationnumber
+ \wlog{\string#5=\string#2\the\allocationnumber}}
\alloc@7\write\chardef\sixt@@n\@unused
\typeout{we are running tex and have to define some LaTeX commands ...}%
- \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname
- #1\endcsname\relax#2\else#3\fi}
+ \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi}
\def\@namedef#1{\expandafter\def\csname #1\endcsname}
\def\@nameuse#1{\csname #1\endcsname}
\def\@eha{%
@@ -109,8 +116,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.57}
-\def\filedate{2014/08/27}
+\def\fileversion{2.60}
+\def\filedate{2014/10/25}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -455,8 +462,7 @@
\fi
%-------------- end old vesrion ---------------
%
-\def\pst@configerr#1{%
- \@pstrickserr{\string#1 not defined in pstricks.con}\@ehpc}
+\def\pst@configerr#1{\@pstrickserr{\string#1 not defined in pstricks.con}\@ehpc}
%
\def\pstVerb#1{\pst@configerr\pstVerb}
\def\pstverb#1{\pst@configerr\pstverb}