From e871cf60fc09d3490d03edd318214ae79c60d646 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Apr 2013 23:09:13 +0000 Subject: pstricks (5apr13) git-svn-id: svn://tug.org/texlive/trunk@29678 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/generic/pstricks/Changes.generic | 3 + .../texmf-dist/doc/generic/pstricks/Changes.latex | 1 + Master/texmf-dist/doc/generic/pstricks/LSM.data | 4 - .../doc/generic/pstricks/pst-doc-pdf.cls | 445 --------------------- .../doc/generic/pstricks/pst-docfull.pdf | Bin 565330 -> 0 bytes .../texmf-dist/doc/generic/pstricks/pst-news13.pdf | Bin 56871 -> 63694 bytes .../texmf-dist/doc/generic/pstricks/pst-news13.tex | 17 +- .../doc/generic/pstricks/pstricks-add-data9.data | 4 - .../texmf-dist/tex/generic/pstricks/pstricks.tex | 38 +- Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 7 +- 10 files changed, 56 insertions(+), 463 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/pstricks/LSM.data delete mode 100644 Master/texmf-dist/doc/generic/pstricks/pst-doc-pdf.cls delete mode 100644 Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf delete mode 100644 Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index 0d79cdbc644..0184acd72b0 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic @@ -1,4 +1,7 @@ pstricks.tex -------- +2.40 2013-04-05 - fix for showgrid=top. Uses now the + same units as showgrid=bottom + - added \psRing 2.39 2013-04-04 - fix for introduced bug for showgrid 2.38 2013-04-03 - fix for showgrid=true 2.37 2013-03-12 - fix for \uput@vii#1#2 diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex index b345f919f76..1602553c21f 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex @@ -1,4 +1,5 @@ pstricks.sty -------- +0.54 2013-04-05 - revert setting of the fillcolor, see 0.33 0.53 2012-08-24 - update version number for pro files 0.52 2011-10-31 - update version number for pro files 0.51 2011-08-01 - revert test for pdflatex / lualatex diff --git a/Master/texmf-dist/doc/generic/pstricks/LSM.data b/Master/texmf-dist/doc/generic/pstricks/LSM.data deleted file mode 100644 index 42ed912743c..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/LSM.data +++ /dev/null @@ -1,4 +0,0 @@ -0.003298697 1.397785583 -0.003193358 1.615489564 -0.003094538 2.044019006 -0.003001651 2.259240127 diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc-pdf.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc-pdf.cls deleted file mode 100644 index afb2c8dd180..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pst-doc-pdf.cls +++ /dev/null @@ -1,445 +0,0 @@ -% $Id: pst-doc.cls 230 2009-12-30 11:57:55Z herbert $ -% -%% -%% The PSTricks Project -%% -%% ``pst-doc'' class for use with the PSTricks documentation. -%% -%% Copyright (C) 2009/2010 Herbert Voss -%% -%% It may be distributed and/or modified under the conditions -%% of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% -%% See http://www.latex-project.org/lppl.txt for details. -%% -% -\listfiles -\ProvidesClass{pst-doc}[2009/12/20 v 0.13 PSTricks documentation class (hv)] -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} -\ProcessOptions\relax -% -\LoadClass[titlepage,DIV13]{scrartcl} -% -\RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor} -\RequirePackage[T1]{fontenc} -\RequirePackage{ifpdf} -\RequirePackage{textcomp} -%\RequirePackage[euler-digits]{eulervm} -\RequirePackage{bera} -%\RequirePackage[scaled=0.85]{luximono} -% Define commands that don't eat spaces. -\RequirePackage{xspace} -\makeatletter -\providecommand{\IfPackageLoaded}[2]{\@ifpackageloaded{#1}{#2}{}} -\providecommand{\IfPackageNotLoaded}[2]{\@ifpackageloaded{#1}{}{#2}} -\providecommand{\IfElsePackageLoaded}[3]{\@ifpackageloaded{#1}{#2}{#3}} -\providecommand{\IfChapterDefined}[1]{\ifthenelse{\boolean{chapteravailable}}{#1}{}}% -\providecommand{\IfElseChapterDefined}[2]{\ifthenelse{\boolean{chapteravailable}}{#1}{#2}}% -\providecommand{\IfDefined}[2]{\ifcsname #1\endcsname #2 \fi} -\providecommand{\IfElseDefined}[3]{\ifcsname #1\endcsname #2 \else #3 \fi} -\providecommand{\IfElseUnDefined}[3]{\ifcsname #1\endcsname #3 \else #2\fi} -% Definde frontmatter, mainmatter and backmatter if not defined -\@ifundefined{frontmatter}{% - \newcommand{\frontmatter}{% - %In Roemischen Buchstaben nummerieren (i, ii, iii) - \pagenumbering{roman}} -}{} -\@ifundefined{mainmatter}{% - % scrpage2 benoetigt den folgenden switch - % wenn \mainmatter definiert ist. - \newif\if@mainmatter\@mainmattertrue - \newcommand{\mainmatter}{% - % -- Seitennummerierung auf Arabische Zahlen zuruecksetzen (1,2,3) - \pagenumbering{arabic}% - \setcounter{page}{1}} -}{} -\@ifundefined{backmatter}{% - \newcommand{\backmatter}{ - %In Roemischen Buchstaben nummerieren (i, ii, iii) - \pagenumbering{roman}} -}{} - -% Pakete speichern die spaeter geladen werden sollen -\newcommand{\LoadPackagesNow}{} -\newcommand{\LoadPackageLater}[1]{% - \g@addto@macro{\LoadPackagesNow}{% - \RequirePackage{#1}% - }% -} -% -\RequirePackage{makeidx} -\makeindex -\RequirePackage{calc} -\RequirePackage{babel} -\RequirePackage{pstricks} -\let\pstricksFV\fileversion -\let\pstricksFD\filedate -\RequirePackage{multido} -\RequirePackage{lscape} -\RequirePackage{graphicx} -\definecolor{DOrange}{rgb}{1,.4,.2} -\RequirePackage{amsmath, amssymb} -\RequirePackage{tabularx,ragged2e} -\RequirePackage{booktabs} -\RequirePackage[bottom,stable,ragged]{footmisc} -\RequirePackage{chngcntr} -\RequirePackage{nameref} -\RequirePackage{varioref} -\RequirePackage{subfig} -\RequirePackage{setspace} -\RequirePackage{paralist} -% -\RequirePackage{fancyvrb} -\newenvironment{Xverbatim}[2][]% - {\VerbatimEnvironment -\handle@index{#2} -\begin{Verbatim}[#1]} -{\end{Verbatim}} -\newcommand\use@index@vals{\index@vals\global\let\index@vals\relax} -\def\handle@index#1{% - \gdef\index@vals{#1}% - \def\FancyVerbFormatLine##1{\FV@ObeyTabs{##1}\use@index@vals}} - -\RequirePackage{filecontents} -%\singlespace -\RequirePackage{showexpl} -\renewcommand*\SX@Info{}% -\definecolor{hellgelb}{rgb}{1,1,0.85} -\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} -\newcommand\ON{% - \gdef\lst@alloverstyle##1{% - \fboxrule=0pt - \fboxsep=0pt - \fcolorbox{Black!15}{Black!15}{\bfseries\strut##1}% -}} -\newcommand\OFF{% - \xdef\lst@alloverstyle##1{##1}% -} -\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, - numbersep=0.8em, - numberstyle=\tiny, % - breaklines=true, % - breakautoindent=true, - captionpos=b, - xleftmargin=1em -} -\lstset{explpreset={pos=t,wide=false,rframe={},preset=\centering}} -\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt, - frame=single} -\lstdefinestyle{code}{backgroundcolor=\color{red!20},numbers=left,xleftmargin=0pt,xrightmargin=0pt, - frame=single} - -\RequirePackage{xkvview} -\raggedbottom -\definecolor{sectioncolor}{RGB}{0, 0, 255} % Schwarz -\definecolor{textcolor}{RGB}{0, 0, 0} % Schwarz -\definecolor{shadecolor}{gray}{0.90} -\colorlet{pdflinkcolor}{DOrange} -\colorlet{pdfurlcolor}{DOrange} -\colorlet{pdffilecolor}{DOrange} -\colorlet{stringcolor}{green!40!black!100} -\colorlet{commencolor}{blue!0!black!100} -\RequirePackage[automark,nouppercase]{scrpage2} - -\pagestyle{scrheadings} -\clearscrheadings -\clearscrplain -\ohead{\pagemark} -\ihead{\headmark} -\ofoot[\pagemark]{} -\automark[subsection]{section} -\setheadsepline{.4pt}[\color{DOrange}] -\setheadwidth[0pt]{text} -\setfootwidth[0pt]{text} -%% Fussnoten ============================================================= -% Keine hochgestellten Ziffern in der Fussnote (KOMA-Script-spezifisch): -\deffootnote{1.5em}{1em}{\makebox[1.5em][l]{\thefootnotemark}} -\addtolength{\skip\footins}{\baselineskip} % Abstand Text <-> Fussnote -%% Schriften (Sections )================================================== -\newcommand\SectionFontStyle{\sffamily} -\setkomafont{sectioning}{\bfseries\SectionFontStyle} % % Titelzeilen % \bfseries -\setkomafont{pagenumber}{\bfseries\SectionFontStyle} % Seitenzahl -\setkomafont{pagehead}{\small\sffamily} % Kopfzeile -%\setkomafont{pagefoot}{\small\sffamily} % Kopfzeile -\setkomafont{descriptionlabel}{\itshape} % Kopfzeile -\addtokomafont{sectioning}{\color{sectioncolor}} % Farbe der Ueberschriften -\renewcommand*{\raggedsection}{\raggedright} % Titelzeile linksbuendig, haengend -\RequirePackage{caption} -\captionsetup{ - margin = 10pt, - font = {small,rm}, - labelfont = {small,bf}, - format = plain, % oder 'hang' - indention = 0em, % Einruecken der Beschriftung - labelsep = colon, %period, space, quad, newline - justification = RaggedRight, % justified, centering - singlelinecheck = true, % false (true=bei einer Zeile immer zentrieren) - position = bottom %top -} -%%% Bugfix Workaround -\DeclareCaptionOption{parskip}[]{} -\DeclareCaptionOption{parindent}[]{} - -% Aussehen der Captions fuer subfigures (subfig-Paket) -\IfPackageLoaded{subfig}{ - \captionsetup[subfloat]{% - margin = 10pt, - font = {small,rm}, - labelfont = {small,bf}, - format = plain, % oder 'hang' - indention = 0em, % Einruecken der Beschriftung - labelsep = space, %period, space, quad, newline - justification = RaggedRight, % justified, centering - singlelinecheck = true, % false (true=bei einer Zeile immer zentrieren) - position = bottom, %top - labelformat = parens % simple, empty % Wie die Bezeichnung gesetzt wird - } -} -\setcounter{secnumdepth}{2} % Abbildungsnummerierung mit groesserer Tiefe -\setcounter{tocdepth}{2} % Inhaltsverzeichnis mit groesserer Tiefe -% -% Inhalte von List of Figures -\IfPackageLoaded{subfig}{\setcounter{lofdepth}{1} %1 = nur figures, 2 = figures + subfigures -} -\RequirePackage[colorlinks=true, - urlcolor=pdfurlcolor, - filecolor=pdffilecolor, - linkcolor=pdflinkcolor, - breaklinks, - linktocpage=true]{hyperref} -\ifpdf -\else - \RequirePackage{breakurl} -\fi -\newsavebox\TBox -\newenvironment{Bsp}[1]{% - \par\bigskip% - \begin{lrbox}{\TBox} - \begin{minipage}{\linewidth-2\fboxrule}% - \setlength\fboxsep{1mm}% - \colorbox{DOrange}{\parbox{\linewidth-2\fboxsep}{% - \color{White}\sffamily#1}}\par - \fontsize{10}{12pt}\fontshape{it}\selectfont% - \begin{quote} -}{% -\par\bigskip\end{quote}\end{minipage}\end{lrbox}\fboxsep=0pt% - \fcolorbox{DOrange}{White}{\usebox\TBox}\par\bigskip} - -\newcommand{\RDO}{\color{DOrange!25}\rule[-1mm]{10mm}{5mm}} - -\DeclareRobustCommand\PST{\texttt{PSTricks\xspace}} -\DeclareRobustCommand\PS{\texttt{PostScript\xspace}} -\def\dt{\ensuremath{\,\mathrm{d}t}} -\def\Index#1{\index{#1}#1} -% -\def\LPack#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Package!#1@\texttt{#1}}} -\def\nxLPack#1{\texttt{#1}} -\def\Lprog#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Program!#1@\texttt{#1}}} -\let\nxLprog\nxLPack -\def\LFile#1{\texttt{#1}\index{#1@\texttt{#1}}\index{File!#1@\texttt{#1}}} -\def\nxLFile#1{\texttt{#1}} -\def\Lext#1{\texttt{.#1}\index{#1@\texttt{.#1}}\index{Extension!#1@\texttt{.#1}}} -\def\nxLext#1{\texttt{.#1}} -\def\xLcs#1{\index{#1@\nxLcs{#1}}\index{Macro!#1@\nxLcs{#1}}} -\def\Lcs#1{\nxLcs{#1}\xLcs{#1}} -\def\LcsStar#1{\index{#1*@\nxLcs{#1*}}\index{Macro!#1@\nxLcs{#1*}}\nxLcs{#1}\OptArg*{*}} -\def\nxLcs#1{\texttt{\textbackslash#1}} -\def\xLenv#1{\index{#1@\texttt{#1}}\index{Environment!#1@\texttt{#1}}} -\def\Lenv#1{\texttt{#1}\xLenv{#1}} -\def\Ldim#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1}}\index{Dimension!#1@\texttt{\textbackslash#1}}} -\def\Lskip#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1}}\index{Skip!#1@\texttt{\textbackslash#1}}} -\def\Lkeyword#1{\texttt{#1}\xLkeyword{#1}} -\def\xLkeyword#1{\index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}}} -\def\nxLkeyword#1{\texttt{#1}} -\let\nxLkeyval\nxLkeyword -\let\nxLenv\nxLkeyword -\let\nxLps\nxLkeyword -\def\Lkeyval#1{\texttt{#1}\xLkeyval{#1}} -\def\xLkeyval#1{\index{#1@\texttt{#1}}\index{Keyvalue!#1@\texttt{#1}}} -\def\xLoption#1{\index{#1@\texttt{#1}}\index{Package option!#1@\texttt{#1}}} -\def\Loption#1{\texttt{#1}\xLoption{#1}} -\def\LPS#1{\texttt{#1}\index{#1@\texttt{#1}}\index{PostScript!#1@\texttt{#1}}} -\def\xLps#1{\index{#1@\texttt{#1}}\index{PostScript!#1@\texttt{#1}}} -\def\nxLps#1{\texttt{#1}} -\def\Lps#1{\nxLps{#1}\xLps{#1}} -\def\LClass#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Class!#1@\texttt{#1}}} -\let\nxLClass\nxLPack -\let\nxLdim\nxLcs -\let\nxLskip\nxLcs -\def\Lctr#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Counter!#1@\texttt{#1}}} -\def\nxLctr#1{\texttt{#1}} -% -\newcommand\Lnotation [1]{\nxLnotation{#1}\xLnotation{#1}} -\newcommand\Lmnotation[1]{\nxLnotation{#1}\xLmnotation{#1}} -\newcommand\xLnotation[1]{\index{Syntax!#1@\nxLnotation{#1}}\index{#1@\nxLnotation{#1}}} -\def\nxLnotation#1{\texttt{#1}} -\def\xLkeyset#1{\expandafter\xLkeyset@i#1\@nil} -\def\xLkeyset@i#1=#2\@nil{\index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}} - \index{#2@\texttt{#2}}\index{Value!#2@\texttt{#2}}} -\def\Lkeyset#1{\expandafter\Lkeyset@i#1\@nil} -\def\Lkeyset@i#1=#2\@nil{\texttt{#1=#2}% - \index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}} - \index{#2@\texttt{#2}}\index{Value!#2@\texttt{#2}}} -\newcommand\Larg [1]{{\normalfont\itshape#1\/}} -\newcommand\Larga[1]{$\langle$\Larg{#1}$\rangle$}% angles -\newcommand\Largb[1]{\lcb\Larg{#1}\rcb} % curly brace -\newcommand\Largs[1]{\lsb\Larg{#1}\rsb} % square brackets -\newcommand\Largr[1]{\lrb\Larg{#1}\rrb} % round brackets -\newcommand\LBEG[1]{{\normalfont\ttfamily\bs{}begin\lcb#1\rcb}\xLenv{#1}} -\newcommand\LmBEG[1]{{\normalfont\ttfamily\bs{}begin\lcb#1\rcb}\xLmenv{#1}} -\newcommand\LEND[1]{{\normalfont\ttfamily\bs{}end\lcb#1\rcb}\xLenv{#1}} -\newcommand\LmEND[1]{{\normalfont\ttfamily\bs{}end\lcb#1\rcb}\xLmenv{#1}} -% -\DeclareRobustCommand\bs{{\normalfont\ttfamily\textbackslash}} % \let\bslash=\bs -\DeclareRobustCommand\lcb{{\normalfont\ttfamily\textbraceleft}} -\DeclareRobustCommand\rcb{{\normalfont\ttfamily\textbraceright}} -\DeclareRobustCommand\lsb{{\normalfont\ttfamily[}} -\DeclareRobustCommand\rsb{{\normalfont\ttfamily]}} -\DeclareRobustCommand\lrb{{\normalfont\ttfamily(}} -\DeclareRobustCommand\rrb{{\normalfont\ttfamily)}} -\DeclareRobustCommand\false{{\ttfamily false}} -\DeclareRobustCommand\true{{\ttfamily true}} - -% -% without brackets -\def\Coordx#1{$x_{#1}$} -\def\Coordy#1{$y_{#1}$} -\def\Coordz#1{$z_{#1}$} -\def\Coord#1{\Coordx{#1},\kern 1pt\Coordy{#1}} -\def\Coordn{\Coordx{n},\kern 1pt\Coordy{n}} -\def\CoordIII#1{\Coordx{#1},\kern 1pt\Coordy{#1},\kern 1pt\Coordz{#1}}% HjG -\def\CAny{\Coordx{},\kern 1pt\Coordy{}} -\def\CIIIAny{\Coordx{},\kern 1pt\Coordy{},\kern 1pt\Coordz{}}% hv -% with brackets -\def\coord#1{(\Coordx{#1},\kern 1pt\Coordy{#1})} -\def\coordn{(\Coordx{n},\kern 1pt\Coordy{n})} -\def\coordiii#1{(\Coordx{#1},\kern 1pt\Coordy{#1},\kern 1pt\Coordz{#1})}% hv -\def\coordx#1{($x_{#1}$)} -\def\coordy#1{($y_{#1}$)} -\def\coordz#1{($z_{#1}$)} -\def\cAny{(\Coordx{},\kern 1pt\Coordy{})} -\def\ciiiAny{(\Coordx{},\kern 1pt\Coordy{},\kern 1pt\Coordz{})}% hv -% -\newskip\BDefaboveskip -\newskip\BDefbelowskip -\newskip\BDefinlineskip -\setlength\BDefaboveskip{0pt plus 2pt}% first-level list topsep -\setlength\BDefbelowskip{10pt} -\setlength\BDefinlineskip{6pt} -% -\newsavebox{\boxdef} -\newenvironment{BDef} - {\begin{lrbox}\boxdef - \def\arraystretch{1.0} - \begin{tabular}{@{}l@{}l@{}l@{}}} - {\end{tabular}\end{lrbox} -% -% braces around next block are needed to stop the list env checking for blank lines -% and the \aftergroups then for making sure no indentation happens ... as i said -% urg -% - {\BCmd\fbox{\usebox\boxdef}\endBCmd} - \aftergroup\@afterindentfalse\aftergroup\@afterheading - } -\newenvironment{BDef*} - {\begin{lrbox}\boxdef - \def\arraystretch{1.0} - \begin{tabular}{@{}l@{}l@{}l@{}} - } - {\end{tabular}\end{lrbox} - {\begin{BCmd*}\fbox{\usebox\boxdef}\end{BCmd*}} - \aftergroup\@afterindentfalse\aftergroup\@afterheading - } -\newenvironment{BCmd}{ - \@beginparpenalty-\@lowpenalty - \topsep\BDefaboveskip - \fboxsep3pt - \flushleft} - {\@endparpenalty\@M - \@topsepadd\BDefbelowskip - \endflushleft} - -\newenvironment{BCmd*}{ - \@beginparpenalty\@M - \topsep\BDefinlineskip - \fboxsep3pt - \flushleft} - {\@endparpenalty5000 - \endflushleft} - - -\def\OptArgs{\colorbox{black!20}{\texttt{[Options]}}\kern1pt} -\def\OptArg{\@ifnextchar*\OptArg@i{\OptArg@ii*}}% star version without braces -\def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt} -\def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt} - -\def\docauthor#1{\gdef\@docauthor{#1}} -\docauthor{} -%\def\author#1{\gdef\@author{#1}\gdef\@docauthor{#1}} - -\providecommand\bgImage{} -\providecommand\bgTitle{} -\providecommand\LenToUnit[1]{#1\@gobble} - -\renewcommand\maketitle{% -\thispagestyle{empty}% -\begingroup% -\unitlength=1mm% -\parindent=0pt% -\begin{titlepage}% -\begin{picture}(\LenToUnit{\textwidth},\LenToUnit{\textheight})(5,0)% -\leavevmode% -\put(0,235){\Huge\sffamily\color{Orange!65!Red}\psscalebox{2}{\textbf{PSTricks}}}% -\put(-30,230){\linethickness{3pt}\color{Orange!65!Red}\line(1,0){\LenToUnit{1.2\paperwidth}}}% -\put(-30,100){\linethickness{5mm}\color{Orange!65!Red}\line(1,0){\LenToUnit{1.2\paperwidth}}}% -\put(-30,97){\color{black!10}\rule[-15cm]{1.1\paperwidth}{15cm}}% -\put(0,141){\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}}% -\put(0,126){\parbox{15cm}{\sffamily\Large\@subtitle}}% -\put(0,76){\parbox{15cm}{\sffamily\@date}}% -\put(0,-2.6){\parbox[b]{19cm}{\sffamily\RaggedRight - \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\ - \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{% - \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}}}% -\put(\strip@pt\paperwidth,50){\bgImage}% -\end{picture}% -\end{titlepage}% -\endgroup% -\setcounter{footnote}{0}% -\global\let\thanks\relax% -\global\let\maketitle\relax% -\global\let\@thanks\@empty% -\global\let\@author\@empty% -\global\let\@docauthor\@empty% -\global\let\@date\@empty% -\global\let\@title\@empty% -\global\let\@subtitle\@empty% -\global\let\title\relax% -\global\let\author\relax% -\global\let\date\relax% -\global\let\and\relax} - -\newdimen\fullWidth -\fullWidth=\linewidth -\advance\fullWidth by \marginparsep -\advance\fullWidth by \marginparwidth -\makeatother -%% -%% End of file `pst-doc.cls'. diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf deleted file mode 100644 index 6666f0a0244..00000000000 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf index 7106cfacab6..12bf0bffc6c 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex index d6337b1cd6d..b3174fe2b06 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news13.tex 755 2013-03-09 08:48:58Z herbert $ +%% $Id: pst-news13.tex 763 2013-04-05 08:45:57Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles @@ -32,6 +32,7 @@ basic package \nxLFile{pstricks}} \section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)} %-------------------------------------------------------------------------------------- +\subsection{Fillstyle \texttt{dots}} A fix for the fill style \Lkeyval{dots} to make it work again: \begin{LTXexample}[width=5cm] @@ -40,6 +41,20 @@ A fix for the fill style \Lkeyval{dots} to make it work again: \endpspicture \end{LTXexample} +\subsection{New macro \nxLcs{psRing}} + +\begin{BDef} +\LcsStar{psRing}\OptArgs\Largr{\CAny}\Largb{Inner Radius}\Largb{Outer Radius} +\end{BDef} + + +\begin{LTXexample}[width=5cm] +\begin{pspicture}[showgrid](4,4) + \psRing[linecolor=red](2,2){0.3}{0.8} + \psRing*[opacity=0.5](2,2){1}{2} +\psdot(2,2) +\end{pspicture} +\end{LTXexample} \section{The PostScript header files} \subsection{\nxLFile{pstricks.pro}} diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data deleted file mode 100644 index 8bd09389cc7..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data +++ /dev/null @@ -1,4 +0,0 @@ -some nonsense in this line ---time forcex forcey -0 0.2 -1 1 -2 4 diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 736f34701d9..7625b3afb98 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -103,8 +103,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.39} -\def\filedate{2013/04/04} +\def\fileversion{2.40} +\def\filedate{2013/04/05} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -3572,6 +3572,26 @@ pop \def\psCircle@i{\@ifnextchar({\psCircle@ii}{\psCircle@ii(0,0)}} \def\psCircle@ii(#1){\pscircle@do(#1){\psk@radius}} % +\def\psRing{\def\pst@par{}\pst@object{psRing}}%% hv 20130405 +\def\psRing@i{\@ifnextchar({\psRing@ii}{\psRing@ii(0,0)}} +\def\psRing@ii(#1)#2#3{% origin, inner radius, outer radius + \begin@ClosedObj + \pst@@getcoor{#1}% + \pssetlength\pst@dimc{#2}% + \pssetlength\pst@dimd{#3}% + \def\pst@linetype{4}% + \addto@pscode{ + \pst@coor translate newpath + \pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED + \pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED + 0 0 InnerRadius 0 360 arc OuterRadius 0 moveto + 0 0 OuterRadius 0 0.0001 arcn + closepath + }% + \showpointsfalse + \end@ClosedObj + \ignorespaces} +% \def\pswedge{\pst@object{pswedge}} \def\pswedge@i{\@ifnextchar({\pswedge@ii}{\pswedge@ii(0,0)}} \def\pswedge@ii(#1)#2#3#4{% @@ -4058,14 +4078,21 @@ pop \newpsstyle{gridstyle}{subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt} %\define@boolkey[psset]{pstricks}[]{showgrid}[true]{} \newif\ifshowgrid +\newdimen\sh@wgridXunit +\newdimen\sh@wgridYunit \define@key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil} \def\pst@@showgrid#1#2#3\@nil{% hv 20130403 - \ifx#1b\showgridtrue\def\showgridp@s{0}\else% bottom + \def\showgridp@s{0}% + \ifx#1b\showgridtrue\else% bottom \ifx#1f\showgridfalse\else% \ifx#1t% - \ifx#2r\showgridtrue\def\showgridp@s{0}\else% true->bottom + \ifx#2r\showgridtrue\else% true->bottom \showgridtrue\def\showgridp@s{1}\fi% top \fi\fi\fi% + \ifnum\showgridp@s>0 + \sh@wgridXunit=\psxunit% + \sh@wgridYunit=\psyunit% + \fi% } \psset[pstricks]{showgrid=false} % @@ -4121,7 +4148,8 @@ pop \def\pic@coor{(0,0)(0,0)(10,10)} %\newdimen\pst@shift \def\endpspicture{% - \ifshowgrid\ifnum\showgridp@s>0\psgrid[style=gridstyle]\fi\fi% + \ifshowgrid\ifnum\showgridp@s>0 + \psgrid[xunit=\sh@wgridXunit,yunit=\sh@wgridYunit,style=gridstyle]\fi\fi% \pst@killglue % \global\pst@shift=\pst@shift% in fact of the following endgroup \endgroup diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 2afb9f5e503..eef59f7a85d 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -5,7 +5,7 @@ %% %% pstricks.sty Copyright (C) 1997 Timothy Van Zandt %% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle -%% pstricks.sty Copyright (C) 2004-2011 Rolf Niepraschk +%% pstricks.sty Copyright (C) 2004-2013 Rolf Niepraschk %% Herbert Voss %% %% This package may be distributed under the terms of the LaTeX Project @@ -15,8 +15,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks} - [2012/08/24 v0.53 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2013/04/05 v0.54 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -257,7 +256,7 @@ \renewcommand*\cyan{\color{cyan}} % \AtBeginDocument{% - \psset{fillcolor=white}% hv 0.33 +% \psset{fillcolor=white}% hv 0.33 \let\pst@endcolor=\relax% % \let\pst@color=\relax% % LaTeX used `\color@endgroup' instead. RN 2004-05-06 -- cgit v1.2.3