From 7a9971d09aa889f7fc85a81301a6e8c52393287d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 20 Aug 2011 21:32:00 +0000 Subject: prerex 6.1.0 (19aug10) git-svn-id: svn://tug.org/texlive/trunk@23621 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/prerex/README | 6 +-- Master/texmf-dist/doc/latex/prerex/doc/intro.pdf | Bin 246315 -> 246200 bytes Master/texmf-dist/doc/latex/prerex/doc/intro.tex | 17 +++---- Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf | Bin 140164 -> 140208 bytes .../texmf-dist/doc/latex/prerex/doc/prerex.sty.7 | 14 +++++- Master/texmf-dist/doc/latex/prerex/doc/prerex.tex | 20 +++++--- .../doc/latex/prerex/prerex-6.0.4.tar.gz | Bin 110368 -> 0 bytes .../doc/latex/prerex/prerex-6.1.0.tar.gz | Bin 0 -> 110665 bytes Master/texmf-dist/tex/latex/prerex/prerex.sty | 54 ++++++++++++++++++++- 9 files changed, 88 insertions(+), 23 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/prerex/prerex-6.0.4.tar.gz create mode 100644 Master/texmf-dist/doc/latex/prerex/prerex-6.1.0.tar.gz diff --git a/Master/texmf-dist/doc/latex/prerex/README b/Master/texmf-dist/doc/latex/prerex/README index 2084a41af61..bdb22603452 100644 --- a/Master/texmf-dist/doc/latex/prerex/README +++ b/Master/texmf-dist/doc/latex/prerex/README @@ -1,4 +1,4 @@ -prerex, version 6.0.6: Macros for prerequisite charts, with associated +prerex, version 6.1.0: Macros for prerequisite charts, with associated editor and viewer applications. This package consists of @@ -71,8 +71,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: - tar zxvf prerex-6.0.4.tar.gz - cd prerex-6.0.4 + tar zxvf prerex-6.1.0.tar.gz + cd prerex-6.1.0 ./configure --help ./configure [options] make diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf index 6f4e2cc7a06..411f649d19e 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 05c1620c790..f684b93c1e5 100644 --- a/Master/texmf-dist/doc/latex/prerex/doc/intro.tex +++ b/Master/texmf-dist/doc/latex/prerex/doc/intro.tex @@ -25,7 +25,7 @@ \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.0.6} +\title{Prerex-Formatted Prerequisite Charts\\[1ex]\Large An Introduction\\[0.5ex]\large \texttt{prerex} Version~6.1.0} \date{} \author{Bob Tennent\\School of Computing, Queen's University\\\texttt{rdt@cs.queensu.ca}} @@ -627,7 +627,7 @@ editor maintains a ``stack'' of elements that have been cut but not yet pasted. \hline \end{tabular} \end{center} -\caption{\texttt{prerex} Command Summary (version 6.0.6)} +\caption{\texttt{prerex} Command Summary (version 6.1.0)} \label{help} \end{table} @@ -718,6 +718,10 @@ the instructions defined by \texttt{prerex.sty}. \verb|\fullcourse |$x,y$:\verb|{|\emph{course code}\verb|}{|\emph{course title}\verb|}{|\emph{timetable code}\verb|}| \\ \verb|\reqhalfcourse |$x,y$:\verb|{|\emph{course code}\verb|}{|\emph{course title}\verb|}{|\emph{timetable code}\verb|}| \\ \verb|\reqfullcourse |$x,y$:\verb|{|\emph{course code}\verb|}{|\emph{course title}\verb|}{|\emph{timetable code}\verb|}| \\ +\verb|\halfcoursec | $x,y$ \verb|:{| \emph{course code} \verb|}{| \emph{course title} \verb|}{| \emph{timetable code} \verb|}| \verb|{| \emph{color} \verb|}| \\ +\verb|\reqhalfcoursec | $x,y$ \verb|:{| \emph{course code} \verb|}{| \emph{course title} \verb|}{| \emph{timetable code} \verb|}| \verb|{| \emph{color} \verb|}| \\ +\verb|\fullcoursec | $x,y$ \verb|:{| \emph{course code} \verb|}{| \emph{course title} \verb|}{| \emph{timetable code} \verb|}| \verb|{| \emph{color} \verb|}| \\ +\verb|\reqfullcoursec | $x,y$ \verb|:{| \emph{course code} \verb|}{| \emph{course title} \verb|}{| \emph{timetable code} \verb|}| \verb|{| \emph{color} \verb|}| \\ \verb|\mini |$x,y:$\verb|{|\emph{course code}\verb|}| \\ \verb|\text |$x,y:$\verb|{|\emph{line of text}\verb|}| \\ \hline @@ -838,14 +842,9 @@ where the argument should be in the range $0$--$100$; $0$ means no curvature. where the arguments supplied at the call are the $x$ and $y$ coordinates of the box or mini, and the course code. \begin{list}{}{} -\item \verb|\newcommand{\background}{LightYellow}| -\end{list} -where -\verb|LightYellow| -is defined by -\begin{list}{}{} -\item \verb|\definecolor{LightYellow}{rgb}{1.0, 1.0, 0.878431}| +\item \verb|\newcommand{\background}{yellow!15}| \end{list} +which defines the default background color for course nodes. \begin{list}{}{} \item \verb|\setlength{\unit}{5.7816pt}| \end{list} diff --git a/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf b/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf index 749295af598..9da5eae1e21 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.sty.7 b/Master/texmf-dist/doc/latex/prerex/doc/prerex.sty.7 index cb91489bdc7..1a8bc41f65d 100644 --- a/Master/texmf-dist/doc/latex/prerex/doc/prerex.sty.7 +++ b/Master/texmf-dist/doc/latex/prerex/doc/prerex.sty.7 @@ -1,4 +1,4 @@ -.TH PREREX.STY 7 2011-08-10 "prerex.sty-6.0.6" "" +.TH PREREX.STY 7 2011-08-18 "prerex.sty-6.1.0" "" .SH NAME prerex.sty \- a LaTeX document style for prerequisite charts .SH DESCRIPTION @@ -123,6 +123,18 @@ The and .I timetable arguments are arbitrary (well-bracketed) text, possibly with LaTeX markup. + +The following are similar but take an additional argument to specify the (non-default) +background color of the course box: +.IP +.BI \ehalfcoursec " x,y" :{ code }{ title }{ timetable }{ color } +.IP +.BI \efullcoursec " x,y" :{ code }{ title }{ timetable }{ color } +.IP +.BI \ereqhalfcoursec " x,y" :{ code }{ title }{ timetable }{ color } +.IP +.BI \ereqfullcoursec " x,y" :{ code }{ title }{ timetable }{ color } +.LP .SH MINI COURSE BOXES AND TEXT LINES A mini course "box" is produced by a command of the form .IP diff --git a/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex b/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex index 98a91eac5a0..58fdb4e2844 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.0.6}} +\title{\textsf{prerex.sty}: Prerequisite Charts in \LaTeX\\{\large Version 6.1.0}} \author{R. D. Tennent\\\texttt{rdt@cs.queensu.ca}} \date{\today} \maketitle @@ -185,6 +185,15 @@ and \emph{timetable} arguments are arbitrary (well-bracketed) text, possibly with \LaTeX\ markup. +The following are similar but take an additional argument to specify +the (non-default) background color of the course box: +\begin{list}{}{} +\item \verb|\halfcoursec | $x,y$ \verb|:{| \emph{code} \verb|}{| \emph{title} \verb|}{| \emph{timetable} \verb|}| \verb|{| \emph{color} \verb|}| +\item \verb|\reqhalfcoursec | $x,y$ \verb|:{| \emph{code} \verb|}{| \emph{title} \verb|}{| \emph{timetable} \verb|}| \verb|{| \emph{color} \verb|}| +\item \verb|\fullcoursec | $x,y$ \verb|:{| \emph{code} \verb|}{| \emph{title} \verb|}{| \emph{timetable} \verb|}| \verb|{| \emph{color} \verb|}| +\item \verb|\reqfullcoursec | $x,y$ \verb|:{| \emph{code} \verb|}{| \emph{title} \verb|}{| \emph{timetable} \verb|}| \verb|{| \emph{color} \verb|}| +\end{list} + \subsection{Mini Course Boxes and Text-Lines} A mini course ``box'' is produced by a command of the form \begin{list}{}{} @@ -424,14 +433,9 @@ where the argument should be in the range $0$--$100$; $0$ means no curvature. where the arguments supplied at the call are the $x$ and $y$ coordinates of the box or mini and the course code. \begin{list}{}{} -\item \verb|\newcommand{\background}{LightYellow}| -\end{list} -where -\verb|LightYellow| -is defined by -\begin{list}{}{} -\item \verb|\definecolor{LightYellow}{rgb}{1.0, 1.0, 0.878431}| +\item \verb|\newcommand{\background}{yellow!15}| \end{list} +which specifies the default background color of course boxes. \begin{list}{}{} \item \verb|\setlength{\unit}{5.7816pt}| \end{list} diff --git a/Master/texmf-dist/doc/latex/prerex/prerex-6.0.4.tar.gz b/Master/texmf-dist/doc/latex/prerex/prerex-6.0.4.tar.gz deleted file mode 100644 index d9e25e7ceaf..00000000000 Binary files a/Master/texmf-dist/doc/latex/prerex/prerex-6.0.4.tar.gz and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/prerex/prerex-6.1.0.tar.gz b/Master/texmf-dist/doc/latex/prerex/prerex-6.1.0.tar.gz new file mode 100644 index 00000000000..a1980963fd4 Binary files /dev/null and b/Master/texmf-dist/doc/latex/prerex/prerex-6.1.0.tar.gz differ diff --git a/Master/texmf-dist/tex/latex/prerex/prerex.sty b/Master/texmf-dist/tex/latex/prerex/prerex.sty index 46d23896bad..a11e03659f6 100644 --- a/Master/texmf-dist/tex/latex/prerex/prerex.sty +++ b/Master/texmf-dist/tex/latex/prerex/prerex.sty @@ -14,7 +14,7 @@ % % Instructions supported inside \begin{chart} ... \end{chart}: % -% \[req]{half|full}course x,y: {course code}{course title}{timetable code} +% \[req]{half|full}course[c] x,y: {course code}{course title}{timetable code}[{color}] % % \mini x,y: {course code} % @@ -62,10 +62,14 @@ % The nominal diagram width is 10 + (\textwidth divided by \unit). % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{prerex}[2011/08/10 v6.0.6 LaTeX style for prerequisite charts, pgf version] +\ProvidesPackage{prerex}[2011/08/18 v6.1.0 LaTeX style for prerequisite charts, pgf version] % Changelog: % +% Version 6.1.0 +% +% Added commands to specify background color of non-mini course boxes. +% % Version 6.0.6 % % Provide \textbullet at mid-point of edges when grid is on. @@ -282,6 +286,17 @@ \@outputImapData#1,#2:{#3}{4}{2}% } +\def\@halfcoursec#1,#2:#3#4#5#6{% +\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)% +{\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% +\end{tabular}}}% +};% +\@outputImapData#1,#2:{#3}{4}{2}% +} + \def\@reqhalfcourse#1,#2:#3#4#5{% \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{% @@ -293,6 +308,17 @@ \@outputImapData#1,#2:{#3}{4}{2}% } +\def\@reqhalfcoursec#1,#2:#3#4#5#6{% +\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{% +\renewcommand{\arraystretch}{0.8}% +\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}% +\mbox{\smallersize#3}\,\hfill\,\mbox{\smallersize#5}\\ #4% +\end{tabular}}}% +}};% +\@outputImapData#1,#2:{#3}{4}{2}% +} + \def\@fullcourse#1,#2:#3#4#5{% \node[draw,thin,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)% {\textsf{% @@ -304,6 +330,16 @@ \@outputImapData#1,#2:{#3}{4}{5}% } +\def\@fullcoursec#1,#2:#3#4#5#6{% +\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)% +{\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% +\end{tabular}}}% +};% +\@outputImapData#1,#2:{#3}{4}{5}% +} \def\@reqfullcourse#1,#2:#3#4#5{% \node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)% @@ -316,6 +352,16 @@ \@outputImapData#1,#2:{#3}{4}{5}% } +\def\@reqfullcoursec#1,#2:#3#4#5#6{% +\node[draw,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)% +{\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% +\end{tabular}}}}% +};% +\@outputImapData#1,#2:{#3}{4}{5}% +} \def\@mini#1,#2:#3{% \node[fill=white,draw=white,inner ysep=1.8pt](x#1y#2) at (#1,#2)% @@ -561,9 +607,13 @@ } \let\halfcourse=\@halfcourse + \let\halfcoursec=\@halfcoursec \let\reqhalfcourse=\@reqhalfcourse + \let\reqhalfcoursec=\@reqhalfcoursec \let\fullcourse=\@fullcourse + \let\fullcoursec=\@fullcoursec \let\reqfullcourse=\@reqfullcourse + \let\reqfullcoursec=\@reqfullcoursec \let\mini=\@mini \let\text=\@text \let\prereq=\@prereq -- cgit v1.2.3