diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-05-25 20:26:07 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-05-25 20:26:07 +0000 |
commit | 3cbd6961c6f5eb2d115fc7273fd20cdc9d29e8f5 (patch) | |
tree | d1961ae35e4607e6cdac1a22ca45e45c6c4f4ddb | |
parent | 30d4ad935fafa91673e4c3880382ee6296584111 (diff) |
pstricks v1.23 2008/05/23
git-svn-id: svn://tug.org/texlive/trunk@8347 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.doc | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Makefile | 48 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/examples.zip | bin | 0 -> 181885 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news.sty | 86 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news2008.pdf | bin | 238682 -> 249194 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news2008.tex | 372 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/pstricks/Changes | 2 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/pstricks/pstricks.pro | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/Changes | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 49 |
10 files changed, 410 insertions, 155 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.doc b/Master/texmf-dist/doc/generic/pstricks/Changes.doc index 3ed819cc93d..39bbbe36595 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.doc +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.doc @@ -1,3 +1,4 @@ -2008-01-22 new files pst-news2008.tex|pdf +2008-05-23 new files pst-news2008.tex|pdf + pst-news.sty for the doc 2005-12-22 new files pstnews1-14.tex|pdf 2006-12-19 new files pstnews1-15.tex|pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/Makefile b/Master/texmf-dist/doc/generic/pstricks/Makefile new file mode 100644 index 00000000000..38c4f089a4f --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks/Makefile @@ -0,0 +1,48 @@ + +# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17 + +.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps + +PACKAGE = pst-news2008 + +MAIN = $(PACKAGE) + +LATEX = latex + +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) + +# EOF diff --git a/Master/texmf-dist/doc/generic/pstricks/examples.zip b/Master/texmf-dist/doc/generic/pstricks/examples.zip Binary files differnew file mode 100644 index 00000000000..20c744620c7 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks/examples.zip diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news.sty b/Master/texmf-dist/doc/generic/pstricks/pst-news.sty new file mode 100644 index 00000000000..7d2ab444208 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news.sty @@ -0,0 +1,86 @@ +%% $Id: pst-news.sty 9 2008-01-03 20:22:50Z herbert $ +\ProvidesPackage{pst-news}[2008/02/01 definitions for + PSTricks news (hv)] + +\RequirePackage{pstricks} +\let\PSTfiledate\filedate +\let\PSTfileversion\fileversion +\RequirePackage{pst-node} +\let\NODEfiledate\filedate +\let\NODEfileversion\fileversion +\RequirePackage{pst-plot} +\let\PLOTfiledate\filedate +\let\PLOTfileversion\fileversion +\RequirePackage{pst-tree} +\let\TREEfiledate\filedate +\let\TREEfileversion\fileversion +% +\RequirePackage{showexpl} +\RequirePackage{makeidx} +\makeindex +\RequirePackage{tabularx,array,longtable} +\SpecialCoor +\RequirePackage[colorlinks,linktocpage]{hyperref} +\RequirePackage{breakurl} +\def\UrlFont{\small\ttfamily} +\makeatletter +\def\verbatim@font{\small\normalfont\ttfamily} +\let\Oldpart\part +\renewcommand\part[1]{\clearpage\Oldpart{#1}} +\makeatother +\RequirePackage{ragged2e} +\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} +% +\RequirePackage{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 +% +%\psset{subgriddiv=0,griddots=5,gridlabels=7pt} +% +\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\let\PSTbibliography\bibliography +\renewcommand\bibliography[1]{\begingroup\RaggedRight\PSTbibliography{#1}\endgroup} +\def\PS{PostScript} +\def\textat{\char064} + +% +\def\LPack#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Package!#1@\texttt{#1}}} +\def\nxLPack#1{\texttt{#1}} +\def\LFile#1{\texttt{#1}\index{#1@\texttt{#1}}\index{File!#1@\texttt{#1}}} +\def\nxLFile#1{\texttt{#1}} +\def\Lcs#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1}}\index{Macro!#1@\texttt{\textbackslash#1}}} +\def\nxLcs#1{\texttt{\textbackslash#1}} +\def\Lenv#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Environment!#1@\texttt{#1}}} +\def\Ldim#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1}}\index{Dimension!#1@\texttt{\textbackslash#1}}} +\def\Lkeyword#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}}} +\def\Lkeyval#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Value!#1@\texttt{#1}}} +\def\Loption#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Package option!#1@\texttt{#1}}} +\def\LPS#1{\texttt{#1}\index{#1@\texttt{#1}}\index{PostScript!#1@\texttt{#1}}} +\def\Index#1{#1\index{#1}} +\endinput diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news2008.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news2008.pdf Binary files differindex 16a6b15a6ff..70a02afa84c 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news2008.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news2008.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news2008.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news2008.tex index 745ac79b7ee..2aedc8e6089 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news2008.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news2008.tex @@ -1,77 +1,13 @@ \documentclass[11pt]{article} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} -%\usepackage{geometry} -% -\usepackage{pstricks} -\let\PSTfiledate\filedate -\let\PSTfileversion\fileversion -\usepackage{pst-node} -\let\NODEfiledate\filedate -\let\NODEfileversion\fileversion -\usepackage{pst-plot} -\let\PLOTfiledate\filedate -\let\PLOTfileversion\fileversion -\usepackage{pst-tree} -\let\TREEfiledate\filedate -\let\TREEfileversion\fileversion -% -\usepackage{showexpl} -\usepackage{tabularx,array,longtable} -\SpecialCoor -\usepackage[colorlinks,linktocpage]{hyperref} -\def\UrlFont{\small\ttfamily} -\makeatletter -\def\verbatim@font{\small\normalfont\ttfamily} -\let\Oldpart\part -\renewcommand\part[1]{\clearpage\Oldpart{#1}} -\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}}} -\let\Lcs\CMD -% -%\psset{subgriddiv=0,griddots=5,gridlabels=7pt} -% -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\def\PS{PostScript} +\usepackage{pst-news} % \begin{document} \title{\texttt{PSTricks -- 2008}\\ new macros and bugfixes for the -basic packages \Lcs{pstricks}, \Lcs{pst-plot}, \Lcs{pst-tree},\\ and \Lcs{pst-node}} +basic packages \nxLFile{pstricks}, \nxLFile{pst-plot}, \nxLFile{pst-tree},\\ and \nxLFile{pst-node}} \author{Herbert Voß\thanks{% -\url{Herbert.Voss@pstricks.de}}} +\url{Herbert.Voss@pstricks.de}; \newline thanks to Patrick Drechsler.}} \date{\today} \maketitle @@ -86,34 +22,83 @@ basic packages \Lcs{pstricks}, \Lcs{pst-plot}, \Lcs{pst-tree},\\ and \Lcs{pst-no \section{\texttt{pstricks.sty}} %-------------------------------------------------------------------------------------- +\subsection{Error messages} \begin{itemize} -\item Loading the package \texttt{pstricks} by \LaTeX\ will now write a message -into the file list of file version and date for the file \texttt{pstricks.pro}. +\item Loading the package \LPack{pstricks} by \LaTeX\ will now write a message +into the file list of file version and date for the file \LFile{pstricks.pro}. \item A frequently done error is choosing a file name for the document, which is -already a name of one PSTricks package, e.\,g. \verb=pstricks.tex=. The error -message in the log file was not really helpful. There is now an extended message: +already a name of one PSTricks package, e.\,g. \LFile{pstricks.tex}. The \Index{error message} +in the log file was not really helpful. There is now an extended message +(example for a dcoument file called \LFile{pstricks.tex}): {\small\begin{verbatim} -! LaTeX Error: Two \documentclass or \documentstyle commands - or `pstricks.tex' is a forbidden name for your document, - it is already a name of a PSTricks package! - Choose another name for your document! +! LaTeX Error: `pstricks.tex' is a forbidden name for your document, + it is already a name of a package. + +See the LaTeX manual or LaTeX Companion for explanation. +Type H <return> for immediate help. + ... + +l.13 \documentclass + {article} +? H +Choose another name for your document \end{verbatim} } \end{itemize} +\subsection{Optional arguments} +\LPack{pstricks} supports \Index{transparent colors} with Ghostscript's \LPS{.setopacityalpha}, +\LPS{.setblendmode}, and \LPS{.setshapealpha}. These functions are not known to +\Index{V\TeX} or Adobes \Index{Distiller}. The optional argument \Loption{vtex} disables transparencies +and \Loption{distiller} overrides the \Index{Ghostscript} functions with the ones from the \Index{Distiller}. + + + +\clearpage %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.tex} (\PSTfileversion -- \PSTfiledate)} %-------------------------------------------------------------------------------------- +\subsection{Option \texttt{shift}} +The optional argument \Lkeyword{shift} can be used for a vertical alignment of the +\Lenv{pspicture} box. With \Lkeyword{shift}=\Lkeyval{*}, instead of a value or a length +it is possible to center the \Lenv{pspicture} box vertically to the baseline +of the current line. + +\begin{LTXexample}[width=4cm] +\usepackage{pstricks} +\rule{5mm}{0.5pt}% +\psframebox{% +\begin{pspicture}[showgrid=true, + shift=*](-0.3,-0.4)(3.2,3.3) + \psarc[showpoints=true](1,1){2}{-45}{120} +\end{pspicture}}\rule{5mm}{0.5pt} +\end{LTXexample} + + +\iffalse +\subsection{Option \texttt{noCheck}} + +By default PSTricks checks all values for angles and radi, which makes it impossible to +insert the values in PostScript notation. With setting \verb+noCheck=true+ the argument is +taken verbatim and passed directly into the PostScript part. + +\begin{LTXexample}[width=4cm] +\usepackage{pstricks} +\begin{pspicture}[showgrid=true](3,2) + \psarc[noCheck=true](1,1){ 100 sin }{ 30 }{ 350 Pi div } +\end{pspicture} +\end{LTXexample} +\fi \subsection{Option \texttt{gridfont}} -By default the grid labels were printed always in Helvetica. With the new option \verb+gridfont+ -one can define another PostScript Font. Available are +By default the \Index{grid label}s were printed always in \Index{Helvetica}. With the new keyword \Lkeyword{gridfont} +one can define another \Index{PostScript Font}. Available are at least \medskip {\ttfamily\noindent -Helvetica (default) -- Helvetica-Narrow -- Times-Roman -- Courier -- AvantGard --NewCenturySchlbk -- -Palatino-Roman -- Bookman-Demi -- \linebreak Zapf-Dingbats -- Symbol} +\Lkeyval{Helvetica} (default) -- \Lkeyval{Helvetica-Narrow} -- \Lkeyval{Times-Roman} -- \Lkeyval{Courier} -- \Lkeyval{AvantGard} --\Lkeyval{NewCenturySchlbk} -- +\Lkeyval{Palatino-Roman} -- \Lkeyval{Bookman-Demi} -- \linebreak \Lkeyval{ZapfDingbats} -- \Lkeyval{Symbol}} \begin{LTXexample}[width=4cm] \usepackage{pstricks} @@ -121,6 +106,9 @@ Palatino-Roman -- Bookman-Demi -- \linebreak Zapf-Dingbats -- Symbol} \end{pspicture}\\[20pt] \begin{pspicture}(3,2) \psgrid[style=gridstyle,gridfont=AvantGard-Demi] +\end{pspicture}\\[20pt] +\begin{pspicture}(3,2) + \psgrid[style=gridstyle,gridfont=ZapfDingbats] \end{pspicture} \end{LTXexample} @@ -128,9 +116,9 @@ Palatino-Roman -- Bookman-Demi -- \linebreak Zapf-Dingbats -- Symbol} \clearpage \subsection{\texttt{linejoin}} Connecting lines can be done in several ways and is controlled on PS level -by the \verb+setlinejoin+ command. With this version of PSTricks it is -possible to controll this by an optional argument, called \verb+linejoin+. -It is preset by 0 and can take values of 0,1,2. Other values jave +by the \LPS{setlinejoin} command. With this version of PSTricks it is +possible to controll this by an optional argument, called \Lkeyword{linejoin}. +It is preset to 0 and can take values of 0,1,2. Other values will have no effect. \begin{LTXexample}[width=4cm] @@ -147,17 +135,17 @@ no effect. \end{LTXexample} \clearpage -\subsection{\texttt{setlinecap}} -The value of \texttt{linecap} determines how the line ends are drawn: +\subsection{\texttt{linecap}} +The value of \Lkeyword{linecap} determines how the line ends are drawn: \begin{description} \item[0] lines are cut (default) -\item[1] lines are ended by a filled semicircle of radius 0.5$\cdot$\verb+\pslinewidth+ -\item[2] lines are ended by a filled half square of radius 0.5$\cdot$\verb+\pslinewidth+ +\item[1] lines are ended by a filled semicircle of radius 0.5$\cdot$\Ldim{pslinewidth} +\item[2] lines are ended by a filled half square of radius 0.5$\cdot$\Ldim{pslinewidth} \end{description} -The following example shows that using \texttt{linecap} for lines is the same -than using the arrow option. +The following example shows that using \Lkeyword{linecap} for lines is the same +than using the \Index{arrow} option. \begin{LTXexample}[width=4cm] \begin{pspicture}[showgrid=true](4,4)% @@ -172,9 +160,9 @@ than using the arrow option. \end{LTXexample} Using this optional argument makes only sense in some special cases, because -it is the same as the arrow type \verb+c-c+. But the arrows are not part -of the current path and filling an open curve with the \texttt{linecap} option -is different to a curve using the \verb+c-c+ arrow. +it is the same as the \Index{arrow type} \Lkeyval{c-c}. But the arrows are not part +of the \Index{current path} and \Index{filling} an \Index{open curve} with the \Lkeyword{linecap} option +is different to a curve using the \Lkeyval{c-c} arrow. \begin{LTXexample}[width=3cm,wide] \psset{unit=5cm,linewidth=5mm} @@ -193,8 +181,8 @@ is different to a curve using the \verb+c-c+ arrow. \clearpage \subsection{New arrowtype \texttt{D>} and \texttt{D>D>}} -All arrows are drawn as polygons. The new arrow type \verb+D>+ or \verb+<D+ for the other way round, -draws it lines as bezier curves, which looks nicer for big arrows. +All arrows are drawn as polygons. The new arrow type \Lkeyval{D>} or \Lkeyval{<D} for the other way round, +draws its lines as bezier curves, which looks nicer for big arrows. \begin{LTXexample}[width=4cm,wide] \psset{arrowscale=5} @@ -209,22 +197,22 @@ draws it lines as bezier curves, which looks nicer for big arrows. \clearpage \subsection{Transparent colors} -The package \texttt{pstricks-add} already defined a fillstyle for -transparency colors by using the GhostScripts blendmode. -It now moves into the main \texttt{PSTricks} package, together with +The package \LPack{pstricks-add} already defined a fillstyle for +transparency colors by using the \Index{Ghostscript}'s \Index{blendmode}. +It now moves into the main \LPack{pstricks} package, together with another possibility for creating transparent colors. -Transparency is only seen with the PDF output (version 1.4 or greater), -nearly all PostScript viewer cannot show transparencies. +Transparency is only seen with the \Index{PDF} output (version 1.4 or greater), +as nearly all PostScript viewer cannot show transparencies. -Loading the \verb+pstricks+ package with the option \verb=vtex=, disables +Loading the \LPack{pstricks} package with the option \Loption{vtex}, disables the transparency effekts and everything works as before. \subsubsection{Options \texttt{strokeopacity} and \texttt{opacity}} -For the existing fill style \verb+solid+ the new option \verb+opacity+ +For the existing fill style \Lkeyval{solid} the new option \Lkeyword{opacity} can be used to get also transparent colors. It is predefined by 1 ($0\ldots1$), which -is the old behaviour, no transpareny. The option is valid only for PostScripts -fill commands. Lines and curves can be trabsparent with setting the option -\verb+strokeopacity+, which can have a different value as for the \verb+opacity+ option. +is the old behaviour, no \Index{transpareny}. The option is valid only for PostScripts +fill commands. Lines and curves can be transparent with setting the option\index{transparent lines} +\Lkeyword{strokeopacity}, which can have a different value than the \Lkeyword{opacity} option. \begin{LTXexample}[width=4cm,wide] \begin{pspicture}[linewidth=1cm](4,4) @@ -282,8 +270,8 @@ fill commands. Lines and curves can be trabsparent with setting the option \clearpage \subsubsection{Fill style \texttt{shape}} -There is now one more fill style for transparent colors: \verb+shape+ -with using the \verb+shapealpha+ value and one of the possible blendmodes: +There is now one more \Index{fill style} for \Index{transparent colors}: \Lkeyword{shape} +with using the \Lkeyword{shapealpha} value and one of the possible blendmodes: \begin{verbatim} /Normal ->0 /Compatible ->1 @@ -292,10 +280,10 @@ with using the \verb+shapealpha+ value and one of the possible blendmodes: \end{verbatim} -The fill style \verb+solid+ uses -GhostScripts \verb+.setopacityalpha+ function -and the new style \verb+shape+ the \verb+blendmode+ together with \verb+.setshapealpha+. -\verb+shapealpha+ is predefined +The fill style \Lkeyval{solid} uses +\Index{Ghostscript}'s \LPS{.setopacityalpha} function +and the new style \Lkeyval{shape} and the \Lkeyword{blendmode} together with \LPS{.setshapealpha}. +\Lkeyword{shapealpha} is predefined with 0.6 and both alpha values can be chosen from the range $0\le\alpha\le1$. \begin{pspicture}(5,5)% default blendmode @@ -395,14 +383,14 @@ with 0.6 and both alpha values can be chosen from the range $0\le\alpha\le1$. \clearpage -\subsection{\CMD{addtopsstyle}} +\subsection{\nxLcs{addtopsstyle}} \begin{verbatim} \addtopsstyle{style-name}{settings} \end{verbatim} -This macro allows to add some more settings to an existing style. -If the style is not defined, then \verb+\addtopsstyle+ behaves like the -already defined \verb+\newpsstyle+ macro. +This macro allows to add some more settings to an existing \Index{style}. +If the style is not defined, then \Lcs{addtopsstyle} behaves like the +already defined \Lcs{newpsstyle} macro. \begin{LTXexample}[width=5cm,wide] \newpsstyle{Fiber}{linewidth=2pt} @@ -420,16 +408,36 @@ already defined \verb+\newpsstyle+ macro. \end{LTXexample} -\subsection{\CMD{psTextFrame}} +\clearpage + +\subsection{\nxLcs{pscircleOA}} +\begin{verbatim} +\pscircleOA[settings](xO,yO)(xA,yA) +\end{verbatim} + +$(x_0, y_0)$ is the center and $(x_A, y_A)$ a given point of the +circle. The radius is calculated by \TeX. + +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid=true](-2,0)(8,8) +\pscircleOA(6,4)(4,4) +\pscircleOA[linecolor=blue](4,6)(4,4) +\pscircleOA[linewidth=2pt,linecolor=yellow](3,5)(4,4) +\pscircleOA*[opacity=0.3,linecolor=red](2,2)(4,4) +\end{pspicture} +\end{LTXexample} + + +\subsection{\nxLcs{psTextFrame}} \begin{verbatim} \psTextFrame[settings](x1,y1)(x2,y2){Text} \end{verbatim} The \emph{Text} cannot have a linebreak. In case it is needed, put the \emph{Text} -into a \verb+minipage+ or \CMD{parbox}, as seen in the following example. The -\verb+ref+-option allows different placing and the \verb+rot+-option allows -the rotating of the \emph{Text}. The macro itself first uses the -\CMD{psframe} and then \CMD{rput} with calculated coordinates. +into a \Lenv{minipage} or \Lcs{parbox}, as seen in the following example. The +\Lkeyword{ref}-option allows different placing and the \Lkeyword{rot}-option allows +the \Index{rotating} of the \emph{Text}. The macro itself first uses the +\Lcs{psframe} and the \Lcs{rput} macro with \Index{calculated coordinates}. \begin{LTXexample}[pos=t] @@ -452,25 +460,57 @@ the rotating of the \emph{Text}. The macro itself first uses the \subsection{Special coordinates} -Additionally to the existing !-operator for PostScript coordinates, -there is new a *-operator, which invokes the algebraic parser before +Additionally to the existing \Index{!-operator} for \Index{PostScript} coordinates, +there is new a \Index{*-operator}, which invokes the \Index{algebraic parser} before the coordinates are passed to the default !-operator. The syntax is pretty easy: \verb=(<value> {f(x)})=. In the following example the -predefined value of Pi from pstricks.pro is used. The function must be enclosed -in braces when itself contains round braces. +predefined value of Pi\index{$\pi$} from \LFile{pstricks.pro} is used. The x value +and the function must be enclosed +in braces when they contain spaces, round braces or sybolic names, like \verb+Pi+ for the +x value. \begin{LTXexample}[width=5cm,wide] \SpecialCoor \begin{pspicture}(0,-1)(5,1) \psaxes{->}(0,0)(0,-1)(5,1) - \psline(0,0)(*Pi {sqrt(abs(cos(x)))}) - \psline{<->}(*Pi {cos(x)})(*5 {sin(x)*cos(x)}) + \psline(0,0)(*{Pi} {sqrt(abs(cos(x)))}) + \psline{<->}(*{Pi} {cos(x)})(*5 {sin(x)*cos(x)}) +\end{pspicture} +\end{LTXexample} + +For a macro definition of the algebraic function the \verb+\string+ command +has to be used, otherwise \TeX{} expects the math mode in the following +example. + +\begin{LTXexample}[width=4cm,wide] +\def\F{\string x^2 } +\begin{pspicture}[showgrid=true](2,4) + \psline[linecolor=red](*1 {\F} )(*2 {\F} ) \end{pspicture} \end{LTXexample} +\subsection{Octogon-Symbol} + +An octogon symbol was added. +\begin{verbatim} +\newpsfontdotH{Octogon}[1 0 0 1 0 0]{PSTricksDotFont}{(f)}{(g)} +\newpsfontdotH{BoldOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(F)}{(g)} +\newpsfontdot{SolidOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(g)} +\end{verbatim} + +\begin{LTXexample}[width=4cm,wide] +\psset{dotscale=4} +\begin{pspicture}[showgrid=true](4,4) +\psdot[dotstyle=Octogon](1,1) +\psdot[dotstyle=BoldOctogon](2,2) +\psdot[dotstyle=SolidOctogon](3,3) +\end{pspicture} +\end{LTXexample} + + \subsection{Code changes} \begin{verbatim} @@ -489,7 +529,8 @@ in braces when itself contains round braces. %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.pro}} +\section{The PostScript header files} +\subsection{\texttt{pstricks.pro}} %-------------------------------------------------------------------------------------- \begin{verbatim} @@ -503,7 +544,21 @@ in braces when itself contains round braces. This new PostScript function allows to calculate the distance between two points, given by their coordinates whereas the -existing /Pyth does ist for two values. +existing \LPS{/Pyth} does this for two values. + +\subsection{\texttt{pst-dots.pro}} +\verb+pst-dots.pro+ ist the file which defines the so called softfont PSTRocksFontDot, which +collects all PSTricks symbols, which are not part of one of the standard PostScript fonts. +The octogon symbol is defined as: +\begin{verbatim} + /OctogonPath { + 228 550 moveto 7 { -456 0 rlineto 45 rotate } repeat closepath + } def + /SolidOctogon { OctogonPath fill } def + /Octogon { OctogonPath .89 .89 scale OctogonPath eofill } def + /BoldOctogon { OctogonPath .79 .79 scale OctogonPath eofill } def +% +\end{verbatim} \part{\texttt{pst-node} -- package} @@ -511,8 +566,8 @@ existing /Pyth does ist for two values. \section{\texttt{pst-node.tex} (\NODEfileversion -- \NODEfiledate)} \subsection{Bugfix for \texttt{psmatrix}} -A long standing bug with psmatrix and using the \texttt{name} option is now fixed. -The following now works as expected: +A long standing bug with \Lenv{psmatrix} and using the \Lkeyword{name} option is now fixed. +The following works as expected: \begin{LTXexample}[width=2cm] \begin{psmatrix}[rowsep=5mm] @@ -524,13 +579,13 @@ The following now works as expected: \ncarc{a}{c} \end{LTXexample} -An optional argument after \verb+\\+ is now scanned in the correct way. +An optional argument after \Lcs{\textbackslash} is now scanned in the correct way. \subsection{New option \texttt{pcRef}} -There is a new option \texttt{pcRef} for the \Lcs{ncangles} connection. By default, -the reference point for the \texttt{armA} option is the border of the node. This makes -it difficult, to get horizontically aligned lines for different node images. +There is a new option \Lkeyword{pcRef} for the \Lcs{ncangles} connection\index{node connection}. By default, +the reference point for the \Lkeyword{armA} option is the border of the node. This makes +it difficult to get horizontically aligned lines for different node images. With \texttt{pcRef=true} the node center is the reference point and the connection is still drawn from the border of the node. @@ -577,7 +632,7 @@ The first three images show the default behaviour: \end{pspicture} } -The next three one the influence of \texttt{pcRef=true}; the horizontal line +The next three images display the influence of \texttt{pcRef=true}; the horizontal line for the three examples is on the same height: \makebox[\linewidth]{% @@ -665,6 +720,47 @@ for the three examples is on the same height: \part{\texttt{pst-plot} -- package} \section{\texttt{pst-plot.tex} (\PLOTfileversion -- \PLOTfiledate)} + +\iffalse + +\subsection{Axes} +The behaviour of the optional argument \Lkeyword{Dx} changed. Using +negative values will now decrease the labels with the correct +value of \Lkeyword{Dx}: + +\psset{xunit=1cm} +\begin{LTXexample}[wide,width=6cm] +\begin{pspicture}(-0.5,-1)(6,4) + \psaxes[Dy=-2, dy=1, + Ox=4000, Dx=-1000, dx=1.5]{->}(10,4) +\end{pspicture} +\end{LTXexample} + +\vspace{1cm} +\begin{pspicture}(-0.5,-1)(10,3) + \psaxes[Dy=2, dy=1, Ox=4000, Dx=1000, dx=1.5]{->}(10,3)(0,0) + \rput(5,2){Positive values for Dx und Dy} +\end{pspicture} + +\begin{pspicture}(-0.5,-1)(10,3) + \psaxes[Dy=-2, dy=1, Ox=4000, Dx=-1000, dx=1.5]{->}(10,3)(0,0) + \rput(5,2){Negative values for Dx und Dy} +\end{pspicture} + +\begin{lstlisting} +\begin{pspicture}(-0.5,-1)(10,3) + \psaxes[Dy=2, dy=1, Ox=4000, Dx=1000, dx=1.5]{->}(10,3)(0,0) + \rput(5,2){Positive values for Dx und Dy} +\end{pspicture} + +\begin{pspicture}(-0.5,-1)(10,3) + \psaxes[Dy=-2, dy=1, Ox=4000, Dx=-1000, dx=1.5]{->}(10,3)(0,0) + \rput(5,2){Negative values for Dx und Dy} +\end{pspicture} +\end{lstlisting} +%\clearpage + +\fi \subsection{New options \texttt{LineToXAxis} and \texttt{LineToYAxis}} @@ -713,9 +809,15 @@ for the three examples is on the same height: \part{\texttt{pst-tree} -- package} \section{\texttt{pst-tree.tex} (\TREEfileversion -- \TREEfiledate)} +There was a bug with \texttt{style=...} due to a missing \Lcs{use\textat par} in +\Lcs{pstree\textat ii}. + + +\nocite{*} +\bibliographystyle{plain} +\bibliography{PSTricks} -There was a bug with \texttt{style=...} in fact of a missing \Lcs{use@par} in -\Lcs{pstree@ii}. +\printindex \end{document} diff --git a/Master/texmf-dist/dvips/pstricks/Changes b/Master/texmf-dist/dvips/pstricks/Changes index 88a7cebf1bf..70c6a76dbe0 100644 --- a/Master/texmf-dist/dvips/pstricks/Changes +++ b/Master/texmf-dist/dvips/pstricks/Changes @@ -1,4 +1,5 @@ ---- pstricks.pro +1.04 2008-05-11 - added Rand for a real random 0<=Rand<=1 1.03 2008-04-15 - only some cosmetics to the code 1.02 2008-01-01 - added the arrowtype D>, sides as curves (ArrowD) - added the whole algebraic parser stuff @@ -23,6 +24,7 @@ ---- pst-dots.pro +2.02 2008-04-19 add octogon symbol (hv) 2.01 2008-04-18 add some comments to the code (hv) 2.00 2006-12-19 add more dot symbols from Etienne Riga (hv) diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 73e4f2a9dc7..841b2896e7d 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ % $Id: pstricks.pro 21 2008-04-18 13:40:08Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.03, 2008/04/15 +%% Version 1.04, 2008/04/15 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -46,6 +46,7 @@ tx@Dict begin sub % yB-yA xA-xB Pyth } def /PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian +/Rand { rand 4294967295 div } def % a real random number %----------------- hv added 20050516 --------------- /PiDiv2 1.57079632680 def /Pi 3.14159265359 def diff --git a/Master/texmf-dist/tex/generic/pstricks/Changes b/Master/texmf-dist/tex/generic/pstricks/Changes index 0c490a72f0c..19b56deda9d 100644 --- a/Master/texmf-dist/tex/generic/pstricks/Changes +++ b/Master/texmf-dist/tex/generic/pstricks/Changes @@ -1,4 +1,6 @@ pstricks.tex -------- +1.23 2008-05-23 - add octogon symbol (hv) + - fix bug with D>-<D (hv) 1.22 2008-04-14 - added shift=* option to get vertically centered pspicture box. It is the old \pspciture[0.5] option - add \pscircleOA(center)(point on the circle) diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index dcb89080527..c13f0f0ff6b 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -20,8 +20,8 @@ % See the PSTricks User's Guide for description. % This uses the header file `pstricks.pro'. % -\def\fileversion{1.22} -\def\filedate{2008/04/14} +\def\fileversion{1.23} +\def\filedate{2008/05/23} % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput @@ -581,6 +581,7 @@ \endgroup% \let\pst@coor\pst@tempg% } +% \def\polar@coor#1#2{% % \pssetlength\pst@dimg{#1}% \pssetlength\pst@dimb{#1}% hv 2007-10-16 g is already used in get@@angle @@ -588,17 +589,21 @@ % \edef\pst@coor{\pst@number\pst@dimg \pst@angle \tx@PtoC}% dito \edef\pst@coor{\pst@number\pst@dimb \pst@angle \tx@PtoC}% } +% \def\raw@coor#1;#2\@nil{% PostScript code \edef\pst@coor{% - #1 \pst@number\psyunit mul exch \pst@number\psxunit mul exch }% -} -\def\alg@coor#1 #2;#3\@nil{% algebraic PostScript code + #1 \pst@number\psyunit mul exch \pst@number\psxunit mul exch }} +% +\def\alg@coor#1;#2\@nil{\expandafter\alg@@@coor#1} +\def\alg@@@coor#1#2{% algebraic PostScript code \edef\pst@coor{% - /x #1 def +% #1 /yArg exch def /x exch def + /x #1 def +% /yArg load 200 string cvs /Arg exch def /Func (#2) AlgParser cvx def x Func - \pst@number\psyunit mul exch \pst@number\psxunit mul exch }% -} + \pst@number\psyunit mul exch \pst@number\psxunit mul exch }} +% \def\node@coor#1\@nil{% \@pstrickserr{You must load `pst-node.tex' to use node coordinates.}\@ehps \def\pst@coor{0 0 }% @@ -779,12 +784,13 @@ /Screen \or /Multiply %\or % /Hardlight + \else + /Normal \fi .setblendmode \psk@shapealpha .setshapealpha > % %--------------------------------- hv 2007-09-09 begin --------------------- % transparency needs a run through latex -> dvips -> ps2pdf14(!) -% use transpalpha=<mumber> to the the opacity level % \def\psset@fillcolor#1{\pst@getcolor{#1}\psfillcolor} \psset@fillcolor{white} @@ -883,7 +889,7 @@ \def\psk@arrowA{} \def\psk@arrowB{} %\def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-]} -\def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-],)-(,]-[,|>-<|,<D-D>,<D<D-D>D>} % hv --1.16 +\def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-],)-(,]-[,|>-<|,<D-D>,D>-<D,<D<D-D>D>} % hv --1.16 \begingroup \catcode`\<=13 \catcode`\>=13 @@ -1626,6 +1632,7 @@ \edef\psk@dotangle{\psk@@dotangle rotate }% % DG/SR modification end \fi} +% \psset@dotangle{0} \def\pst@getdotsize{% \pst@dimg=\psk@@@dotsize\pslinewidth @@ -1637,6 +1644,7 @@ % DG/SR modification begin - Oct. 17, 1997 - Patch 5 \psset@dotscale{1} % DG/SR modification end +% \def\psdot{\pst@object{psdot}} \def\psdot@i{\@ifnextchar({\psdot@ii}{\psdot@ii(\z@,\z@)}} \def\psdot@ii(#1){% @@ -1650,6 +1658,7 @@ \@nameuse{psds@\psk@dotstyle}% \pst@coor Dot}% \end@SpecialObj} +% \def\psdots{\pst@object{psdots}} \def\psdots@i{% \begin@SpecialObj% @@ -1716,19 +1725,19 @@ /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def }} % DG/SR modification end -\def\newpsfontdotH#1[#2]#3#4#5{% +\def\newpsfontdotH#1[#2]#3#4#5{% for filled objects \@namedef{psds@#1}{% /#3 \psk@@dotangle [#2] \tx@FontDot /Dot { moveto - \iftrue +% \iftrue % DG/SR modification begin - Dec. 23, 1999 - Patch 14 %gsave \pst@usecolor\psfillcolor #5 show grestore %\fi %#4 show - gsave \psk@dotscale \pst@usecolor\psfillcolor #5 show grestore - \fi - gsave \psk@dotscale #4 show grestore + gsave \psk@dotscale \pst@usecolor\psfillcolor #5 show grestore % fill first +% \fi + gsave \psk@dotscale #4 show grestore % show the unfilled one % DG/SR modification end } bind def }} @@ -1781,9 +1790,16 @@ \newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)} \newpsfontdot{BoldAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(K)} \newpsfontdotH{SolidAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(J)}{(b)} +% +\newpsfontdotH{Pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)} +\newpsfontdotH{BoldPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} +\newpsfontdot{SolidPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} \newpsfontdotH{Hexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(h)}{(G)} \newpsfontdotH{BoldHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(H)}{(G)} \newpsfontdot{SolidHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(G)} +\newpsfontdotH{Octogon}[1 0 0 1 0 0]{PSTricksDotFont}{(f)}{(g)} +\newpsfontdotH{BoldOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(F)}{(g)} +\newpsfontdot{SolidOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(g)} % \newpsfontdot{Bullet}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)} \newpsfontdotH{Circle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)} @@ -1795,9 +1811,6 @@ \newpsfontdotH{Square}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(s)}{(r)} \newpsfontdotH{BoldSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(S)}{(r)} \newpsfontdot{SolidSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(r)} -\newpsfontdotH{Pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)} -\newpsfontdotH{BoldPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} -\newpsfontdot{SolidPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} \newpsfontdot{Add}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(a)} \newpsfontdot{BoldAdd}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(A)} \newpsfontdot{Mul}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(x)} |