summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/prerex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-14 22:26:48 +0000
committerKarl Berry <karl@freefriends.org>2013-10-14 22:26:48 +0000
commit2649a3c68067ecebff52a90d6daf3df0d6eba4ca (patch)
treecf06e4a9e40625755cb3fe66e284c277f7f97607 /Master/texmf-dist/tex/latex/prerex
parent071eb22cedc6875291e078fa0a907ddbb45cb1b3 (diff)
prerex (14oct13)
git-svn-id: svn://tug.org/texlive/trunk@31899 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/prerex')
-rw-r--r--Master/texmf-dist/tex/latex/prerex/prerex.sty76
1 files changed, 40 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/prerex/prerex.sty b/Master/texmf-dist/tex/latex/prerex/prerex.sty
index 85d297cbf22..77d5c3cbae7 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-12 R. D. Tennent, rdt@cs.queensu.ca
+%% Copyright (C) 2006-13 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
@@ -63,10 +63,14 @@
% The nominal diagram width is 10 + (\textwidth divided by \unit).
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2012/06/28 v6.3.4 LaTeX style for prerequisite charts, pgf version]
+\ProvidesPackage{prerex}[2013/07/19 v6.3.5 LaTeX style for prerequisite charts, pgf version]
% Changelog:
%
+% Version 6.3.5
+%
+% Fix font usage to work with mweights.sty.
+%
% Version 6.3.4
%
% Timetable and course code in bold for required boxes.
@@ -317,18 +321,18 @@
\def\lightbox{%
\tikz[thin,baseline=\baselineAdj]\node[draw,rounded corners=2pt,inner xsep=1.8pt]
-{\rule[-2pt]{0pt}{4pt}\textsf{light}};
+{\rule[-2pt]{0pt}{4pt}light};
}
\def\boldbox{%
\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt]
-{\rule[-2pt]{0pt}{4pt}\textsf{\textbf{bold}}};
+{\rule[-2pt]{0pt}{4pt}\bfseries bold};
}
\def\dottedbox{%
\tikz[baseline=\baselineAdj]\node[draw,dotted,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt]
-{\rule[-2pt]{0pt}{4pt}\textsf{dotted}};
+{\rule[-2pt]{0pt}{4pt}dotted};
}
\pgfdeclarelayer{arrows}
@@ -339,7 +343,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -355,7 +359,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize\selectfont{#3}}%
@@ -371,12 +375,12 @@
\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)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}%
}};%
@@ -387,12 +391,12 @@
\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)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}%
}};%
@@ -404,7 +408,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -420,7 +424,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -436,7 +440,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -452,7 +456,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -468,12 +472,12 @@
\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)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}}%
};%
@@ -484,12 +488,12 @@
\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)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}}%
};%
@@ -500,7 +504,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -516,7 +520,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -533,7 +537,7 @@
\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)%
-{\fontfamily{\sfdefault}\selectfont
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -550,14 +554,14 @@
\begin{pgfonlayer}{courses}%
\ifgridon
\node[fill=white,draw=white,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
- {\fontfamily{\sfdefault}\selectfont
+ {
\href{\CourseURL{#1}{#2}{#3}}{%
- {\smallersize#3}}};%
+ {\smallersize\mdseries#3}}};%
\else
\node[fill=none,draw=none,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
- {\fontfamily{\sfdefault}\selectfont
+ {
\href{\CourseURL{#1}{#2}{#3}}{%
- {\smallersize#3}}};%
+ {\smallersize\mdseries#3}}};%
\fi
\@outputImapData#1,#2:{#3}{2}{1}%
\end{pgfonlayer}%
@@ -568,9 +572,9 @@
\begin{pgfonlayer}{courses}%
\ifgridon
\node[fill=white,draw=white,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
-{\href{coord: #1,#2}{\mbox{#3}}};%
+{\href{coord: #1,#2}{\mbox{\sffamily\mdseries#3}}};%
\else
- \node[fill=none,draw=none,inner ysep=1.8pt](x#1y#2) at (#1,#2){\mbox{#3}};%
+ \node[fill=none,draw=none,inner ysep=1.8pt](x#1y#2) at (#1,#2){\mbox{\sffamily\mdseries#3}};%
\fi
\end{pgfonlayer}%
}
@@ -753,16 +757,16 @@
\draw[line width=0.4pt,draw=somewhatlight] (0,0) grid [step=5] (\value{@gridright},\value{@gridtop});
\foreach \i in {0,10,...,\value{@gridright}}
- \node at (\i,-4){\mbox{\textsf{\small \i}}};
+ \node at (\i,-4){\small \i};
\foreach \i in {0,10,...,\value{@gridtop}}
- \node at (-5,\i){\mbox{\textsf{\small \i}}};
+ \node at (-5,\i){\small \i};
\foreach \i in {0,10,...,\value{@gridright}}
- \node at (\i,\value{@gridtop}+4){\mbox{\textsf{\small \i}}};
+ \node at (\i,\value{@gridtop}+4){\small \i};
\foreach \i in {0,10,...,\value{@gridtop}}
- \node at (\value{@gridright}+5,\i){\mbox{\textsf{\small \i}}};
+ \node at (\value{@gridright}+5,\i){\small \i};
% anchors are to allow computation of coordinates from mouse clicks in kpdf/okular:
% latex/dvips requires non-null href box