summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-19 21:46:00 +0000
committerKarl Berry <karl@freefriends.org>2016-05-19 21:46:00 +0000
commit939a7831637b1e02e5f7558aecbe3d8eb1a6770c (patch)
treeef09570e96f885a7be18666ccb32a17a4a9fcf31 /Master
parentd793af69003b8e4a6ded4c69e368f7519acd5bd5 (diff)
pstricks (19may16)
git-svn-id: svn://tug.org/texlive/trunk@41263 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/pst-news16.pdfbin40017 -> 40176 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex43
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-doc.cls4
5 files changed, 38 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index cba6b260147..2839f70420d 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -2,6 +2,8 @@ pstricks.tex --------
versions like 2.47a have only changes in other files, but not
in this main package.
+2.66 2016-05-19 - do the allocation stuff only for
+ the original TeX and not eTeX
2.65a 2016-04-22 - fix in pstricks.pro
2.65 2016-02-07 - fix bug with pst@refangle
2.64b 2015-11-14 - fix bug in pstricks.sty
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
index 71763886903..e63f96fdd8f 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.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/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 373d1fad223..dccfc525b5e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -27,16 +27,37 @@
\catcode`\@=11\relax
%
\expandafter\ifx\csname @latexerr\endcsname\relax% do we have LaTeX?
+ \newwrite\@unused
\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
+ \ifx\eTeXversion\@undefined
+ \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
+ \else
+ \def\e@alloc#1#2#3#4#5#6{%
+ \global\advance#3\@ne
+ \e@ch@ck{#3}{#4}{#5}#1%
+ \allocationnumber#3\relax
+ \global#2#6\allocationnumber
+ \wlog{\string#6=\string#1\the\allocationnumber}}%
+ \gdef\e@ch@ck#1#2#3#4{%
+ \ifnum#1<#2\else
+ \ifnum#1=#2\relax
+ \global#1\@cclvi
+ \ifx\count#4\global\advance#1 10 \fi
+ \fi
+ \ifnum#1<#3\relax
+ \else
+ \errmessage{No room for a new \string#4}%
+ \fi
+ \fi}%
+ \fi
\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}
\def\@namedef#1{\expandafter\def\csname #1\endcsname}
@@ -116,8 +137,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.65a}
-\def\filedate{2016/04/22}
+\def\fileversion{2.66}
+\def\filedate{2016/05/18}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index 8b3df60d05b..7521a82a09f 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -25,6 +25,10 @@ DIV13]{scrartcl}
\RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor}
\RequirePackage{ifxetex}
\ifxetex
+ \usepackage{unicode.math}
+ \usepackage{libertine}
+ \usepackage[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro}
+ \setmathfont{XITS Math}
\else
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}