diff options
15 files changed, 8 insertions, 1115 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips index cac4d77d383..6a8cc99a672 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips @@ -1,4 +1,5 @@ ---- pstricks.pro +1.18 2013-10-13 - put /UUput and /Uput in local dictionaries 1.17 2013-07-08 - move the overlay part into pst-ovl.pro 1.16 2013-05-22 - save color functions 1.15 2012-10-16 - modified Div operator diff --git a/Master/texmf-dist/doc/generic/pstricks/Makefile b/Master/texmf-dist/doc/generic/pstricks/Makefile deleted file mode 100644 index b08010d4072..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# `Makefile' for `pst-news.pdf', hv, 2007/03/17 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = pst-news$(shell date +%y) - -MAIN = $(PACKAGE) - -BASE = pstricks - -LATEX = latex - -TDS = ~/PSTricks/PSTricks-TDS - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -all : doc clean -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< - if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi - if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi - makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ - $(basename $<).glo - makeindex -t $(basename $<).ilg -o $(basename $<).ind \ - $(basename $<).idx - bibtex $(basename $<) - $(LATEX) $< - $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl ) - $(RM) $(addprefix $(MAIN), .dvi .ps) - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -tds: -#################### base ######################### - cp -u ../config/* ../.base/config/ -# - cp -u Changes ../.base/doc/ - cp -u pst-doc.* ../.base/doc/ - cp -u PSTricks.bib* ../.base/doc/ - cp -u pst-news* ../.base/doc/ - cp -u pst-user* ../.base/doc/ - cp -u *.sty ../.base/doc/ - cp -u pstricks-* ../.base/doc/ - cp -u test* ../.base/doc/ - cp -u images/* ../.base/doc/images/ -# - cp -u ../dvips/* ../.base/dvips/ - cp -u ../generic/* ../.base/generic/ - cp -u ../latex/* ../.base/latex/ - cp -u ../README ../.base/ -# -#################### TDS ######################### - cp -u Changes $(TDS)/doc/generic/$(BASE)/ - cp -u README $(TDS)/doc/generic/$(BASE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(BASE)/ -# - cp -u ../latex/Changes $(TDS)/tex/latex/$(BASE)/ - cp -u ../latex/$(BASE).sty $(TDS)/tex/latex/$(BASE)/ -# - cp -u ../generic/Changes $(TDS)/tex/generic/$(BASE)/ - cp -u ../generic/$(BASE).tex $(TDS)/tex/generic/$(BASE)/ -# - cp -u ../dvips/Changes $(TDS)/dvips/$(BASE)/ -# cp -u ../dvips/$(BASE).pro $(TDS)/dvips/$(BASE)/ -# cp -u ../dvips/$(BASE)97.pro $(TDS)/dvips/$(BASE)/ - cp -u ../dvips/*.pro $(TDS)/dvips/$(BASE)/ -# - cp -u Changes $(TDS)/source/$(BASE)/ - cp -u $(MAIN).tex $(TDS)/source/$(BASE)/ -# cp -u $(MAIN).bib $(TDS)/source/$(BASE)/ - cp -u Makefile $(TDS)/source/$(BASE)/ - -# EOF diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf Binary files differindex 8ac4c06840c..d8159277d9b 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf Binary files differdeleted file mode 100644 index 24d8d07b21e..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-usrfull.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-usrfull.pdf Binary files differdeleted file mode 100644 index ea5caefd0f1..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pst-usrfull.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.pdf Binary files differdeleted file mode 100644 index 3c12c2e6d24..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.tex deleted file mode 100644 index 22d2d5ca3fb..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.tex +++ /dev/null @@ -1,237 +0,0 @@ -\documentclass[12pt]{article} -\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -%\usepackage{geometry} -\usepackage{pst-all} -\usepackage{showexpl} -\SpecialCoor -%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref} -\usepackage[colorlinks,linktocpage]{hyperref} -\def\UrlFont{\small\ttfamily} -\makeatletter -\def\verbatim@font{\small\normalfont\ttfamily} -\makeatother -%\usepackage{color} -\definecolor{hellgelb}{rgb}{1,1,0.8} -\definecolor{colKeys}{rgb}{0,0,1} -\definecolor{colIdentifier}{rgb}{0,0,0} -\definecolor{colComments}{rgb}{1,0,0} -\definecolor{colString}{rgb}{0,0.5,0} -% -\usepackage{listings} -\lstset{% - language=[PSTricks]TEX,% - float=hbp,% - basicstyle=\ttfamily\small, % - identifierstyle=\color{colIdentifier}, % - keywordstyle=\color{colKeys}, % - stringstyle=\color{colString}, % - commentstyle=\color{colComments}, % - columns=flexible, % - tabsize=4, % - frame=single, % - extendedchars=true, % - showspaces=false, % - showstringspaces=false, % - numbers=left, % - numberstyle=\tiny, % - breaklines=true, % -% backgroundcolor=\color{hellgelb}, % - breakautoindent=true, % - captionpos=b,% - xleftmargin=0pt% -} - -%\parindent=0pt -\newcommand\verbI[1]{{\small\texttt{#1}}} -\newcommand\CMD[1]{{\texttt{\textbackslash#1}}} -% -%\psset{subgriddiv=0,griddots=5,gridlabels=7pt} -% -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\def\PS{PostScript} -% -\begin{document} -\title{\texttt{PSTricks -- version 1.10}\\new macros and bugfixes for \texttt{pstricks}} -\author{Herbert Voß\thanks{% -\url{Herbert.Voss@perce.de}}} -\date{\today} - -\maketitle - -\begin{abstract} -This new version 1.10 has some minor but important changes; it is not compatible -to older versions when using the vertical shift option for the \verb+pspicture+ -environment. -\end{abstract} - -\clearpage -\tableofcontents - -\clearpage - -\section{New and modified option for {pspicture}}\label{sec:option} - -Table~\ref{tab:pspicture} shows the two new options for the \verb+pspicture+ environment. - -\begin{table}[htb] -\caption{Optionen der \texttt{pspicture}-Umgebung}\label{tab:pspicture} -\centering -\begin{tabular}{@{}lll@{}} -\textrm{\emph{name}} & \emph{meaning} & \emph{default}\\\hline -\verb+shift+ & vertical shift & $0$ \\ -\verb+showgrid+ & show grid & \verb+false+\\ -\end{tabular} -\end{table} - - -% --------------------------------------------------------------------------------------- -\subsection{\texttt{shift}}\label{subsubsec:shift} -% --------------------------------------------------------------------------------------- -This option is the known one from older \texttt{PSTricks} version, but now with the -usual syntax for options. The shift is relative to the height of the defined \verb+pspicture+ -environment, its lower left corner is by deafult on the base line. For older versions -the shift depends with its value to the baseline, a negative value raised up the \verb+pspicture+ -box. Now the \verb+shift+ option works similiar to the known \CMD{raisebox} makro, except that -\verb+shift+ is relative to the box height. A positive \verb+shift+ value raises up the box -and vice versa for a negative value. - -\begin{figure}[htb] -\centering -\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}[shift=0.5](-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5} -\end{pspicture}% -\textcolor{red}{\rule{5mm}{1pt}} -\hspace{1cm}% -\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}(-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0} -\end{pspicture}\textcolor{red}{\rule{5mm}{1pt}} -\hspace{1cm}% -\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}[shift=-0.5](-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5} -\end{pspicture}% -\textcolor{red}{\rule{5mm}{1pt}} -\caption{Meaning of the \texttt{shift} option}\label{fig:baseline} -\end{figure} - -%\begin{lstlisting}[caption={Vertikale Verschiebung der Baseline}] -\begin{lstlisting} -\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}[shift=0.5](-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5} -\end{pspicture}% -\textcolor{red}{\rule{5mm}{1pt}} -\hspace{1cm}% -\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}(-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0} -\end{pspicture}\textcolor{red}{\rule{5mm}{1pt}} -\hspace{1cm}% -\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}[shift=-0.5](-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5} -\end{pspicture}% -\textcolor{red}{\rule{5mm}{1pt}} -\end{lstlisting} - - -% --------------------------------------------------------------------------------------- -\subsection{\texttt{showgrid}}\label{subsubsec:showgrid} -% --------------------------------------------------------------------------------------- -This new version of \texttt{PSTricks} defines internally a special grid style - -\begin{lstlisting} -\newpsstyle{gridstyle}{% - subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt} -\end{lstlisting} - -which can be overwritten by the user. This style is only used for the \verb+showgrid+ -option of the \verb+pspicture+ environment. The macro \verb+\psgrid+ doesn't use this predefined -style and works in the usual way. However, the user can use it like all -other self defined styles: \verb+\psgrid[style=gridstyle]+. - - -\begin{LTXexample}[width=3.5cm] -\begin{pspicture}[showgrid=true](-1,0)(2,1) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[width=3.5cm] -\newpsstyle{gridstyle}{% - subgriddiv=2,subgridcolor=lightgray} -\begin{pspicture}[showgrid=true](-1,0)(2,1) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[width=3.5cm] -\newpsstyle{gridstyle}{} -\begin{pspicture}[showgrid=true](-1,0)(2,1) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[width=3.5cm] -\begin{pspicture}(-1,0)(2,1) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[width=3.5cm] -\begin{pspicture}(-1,0)(2,1) - \psgrid -\end{pspicture} -\end{LTXexample} - -Depending to the internal structure of the \verb+pspicture+ environment it is not possible -to set the \verb+shift+ option global by \CMD{psset}, it must always be locally defined -with optional part of the parameter, as seen in the above examples. - - -\section{Bugfixes} -\subsection{\texttt{origin}} - -There were several mailings in the past to the \verb+origin+ option, which worked the other -way round than expected. Now the coordinates work realtive to the current origin. - - -\begin{LTXexample}[width=3cm] -\begin{pspicture}(-1,-1)(2,1.25) - \psaxes{->}(0,0)(-1,-1)(2,1.25) - \psset{linewidth=1.5pt} - \parabola[linestyle=dashed](-1,1)(0,0) - \parabola[origin={0.5,-0.5}](-1,1)(0,0) - \qdisk(0.5,-0.5){2pt} -\end{pspicture} -\end{LTXexample} - -\subsection{Empty parameter} -\sloppy -To prevent some problems with empty arrow definitions in macros like \verb+\psline[...]{}(..)(...)+, -which makes no sense, but should be possible, there is now a check before setting the values. - -\subsection{\CMD{nccircle}} -With some modification to \CMD{psarc\@iv} it is now possible to get the loops in any direction -and above or below the node. - -\begin{LTXexample}[width=.35\linewidth] -\psscalebox{1.5}{% - \circlenode{A}{A} - \nccircle{->}{A}{1.5em} \nbput{foo} - \nccircle{<-}{A}{-1.5em}\naput{bar}} -% -\hspace{1cm} -\psscalebox{1.5}{% - \circlenode{A}{A} - \nccircle{<-}{A}{1.5em} \nbput{foo} - \nccircle{->}{A}{-1.5em}\naput{bar}} -\end{LTXexample} - -\subsection{\CMD{psscalebox} and \CMD{psscaleboxto}} -To prevent clashes with the \verb+graphicx+ package, which also defines a \CMD{scalebox} macro -with different syntax, -\verb+PSTricks+ now defines \CMD{psscalebox} and \CMD{psscaleboxto}. For some compatibility reasons the old -names are still supported. With the new names it doesn'r matter if \verb+pstricks+ is loaded before or after -\verb+graphicx+. - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.pdf Binary files differdeleted file mode 100644 index 1b3d3772dc5..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.tex deleted file mode 100644 index 3c5b922e112..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.tex +++ /dev/null @@ -1,167 +0,0 @@ -\documentclass[12pt]{article} -\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -%\usepackage{geometry} -\usepackage{pst-all} -\usepackage{showexpl} -\usepackage{tabularx} -\SpecialCoor -%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref} -\usepackage[colorlinks,linktocpage]{hyperref} -\def\UrlFont{\small\ttfamily} -\makeatletter -\def\verbatim@font{\small\normalfont\ttfamily} -\makeatother -%\usepackage{color} -\definecolor{hellgelb}{rgb}{1,1,0.8} -\definecolor{colKeys}{rgb}{0,0,1} -\definecolor{colIdentifier}{rgb}{0,0,0} -\definecolor{colComments}{rgb}{1,0,0} -\definecolor{colString}{rgb}{0,0.5,0} -% -\usepackage{listings} -\lstset{% - language=PSTricks,% - float=hbp,% - basicstyle=\ttfamily\small, % - identifierstyle=\color{colIdentifier}, % - keywordstyle=\color{colKeys}, % - stringstyle=\color{colString}, % - commentstyle=\color{colComments}, % - columns=flexible, % - tabsize=4, % - frame=single, % - extendedchars=true, % - showspaces=false, % - showstringspaces=false, % - numbers=left, % - numberstyle=\tiny, % - breaklines=true, % -% backgroundcolor=\color{hellgelb}, % - breakautoindent=true, % - captionpos=b,% - xleftmargin=0pt% -} - -%\parindent=0pt -\newcommand\verbI[1]{{\small\texttt{#1}}} -\newcommand\CMD[1]{{\texttt{\textbackslash#1}}} -% -%\psset{subgriddiv=0,griddots=5,gridlabels=7pt} -% -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\def\PS{PostScript} -% -\begin{document} -\title{\texttt{PSTricks -- version 1.11}\\new macros and bugfixes for \texttt{pstricks}} -\author{Herbert Voß\thanks{% -\url{Herbert.Voss@perce.de}}} -\date{\today} - -\maketitle - -\begin{abstract} -This new version of \texttt{pstricks.tex} depends on the also new prologue file -\texttt{pstricks.pro} (v 1.00), which should go into the local \TeX-directoory \url{$TEXMFLOCAL/dvips/}. -\end{abstract} - - -\tableofcontents - -%-------------------------------------------------------------------------------------- -\section{New macro names} -%-------------------------------------------------------------------------------------- -In general \texttt{PSTricks} uses macronames with a preceeding \verb+ps+ to prevent -clashes with other packages. However, some macros have names without the \verb+ps+ and -these ones have now new names: - -\begin{verbatim} - \scalebox -> \psscalebox - \scaleboxto -> \psscaleboxto - \rotateleft -> \psrotateleft - \rotateright -> \psrotateright - \rotatedown -> \psrotatedown -\end{verbatim} - -The first change is important, because there were a lot of problems in the past; -\verb+graphicx+ also defines a \verb+scalebox+ but with diffent syntax. - -%-------------------------------------------------------------------------------------- -\section{New fill options} -%-------------------------------------------------------------------------------------- -For the fillstyles \verb+hlines+, \verb+vlines+ and \verb+crosshatch+ there are two new -options to get increasing line widths and/or increasing whitespace. Both options are -lengths and can be set as usual for PSTricks, with or without a unit. - -\bigskip\noindent -\begin{tabularx}{\linewidth}{lXc} -\emph{name} & \emph{meaning} & \emph{default}\\\hline -\verb|hatchsepinc| & additional increasing space between two hatch lines & 0\tabularnewline -\verb|hatchwidthinc| & value for the increasing line width of two hatch lines & 0 -\end{tabularx} - - - -\bigskip -\begin{LTXexample}[pos=t] -\begin{pspicture}(\linewidth,3) - \psframe[fillstyle=vlines,hatchangle=0,hatchsep=.5pt,% - hatchwidth=1pt,hatchwidthinc=0.25pt](\linewidth,3) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[pos=t] -\begin{pspicture}(\linewidth,3) - \psframe[fillstyle=hlines,hatchangle=0,% - hatchwidth=1pt,hatchsep=0.5pt,hatchsepinc=0.1pt](\linewidth,3) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[pos=t] -\begin{pspicture}(\linewidth,3) - \psframe[fillstyle=vlines,hatchangle=0,hatchsep=0.6pt,% - hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=60, - hatchcolor=red](\linewidth,3) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[pos=t] -\begin{pspicture}(\linewidth,3) - \psframe[fillstyle=hlines,hatchangle=0,hatchangle=-60,% - hatchwidth=1pt,hatchsep=0.5pt,hatchsepinc=0.1pt, - hatchcolor=blue](\linewidth,3) -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[pos=t] -\begin{pspicture}(\linewidth,4) - \pscircle[fillstyle=vlines,hatchangle=0,hatchsep=0.6pt,% - hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=90, - hatchcolor=red](2,2){2} - \pscircle[fillstyle=vlines,hatchangle=0,hatchsep=0.6pt,% - hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=-45, - hatchcolor=green](7,2){2} - \pscircle[fillstyle=hlines,hatchangle=0,hatchsep=0.6pt,% - hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=45, - hatchcolor=blue](12,2){2} -\end{pspicture} -\end{LTXexample} - -\begin{LTXexample}[pos=t] -\begin{pspicture}(\linewidth,3) - \psframe[fillstyle=crosshatch,hatchangle=0,hatchangle=-90,% - hatchwidth=1pt,hatchsep=0.5pt,hatchsepinc=0.1pt, - hatchcolor=blue](\linewidth,3) -\end{pspicture} -\end{LTXexample} - -%-------------------------------------------------------------------------------------- -\section{Other changes} -%-------------------------------------------------------------------------------------- -\texttt{pstricks.tex} defined the PostScript subroutines for arcs of an ellipse. -This code now moved into the appropriate \texttt{pstricks.pro}, which holds the -pure PostScript code of \texttt{PSTricks}. This in not important for user until -the newest \texttt{pstricks.pro} \textbf{and} \texttt{pstricks.tex} are installed. - - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.pdf Binary files differdeleted file mode 100644 index 19d4c37b1d5..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.tex deleted file mode 100644 index 037668123b1..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.tex +++ /dev/null @@ -1,147 +0,0 @@ -\documentclass[12pt]{article} -\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -%\usepackage{geometry} -\usepackage{pst-all} -\usepackage{showexpl} -\usepackage{tabularx} -\SpecialCoor -%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref} -\usepackage[colorlinks,linktocpage]{hyperref} -\def\UrlFont{\small\ttfamily} -\makeatletter -\def\verbatim@font{\small\normalfont\ttfamily} -\makeatother -%\usepackage{color} -\definecolor{hellgelb}{rgb}{1,1,0.8} -\definecolor{colKeys}{rgb}{0,0,1} -\definecolor{colIdentifier}{rgb}{0,0,0} -\definecolor{colComments}{rgb}{1,0,0} -\definecolor{colString}{rgb}{0,0.5,0} -% -\usepackage{listings} -\lstset{% - language=PSTricks,% - float=hbp,% - basicstyle=\ttfamily\small, % - identifierstyle=\color{colIdentifier}, % - keywordstyle=\color{colKeys}, % - stringstyle=\color{colString}, % - commentstyle=\color{colComments}, % - columns=flexible, % - tabsize=4, % - frame=single, % - extendedchars=true, % - showspaces=false, % - showstringspaces=false, % - numbers=left, % - numberstyle=\tiny, % - breaklines=true, % -% backgroundcolor=\color{hellgelb}, % - breakautoindent=true, % - captionpos=b,% - xleftmargin=0pt% -} - -%\parindent=0pt -\newcommand\verbI[1]{{\small\texttt{#1}}} -\newcommand\CMD[1]{{\texttt{\textbackslash#1}}} -% -%\psset{subgriddiv=0,griddots=5,gridlabels=7pt} -% -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\def\PS{PostScript} -% -\begin{document} -\title{\texttt{PSTricks -- version 1.12}\\new macros and bugfixes for \texttt{pstricks}} -\author{Herbert Voß\thanks{% -\url{Herbert.Voss@perce.de}}} -\date{\today} - -\maketitle - -\begin{abstract} -This new version of \texttt{pstricks.tex} depends on the also new prologue file -\texttt{pstricks.pro} (v 1.00), which should go into the local \TeX-directory \url{$TEXMFLOCAL/dvips/}. -\end{abstract} - - -\tableofcontents - -%-------------------------------------------------------------------------------------- -\section{New macro names} -%-------------------------------------------------------------------------------------- -In general \texttt{PSTricks} uses macronames with a preceeding \verb+ps+ to prevent -clashes with other packages. However, some macros have names without the \verb+ps+ and -these ones have now new names: - -\begin{verbatim} - \scalebox -> \psscalebox - \scaleboxto -> \psscaleboxto - \rotateleft -> \psrotateleft - \rotateright -> \psrotateright - \rotatedown -> \psrotatedown -\end{verbatim} - -The first change is important, because there were a lot of problems in the past; -\verb+graphicx+ also defines a \verb+scalebox+ but with diffent syntax. - - -%-------------------------------------------------------------------------------------- -\section{\texttt{shift} Option} -%-------------------------------------------------------------------------------------- -The new \verb+shift+ option now expects a length with a \verb+PSTricks+ compatible dimension. - -\bgroup -\begin{LTXexample}[pos=t] -\small -\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}[shift=0.5cm](-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5cm} -\end{pspicture}% -\textcolor{red}{\rule{5mm}{1pt}}\hspace{1cm}\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}(-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0} -\end{pspicture}% -\textcolor{red}{\rule{5mm}{1pt}}\hspace{1cm}\textcolor{red}{\rule{5mm}{1pt}}% -\begin{pspicture}[shift=-0.5cm](-0.5,-0.5)(0.5,0.5) - \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5cm} -\end{pspicture}% -\textcolor{red}{\rule{5mm}{1pt}} -\end{LTXexample} -\egroup - -%-------------------------------------------------------------------------------------- -\section{New arrows} -%-------------------------------------------------------------------------------------- - -\verb+pstricks now contains the missing arrow ends \verb+]-[+ and \verb+)-(+. - -\begin{LTXexample}[width=4cm] -\begin{pspicture}(4,3) - \psset{arrowscale=2,linewidth=1pt} - \psline{]-[}(4,0) - \psline{)-(}(0,1)(4,1) - \psline{)->}(0,2)(4,2) - \psline{]->>}(0,3)(4,3) -\end{pspicture} -\end{LTXexample} - -%-------------------------------------------------------------------------------------- -\section{New otions for \texttt{pstricks.sty}} -%-------------------------------------------------------------------------------------- - -\begin{description} -\item[\texttt{noxcolor}] load package \verb+color+ instead of \verb+xcolor+; -\item[\texttt{plain}] do nothing else as a \CMD{input\{pstricks\}}; -\item[\texttt{DIA}] a bug fix for the \verb+PSTricks+-export of the garfic program DIA. -\end{description} - - -%-------------------------------------------------------------------------------------- -\section{New \texttt{pstricks.pro}} -%-------------------------------------------------------------------------------------- - -this file now contains the PostScript code for arcs of an ellipse. - -\end{document} diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.pdf Binary files differdeleted file mode 100644 index eeb545bc825..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.tex deleted file mode 100644 index f870ba62b38..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.tex +++ /dev/null @@ -1,470 +0,0 @@ -\documentclass[12pt]{article} -\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -%\usepackage{geometry} -\usepackage{url,calc} -\usepackage{pstricks} -\usepackage{pst-plot} -\SpecialCoor -%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref} -\usepackage[colorlinks,linktocpage]{hyperref} -\def\UrlFont{\small\ttfamily} -\makeatletter -\def\verbatim@font{\small\normalfont\ttfamily} -\makeatother -%\usepackage{color} -\definecolor{hellgelb}{rgb}{1,1,0.8} -\definecolor{colKeys}{rgb}{0,0,1} -\definecolor{colIdentifier}{rgb}{0,0,0} -\definecolor{colComments}{rgb}{1,0,0} -\definecolor{colString}{rgb}{0,0.5,0} -% -\usepackage{listings} -\lstset{% - language=[LaTeX]TEX,% - float=hbp,% - basicstyle=\ttfamily\small, % - identifierstyle=\color{colIdentifier}, % - keywordstyle=\color{colKeys}, % - stringstyle=\color{colString}, % - commentstyle=\color{colComments}, % - columns=flexible, % - tabsize=4, % - frame=single, % - extendedchars=true, % - showspaces=false, % - showstringspaces=false, % - numbers=left, % - numberstyle=\tiny, % - breaklines=true, % -% backgroundcolor=\color{hellgelb}, % - breakautoindent=true, % - captionpos=b,% - xleftmargin=0pt% -} - -%\parindent=0pt -\newcommand\verbI[1]{{\small\texttt{#1}}} -\newcommand\CMD[1]{{\texttt{\textbackslash#1}}} -% -\psset{subgriddiv=0,griddots=5,gridlabels=7pt} -% -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\def\PS{PostScript} -% -\begin{document} -\title{\texttt{pstricks -- patch 15}\\new macros and bugfixes for \texttt{pstricks}} -\author{Herbert Voß\thanks{% -\url{Herbert.Voss@perce.de}} \and Rolf Niepraschk\thanks{\url{Rolf.Niepraschk@ptb.de}}} -\date{2004/05/12} - -\maketitle - -\begin{abstract} -It is long time ago since \verb+pstricks.tex patch 14+ came out. The new version -\verb+patch 15+ fixes some bugs and provides three new elliptic macros, which were -already present in the old beta version of \verb+PSTricks+. - -There is also a new \verb+pstricks.sty+, which makes the \verb+\pstcol+ package -obsolete. It uses the new color package \verb+xcolor+, which provides a much more -powerful color management than \verb+color.sty+ does. The \verb+pstricks.sty+ is -a real \LaTeX{} package, it makes no sense for \TeX{} users. Nevertheless, using -of \verb+pstcol+ or package \verb+color+ is still possible. - -Timothy Van Zandt was the one, who creates \verb+PSTricks+, but Denis Girou was -the one who makes it run over many years. Needless to say, how important his work is -for \verb+PSTricks+. Since more than nine month we are unable to get in touch with -Denis, which is the reason why this update of \verb+PSTricks+ comes without any -comments from Denis. -\end{abstract} - -\clearpage -\tableofcontents - -\clearpage - -\section{New fill style \texttt{eofill}} -\PS\ has a special fillstyle, called \verb|eofill|, which is now available -with the option -\verb|fillstyle=eofill|. The following two images show the difference, -the first one is filled with -\verb|fillstyle=solid| and the second one with the new option \verb|fillstyle=eofill|. - -\begin{minipage}{5.5cm} -\begin{pspicture}(5,2.5) -\pspolygon[unit=0.5cm,% - fillstyle=solid,% - fillcolor=yellow](7,3)(0,0)(1,3) - (5,5)(10,3)(2,2)(7,5)(7,3) -\end{pspicture} -\end{minipage}\hfill% -\begin{minipage}{\linewidth-6cm} -\begin{lstlisting} -\begin{pspicture}(5,2.5) -\pspolygon[unit=0.5cm,% - fillstyle=solid,% - fillcolor=yellow](7,3)(0,0)(1,3) - (5,5)(10,3)(2,2)(7,5)(7,3) -\end{pspicture} -\end{lstlisting} -\end{minipage} - - -\begin{minipage}{5.5cm} -\begin{pspicture}(5,2.5) -\pspolygon[unit=0.5cm,% - fillstyle=eofill,% - fillcolor=yellow](7,3)(0,0)(1,3)% - (5,5)(10,3)(2,2)(7,5)(7,3) -\end{pspicture} -\end{minipage}\hfill% -\begin{minipage}{\linewidth-6cm} -\begin{lstlisting} -\begin{pspicture}(5,2.5) -\pspolygon[unit=0.5cm,% - fillstyle=eofill,% - fillcolor=yellow](7,3)(0,0)(1,3)% - (5,5)(10,3)(2,2)(7,5)(7,3) -\end{pspicture} -\end{lstlisting} -\end{minipage} - -\section{Dashed lines} -By default a dash line can be set with the option \verb+dash=<black> <white>+, -e.g. \verb+dash=10pt 5pt+. This definition makes it impossible to define a -dashed/dotted line. \verb+pstricks-add+ redefines this option for a use with -four parameters \verb+dash=<black> <white> <black> <white>+, -where the last two can be omit. The following examples show different values for these -parameters: - - -\medskip -\begin{center} -\begin{minipage}{10.5cm}% -\psset{linestyle=dashed,dashadjust=false} -\noindent -\psline[dash=1 1](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 0.5](0,0)(10,0)\\ -\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\ -\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0)\\ - -\psset{dashadjust=true} -\noindent -\psline[dash=1 1](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 0](0,0)(10,0)\\ -\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\ -\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0) -\end{minipage} -\end{center} - - -\medskip -\begin{lstlisting} -{\psset{linestyle=dashed,dashadjust=false} -\psline[dash=1 1](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 0.5](0,0)(10,0)\\ -\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\ -\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0)\\ - -\psset{dashadjust=true} -\psline[dash=1 1](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 0](0,0)(10,0)\\ -\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\ -\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\ -\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0)} -\end{lstlisting} - - -As seen in the above code, it is no problem to use dashed lines in the usual way -with two parameters. - - -\section{Ellipses} -\verbI{pstricks - patch 14} has only the following macro for drawing an ellipse: - -{\small\begin{verbatim} -\psellipse[<option>](x,y)(a,b) -\psellipse*[<option>](x,y)(a,b) -\end{verbatim}} - -\noindent whith \verbI{(x,y)} as the center and \verbI{(a,b)} as the two radians -(figure \ref{pstricks}). - -\begin{figure}[htb] -\begin{minipage}{0.39\columnwidth} -\begin{pspicture}(0,-0.25)(5,3.25) - \psgrid - \psellipse[% - linewidth=0.2,% - linecolor=red](2.5,1.5)(2,1) - \psellipse*[% - linecolor=blue](2.5,1.5)(0.5,1.5) -\end{pspicture}% -\end{minipage}% -\hfill% -\begin{minipage}{0.59\columnwidth} -\begin{lstlisting} -\begin{pspicture}(0,-0.25)(5,3.25) - \psgrid - \psellipse[% - linewidth=0.2,% - linecolor=red](2.5,1.5)(2,1) - \psellipse*[% - linecolor=blue](2.5,1.5)(0.5,1.5) -\end{pspicture}% -\end{lstlisting} -\end{minipage}% -\caption{The \verbI{pstricks} macro \CMD{psellipse}}\label{pstricks} -\end{figure} - -\subsection{Ellipse based on \texttt{pst-plot}} - -With the \CMD{parametricplot} macro from \verbI{pst-plot} we can define a new macro for -drawing ellipses: - -\begin{lstlisting} -% #1 options -% #2 a -% #3 b -% #4 start angle -% #5 end angle -\newcommand{\pstEllipse}[5][]{% - \psset{#1} - \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}} -\end{lstlisting} - -\noindent which has the syntax - -{\small\begin{verbatim} -\pstEllipse[<options>]{a}{b}{start angle}{end angle} -\end{verbatim}} - -This macro is not part of of \verb|pstricks.tex|, it is only defined for some demonstration. - -\newcommand*{\pstEllipse}[5][]{% - \psset{#1} - \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}% -} - -\begin{figure}[htb] -\begin{minipage}{0.39\columnwidth} -\begin{pspicture}(-2.25,-1.75)(2.25,1.75) - \psgrid - \pstEllipse[% - linewidth=0.2,% - linecolor=red]{2}{1}{0}{360} - \pstEllipse[% - linewidth=0.1,% - arrows=|->,% - arrowsize=0.5,% - linecolor=blue]{1}{2}{-30}{250} -\end{pspicture}% -\end{minipage}% -\hfill% -\begin{minipage}{0.59\columnwidth} -\begin{lstlisting} -\begin{pspicture}(-2.25,-1.75)(2.25,1.75) - \psgrid - \pstEllipse[% - linewidth=0.2,% - linecolor=red]{2}{1}{0}{360} - \pstEllipse[% - linewidth=0.1,arrows=|->,% - arrowsize=0.5,% - linecolor=blue]{1}{2}{-30}{250} -\end{pspicture}% -\end{lstlisting} -\end{minipage}% -\caption{The macro \CMD{pstEllipse} which uses the \CMD{parametricplot} macro -from \verbI{pst-plot}}\label{parametric} -\end{figure} - -As seen in figure \ref{parametric} it is no problem to draw arcs of an ellipse. -The center of these ellipses are by default $(0,0)$, with the \CMD{rput} macro -it is also not a problem to put the ellipse anywhere in the coordinate system with -any angle of rotating. - - -\subsubsection{Wedge of an ellipse} -To define a macro for a wedge of an ellipse (figure \ref{parametric-wedge}) is also easy with -the \verb+\pscustom+ macro. which uses the following code: - - -% -\newcommand*{\pstEllipseWedge}[5][]{% - \psset{#1}% - \pscustom{% - \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}% - \psline(! #2\space #5\space cos mul #3\space #5\space sin mul)% - (0,0)% - (! #2\space #4\space cos mul #3\space #4\space sin mul)% - }% -} -% - -\begin{lstlisting} -% #1 options -% #2 a -% #3 b -% #4 start angle -% #5 end angle -\newcommand{\pstEllipseWedge}[5][]{% - \psset{#1} - \pscustom{% - \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}% - \psline(! #2\space #5\space cos mul #3\space #5\space sin mul)% - (0,0)% - (! #2\space #4\space cos mul #3\space #4\space sin mul)% - }% -} -\end{lstlisting} - -This macro is also not part of of \verb|pstricks.tex|, it is only defined for some -demonstration. - -\begin{figure}[htb] -\begin{minipage}{0.39\columnwidth} -\begin{pspicture}(-2.25,-1.75)(2.25,1.75) - \psgrid - \pstEllipseWedge[% - linewidth=0.05,linecolor=red,% - fillstyle=hlines,% - fillcolor=red]{2}{1}{0}{130} - \pstEllipseWedge[% - linewidth=0.1,% - linecolor=blue,% - fillstyle=vlines,% - fillcolor=blue]{1}{2}{-30}{190} -\end{pspicture}% -\end{minipage}% -\hfill% -\begin{minipage}{0.59\columnwidth} -\begin{lstlisting} -\begin{pspicture}(-2.25,-1.75)(2.25,1.75) - \psgrid - \pstEllipseWedge[% - linewidth=0.05,linecolor=red,% - fillstyle=hlines,% - fillcolor=red]{2}{1}{0}{130} - \pstEllipseWedge[% - linewidth=0.1,linecolor=blue,% - fillstyle=vlines,% - fillcolor=blue]{1}{2}{-30}{190} -\end{pspicture}% -\end{lstlisting} -\end{minipage}% -\caption{The macro \CMD{pstEllipseWedge} which uses the \CMD{parametricplot} -macro from \verbI{pst-plot}}\label{parametric-wedge} -\end{figure} - -\subsection{New ellipse macros} - -All macros defined in this package are original from Timothy Van Zandt and Denis Girou and -modified by several other authors. The available macros are - -{\small\begin{verbatim} -\psellipticarc[<options>] - {<arrows>}(<center>)(a,b){start angle}{end angle} -\psellipticarcn[<options>] - {<arrows>}(<center>)(a,b){start angle}{end angle} -\psellipticwedge[<options>] - {<arrows>}(<center>)(a,b){start angle}{end angle} -\end{verbatim}} - -\subsubsection{Arc of an ellipse} - -Figure \ref{pst-ellipse-arc} shows different examples for this macro. - -\begin{figure}[htb] -\begin{minipage}{0.39\columnwidth} -\begin{pspicture}(-2.25,-2.25)(2.25,2.25) - \psgrid - \psellipticarc[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180} - \psellipticarc[linecolor=red](0,0)(0.5,1.5){30}{320} -\end{pspicture} -\end{minipage}% -\hfill% -\begin{minipage}{0.59\columnwidth} -\begin{lstlisting} -\begin{pspicture}(-2.25,-2.25)(2.25,2.25) - \psellipticarc[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180} - \psellipticarc[linecolor=red](0,0)(0.5,1.5){30}{320} -\end{pspicture} -\end{lstlisting} -\end{minipage}% -\caption{The macro \CMD{psellipticarc}}\label{pst-ellipse-arc} -\end{figure} - -\subsection{Arc of an ellipse with anti clockwise direction} - -Figure \ref{pst-ellipse-arcN} shows different examples for this macro which is the same than the one figure \ref{{pst-ellipse-arc}} only drawn anti clockwise. - -\begin{figure}[htb] -\begin{minipage}{0.39\columnwidth} -\begin{pspicture}(-2.25,-2.25)(2.25,2.25) - \psgrid - \psellipticarcn[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180} - \psellipticarcn[linecolor=red](0,0)(0.5,1.5){30}{320} -\end{pspicture} -\end{minipage}% -\hfill% -\begin{minipage}{0.59\columnwidth} -\begin{lstlisting} -\begin{pspicture}(-2.25,-2.25)(2.25,2.25) - \psellipticarcn[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180} - \psellipticarcn[linecolor=red](0,0)(0.5,1.5){30}{320} -\end{pspicture} -\end{lstlisting} -\end{minipage}% -\caption{The macro \CMD{psellipticarcn}}\label{pst-ellipse-arcN} -\end{figure} - - -\subsubsection{Wedge of an ellipse} - -Figure \ref{pst-ellipse-wedge} shows different examples for this macro. - -\begin{figure}[htb] -\begin{minipage}{0.39\columnwidth} -\begin{pspicture}(-2.25,-2.25)(2.25,2.25) - \psgrid - \psellipticwedge[% - fillstyle=vlines,% - linewidth=0.1](0,0)(1.5,1){0}{200} - \psellipticwedge[% - fillstyle=hlines,% - linecolor=red](0,0)(0.5,1.5){30}{220} -\end{pspicture} -\end{minipage}% -\hfill% -\begin{minipage}{0.59\columnwidth} -\begin{lstlisting} -\begin{pspicture}(-2.25,-2.25)(2.25,2.25) - \psgrid - \psellipticwedge[% - fillstyle=vlines,% - linewidth=0.1](0,0)(1.5,1){0}{200} - \psellipticwedge[% - fillstyle=hlines,% - linecolor=red](0,0)(0.5,1.5){30}{220} -\end{pspicture} -\end{lstlisting} -\end{minipage}% -\caption{The macro \CMD{psellipticwedge}}\label{pst-ellipse-wedge} -\end{figure} - -\section{\texttt{pstricks.sty}} -In the past there were some problems with \verb+pstricks.tex+ and the package \verb+color.sty+. -\verb+pstcol.sty+ tried to get rid of them but not with success in any case. The -new package \verb+pstricks.sty+ loads first \verb+pstricks.tex+, does some modifcation -to \verb+pstricks+, loads \verb+xcolor.sty+ and some more modifications to the the code to -get \verb+pstricks+ and colors work in a right way. It also renames the \verb+\scalebox+ -macro to \verb+\psscalebox+ to prevend clashes with the one from the package \verb+graphicx.sty+ which has the -same name but another syntax. If you want to use the macro from \verb+graphicx+, then load this -package as the last one. - - -\end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index c0edb6bf1b2..4473808ba6f 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ % $Id: pstricks.pro 801 2013-07-09 18:10:41Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.17, 2013/07/08 +%% Version 1.18, 2013/11/05 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -1069,7 +1069,8 @@ dup angle0 sub dup abs 180 gt { 180 add 360 div floor 360 mul sub } { pop } ifel /PutBegin { /TMatrix [ TMatrix CM ] cvx def CP 4 2 roll T moveto } def /PutEnd { CP /TMatrix [ TMatrix setmatrix ] cvx def moveto } def % -/Uput { +/Uput { + 10 dict begin /a ED add 2 div /h ED 2 div /w ED @@ -1081,9 +1082,11 @@ dup angle0 sub dup abs 180 gt { 180 add 360 div floor 360 mul sub } { pop } ifel /w1 c b div w mul def /h1 s b div h mul def q { w1 abs w sub dup c mul abs }{ h1 abs h sub dup s mul abs } ifelse + end } def % /UUput { + 5 dict begin /z ED abs /y ED /x ED @@ -1094,6 +1097,7 @@ dup angle0 sub dup abs 180 gt { 180 add 360 div floor 360 mul sub } { pop } ifel a PtoC h1 add exch w1 add exch + end } def % /BeginOL { diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 471bd5a6385..69c6d6c0d71 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -162,7 +162,7 @@ \long\def\psForeach#1#2#3{% without grouping the contents \global\psLoopIndex=0\relax% \if$\ifnum9<1#2$\else\fi\psforeach@ii{#1}{#2}{#3}% - \else \expandafter\psForeach@i#2,..,,..,\@nil{#1}{#3}\fi} + \else \expandafter\psForeach@i#2,..,,..,\@nil{#1}{#3}\fi} \long\def\psForeach@i#1,#2,..,#3,..,#4\@nil#5#6{% \ifx\relax#3\relax\psForeach@ii{#5}{#1,#2}{#6}% \else\psForeach@iii{#5}{#1}{#2}{#3}{#6}\fi% |