11 files changed, 46 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/prerex/README b/Master/texmf-dist/doc/latex/prerex/README
index 1f7bbda3ad1..ab65eeae9fb 100644
--- a/Master/texmf-dist/doc/latex/prerex/README
+++ b/Master/texmf-dist/doc/latex/prerex/README
@@ -1,4 +1,4 @@
-prerex, version 6.2: Macros for prerequisite charts, with associated
+prerex, version 6.3: Macros for prerequisite charts, with associated
 editor and viewer applications. 
 
 This package consists of 
diff --git a/Master/texmf-dist/doc/latex/prerex/chart.pdf b/Master/texmf-dist/doc/latex/prerex/chart.pdf
index b41186e33cd..4139e8befdf 100644
--- a/Master/texmf-dist/doc/latex/prerex/chart.pdf
+++ b/Master/texmf-dist/doc/latex/prerex/chart.pdf
diff --git a/Master/texmf-dist/doc/latex/prerex/chart.png b/Master/texmf-dist/doc/latex/prerex/chart.png
index 40bab4cea8e..814242956cd 100644
--- a/Master/texmf-dist/doc/latex/prerex/chart.png
+++ b/Master/texmf-dist/doc/latex/prerex/chart.png
diff --git a/Master/texmf-dist/doc/latex/prerex/chart.tex b/Master/texmf-dist/doc/latex/prerex/chart.tex
index 3135dcffb68..366c9b927f6 100644
--- a/Master/texmf-dist/doc/latex/prerex/chart.tex
+++ b/Master/texmf-dist/doc/latex/prerex/chart.tex
@@ -3,10 +3,9 @@
 \geometry{noheadfoot, vmargin=1.0in, hmargin=0.5in}
 \usepackage{prerex}
 
-\usepackage[T1]{fontenc}
-\usepackage{lmodern} 
 %\renewcommand{\sfdefault}{phv}  % uncomment to use Helvetica
 %\renewcommand{\sfdefault}{uop}  % uncomment to use URW Optima 
+
 \renewcommand{\rmdefault}{\sfdefault}
 
 
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf
index e4a3b7253d5..9365ec1d354 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf
+++ b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.tex b/Master/texmf-dist/doc/latex/prerex/doc/intro.tex
index ba3850c7dcd..054ec301e86 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/intro.tex
+++ b/Master/texmf-dist/doc/latex/prerex/doc/intro.tex
@@ -25,8 +25,8 @@
 
 \newcommand{\myurl}[1]{\textcolor{blue}{\underline{\textcolor{black}{\url{#1}}}}}
 
-\title{Prerex-Formatted Prerequisite Charts\\[1ex]\Large An Introduction\\[0.5ex]\large \texttt{prerex} Version~6.2}
-\date{}
+\title{Prerex-Formatted Prerequisite Charts\\[1ex]\Large An Introduction} 
+\date{\today}
 \author{Bob Tennent\\School of Computing, Queen's University\\\texttt{rdt@cs.queensu.ca}}
 
 \begin{document}
@@ -101,25 +101,19 @@ expect to have expertise in technical drawings.
 Here are some of these:
 \begin{itemize}
 \item Queen's University, Electrical and Computer Engineering\footnote{%
-\myurl{http://www.ece.queensu.ca/undergraduate/coursesummaries/Queens_ECE_prerequisite_graph_2007.pdf}}
-\item University of Auckland Business School, Department of Information Systems\footnote{%
-\myurl{http://www.code.auckland.ac.nz/comwebcontent/isom/diagrams/ispre-req.html}}
+\myurl{http://www.ece.queensu.ca/Current-Students/Undergraduate/files/Queens_ECE_prerequisite_graph_2011.pdf}}
 \item University of Waterloo, Computer Science\footnote{%
 \myurl{http://www.cs.uwaterloo.ca/current/courses/charts/majorPrereq.shtml}}
 \item Georgia Tech, Electrical Engineering\footnote{%
 \myurl{http://www.ece.gatech.edu/academics/undergrad/ee_prereq.html}}
 \item Georgia State University, Computer Science\footnote{%
 \myurl{http://www.cs.gsu.edu/sites/default/files/prereq.pdf}}
-\item Langara College, Computer Science and Information Systems\footnote{%
-\myurl{http://www.langara.bc.ca/science-technology/computing-science-systems/course-prerequisites.html}}
 \item Iowa State University, Civil, Construction, \& Environmental Engineering\footnote{%
 \myurl{http://www.ccee.iastate.edu/fileadmin/www.ccee.iastate.edu/academics/mechanical-prereq-0507.pdf}}
 \item Kansas State University, Mathematics\footnote{%
-\myurl{http://www.math.ksu.edu/main/course_info/courses/prereqcht.htm}}
+\myurl{http://www.math.ksu.edu/courses/catalog/prereqcht.pdf}}
 \item Carleton University, Engineering Physics\footnote{%
-\myurl{http://www2.carleton.ca/engineering-design/ccms/wp-content/ccms-files/Engineering-Physics_July14_09.pdf}}
-\item Mississippi State, Civil Engineering\footnote{%
-\myurl{http://www.cee.msstate.edu/assets/documents/flow\%20chart.pdf}}
+\myurl{http://www1.carleton.ca/engineering-design/ccms/wp-content/ccms-files/Engineering-Physics_Aug_19_11.pdf}}
 \end{itemize}
 
 \subsection{Prerex-Formatted  Prerequisite Charts}
@@ -127,7 +121,7 @@ Here are some of these:
 \subsubsection*{Where can I see prerex-formatted charts in use?}
 
 There are several charts for both specialized and multi-disciplinary programs
-on-line here: \myurl{http://www.cs.queensu.ca/undergraduate/prereq.html}.
+on-line here: \myurl{http://www.cs.queensu.ca/undergraduate/prerequisites}.
 
 \subsubsection*{What file formats are used for prerex-formatted charts?}
 
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf b/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf
index 9da5eae1e21..d22fe030093 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf
+++ b/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex b/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex
index 58fdb4e2844..bab1356d499 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex
+++ b/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex
@@ -6,7 +6,7 @@
 %\def\LaTeX{\mbox{LaTeX}}
 \begin{document}
 
-\title{\textsf{prerex.sty}: Prerequisite Charts in \LaTeX\\{\large Version 6.1.0}}
+\title{\textsf{prerex.sty}: Prerequisite Charts in \LaTeX\\{\large Version 6.2}}
 \author{R. D. Tennent\\\texttt{rdt@cs.queensu.ca}}
 \date{\today}
 \maketitle 
diff --git a/Master/texmf-dist/doc/latex/prerex/vprerex-6.2.tar.gz b/Master/texmf-dist/doc/latex/prerex/vprerex-6.2.tar.gz
deleted file mode 100644
index 1dbfae7c778..00000000000
--- a/Master/texmf-dist/doc/latex/prerex/vprerex-6.2.tar.gz
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/prerex/vprerex-6.3.1.tar.gz b/Master/texmf-dist/doc/latex/prerex/vprerex-6.3.1.tar.gz
new file mode 100644
index 00000000000..df7bb3e1752
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/vprerex-6.3.1.tar.gz
diff --git a/Master/texmf-dist/tex/latex/prerex/prerex.sty b/Master/texmf-dist/tex/latex/prerex/prerex.sty
index a11e03659f6..4059f122835 100644
--- a/Master/texmf-dist/tex/latex/prerex/prerex.sty
+++ b/Master/texmf-dist/tex/latex/prerex/prerex.sty
@@ -62,10 +62,14 @@
 % The nominal diagram width is 10 + (\textwidth divided by \unit).
 %
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2011/08/18 v6.1.0 LaTeX style for prerequisite charts, pgf version]
+\ProvidesPackage{prerex}[2011/10/28 v6.2 LaTeX style for prerequisite charts, pgf version]
 
 % Changelog:
 %
+%  Version 6.2
+%
+%    Allow for multi-line "timetable" arguments by using nested tabular environments.
+%
 %  Version 6.1.0
 %
 %    Added commands to specify background color of non-mini course boxes.
@@ -280,7 +284,10 @@
 {\textsf{%
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{2}%
@@ -291,7 +298,10 @@
 {\textsf{%
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{2}%
@@ -302,7 +312,10 @@
 {\textsf{\textbf{%
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}%
 }};%
 \@outputImapData#1,#2:{#3}{4}{2}%
@@ -313,7 +326,10 @@
 {\textsf{\textbf{%
 \renewcommand{\arraystretch}{0.8}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}%
 }};%
 \@outputImapData#1,#2:{#3}{4}{2}%
@@ -324,7 +340,10 @@
 {\textsf{%
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
@@ -335,7 +354,10 @@
 {\textsf{%
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
@@ -346,7 +368,10 @@
 {\textsf{\textbf{%
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%
@@ -357,7 +382,10 @@
 {\textsf{\textbf{%
 \renewcommand{\arraystretch}{1.7}%
 \href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4%
+\mbox{\smallersize#3}%
+\,\hfill\,%
+\mbox{\smallersize\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+\\ #4%
 \end{tabular}}}}%
 };%
 \@outputImapData#1,#2:{#3}{4}{5}%