prerex (14oct13)

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

14 files changed, 103 insertions, 132 deletions

diff --git a/Master/texmf-dist/doc/latex/prerex/README b/Master/texmf-dist/doc/latex/prerex/README
index 493b4c70e86..f5c15cf4a78 100644
--- a/Master/texmf-dist/doc/latex/prerex/README
+++ b/Master/texmf-dist/doc/latex/prerex/README
@@ -1,4 +1,4 @@
-prerex, version 6.5.2: Macros for prerequisite charts, with associated
+prerex, version 6.5.3: Macros for prerequisite charts, with associated
 editor and viewer applications. 
 
 This package consists of 
@@ -69,8 +69,8 @@ of the whole diagram or selected sets of course boxes. When a course box
 is moved, the arrows into and out of it automatically follow. To install
 on most Unix-like platforms, including OS-X and Cygwin on Windows:
 
-  tar zxvf prerex-6.5.1.tar.gz
-  cd prerex-6.5.1
+  tar zxvf prerex-6.5.2.tar.gz
+  cd prerex-6.5.2
   ./configure  [--prefix=$HOME]
   make
   make install  (as root if necessary)
@@ -90,9 +90,9 @@ for installation instructions.
 
 See the file doc/intro.pdf for an overview of the prerex system.
 
-prerex.sty, README.prerex, prerex.1, prerex.5, prerex.sty.7, prerex.tex
-and chart.tex may be modified and distributed according to the terms of
-the LaTeX Project Public License.
+prerex.sty, README, prerex.1, prerex.5, prerex.sty.7, prerex.tex and
+chart.tex may be modified and distributed according to the terms of the
+LaTeX Project Public License.
 
 The source files for prerex and vprerex may be modified and distributed
 according to the terms of the GNU General Public Licence (version 2).
diff --git a/Master/texmf-dist/doc/latex/prerex/boldbox.png b/Master/texmf-dist/doc/latex/prerex/boldbox.png
new file mode 100644
index 00000000000..32f5772b56a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/boldbox.png
diff --git a/Master/texmf-dist/doc/latex/prerex/dashed.png b/Master/texmf-dist/doc/latex/prerex/dashed.png
new file mode 100644
index 00000000000..c122a28f0d6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/dashed.png
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf
index cc2b27a1a66..50987765063 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 c53ac340589..e78d0ed0a1c 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/intro.tex
+++ b/Master/texmf-dist/doc/latex/prerex/doc/intro.tex
@@ -1,5 +1,6 @@
 \documentclass[11pt]{article}
 \usepackage[textwidth=6.5in,textheight=8.5in]{geometry}
+\usepackage{cabin}
 \listfiles
 \usepackage{prerex}
 
@@ -8,7 +9,6 @@
 \renewcommand{\bottomfraction}{1.00}
 
 \usepackage[osf]{mathpazo}
-\usepackage[defaultsans,scale=0.82]{opensans}
 
 \definecolor{light}{gray}{0.5}
 \definecolor{bg}{rgb}{0.99,0.96,0.90}
@@ -153,7 +153,8 @@ which is included in the prerex package
 available at any repository
 of
 the Comprehensive TeX Archive Network (CTAN)\footnote{%
-\myurl{http://www.ctan.org/}}.
+\myurl{http://www.ctan.org/}}
+and in many \TeX\ distributions.
 \end{itemize}
 The following additional software is optional but recommended:
 \begin{itemize}
@@ -332,7 +333,7 @@ to process the description of a prerex-formatted prerequisite chart until some n
 
 To process descriptions of prerex-formatted charts,  some additional packages
 are needed. 
-The file \texttt{prerex.sty} is essential;
+The file \texttt{prerex.sty} fromthe \texttt{prerex} package is essential;
 it should be stored
 in the same folder as the \texttt{.tex} file to be processed
 (or in the 
@@ -378,56 +379,28 @@ separated by semi-colons. For \MikTeX, the default path for commands is
 Most beginning
 users will prefer
 to use a graphical ``development environment'' which supports editing, processing and
-previewing of documents, rather than the command-line interface.  There are \emph{many} such applications.
-
-For Windows, we suggest you go 
-the Texmaker download site\footnote{%
-\myurl{http://www.xm1math.net/texmaker/download.html}}
-and click on the link for the self-installing archive
-\verb|texmakerwin32_install.exe|.
-For Mac OS~X, go to the same site, get
-the \texttt{texmakerbinmacosx} archive and follow the instructions.
-For Linux, install a \texttt{texmaker} package or get the source files
-at the Texmaker site.
-
-When Texmaker has been installed, 
-start it up and
-then click on \emph{Options} $\rightarrow$ \emph{Configure~Texmaker} to
-do any necessary configuration, such as the \emph{Quick Build} operation.
-
-You should now be able to
-open the source file for your chart,
-process 
-it, and then view the result
-using the items in the \emph{Tools} menu, or the \emph{Quick~Build} button.
-If there are any processing errors, error messages will appear in the bottom window pane.  
-
-Many other LaTeX editors are available if
-Texmaker doesn't satisfy you.  Two of the most popular of
-these for Windows are 
-WinEdt\footnote{%
-\myurl{http://www.winedt.com/}}
-and 
-TeXnicCenter;\footnote{%
-\myurl{http://sourceforge.net/projects/texniccenter}}
-the former is ``shareware'' and the latter is free.
-Mac users may want to check out the list of ``front-ends'' 
-at the \emph{TeX on Mac OS~X} site.\footnote{%
-\myurl{http://www.rna.nl/tex.html}}.
-Linux users also have 
-Kile\footnote{%
-\myurl{http://kile.sourceforge.net/}}
-and
-Klat.\footnote{%
-\myurl{http://research.edm.luc.ac.be/jori/klat/klat.html}}
+previewing of documents, rather than the command-line interface.  There are \emph{many} such applications;
+one called \TeX Works is supported in both MiK\TeX\ and \TeX Live.
 
 \section{Fonts}
 \label{fonts}
 
-Look carefully at the samples in Figure~\ref{samples}.
+Look carefully at the samples in Figure~\ref{samples} on page~\pageref{samples}.
 \begin{figure}
-\centering
-\includegraphics*[scale=0.35]{introFonts}
+\Huge
+\begin{list}{}{}\item
+\begin{tabular}{l}
+{\fontfamily{ptm}\selectfont Times}\\
+{\fontfamily{pplj}\selectfont Palatino}\\
+{\fontfamily{cmss}\selectfont Computer Modern Sans}\\
+{\fontfamily{phv}\selectfont Helvetica} \\
+{\fontfamily{fos}\selectfont Open Sans} \\
+{\fontfamily{Cabin-TLF}\selectfont Cabin}\\
+{\fontfamily{QuattrocentoSans-TLF}\selectfont Quattrocento Sans}\\
+{\fontfamily{LinuxBiolinumT-TLF}\selectfont Linux Biolinum}\\
+{\fontfamily{uop}\selectfont Optima} 
+\end{tabular}
+\end{list}
 \caption{Typeface Samples}
 \label{samples}
 \end{figure}
@@ -438,48 +411,36 @@ The others
 are \emph{sans serif} typefaces; this class of typefaces is more
 appropriate for use in prerequisite charts where \emph{legibility} of fairly small and short textual fragments is of primary importance.  
 
-Computer Modern Sans is the default \emph{sans serif} font in \LaTeX,
-and Helvetica and Avant~Garde should also be available in every \LaTeX\ installation.
-To get Helvetica (scaled down 20\%) or Avant Garde, use
+There are several \emph{sans serif} options available for \LaTeX.
+Computer Modern Sans is the default \emph{sans serif} font,
+and Helvetica should also be available in every \LaTeX\ installation.
+To get Helvetica (scaled down 20\%), use
 \begin{verbatim}
   \usepackage[scaled=0.8]{helvet}
 \end{verbatim}
-or
-\begin{verbatim}
-  \renewcommand{\sfdefault}{pag}
-\end{verbatim}
-respectively.
-If none of these is used,
-(or the command is commented out by preceding
-it with a \verb|%| character), Computer Modern Sans will be used.
 
 The Open Sans family\footnote{%
 \myurl{http://www.google.com/webfonts/specimen/Open+Sans}}
 of  fonts, designed by Steve Matteson of
-Ascender, is supported for use in LaTeX by the \texttt{opensans} package,
+Ascender, is supported for use in \LaTeX\ by the \texttt{opensans} package,
 available from CTAN\footnote{%
 \myurl{http://www.ctan.org/tex-archive/fonts/opensans}}
-and in most distributions. The chart in Figure~\ref{chart} on page~\pageref{chart} uses Open Sans.
-
-Futura, Gill Sans, Frutiger and Optima are commercial fonts available from
-font vendors such as \texttt{myfonts.com}.
-The \LaTeX\ support files and instructions for installation
-into a standard \LaTeX\ implementation for many commercial fonts can be found 
-at CTAN\footnote{%
-\myurl{http://www.ctan.org/tex-archive/fonts/psfonts/w-a-schmidt/}};
-otherwise you will have to follow the instructions
-in the Font Installation Guide.\footnote{%
-\myurl{http://www.ctan.org/tex-archive/info/Type1fonts/fontinstallationguide/}}
-
-Less expensive alternatives may be available to you.
-The Humanist~521 and Zapf-Humanist~601 families of fonts are Bitstream clones
-of Gill Sans and Optima, respectively.
-These fonts are available from commercial vendors but have been bundled with 
-Corel applications such as \mbox{WordPerfect}, and so you may
-already have them.  Windows\textsuperscript{\textregistered}\ systems come
-with several fonts, some of which (Arial, Verdana, Calibri) are suitable for use in prerequisite charts.
-
-Four URW-Classico fonts, a fairly good clone of Optima,  are available in a package
+and in most distributions. 
+The Cabin\footnote{%
+\myurl{http://www.google.com/webfonts/specimen/Cabin}}
+and Quattrocento Sans\footnote{%
+\myurl{http://www.google.com/webfonts/specimen/Quattrocento+Sans}
+}
+families of fonts, designed by Pablo Impallari, are supported for use
+in \LaTeX\ by the \texttt{cabin} and \texttt{quattrocento} packages.
+The chart in Figure~\ref{chart} on page~\pageref{chart} uses Cabin.
+The Linux Biolinum fonts are the sans-serif
+companions to the Linux Libertine family\footnote{%
+\myurl{http://www.linuxlibertine.org/index.php?id=1&L=1}},
+designed by Philipp H. Poll, and are supported for use in \LaTeX\ by the
+\texttt{libertine} package. 
+
+Four URW-Classico fonts, a fairly good clone of Hermann Zapf's Optima,  are available in a package
 of 79~fonts in Type~1 format that may be legally downloaded for non-commercial use 
 from 
 Artifex\footnote{%
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex b/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex
index 3801550efe9..9609cdfcbcc 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex
+++ b/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex
@@ -1,10 +1,11 @@
 \begin{figure}
-\renewcommand{\bfdefault}{b}
-\renewcommand{\seriesdefault}{sb}
+\small
+\renewcommand{\bfdefault}{sb}
+\renewcommand{\mddefault}{mb}
 \setcounter{diagheight}{50}
 \textwidth6.25in
-\begin{chart}\sf
-\text 20,50:{\textsf{\textbf{\Large Computer Science}}}
+\begin{chart}
+\text 20,52:{\textsf{\textsc{\Large Computer Science}}}
 \reqfullcourse 50,45:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00}
 \reqhalfcourse 25,40:{1303}{Discrete\\Structures}{MWF 9:30}
 \reqhalfcourse 30,30:{2813}{Computer\\Organiz.\,I}{MWF 8:30}
@@ -54,6 +55,8 @@ are in \lightbox\ boxes.
 \end{itemize}
 \end{minipage}
 \end{center}
+\renewcommand{\bfdefault}{b}
+\renewcommand{\mddefault}{m}
 \caption{A Prerex-Formatted Prerequisite Chart}
 \label{chart}
 \end{figure}
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex b/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex
index 0235bee741a..19dd24e1a27 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex
+++ b/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex
@@ -1,11 +1,12 @@
 \begin{figure}
-\renewcommand{\bfdefault}{b}
-\renewcommand{\seriesdefault}{sb}
-\textwidth6.25in
+\small
+\renewcommand{\bfdefault}{sb}
+\renewcommand{\mddefault}{mb}
 \setcounter{diagheight}{50}
-\begin{chart}\sf
+\textwidth6.25in
+\begin{chart}
 \grid
-\text 20,50:{\textsf{\textbf{\Large Computer Science}}}
+\text 20,52:{\textsf{\textsc{\Large Computer Science}}}
 \reqfullcourse 50,45:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00}
 \reqhalfcourse 25,40:{1303}{Discrete\\Structures}{MWF 9:30}
 \reqhalfcourse 30,30:{2813}{Computer\\Organiz.\,I}{MWF 8:30}
@@ -41,6 +42,8 @@
   \prereq 65,30,70,10:
 \end{chart}
 \vspace*{6ex}
+\renewcommand{\bfdefault}{b}
+\renewcommand{\mddefault}{m}
 \caption{A Prerequisite Chart with a Coordinate Grid}
 \label{grid}
 \end{figure}
diff --git a/Master/texmf-dist/doc/latex/prerex/dotted.png b/Master/texmf-dist/doc/latex/prerex/dotted.png
new file mode 100644
index 00000000000..945fdf5c2dc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/dotted.png
diff --git a/Master/texmf-dist/doc/latex/prerex/lightbox.png b/Master/texmf-dist/doc/latex/prerex/lightbox.png
new file mode 100644
index 00000000000..1e608f5382b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/lightbox.png
diff --git a/Master/texmf-dist/doc/latex/prerex/prerex-6.5.1.tar.gz b/Master/texmf-dist/doc/latex/prerex/prerex-6.5.1.tar.gz
deleted file mode 100644
index 5515d2eb80d..00000000000
--- a/Master/texmf-dist/doc/latex/prerex/prerex-6.5.1.tar.gz
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/prerex/prerex-6.5.2.tar.gz b/Master/texmf-dist/doc/latex/prerex/prerex-6.5.2.tar.gz
new file mode 100644
index 00000000000..d2c4308b4e4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/prerex-6.5.2.tar.gz
diff --git a/Master/texmf-dist/doc/latex/prerex/solid.png b/Master/texmf-dist/doc/latex/prerex/solid.png
new file mode 100644
index 00000000000..2515d712af1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/solid.png
diff --git a/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.2.tar.gz b/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.2.tar.gz
index e643d589d4a..c949af1ddaf 100644
--- a/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.2.tar.gz
+++ b/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.2.tar.gz
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