diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-doc.cls | 84 |
2 files changed, 43 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes b/Master/texmf-dist/doc/generic/pstricks/Changes index 2ca6c01f53b..bd20916eba8 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes +++ b/Master/texmf-dist/doc/generic/pstricks/Changes @@ -1,5 +1,6 @@ -2009-12-08 - extensions to pst-doc.cls v 0.11 - (load package paralist) +2010-01-04 - extensions to pst-doc.cls v 0.14 +2009-12-08 - extensions to pst-doc.cls + v 0.11 (package paralist) 2009-09-27 - extensions to pst-doc.cls 2009-08-17 - extensions to pst-doc.cls 2009-03-17 - update pst-doc.cls diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls index 78f68be3d0f..ae6b7a06257 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls +++ b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls @@ -1,4 +1,4 @@ -% $Id: pst-doc.cls 165 2009-12-08 14:36:36Z herbert $ +% $Id: pst-doc.cls 246 2010-01-04 19:54:06Z herbert $ % %% %% The PSTricks Project @@ -15,16 +15,15 @@ %% % \listfiles -\ProvidesClass{pst-doc}[2009/12/08 v 0.11 PSTricks documentation class (hv)] +\ProvidesClass{pst-doc}[2010/01/04 v 0.14 PSTricks documentation class (hv)] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessOptions\relax % -\LoadClass[titlepage]{scrartcl} +\LoadClass[titlepage,DIV13]{scrartcl} % -\PassOptionsToPackage{dvipsnames,x11names,svgnames,table}{xcolor} - +\RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor} \RequirePackage[T1]{fontenc} -%\RequirePackage{mathpazo} +\RequirePackage{ifpdf} \RequirePackage{textcomp} %\RequirePackage[euler-digits]{eulervm} \RequirePackage{bera} @@ -40,9 +39,6 @@ \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} -\newcommand{\IfNotDraft}[1]{\ifx\@draft\@undefined #1 \fi} -\newcommand{\IfNotDraftElse}[2]{\ifx\@draft\@undefined #1 \else #2 \fi} -\newcommand{\IfDraft}[1]{\ifx\@draft\@undefined \else #1 \fi} % Definde frontmatter, mainmatter and backmatter if not defined \@ifundefined{frontmatter}{% \newcommand{\frontmatter}{% @@ -76,7 +72,7 @@ \makeindex \RequirePackage{calc} \RequirePackage{babel} -\RequirePackage[table,svgnames,dvipsnames]{pstricks} +\RequirePackage{pstricks} \let\pstricksFV\fileversion \let\pstricksFD\filedate \RequirePackage{multido} @@ -106,8 +102,9 @@ \def\FancyVerbFormatLine##1{\FV@ObeyTabs{##1}\use@index@vals}} \RequirePackage{filecontents} -\singlespace +%\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} @@ -117,12 +114,11 @@ \gdef\lst@alloverstyle##1{% \fboxrule=0pt \fboxsep=0pt - \fcolorbox{DarkBlue}{DarkBlue}{\textcolor{white}{\bfseries\strut##1}}% + \fcolorbox{Black!15}{Black!15}{\bfseries\strut##1}% }} \newcommand\OFF{% \xdef\lst@alloverstyle##1{##1}% } -\renewcommand*\SX@Info{}% \lstset{% language=PSTricks,% float=hbp,% @@ -145,6 +141,7 @@ 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, @@ -228,8 +225,10 @@ linkcolor=pdflinkcolor, breaklinks, linktocpage=true]{hyperref} -\RequirePackage{breakurl} - +\ifpdf +\else + \RequirePackage{breakurl} +\fi \newsavebox\TBox \newenvironment{Bsp}[1]{% \par\bigskip% @@ -244,21 +243,8 @@ \par\bigskip\end{quote}\end{minipage}\end{lrbox}\fboxsep=0pt% \fcolorbox{DOrange}{White}{\usebox\TBox}\par\bigskip} -\newenvironment{Glistout}{\begin{list}{\color{DOrange}\rule{2mm}{2mm}}{\setlength{\labelsep}{10pt}\setlength{\leftmargin}{2.5mm+\labelsep}}}{\end{list}} -\newcounter{Numlist}\newenvironment{Numlist}{\begin{list}{\color{DOrange}\arabic{Numlist}.}{\usecounter{Numlist}\setlength{\labelsep}{2mm}\setlength{\leftmargin}{3.5mm+\labelsep}}}{\end{list}} -\newenvironment{listin}{\begin{list}{\color{DOrange}\rule{2mm}{2mm}}{\setlength{\itemsep}{0pt}\setlength{\parsep}{0pt}\setlength{\leftmargin}{4.5mm}}}{\end{list}} -\newenvironment{Zlistin}{\begin{quote}\fontsize{10}{12pt}\fontshape{it}\selectfont\begin{list}{\color{DOrange}\rule{2mm}{2mm}}{\setlength{\itemsep}{0pt}\setlength{\parsep}{0pt}\setlength{\leftmargin}{4.5mm}}}{\end{list}\end{quote}} - \newcommand{\RDO}{\color{DOrange!25}\rule[-1mm]{10mm}{5mm}} -\newcommand{\ph}[1]{\phantom{#1}} -\newcommand{\MathWBox}[2]{\setlength\fboxsep{1mm}\colorbox{White}{\makebox[\widthof{$#1$}]{$#2$}}} -\newcommand{\MathDOBox}[2]{\setlength\fboxsep{1mm}\colorbox{DOrange!25}{\makebox[\widthof{$#1$}]{$#2$}}} -\newcommand{\MathDOUBox}[2]{\setlength\fboxsep{1mm}\underline{\rule[-2mm]{0mm}{2mm}\colorbox{DOrange!25}{\makebox[\widthof{$#1$}]{$#2$}}}} -\newcommand{\rb}[2]{\raisebox{#1}{#2}} -\makeatletter - -%%% ---------------------------------------------------------------- \DeclareRobustCommand\PST{\texttt{PSTricks\xspace}} \DeclareRobustCommand\PS{\texttt{PostScript\xspace}} \def\dt{\ensuremath{\,\mathrm{d}t}} @@ -283,6 +269,9 @@ \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}}} @@ -295,6 +284,8 @@ \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}} @@ -347,12 +338,18 @@ \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@{}} - } + \begin{tabular}{@{}l@{}l@{}l@{}}} {\end{tabular}\end{lrbox} % % braces around next block are needed to stop the list env checking for blank lines @@ -362,7 +359,6 @@ {\BCmd\fbox{\usebox\boxdef}\endBCmd} \aftergroup\@afterindentfalse\aftergroup\@afterheading } - \newenvironment{BDef*} {\begin{lrbox}\boxdef \def\arraystretch{1.0} @@ -389,17 +385,11 @@ {\@endparpenalty5000 \endflushleft} -\newskip\BDefaboveskip -\newskip\BDefbelowskip -\newskip\BDefinlineskip -\setlength\BDefaboveskip{10pt plus 4pt} % first-level list topsep -\setlength\BDefbelowskip{6pt} -\setlength\BDefinlineskip{6pt} -\def\OptArgs{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{[Options]}}\kern1pt} +\def\OptArgs{\colorbox{black!20}{\texttt{[Options]}}\kern1pt} \def\OptArg{\@ifnextchar*\OptArg@i{\OptArg@ii*}}% star version without braces -\def\OptArg@i*#1{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{#1}}\kern1pt} -\def\OptArg@ii*#1{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{[#1]}}\kern1pt} +\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{} @@ -407,15 +397,15 @@ \providecommand\bgImage{} \providecommand\bgTitle{} +\providecommand\LenToUnit[1]{#1\@gobble} \renewcommand\maketitle{% \thispagestyle{empty}% \begin{titlepage} \begin{pspicture}(1.6in,0)(21,21.7) - \rput(11.1,3){\bgImage} - \psframe[fillstyle=solid,linecolor=lightgray,fillcolor=lightgray,linestyle=solid,opacity=0.5](0,-5.75)(22.2,10) - \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,10)(22.2,10.5) - \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,21.1)(22.2,21.2) + \psframe[fillstyle=solid,linecolor=lightgray,fillcolor=lightgray,linestyle=solid](0,-5.75)(21.2,10) + \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,10)(21.2,10.5) + \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,21.1)(21.2,21.2) \rput[lb](3,22){\Huge\sffamily\color{Orange!65!Red}\psscalebox{2}{\textbf{PSTricks}}} \rput[lb](3,14.1){\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}} \rput[lb](3,12.6){\parbox{15cm}{\sffamily\Large\@subtitle}} @@ -424,6 +414,7 @@ \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}}} + \rput[C](11,4){\bgImage}% \end{pspicture}% \end{titlepage} \setcounter{footnote}{0}% @@ -440,6 +431,11 @@ \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'. |