From 135d4e294c8799bf72c97ae9ae12f679d57a2450 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Aug 2011 23:07:00 +0000 Subject: prerex 6.0.4 git-svn-id: svn://tug.org/texlive/trunk@23557 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/prerex/prerex.sty | 83 +++++++++++++++------------ 1 file changed, 47 insertions(+), 36 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/prerex/prerex.sty b/Master/texmf-dist/tex/latex/prerex/prerex.sty index 6a7b2ff7cef..46d23896bad 100644 --- a/Master/texmf-dist/tex/latex/prerex/prerex.sty +++ b/Master/texmf-dist/tex/latex/prerex/prerex.sty @@ -1,6 +1,6 @@ %% This is file 'prerex.sty' %% -%% Copyright (C) 2006-10 R. D. Tennent, rdt@cs.queensu.ca +%% Copyright (C) 2006-11 R. D. Tennent, rdt@cs.queensu.ca %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -57,14 +57,24 @@ % \newcommand{\dashedwidth}{0.5pt} % \newcommand{\boldwidth}{1.0pt} % \newcommand{\smallersize}{\relsize{-3}} +% \newcommand{\baselineAdj}{-0.5ex} % % The nominal diagram width is 10 + (\textwidth divided by \unit). % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{prerex}[2010/10/31 v6.0.4 LaTeX style for prerequisite charts, pgf version] +\ProvidesPackage{prerex}[2011/08/10 v6.0.6 LaTeX style for prerequisite charts, pgf version] % Changelog: % +% Version 6.0.6 +% +% Provide \textbullet at mid-point of edges when grid is on. +% +% Version 6.0.5 +% +% Changed TARGET attribute in AREA outputs to "new". +% New configuration command \baselineAdj. +% % Version 6.0.4 % % Added missing initializations of @dy to curved... macros. @@ -194,7 +204,7 @@ \RequirePackage{ifthen} \RequirePackage{textcomp} \RequirePackage{zref-savepos} -\PassOptionsToPackage{urlcolor=black,colorlinks}{hyperref} +\PassOptionsToPackage{urlcolor=black,colorlinks,raiselinks}{hyperref} \RequirePackage{hyperref} \RequirePackage{xcolor} @@ -212,6 +222,7 @@ \newcommand{\dottedwidth}{0.8pt} \newcommand{\dashedwidth}{0.5pt} \newcommand{\smallersize}{\relsize{-3}} +\newcommand{\baselineAdj}{-0.5ex} \newcounter{@myangle} \newcounter{@inangle} @@ -257,7 +268,7 @@ \addtocounter{ySE}{0 - \dpi * \ratio{\zposy{gridOrigin_\thechart}sp}{1in}} \addtocounter{ySE}{0 - (#2 + #5) * \PixelsPerUnit } % subtract # of pixels from origin to node (+#5) -\immediate\write\@imapfile{#3}% +\immediate\write\@imapfile{#3}% } \def\@halfcourse#1,#2:#3#4#5{% @@ -390,13 +401,13 @@ \def\@straight#1,#2,#3,#4:{% -\ifgridon - \draw[draw=white,line width=1.5pt](x#1y#2) -- (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}}; -\else \draw[draw=white,line width=1.5pt](x#1y#2) -- (x#3y#4) ; -\fi \draw[-latex',draw=white,very thin](x#1y#2) -- (x#3y#4) ; - \draw[line width=\solidwidth](x#1y#2) -- (x#3y#4) ; + \ifgridon + \draw[line width=\solidwidth](x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4); + \else + \draw[line width=\solidwidth](x#1y#2) -- (x#3y#4) ; + \fi } @@ -411,23 +422,23 @@ \fi \setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))} \setcounter{@inangle}{180 - \the@myangle} + \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; + \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; \ifgridon - \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}} ; + \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ; \else - \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; + \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; \fi - \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; - \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; } \def\@straightDashed#1,#2,#3,#4:{% +\draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4); +\draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4); \ifgridon - \draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}}; + \draw[dashed,line width=\dashedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ; \else - \draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4); + \draw[dashed,line width=\dashedwidth] (x#1y#2) -- (x#3y#4); \fi -\draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4); -\draw[dashed,line width=\dashedwidth] (x#1y#2) -- (x#3y#4); } \def\@curvedDashed#1,#2,#3,#4;#5:{ @@ -441,23 +452,23 @@ \fi \setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))} \setcounter{@inangle}{180 - \the@myangle} + \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; + \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; \ifgridon - \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}} ; + \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4); \else - \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; + \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4); \fi - \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; - \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; } \def\@straightDotted#1,#2,#3,#4:{% -\ifgridon - \draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}}; -\else \draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4); -\fi -\draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4); -\draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- (x#3y#4); + \draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4); + \ifgridon + \draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ; + \else + \draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- (x#3y#4); + \fi } \def\@curvedDotted#1,#2,#3,#4;#5:{ @@ -471,36 +482,36 @@ \fi \setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))} \setcounter{@inangle}{180 - \the@myangle} + \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; + \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; \ifgridon - \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}} ; + \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ; \else - \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; + \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; \fi - \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; - \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ; } \def\solidarrow{% -\tikz[x=\unit,y=\unit,baseline=-0.5ex] +\tikz[x=\unit,y=\unit,baseline=\baselineAdj] \draw[-latex',line width =\solidwidth] (0,0) -- (4,0); } \def\dottedarrow{% -\tikz[x=\unit,y=\unit,baseline=-0.5ex] +\tikz[x=\unit,y=\unit,baseline=\baselineAdj] \draw[loosely dotted,line width=\dottedwidth,-latex'] (0,0) -- (4,0); } \def\dashedarrow{% -\tikz[x=\unit,y=\unit,baseline=-0.5ex] +\tikz[x=\unit,y=\unit,baseline=\baselineAdj] \draw[dashed,line width=\dashedwidth,-latex'] (0,0) -- (4,0); } \def\lightbox{% -\tikz[thin,baseline=-0.5ex]\node[draw,fill=\background,rounded corners=2pt,inner sep=1.5pt] +\tikz[thin,baseline=\baselineAdj]\node[draw,fill=\background,rounded corners=2pt,inner sep=1.8pt] {\textsf{light}};} \def\boldbox{% -\tikz[baseline=-0.65ex]\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner sep=1.8pt] +\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner sep=1.8pt] {\textsf{\textbf{bold}}};} \def\@grid{ -- cgit v1.2.3