summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-11-30 00:20:20 +0000
committerKarl Berry <karl@freefriends.org>2011-11-30 00:20:20 +0000
commit3a2f330501d715a98d0ab85c05dbd12e7c8f5d67 (patch)
treeaf5491fb7c9c3c407a8dc0df54dfa1eba668ec21 /Master
parent99a32e30f2adbd8dd4a97967f8541b60300c04ef (diff)
pstricks (29nov11)
git-svn-id: svn://tug.org/texlive/trunk@24695 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/dvips/pstricks/pst-tools.pro4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/Changes1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg93
3 files changed, 50 insertions, 48 deletions
diff --git a/Master/texmf-dist/dvips/pstricks/pst-tools.pro b/Master/texmf-dist/dvips/pstricks/pst-tools.pro
index d4dc3795266..580f9381c3d 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-tools.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-tools.pro
@@ -12,7 +12,7 @@
%% syntax : array bubblesort --> array2 trie par ordre croissant
%% code de Bill Casselman
%% http://www.math.ubc.ca/people/faculty/cass/graphics/text/www/
-/bubblesort {
+/bubblesort { % on stack must be an array [ ... ]
4 dict begin
/a exch def
/n a length 1 sub def
@@ -37,7 +37,7 @@
/n n 1 sub def
} repeat
} if
- a
+ a % return the sorted array
end
} def
%
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/Changes b/Master/texmf-dist/tex/generic/pstricks/config/Changes
index 0e14ca192b8..4f6c186db9c 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/Changes
+++ b/Master/texmf-dist/tex/generic/pstricks/config/Changes
@@ -1,4 +1,5 @@
xdvipdfmx.con ------
+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
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
index 7da112624ad..351a17d869c 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
@@ -2,28 +2,29 @@
%%
%% Configuration file for PSTricks
%%
-%% Version 0.02 (2010/08/02)
+%% Version 0.03 (2011/11/23)
%%
%% For use with xdvipdfmx
%% Created by SMiyata based on standard pstricks.con from TeXLive distribution.
%% This file may be distributed, used and modified freely.
%
-\def\pstdriver{xdvipdfmx}
-\def\pstverb#1{\special{pst: #1}} % Check catcode of "
+\def\pstdriver{xdvipdfmx}%
+\def\pstverb#1{\special{pst: #1}}% Check catcode of "
\def\pstunit{1bp}%
-\def\pstVerb#1{\immediate\special{PST: #1}}
-\def\pstverbscale{72.27 72 div dup scale }
+\def\pstVerb#1{\immediate\special{PST: #1}}%
+\def\pstverbscale{72.27 72 div dup scale }%
+\def\pstnodescale{72 72.27 div dup scale }%
% 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
% so we now check for the existence of |\textsuperscript| (added 1995/05/16)
\ifx\textsuperscript\@undefined
- \def\pstheader#1{\special{header=#1}}
+ \def\pstheader#1{\special{header=#1}}%
\else
\ifx\Gin@PS@file@header\@undefined
- \def\pstheader#1{\AtBeginDvi{\special{header=#1}}}
+ \def\pstheader#1{\AtBeginDvi{\special{header=#1}}}%
\else
- \let\pstheader\Gin@PS@file@header
+ \let\pstheader\Gin@PS@file@header%
\fi
\fi
% DG/SR modification end
@@ -31,7 +32,7 @@
%% In the following, CP is short for currentpoint.
%% The neg is necessary because dvips scales the coordinates by 1 -1.
%% \tx@NET means neg exch neg exch translate.
-\def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}
+\def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}%
%%
%% ****************** END xdvipdfmx *****************************
@@ -39,52 +40,52 @@
%% If you want to include your own customizations to pstricks.tex, then
%% uncomment the \pstcustomize command, and include your modifications
%% after \pstcustomize. These will be read in after pstricks.tex.
-\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@}
-\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end}
-\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor}
-\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
-\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}
+\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@}%
+\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end}%
+\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor}%
+\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%
+\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}%
\def\@@scalebox{%
-\leavevmode
+\leavevmode%
\hbox{%
\ifdim\pst@tempd\p@<\z@
-\pst@dimg=\pst@tempd\ht\pst@hbox
-\pst@dimh=\pst@tempd\dp\pst@hbox
-\dp\pst@hbox=-\pst@dimg
-\ht\pst@hbox=-\pst@dimh
+\pst@dimg=\pst@tempd\ht\pst@hbox%
+\pst@dimh=\pst@tempd\dp\pst@hbox%
+\dp\pst@hbox=-\pst@dimg%
+\ht\pst@hbox=-\pst@dimh%
\else
-\ht\pst@hbox=\pst@tempd\ht\pst@hbox
-\dp\pst@hbox=\pst@tempd\dp\pst@hbox
+\ht\pst@hbox=\pst@tempd\ht\pst@hbox%
+\dp\pst@hbox=\pst@tempd\dp\pst@hbox%
\fi
-\pst@dima=\pst@tempc\wd\pst@hbox
-\ifdim\pst@dima<\z@\kern-\pst@dima\fi
+\pst@dima=\pst@tempc\wd\pst@hbox%
+\ifdim\pst@dima<\z@\kern-\pst@dima\fi%
\special{x: bscale \pst@tempc \pst@tempd}%
\hbox to \z@{\box\pst@hbox\hss}%
\special{x: escale}%
-\ifdim\pst@dima>\z@\kern\pst@dima\fi}}
+\ifdim\pst@dima>\z@\kern\pst@dima\fi}}%
%
-\let\ps@@scalebox\@@scalebox
+\let\ps@@scalebox\@@scalebox%
\def\ps@rotateleft#1{%
\leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
-\pst@Verb{90 \tx@RotBegin}
+\pst@Verb{90 \tx@RotBegin}%
\vbox to \z@{\vss\hbox to \z@{\box#1\hss}\vskip\z@}%
-\pst@Verb{\tx@RotEnd}}}}
+\pst@Verb{\tx@RotEnd}}}}%
%
\def\ps@rotateright#1{%
\leavevmode\hbox{%
\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
- \pst@Verb{-90 \tx@RotBegin}
+ \pst@Verb{-90 \tx@RotBegin}%
\vbox to \z@{\hbox to \z@{\hss\box#1}\vss}%
- \pst@Verb{\tx@RotEnd}}}}
+ \pst@Verb{\tx@RotEnd}}}}%
%
\def\ps@rotatedown#1{%
\hbox{\hskip\wd#1\vbox{\vskip\ht#1\vskip\dp#1%
\pst@Verb{180 \tx@RotBegin}%
\vbox to \z@{\hbox to \z@{\box#1\hss}\vss}%
-\pst@Verb{\tx@RotEnd}}}}
+\pst@Verb{\tx@RotEnd}}}}%
%
\def\begin@psclip{\special{x: gsave}}
\def\end@psclip{\special{x: grestore}}
@@ -111,17 +112,17 @@
\@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}%
{cmyk \pst@tempg \pst@temph \pst@tempi \pst@tempj}%
}
-\newgray{black}{0}
-\newgray{darkgray}{.25}
-\newgray{gray}{.5}
-\newgray{lightgray}{.75}
-\newgray{white}{1}
-\newrgbcolor{red}{1 0 0}
-\newrgbcolor{green}{0 1 0}
-\newrgbcolor{blue}{0 0 1}
-\newrgbcolor{yellow}{1 1 0}
-\newrgbcolor{cyan}{0 1 1}
-\newrgbcolor{magenta}{1 0 1}
+\newgray{black}{0}%
+\newgray{darkgray}{.25}%
+\newgray{gray}{.5}%
+\newgray{lightgray}{.75}%
+\newgray{white}{1}%
+\newrgbcolor{red}{1 0 0}%
+\newrgbcolor{green}{0 1 0}%
+\newrgbcolor{blue}{0 0 1}%
+\newrgbcolor{yellow}{1 1 0}%
+\newrgbcolor{cyan}{0 1 1}%
+\newrgbcolor{magenta}{1 0 1}%
\@ifundefined{LaTeXe}%
{\def\current@@@@color{\csname\string\color@xetex@\psfillcolor\endcsname}}{%
@@ -142,10 +143,10 @@
\rlap{\hskip\psframesep\unhbox\pst@hbox}}}
\fi
%
-\def\AltClipMode{}
+\def\AltClipMode{}%
%
\def\putoverlaybox#1{%
-\hbox{\special{x: gsave}\special{x: initoverlay #1}\copy\theoverlaybox\special{x: grestore}}}
+\hbox{\special{x: gsave}\special{x: initoverlay #1}\copy\theoverlaybox\special{x: grestore}}}%
%
\def\pst@overlay#1{\edef\curr@overlay{#1}\special{x: clipoverlay #1}\aftergroup\pst@endoverlay}
\def\pst@endoverlay{\special{x: clipoverlay \curr@overlay}}