From 8af9cbd92109db849ae5e929d232a0dda2e25d5f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Aug 2012 23:07:19 +0000 Subject: prerex 6.4.2 (22aug12) git-svn-id: svn://tug.org/texlive/trunk@27495 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/prerex/README | 4 +- Master/texmf-dist/doc/latex/prerex/chart.html | 85 ++++++++++--- Master/texmf-dist/doc/latex/prerex/chart.pdf | Bin 54062 -> 47713 bytes Master/texmf-dist/doc/latex/prerex/chart.png | Bin 38500 -> 23805 bytes Master/texmf-dist/doc/latex/prerex/chart.tex | 6 +- Master/texmf-dist/doc/latex/prerex/doc/intro.pdf | Bin 245406 -> 228834 bytes Master/texmf-dist/doc/latex/prerex/doc/intro.tex | 27 +++-- .../texmf-dist/doc/latex/prerex/doc/introFonts.png | Bin 15287 -> 7181 bytes .../doc/latex/prerex/doc/introchart1.tex | 5 +- .../doc/latex/prerex/doc/introchart2.tex | 5 +- Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf | Bin 140709 -> 166691 bytes Master/texmf-dist/doc/latex/prerex/doc/prerex.tex | 10 +- .../doc/latex/prerex/vprerex-6.4.1.tar.gz | Bin 15731 -> 0 bytes .../doc/latex/prerex/vprerex-6.4.2.tar.gz | Bin 0 -> 18255 bytes Master/texmf-dist/tex/latex/prerex/prerex.sty | 135 +++++++++++---------- Master/tlpkg/libexec/ctan2tds | 2 +- 16 files changed, 171 insertions(+), 108 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/prerex/vprerex-6.4.1.tar.gz create mode 100644 Master/texmf-dist/doc/latex/prerex/vprerex-6.4.2.tar.gz diff --git a/Master/texmf-dist/doc/latex/prerex/README b/Master/texmf-dist/doc/latex/prerex/README index 4c433e10b4c..493b4c70e86 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.1: Macros for prerequisite charts, with associated +prerex, version 6.5.2: Macros for prerequisite charts, with associated editor and viewer applications. This package consists of @@ -82,7 +82,7 @@ installed. The effects of editing operations may be observed in any PDF viewer. The vprerex (visual prerex) application included in the prerex suite is a GUI and viewer for the prerex editor. It may be used just as a -minimalistic viewer of arbitrary PDF files but supports editing of +minimalist viewer of arbitrary PDF files but supports editing of charts generated using prerex.sty by allowing coordinates of course boxes, arrows, and background points to be conveyed back to the prerex editor command-line using the clipboard. See the INSTALL in the tarball diff --git a/Master/texmf-dist/doc/latex/prerex/chart.html b/Master/texmf-dist/doc/latex/prerex/chart.html index 22e0ab32962..643ea631edf 100644 --- a/Master/texmf-dist/doc/latex/prerex/chart.html +++ b/Master/texmf-dist/doc/latex/prerex/chart.html @@ -1,22 +1,67 @@ - -A Simple Prerequisite Chart -
+ + + + + + + + + + + + +
+

+ +

chart.png

+
+

+

    +
  • A solid arrow solid.png indicates a required prerequisite, a dotted arrow dotted.png indicates + a corequisite (to be taken before or concurrently), and a dashed arrow dashed.png indicates a + recommended prerequisite. Core courses are in boldbox.png boxes; other courses (i.e., options or + prerequisites) are in lightbox.png boxes. +
  • +
  • Timetabling abbreviations: M, T, W, Th, F=Mon, Tue, Wed, Thur, Fri, resp.; eve=7:00–9:50 pm; + no=not offered.
+ -1083 -1303 -2813 -2023 -2513 -1083 -2333 -2013 -2685 -2013 -3323 -3813 -3413 -3013 -3513 -3503 +1083 +1303 +2813 +2023 +2513 +1083 +2333 +2013 +2685 +2013 +3323 +3813 +3413 +3013 +3513 +3503 - + + + + + + diff --git a/Master/texmf-dist/doc/latex/prerex/chart.pdf b/Master/texmf-dist/doc/latex/prerex/chart.pdf index 4139e8befdf..af8935b4e7b 100644 Binary files a/Master/texmf-dist/doc/latex/prerex/chart.pdf and b/Master/texmf-dist/doc/latex/prerex/chart.pdf differ diff --git a/Master/texmf-dist/doc/latex/prerex/chart.png b/Master/texmf-dist/doc/latex/prerex/chart.png index 814242956cd..d9968b66a00 100644 Binary files a/Master/texmf-dist/doc/latex/prerex/chart.png and b/Master/texmf-dist/doc/latex/prerex/chart.png differ diff --git a/Master/texmf-dist/doc/latex/prerex/chart.tex b/Master/texmf-dist/doc/latex/prerex/chart.tex index 366c9b927f6..ccd20e7ba7c 100644 --- a/Master/texmf-dist/doc/latex/prerex/chart.tex +++ b/Master/texmf-dist/doc/latex/prerex/chart.tex @@ -3,10 +3,10 @@ \geometry{noheadfoot, vmargin=1.0in, hmargin=0.5in} \usepackage{prerex} -%\renewcommand{\sfdefault}{phv} % uncomment to use Helvetica -%\renewcommand{\sfdefault}{uop} % uncomment to use URW Optima +\usepackage[default,scale=0.92]{opensans} +\renewcommand{\seriesdefault}{sb} +\renewcommand{\ttfamily}{\fontfamily{cmtt}\fontseries{m}\selectfont} -\renewcommand{\rmdefault}{\sfdefault} \begin{document} diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf index 4873942ebfc..cc2b27a1a66 100644 Binary files a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf and b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf differ diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.tex b/Master/texmf-dist/doc/latex/prerex/doc/intro.tex index 5b376fd8a43..c53ac340589 100644 --- a/Master/texmf-dist/doc/latex/prerex/doc/intro.tex +++ b/Master/texmf-dist/doc/latex/prerex/doc/intro.tex @@ -8,10 +8,7 @@ \renewcommand{\bottomfraction}{1.00} \usepackage[osf]{mathpazo} -% \usepackage[scaled=0.8]{helvet} % Helvetica scaled down 20% -\renewcommand{\sfdefault}{uop} % URW clone of Optima - -\renewcommand{\ttdefault}{cmtt} +\usepackage[defaultsans,scale=0.82]{opensans} \definecolor{light}{gray}{0.5} \definecolor{bg}{rgb}{0.99,0.96,0.90} @@ -200,9 +197,8 @@ quality: than the course name. The latter is centered and the former are left- and right-justified, respectively. Arbitrary \LaTeX\ formatting can be used for the text. -\item Any available Type 1 (Postscript) or TrueType format fonts may be used; - in the chart in Figure~\ref{chart}, the typeface used is Optima, an elegant - \emph{sans serif} face designed by Hermann Zapf. The professional-quality +\item Any available Type 1 (Postscript) or TrueType format fonts may be used. + The professional-quality typesetting engine takes advantage of kerns and ligatures in the fonts. \item Line thickness for boxes may be varied; in the example diagram, heavier boxes (and bold-face text) are used to indicate that a course is @@ -457,6 +453,14 @@ 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, +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 @@ -464,7 +468,7 @@ 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{% +in the Font Installation Guide.\footnote{% \myurl{http://www.ctan.org/tex-archive/info/Type1fonts/fontinstallationguide/}} Less expensive alternatives may be available to you. @@ -473,7 +477,7 @@ 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 might be suitable for use in prerequisite charts. +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 of 79~fonts in Type~1 format that may be legally downloaded for non-commercial use @@ -487,6 +491,7 @@ Note that the font files cannot be distributed commercially without a commercial before re-distributing them. This restriction does not prevent you from distributing documents that \emph{use} the fonts. + \section{Conversion to Portable Network Graphic (PNG) Format} Although PDF is currently the best available format for distributing @@ -785,9 +790,9 @@ in explanatory notes outside of the \verb\chart\ environment: \verb|\solidarrow| & \solidarrow \\ \verb|\dottedarrow| & \dottedarrow \\ \verb|\dashedarrow| & \dashedarrow \\ -\verb|\lightbox| & \lightbox \\ +\verb|\lightbox| & \fontseries{sb}\selectfont\lightbox \\ \verb|\boldbox| & \boldbox \\ -\verb|\dottedbox| & \dottedbox +\verb|\dottedbox| & \fontseries{sb}\selectfont\dottedbox \end{tabular} \renewcommand{\arraystretch}{1.0} \end{list} diff --git a/Master/texmf-dist/doc/latex/prerex/doc/introFonts.png b/Master/texmf-dist/doc/latex/prerex/doc/introFonts.png index 13d49ce3c4f..9ab370829aa 100644 Binary files a/Master/texmf-dist/doc/latex/prerex/doc/introFonts.png and b/Master/texmf-dist/doc/latex/prerex/doc/introFonts.png differ diff --git a/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex b/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex index 6ec2b607862..3801550efe9 100644 --- a/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex +++ b/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex @@ -1,8 +1,9 @@ \begin{figure} -\renewcommand{\rmdefault}{\sfdefault} +\renewcommand{\bfdefault}{b} +\renewcommand{\seriesdefault}{sb} \setcounter{diagheight}{50} \textwidth6.25in -\begin{chart} +\begin{chart}\sf \text 20,50:{\textsf{\textbf{\Large Computer Science}}} \reqfullcourse 50,45:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00} \reqhalfcourse 25,40:{1303}{Discrete\\Structures}{MWF 9:30} diff --git a/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex b/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex index 0764ba8f186..0235bee741a 100644 --- a/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex +++ b/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex @@ -1,8 +1,9 @@ \begin{figure} -\renewcommand{\rmdefault}{\sfdefault} +\renewcommand{\bfdefault}{b} +\renewcommand{\seriesdefault}{sb} \textwidth6.25in \setcounter{diagheight}{50} -\begin{chart} +\begin{chart}\sf \grid \text 20,50:{\textsf{\textbf{\Large Computer Science}}} \reqfullcourse 50,45:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00} diff --git a/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf b/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf index d32cfedb8fb..9218342e9a0 100644 Binary files a/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf and b/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf differ diff --git a/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex b/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex index 12bd6aa8d27..677ed8235fa 100644 --- a/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex +++ b/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex @@ -1,6 +1,6 @@ \documentclass[10pt]{article} -\usepackage{mathpazo} -\usepackage[scaled=0.9]{helvet} +\usepackage[osf]{mathpazo} +\usepackage[defaultsans,scale=0.82]{opensans} \usepackage{fullpage} \usepackage{prerex} %\def\LaTeX{\mbox{LaTeX}} @@ -34,8 +34,9 @@ format, a chart description may be edited using the interactive editor (as well as any conventional text editor). \begin{figure} +\renewcommand{\seriesdefault}{sb} \setcounter{diagheight}{40} -\begin{chart} +\begin{chart}\sf \text 15,40:{\textsf{\textbf{\Large Computer Science}}} \reqfullcourse 50,35:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00} \reqhalfcourse 25,30:{1303}{Discrete\\Structures}{MWF 9:30} @@ -306,7 +307,8 @@ editor which incorporates a minimalistic prerex-enabled PDF viewer. \begin{figure} \setcounter{diagheight}{40} -\begin{chart} +\renewcommand{\seriesdefault}{sb} +\begin{chart}\sf \grid \text 15,40:{\textsf{\textbf{\Large Computer Science}}} \reqfullcourse 50,35:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00} diff --git a/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.1.tar.gz b/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.1.tar.gz deleted file mode 100644 index 5bc813626c0..00000000000 Binary files a/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.1.tar.gz and /dev/null differ 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 new file mode 100644 index 00000000000..e643d589d4a Binary files /dev/null and b/Master/texmf-dist/doc/latex/prerex/vprerex-6.4.2.tar.gz differ 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}% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index c9592764df8..e730da1ff69 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2362,7 +2362,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' 'parnotes' => 'PNmanual.pdf', # no source 'piechartmp' => 'piechartmp.pdf', # no source 'ptptex' => '(overcite|cite|wrapfig).sty', # duplicated - 'sapthesis' => '.*-ML.*\.pdf', # univ logos + 'sapthesis' => '.*-ML.*\.pdf', # univ logos 'stix' => 'STIX_Font_Release_Documentation_2010.pdf', # no source 'sttools' => 'presfull.pdf', # no source 'stubs' => 'stubs.pdf', # no source -- cgit v1.2.3