summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-09 22:08:47 +0000
committerKarl Berry <karl@freefriends.org>2016-06-09 22:08:47 +0000
commit9bbb661832e0d0f03721cd45084b8c0b6e1abf15 (patch)
tree7c46a92d8a92b514fc029d7a86be020024e27963 /Master/texmf-dist/tex/generic
parenta9649879ec41eb2fefe35c74d9cedfcaaf093f7e (diff)
pstricks (9jun16)
git-svn-id: svn://tug.org/texlive/trunk@41321 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/Changes12
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex67
2 files changed, 39 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/Changes b/Master/texmf-dist/tex/generic/pstricks/config/Changes
deleted file mode 100644
index 638e3e806db..00000000000
--- a/Master/texmf-dist/tex/generic/pstricks/config/Changes
+++ /dev/null
@@ -1,12 +0,0 @@
-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
- when used with XeTeX
-
-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/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index dccfc525b5e..63f12e9e309 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -26,7 +26,7 @@
\edef\PstAtCode{\the\catcode`\@}
\catcode`\@=11\relax
%
-\expandafter\ifx\csname @latexerr\endcsname\relax% do we have LaTeX?
+\expandafter\ifx\csname @latexerr\endcsname\relax % do we have LaTeX? then it is false
\newwrite\@unused
\def\typeout#1{\immediate\write\@unused{#1}}%
\ifx\eTeXversion\@undefined
@@ -137,8 +137,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.66}
-\def\filedate{2016/05/18}
+\def\fileversion{2.68}
+\def\filedate{2016/06/09}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -3102,28 +3102,30 @@
\def\pscirclebox{\pst@object{pscirclebox}}
\def\pscirclebox@i{\pst@makebox\pscirclebox@ii}
\def\pscirclebox@ii{%
-\begingroup%
-\pst@useboxpar%
-\setbox\pst@hbox=\hbox{%
-\pst@nodehook%
-\pscirclebox@iii%
-\box\pst@hbox}%
-\ifpsboxsep\pscirclebox@sep\fi%
-\leavevmode%
-\box\pst@hbox%
-\endgroup}
-%
+ \begingroup
+ \pst@useboxpar
+ \setbox\pst@hbox=\hbox{%
+ \pst@nodehook
+ \pscirclebox@iii
+ \box\pst@hbox}%
+ \ifpsboxsep\pscirclebox@sep\fi
+ \leavevmode
+ \box\pst@hbox
+ \endgroup
+ \ignorespaces
+}
\def\pscirclebox@iii{%
- \if@star%
- \pslinewidth\z@%
+\if@star
+ \pslinewidth\z@
\pstverb{\pst@dict \tx@STP \pst@usecolor\psfillcolor
newpath \pscirclebox@iv \tx@SD end}%
- \else%
- \begin@ClosedObj%
- \def\pst@linetype{4}\showpointsfalse%
+\else
+ \begin@ClosedObj
+ \def\pst@linetype{4}\showpointsfalse
\addto@pscode{ \pscirclebox@iv\space CLW 2 div add 0 360 arc closepath}%
- \end@ClosedObj%
- \fi}
+ \end@ClosedObj
+\fi
+}
%
\def\pscirclebox@iv{
\pst@number{\wd\pst@hbox} 2 div
@@ -3152,7 +3154,7 @@
\begingroup
\pst@useboxpar
\pst@dima=\ht\pst@hbox
- \advance\pst@dima\dp\pst@hbox
+ \advance\pst@dima by -\dp\pst@hbox
\divide\pst@dima\tw@
\pssetlength\pst@dimb\psk@radius
\setbox\pst@hbox=\hbox{%
@@ -3162,7 +3164,8 @@
\ifpsboxsep \psCirclebox@sep \fi
\leavevmode
\box\pst@hbox
- \endgroup}
+ \endgroup
+}
%
\def\psCirclebox@sep{%
\pst@dimc=\pst@dimb
@@ -4180,7 +4183,7 @@ pop
\@ifnextchar({\cput@iv}{\cput@iv(\z@,\z@)}%
}
\def\cput@iv(#1){\pst@makebox{\cput@v{#1}}}
- \def\cput@v#1{%
+\def\cput@v#1{%
\begingroup
\use@par
\setbox\pst@hbox=\hbox{%
@@ -4442,10 +4445,18 @@ pop
\box\pst@hbox
\kern\pst@dimc}%
\if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi
- \leavevmode\ifdim\overfullrule=\z@\box\pst@hbox\else
- \fboxsep=0pt
- \fbox{\rule[-\pst@shift]{0pt}{\ht\pst@hbox}\rule{\wd\pst@hbox}{0pt}}\fi
- \endgroup%
+ \leavevmode
+ \ifdim\overfullrule=\z@
+ \box\pst@hbox
+ \else
+ \expandafter\ifx\csname @latexerr\endcsname\relax
+ \box\pst@hbox
+ \else % do we have LaTeX?
+ \fboxsep=0pt
+ \fbox{\rule[-\pst@shift]{0pt}{\ht\pst@hbox}\rule{\wd\pst@hbox}{0pt}}%
+ \fi
+ \fi
+ \endgroup
\psset[pstricks]{shift=0}% reset value
}
%