summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-14 23:07:00 +0000
committerKarl Berry <karl@freefriends.org>2011-08-14 23:07:00 +0000
commit135d4e294c8799bf72c97ae9ae12f679d57a2450 (patch)
treef292038c11b835abf0669c73201afb51b042f513
parent1efb01d31a3aa696e10fcd96924201b097ef73a0 (diff)
prerex 6.0.4
git-svn-id: svn://tug.org/texlive/trunk@23557 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/prerex/README6
-rw-r--r--Master/texmf-dist/doc/latex/prerex/chart.html2
-rw-r--r--Master/texmf-dist/doc/latex/prerex/chart.pdfbin29759 -> 79220 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prerex/chart.pngbin21800 -> 53303 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prerex/chart.tex59
-rw-r--r--Master/texmf-dist/doc/latex/prerex/doc/intro.pdfbin334990 -> 246315 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prerex/doc/intro.tex21
-rw-r--r--Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex2
-rw-r--r--Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex2
-rw-r--r--Master/texmf-dist/doc/latex/prerex/doc/prerex.pdfbin183330 -> 140164 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prerex/doc/prerex.sty.712
-rw-r--r--Master/texmf-dist/doc/latex/prerex/doc/prerex.tex15
-rw-r--r--Master/texmf-dist/doc/latex/prerex/prerex-6.0.3.tar.gzbin103110 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prerex/prerex-6.0.4.tar.gzbin0 -> 110368 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prerex/vprerex-6.0.1.tar.gzbin0 -> 15315 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prerex/vprerex-6.0.tar.gzbin15538 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/latex/prerex/prerex.sty83
17 files changed, 96 insertions, 106 deletions
diff --git a/Master/texmf-dist/doc/latex/prerex/README b/Master/texmf-dist/doc/latex/prerex/README
index 757e64e8628..2084a41af61 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.4: Macros for prerequisite charts, with associated
+prerex, version 6.0.6: 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.3.tar.gz
- cd prerex-6.0.3
+ tar zxvf prerex-6.0.4.tar.gz
+ cd prerex-6.0.4
./configure --help
./configure [options]
make
diff --git a/Master/texmf-dist/doc/latex/prerex/chart.html b/Master/texmf-dist/doc/latex/prerex/chart.html
index 93d4975921f..22e0ab32962 100644
--- a/Master/texmf-dist/doc/latex/prerex/chart.html
+++ b/Master/texmf-dist/doc/latex/prerex/chart.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html><head><title></title></head><body>
+<html><head><title>A Simple Prerequisite Chart</title></head><body>
<div class="center"><img src="chart.png" usemap="#chart" ismap border=0></div>
<map name="chart">
<area shape=rect coords="548,225,628,125" href="file:1083.html" target="_new" alt="1083">
diff --git a/Master/texmf-dist/doc/latex/prerex/chart.pdf b/Master/texmf-dist/doc/latex/prerex/chart.pdf
index 5833ff84282..b41186e33cd 100644
--- a/Master/texmf-dist/doc/latex/prerex/chart.pdf
+++ b/Master/texmf-dist/doc/latex/prerex/chart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prerex/chart.png b/Master/texmf-dist/doc/latex/prerex/chart.png
index df1f981c343..40bab4cea8e 100644
--- a/Master/texmf-dist/doc/latex/prerex/chart.png
+++ b/Master/texmf-dist/doc/latex/prerex/chart.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prerex/chart.tex b/Master/texmf-dist/doc/latex/prerex/chart.tex
index ba0a8cda3a4..33e12187f66 100644
--- a/Master/texmf-dist/doc/latex/prerex/chart.tex
+++ b/Master/texmf-dist/doc/latex/prerex/chart.tex
@@ -1,59 +1,11 @@
\documentclass{article}
-\usepackage{geometry}
-\geometry{noheadfoot, vmargin=1.0in, hmargin=0.5in}
-\usepackage{prerex}
-
-\renewcommand{\sfdefault}{phv}
-\usepackage{courier}
-%\renewcommand{\sfdefault}{uop} % uncomment to use URW Optima font
-\renewcommand{\rmdefault}{\sfdefault}
-
-
+\usepackage{prereqsWeb}
\begin{document}
-\thispagestyle{empty}
-\setcounter{diagheight}{50}
-
-
-\begin{chart}
-\text 10,50:{\textbf{\Large Computer}}
-\text 10,47:{\textbf{\Large 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}
- \prereq 50,45,30,30:
- \prereq 25,40,30,30:
-\reqhalfcourse 45,30:{2023}{Procedural\\Prog.\,Devel.}{MWF 2:30}
- \prereq 50,45,45,30:
-\reqhalfcourse 65,30:{2513}{Informat.\\Systems}{TTh 1:00}
- \coreq 50,45,65,30:
-\mini 10,26:{1083}
-\reqhalfcourse 10,20:{2333}{Computab.\,\&\\Formal\,Lang.}{TTh 11:30}
- \prereq 25,40,10,20:
- \prereq 10,26,10,20:
-\reqhalfcourse 45,20:{2013}{Software\\Engineer.\,I}{MWF 11:30}
- \prereq 45,30,45,20:
-\halfcourse 55,20:{2685}{\texttt{C++}\\Program.}{no}
- \prereq 45,30,55,20:
-\mini 21,16:{2013}
-\reqhalfcourse 15,10:{3323}{Data\\Structures}{MWF 10:30}
- \prereq 25,40,15,10:
- \prereq 21,16,15,10:
-\reqhalfcourse 25,10:{3813}{Comput.\\Organiz.\,II}{TTh 8:30}
- \prereq 30,30,25,10:
-\reqhalfcourse 35,10:{3413}{Operating\\Systems\,I}{MWF 9:30}
- \prereq 30,30,35,10:
- \recomm 45,20,35,10:
-\halfcourse 45,10:{3013}{Software\\Engineer.\,II}{MWF 11:30}
- \prereq 45,20,45,10:
-\halfcourse 58,10:{3513}{Database\\Mngt.\,Sys.\,I}{MWF 8:30 pm}
- \prereq 65,30,58,10:
- \prereq 45,20,58,10:
-\reqhalfcourse 70,10:{3503}{Sys.\,Anal.\\\&\,Design}{TTh 10:00}
- \prereq 65,30,70,10:
-\end{chart}
-
\begin{center}
-\begin{minipage}{6.0in}
+\includegraphics*{chart.png}
+\end{center}
+\begin{center}
+\begin{minipage}{4.0in}
\begin{itemize}
\item
A solid arrow \solidarrow\ indicates a required prerequisite,
@@ -68,3 +20,4 @@ are in \lightbox\ boxes.
\end{minipage}
\end{center}
\end{document}
+
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf
index 153f76104cb..6f4e2cc7a06 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf
+++ b/Master/texmf-dist/doc/latex/prerex/doc/intro.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/intro.tex b/Master/texmf-dist/doc/latex/prerex/doc/intro.tex
index 6bb82be325b..05c1620c790 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}
+\title{Prerex-Formatted Prerequisite Charts\\[1ex]\Large An Introduction\\[0.5ex]\large \texttt{prerex} Version~6.0.6}
\date{}
\author{Bob Tennent\\School of Computing, Queen's University\\\texttt{rdt@cs.queensu.ca}}
@@ -302,8 +302,9 @@ shows hyperlinks
in a ``tooltip'' when the mouse hovers over it; this is a convenient way to get
the coordinates of course boxes and arrows while editing the description.
Recent versions of some of these viewing programs have the latter capability.
-The \texttt{vprerex} ``wrapper' for the \texttt{prerex} editor includes
-a built-in \texttt{prerex}-enabled PDF viewer.
+The \texttt{vprerex} ``wrapper'' for the \texttt{prerex} editor includes
+a built-in \texttt{prerex}-enabled PDF viewer that makes it extremely easy to
+transfer coordinates from the chart to the editor.
\section{Installing a Basic \LaTeX\ System}
@@ -489,7 +490,8 @@ The four Classico font files, renamed for use in \LaTeX, with the necessary supp
from CTAN\footnote{%
\myurl{ftp://tug.ctan.org/pub/tex-archive/nonfree/fonts/urw/classico.zip}}.
Note that the font files cannot be distributed commercially without a commercial license; please read the license in the archive
-before re-distributing them.
+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}
@@ -544,7 +546,7 @@ When a conventional arrow would be inappropriate, it is possible to use
a
\emph{mini}
course ``box'' (consisting of just a course code) just above a target box.
-A line of text may be placed anywhere on the chart.
+A line (or paragraph) of text may be placed anywhere on the chart.
A conventional two-dimensional
Cartesian coordinate system is used to specify the locations of
@@ -625,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)}
+\caption{\texttt{prerex} Command Summary (version 6.0.6)}
\label{help}
\end{table}
@@ -885,6 +887,13 @@ timetable information, and mini-course codes:
\verb|\newcommand{\smallersize}{\relsize{-3}}|
\end{list}
+The following command defines the baseline adjustment for the stand-alone arrows and boxes;
+this parameter is font-dependent.
+\begin{list}{}{}
+\item
+\verb|\newcommand{\baselineAdj}{-0.5ex}|
+\end{list}
+
\newpage
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex b/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex
index aad3583ce06..6ec2b607862 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex
+++ b/Master/texmf-dist/doc/latex/prerex/doc/introchart1.tex
@@ -2,7 +2,7 @@
\renewcommand{\rmdefault}{\sfdefault}
\setcounter{diagheight}{50}
\textwidth6.25in
-\begin{chart}\sl
+\begin{chart}
\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 a7ebd465dd7..0764ba8f186 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex
+++ b/Master/texmf-dist/doc/latex/prerex/doc/introchart2.tex
@@ -2,7 +2,7 @@
\renewcommand{\rmdefault}{\sfdefault}
\textwidth6.25in
\setcounter{diagheight}{50}
-\begin{chart}\sl
+\begin{chart}
\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 aefd176eaf3..749295af598 100644
--- a/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf
+++ b/Master/texmf-dist/doc/latex/prerex/doc/prerex.pdf
Binary files 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 db6fff2cef9..cb91489bdc7 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 2010-09-17 "prerex.sty-6.0" ""
+.TH PREREX.STY 7 2011-08-10 "prerex.sty-6.0.6" ""
.SH NAME
prerex.sty \- a LaTeX document style for prerequisite charts
.SH DESCRIPTION
@@ -225,6 +225,8 @@ the Adobe Reader.
Similarly, the coordinates of the source and target boxes of arrows
are displayed if the mouse hovers over the mid-point of an arrow,
Such coordinate displays make it easier to edit chart descriptions.
+When the grid is on, the mid-point of every arrow is highlighted by a
+"bullet".
.PP
The
.B prerex
@@ -314,7 +316,13 @@ and the thickness of bold boxes:
The following command is used to change to a smaller size for course codes,
timetable information, and mini-course codes:
.IP
-.BI \enewcommand{\esmallersize} {\erelsize{-3}}
+.BI \enewcommand{\esmallersize}{\erelsize{-3}}
+.LP
+.P
+The following command defines the baseline adjustment for the stand-alone arrows and boxes;
+this parameter is font-dependent.
+.IP
+.BI \enewcommand{\ebaselineAdj}{ -0.5ex }
.LP
.SH DEPEDENCIES
This implementation of
diff --git a/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex b/Master/texmf-dist/doc/latex/prerex/doc/prerex.tex
index 84488e50ff5..98a91eac5a0 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}}
+\title{\textsf{prerex.sty}: Prerequisite Charts in \LaTeX\\{\large Version 6.0.6}}
\author{R. D. Tennent\\\texttt{rdt@cs.queensu.ca}}
\date{\today}
\maketitle
@@ -35,7 +35,7 @@ interactive editor (as well as any conventional text editor).
\begin{figure}
\setcounter{diagheight}{40}
-\begin{chart}\sl
+\begin{chart}
\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}
@@ -270,6 +270,8 @@ status bar
in \texttt{xpdf} and \texttt{gpdf}, and in a
``tooltip'' in recent versions of \texttt{kpdf}/\texttt{okular}, \texttt{evince}, and the Acrobat Reader.
This coordinate display make it easier to edit chart descriptions.
+When the grid is on, the mid-point of every arrow is highlighted by
+a ``bullet''.
The
\texttt{prerex}
@@ -289,7 +291,7 @@ editor which incorporates a minimalistic prerex-enabled PDF viewer.
\begin{figure}
\setcounter{diagheight}{40}
-\begin{chart}\sl
+\begin{chart}
\grid
\text 15,40:{\textsf{\textbf{\Large Computer Science}}}
\reqfullcourse 50,35:{1083}{Comput.\,Sci.\\Concepts}{TTh 10:00}
@@ -471,6 +473,13 @@ timetable information, and mini-course codes:
\verb|\newcommand{\smallersize}{\relsize{-3}}|
\end{list}
+The following command defines the baseline adjustment for the stand-alone arrows and boxes;
+this parameter is font-dependent.
+\begin{list}{}{}
+\item
+\verb|\newcommand{\baselineAdj}{-0.5ex}|
+\end{list}
+
\section{Implementation Details}
\subsection{Boxes}
diff --git a/Master/texmf-dist/doc/latex/prerex/prerex-6.0.3.tar.gz b/Master/texmf-dist/doc/latex/prerex/prerex-6.0.3.tar.gz
deleted file mode 100644
index 2df3086e544..00000000000
--- a/Master/texmf-dist/doc/latex/prerex/prerex-6.0.3.tar.gz
+++ /dev/null
Binary files differ
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
new file mode 100644
index 00000000000..d9e25e7ceaf
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/prerex-6.0.4.tar.gz
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prerex/vprerex-6.0.1.tar.gz b/Master/texmf-dist/doc/latex/prerex/vprerex-6.0.1.tar.gz
new file mode 100644
index 00000000000..97b6c09d43c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prerex/vprerex-6.0.1.tar.gz
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prerex/vprerex-6.0.tar.gz b/Master/texmf-dist/doc/latex/prerex/vprerex-6.0.tar.gz
deleted file mode 100644
index 96189cfa6db..00000000000
--- a/Master/texmf-dist/doc/latex/prerex/vprerex-6.0.tar.gz
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/prerex/prerex.sty b/Master/texmf-dist/tex/latex/prerex/prerex.sty
index 6a7b2ff7cef..46d23896bad 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-10 R. D. Tennent, rdt@cs.queensu.ca
+%% Copyright (C) 2006-11 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
@@ -57,14 +57,24 @@
% \newcommand{\dashedwidth}{0.5pt}
% \newcommand{\boldwidth}{1.0pt}
% \newcommand{\smallersize}{\relsize{-3}}
+% \newcommand{\baselineAdj}{-0.5ex}
%
% The nominal diagram width is 10 + (\textwidth divided by \unit).
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2010/10/31 v6.0.4 LaTeX style for prerequisite charts, pgf version]
+\ProvidesPackage{prerex}[2011/08/10 v6.0.6 LaTeX style for prerequisite charts, pgf version]
% Changelog:
%
+% Version 6.0.6
+%
+% Provide \textbullet at mid-point of edges when grid is on.
+%
+% Version 6.0.5
+%
+% Changed TARGET attribute in AREA outputs to "new".
+% New configuration command \baselineAdj.
+%
% Version 6.0.4
%
% Added missing initializations of @dy to curved... macros.
@@ -194,7 +204,7 @@
\RequirePackage{ifthen}
\RequirePackage{textcomp}
\RequirePackage{zref-savepos}
-\PassOptionsToPackage{urlcolor=black,colorlinks}{hyperref}
+\PassOptionsToPackage{urlcolor=black,colorlinks,raiselinks}{hyperref}
\RequirePackage{hyperref}
\RequirePackage{xcolor}
@@ -212,6 +222,7 @@
\newcommand{\dottedwidth}{0.8pt}
\newcommand{\dashedwidth}{0.5pt}
\newcommand{\smallersize}{\relsize{-3}}
+\newcommand{\baselineAdj}{-0.5ex}
\newcounter{@myangle}
\newcounter{@inangle}
@@ -257,7 +268,7 @@
\addtocounter{ySE}{0 - \dpi * \ratio{\zposy{gridOrigin_\thechart}sp}{1in}}
\addtocounter{ySE}{0 - (#2 + #5) * \PixelsPerUnit } % subtract # of pixels from origin to node (+#5)
-\immediate\write\@imapfile{<area shape=rect coords="\thexNW,\theyNW,\thexSE,\theySE" href="\CourseURL{#1}{#2}{#3}" target="_new" alt="#3">}%
+\immediate\write\@imapfile{<area shape=rect coords="\thexNW,\theyNW,\thexSE,\theySE" href="\CourseURL{#1}{#2}{#3}" target="new" alt="#3">}%
}
\def\@halfcourse#1,#2:#3#4#5{%
@@ -390,13 +401,13 @@
\def\@straight#1,#2,#3,#4:{%
-\ifgridon
- \draw[draw=white,line width=1.5pt](x#1y#2) -- (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}};
-\else
\draw[draw=white,line width=1.5pt](x#1y#2) -- (x#3y#4) ;
-\fi
\draw[-latex',draw=white,very thin](x#1y#2) -- (x#3y#4) ;
- \draw[line width=\solidwidth](x#1y#2) -- (x#3y#4) ;
+ \ifgridon
+ \draw[line width=\solidwidth](x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4);
+ \else
+ \draw[line width=\solidwidth](x#1y#2) -- (x#3y#4) ;
+ \fi
}
@@ -411,23 +422,23 @@
\fi
\setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
\setcounter{@inangle}{180 - \the@myangle}
+ \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\ifgridon
- \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}} ;
+ \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
\else
- \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\fi
- \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
- \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
}
\def\@straightDashed#1,#2,#3,#4:{%
+\draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4);
+\draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4);
\ifgridon
- \draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}};
+ \draw[dashed,line width=\dashedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
\else
- \draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4);
+ \draw[dashed,line width=\dashedwidth] (x#1y#2) -- (x#3y#4);
\fi
-\draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4);
-\draw[dashed,line width=\dashedwidth] (x#1y#2) -- (x#3y#4);
}
\def\@curvedDashed#1,#2,#3,#4;#5:{
@@ -441,23 +452,23 @@
\fi
\setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
\setcounter{@inangle}{180 - \the@myangle}
+ \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\ifgridon
- \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}} ;
+ \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4);
\else
- \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4);
\fi
- \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
- \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
}
\def\@straightDotted#1,#2,#3,#4:{%
-\ifgridon
- \draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}};
-\else
\draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4);
-\fi
-\draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4);
-\draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- (x#3y#4);
+ \draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4);
+ \ifgridon
+ \draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
+ \else
+ \draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- (x#3y#4);
+ \fi
}
\def\@curvedDotted#1,#2,#3,#4;#5:{
@@ -471,36 +482,36 @@
\fi
\setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
\setcounter{@inangle}{180 - \the@myangle}
+ \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\ifgridon
- \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) node[midway] {\href{coord: #1,#2,#3,#4}{\quad}} ;
+ \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
\else
- \draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\fi
- \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
- \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
}
\def\solidarrow{%
-\tikz[x=\unit,y=\unit,baseline=-0.5ex]
+\tikz[x=\unit,y=\unit,baseline=\baselineAdj]
\draw[-latex',line width =\solidwidth] (0,0) -- (4,0);
}
\def\dottedarrow{%
-\tikz[x=\unit,y=\unit,baseline=-0.5ex]
+\tikz[x=\unit,y=\unit,baseline=\baselineAdj]
\draw[loosely dotted,line width=\dottedwidth,-latex'] (0,0) -- (4,0);
}
\def\dashedarrow{%
-\tikz[x=\unit,y=\unit,baseline=-0.5ex]
+\tikz[x=\unit,y=\unit,baseline=\baselineAdj]
\draw[dashed,line width=\dashedwidth,-latex'] (0,0) -- (4,0);
}
\def\lightbox{%
-\tikz[thin,baseline=-0.5ex]\node[draw,fill=\background,rounded corners=2pt,inner sep=1.5pt]
+\tikz[thin,baseline=\baselineAdj]\node[draw,fill=\background,rounded corners=2pt,inner sep=1.8pt]
{\textsf{light}};}
\def\boldbox{%
-\tikz[baseline=-0.65ex]\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner sep=1.8pt]
+\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner sep=1.8pt]
{\textsf{\textbf{bold}}};}
\def\@grid{