pstricks (19may16)

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

2 files changed, 36 insertions, 11 deletions

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}