prerex 6.4.2 (22aug12)

git-svn-id: svn://tug.org/texlive/trunk@27495 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 72 insertions, 63 deletions

diff --git a/Master/texmf-dist/tex/latex/prerex/prerex.sty b/Master/texmf-dist/tex/latex/prerex/prerex.sty
index f60a1c06484..85d297cbf22 100644
--- a/Master/texmf-dist/tex/latex/prerex/prerex.sty
+++ b/Master/texmf-dist/tex/latex/prerex/prerex.sty
@@ -57,16 +57,25 @@
 %   \newcommand{\dottedwidth}{0.8pt}
 %   \newcommand{\dashedwidth}{0.5pt}
 %   \newcommand{\boldwidth}{1.0pt}
-%   \newcommand{\smallersize}{\relsize{-3}}
+%   \newcommand{\smallersize}{\relsize{-2}}
 %   \newcommand{\baselineAdj}{-0.5ex}
 %
 % The nominal diagram width is 10 + (\textwidth divided by \unit).
 %
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2012/03/29 v6.3.2 LaTeX style for prerequisite charts, pgf version]
+\ProvidesPackage{prerex}[2012/06/28 v6.3.4 LaTeX style for prerequisite charts, pgf version]
 
 % Changelog:
 %
+%  Version 6.3.4
+%
+%    Timetable and course code in bold for required boxes.
+%
+%  Version 6.3.3
+%
+%    Remove background colour from standalone boxes.
+%    \smallersize increased to \relsize{-2}.
+%
 %  Version 6.3.2
 %
 %    Use pgf layers to keep grid below arrows below boxes (thanks to Ryan Kavanagh).
@@ -240,7 +249,7 @@
 \newcommand{\boldwidth}{1.0pt}
 \newcommand{\dottedwidth}{0.8pt}
 \newcommand{\dashedwidth}{0.5pt}
-\newcommand{\smallersize}{\relsize{-3}}
+\newcommand{\smallersize}{\relsize{-2}}
 \newcommand{\baselineAdj}{-0.5ex}
 
 \newcounter{@myangle}
@@ -307,19 +316,19 @@
 }
 
 \def\lightbox{%
-\tikz[thin,baseline=\baselineAdj]\node[draw,fill=\background,rounded corners=2pt,inner xsep=1.8pt] 
+\tikz[thin,baseline=\baselineAdj]\node[draw,rounded corners=2pt,inner xsep=1.8pt] 
 {\rule[-2pt]{0pt}{4pt}\textsf{light}};
 }
 
 \def\boldbox{%
-\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner xsep=1.8pt] 
+\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt] 
 {\rule[-2pt]{0pt}{4pt}\textsf{\textbf{bold}}};
 }
 
 
 \def\dottedbox{%
-\tikz[baseline=\baselineAdj]\node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner xsep=1.8pt] 
-{\rule[-2pt]{0pt}{4pt}\textsf{\textsf{dotted}}};
+\tikz[baseline=\baselineAdj]\node[draw,dotted,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt] 
+{\rule[-2pt]{0pt}{4pt}\textsf{dotted}};
 }
 
 \pgfdeclarelayer{arrows}
@@ -330,14 +339,14 @@
 \def\@halfcourse#1,#2:#3#4#5{%
 \begin{pgfonlayer}{courses}%
 \node[draw,thin,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{2}%
 \end{pgfonlayer}%
@@ -346,14 +355,14 @@
 \def\@halfcoursec#1,#2:#3#4#5#6{%
 \begin{pgfonlayer}{courses}%
 \node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\selectfont{#3}}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize{\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{2}%
 \end{pgfonlayer}%
@@ -362,14 +371,14 @@
 \def\@reqhalfcourse#1,#2:#3#4#5{%
 \begin{pgfonlayer}{courses}%
 \node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}%
 }};%
 \@outputImapData#1,#2:{#3}{4}{2}%
 \end{pgfonlayer}%
@@ -378,14 +387,14 @@
 \def\@reqhalfcoursec#1,#2:#3#4#5#6{%
 \begin{pgfonlayer}{courses}%
 \node[draw,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}%
 }};%
 \@outputImapData#1,#2:{#3}{4}{2}%
 \end{pgfonlayer}%
@@ -395,14 +404,14 @@
 \def\@opthalfcourse#1,#2:#3#4#5{%
 \begin{pgfonlayer}{courses}%
 \node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{2}%
 \end{pgfonlayer}%
@@ -411,14 +420,14 @@
 \def\@opthalfcoursec#1,#2:#3#4#5#6{%
 \begin{pgfonlayer}{courses}%
 \node[draw,dotted,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{2}%
 \end{pgfonlayer}%
@@ -427,14 +436,14 @@
 \def\@fullcourse#1,#2:#3#4#5{%
 \begin{pgfonlayer}{courses}%
 \node[draw,thin,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
 \end{pgfonlayer}%
@@ -443,14 +452,14 @@
 \def\@fullcoursec#1,#2:#3#4#5#6{%
 \begin{pgfonlayer}{courses}%
 \node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \end{pgfonlayer}%
 \@outputImapData#1,#2:{#3}{4}{5}%
@@ -459,14 +468,14 @@
 \def\@reqfullcourse#1,#2:#3#4#5{%
 \begin{pgfonlayer}{courses}%
 \node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
 \end{pgfonlayer}%
@@ -475,14 +484,14 @@
 \def\@reqfullcoursec#1,#2:#3#4#5#6{%
 \begin{pgfonlayer}{courses}%
 \node[draw,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{\textbf{%
+{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize\fontseries{\bfdefault}\selectfont#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
 \end{pgfonlayer}%
@@ -491,14 +500,14 @@
 \def\@fullcoursec#1,#2:#3#4#5#6{%
 \begin{pgfonlayer}{courses}%
 \node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
 \end{pgfonlayer}%
@@ -507,14 +516,14 @@
 \def\@optfullcourse#1,#2:#3#4#5{%
 \begin{pgfonlayer}{courses}%
 \node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
 \end{pgfonlayer}%
@@ -524,14 +533,14 @@
 \def\@optfullcoursec#1,#2:#3#4#5#6{%
 \begin{pgfonlayer}{courses}%
 \node[draw,dotted,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\textsf{%
+{\fontfamily{\sfdefault}\selectfont
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}%
+{\smallersize#3}%
 \,\hfill\,%
-\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
 \\ #4%
-\end{tabular}}}%
+\end{tabular}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
 \end{pgfonlayer}%
@@ -541,14 +550,14 @@
 \begin{pgfonlayer}{courses}%
 \ifgridon
   \node[fill=white,draw=white,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
-  {\textsf{%
+  {\fontfamily{\sfdefault}\selectfont
   \href{\CourseURL{#1}{#2}{#3}}{%
-  \mbox{\smallersize#3}}}};%
+  {\smallersize#3}}};%
 \else
   \node[fill=none,draw=none,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
-  {\textsf{%
+  {\fontfamily{\sfdefault}\selectfont
   \href{\CourseURL{#1}{#2}{#3}}{%
-  \mbox{\smallersize#3}}}};%
+  {\smallersize#3}}};%
 \fi
 \@outputImapData#1,#2:{#3}{2}{1}%
 \end{pgfonlayer}%