Refresh dotguide; fix bug 2505

diff --git a/doc/dotguide.pdf b/doc/dotguide.pdf
index 52ca1079236a784008ddb0c02c0530a1a1129d2a..0c5a33bc3a957076cd6821442aa8a9e8ab1af722 100644 (file)
Binary files a/doc/dotguide.pdf and b/doc/dotguide.pdf differ

diff --git a/doc/dotguide/Makefile b/doc/dotguide/Makefile
index 9ed63e9998f69f9b8db8c6a8fa892c590aacfbeb..1a0af64267df2fd33389549d54990be369484848 100644 (file)
--- a/doc/dotguide/Makefile
+++ b/doc/dotguide/Makefile
@@ -11,6 +11,7 @@ ARROWHEADFILES = \
     normal.pdf diamondarrow.pdf dot.pdf odot.pdf \
     inv.pdf invdot.pdf invodot.pdf \
     crow.pdf vee.pdf tee.pdf \
+    boxarrow.pdf curve.pdf icurve.pdf \
     no_arrow.pdf diamond.pdf
 
 GRAPHFILES =  \
@@ -47,5 +48,5 @@ dotguide.aux : dotguide.tex $(GRAPHFILES)
        pdflatex dotguide
 
 clean: 
-       rm -rf *.ps *.pdf *.log 
+       rm -rf *.ps *.pdf *.log  dotguide.aux dotguide.blg dotguide.bbl
 

diff --git a/doc/dotguide/boxarrow.dot b/doc/dotguide/boxarrow.dot
new file mode 100644 (file)
index 0000000..ca8dd67
--- /dev/null
+++ b/doc/dotguide/boxarrow.dot
@@ -0,0 +1,6 @@
+digraph G {
+  rankdir=LR;
+  T [shape=point];
+  H [label=""];
+  T -> H [arrowsize=1.5,arrowhead=box];
+}

diff --git a/doc/dotguide/curve.dot b/doc/dotguide/curve.dot
new file mode 100644 (file)
index 0000000..7806a16
--- /dev/null
+++ b/doc/dotguide/curve.dot
@@ -0,0 +1,7 @@
+digraph G {
+  rankdir=LR;
+  T [shape=point];
+  H [label=""];
+  T -> H [arrowsize=1.5,arrowhead=curve];
+}
+

diff --git a/doc/dotguide/dotguide.tex b/doc/dotguide/dotguide.tex
index 6e66130dfcfe5e0ed696fb0cdcd09efa8c8d1e98..0d77f6fd57af3da88728570689dee1f4f96a0fc4 100644 (file)
--- a/doc/dotguide/dotguide.tex
+++ b/doc/dotguide/dotguide.tex
@@ -8,7 +8,7 @@
 \def\dag{{\it dag}}
 \def\DOT{{\it DOT}}
 \def\graphviz{{\it Graphviz}}
-\newcommand{\lastedited}{December 11, 2014}
+\newcommand{\lastedited}{January 5, 2015}
 \date{\lastedited}
 \newcommand{\mymark}{{\it dot} User's Manual, \lastedited \hfil }
 \markboth{\mymark}{\mymark}
@@ -863,7 +863,7 @@ There are two types of ports. Ports based on the
 8 compass points {\tt "n"}, {\tt "ne"}, {\tt "e"}, {\tt "se"}, 
 {\tt "s"}, {\tt "sw"}, {\tt "w"} or  {\tt "nw"} can be specified
 for any node. The end of the
-node will then be aimed at that position on the node. Thus, if
+edge will then be aimed at that position on the node. Thus, if
 {\tt se} port is specified, the edge will connect to the node at
 its southeast ``corner''.
 
@@ -1194,7 +1194,7 @@ layout attributes appended.
 for {\it format} are:
 
 \begin{description}
-\item[{\tt bmp}] Windoes bitMap format.
+\item[{\tt bmp}] Windows bitmap format.
 \item[{\tt canon}]
 Prettyprint input; no layout is done.
 \item[{\tt dot}] 
@@ -1733,16 +1733,25 @@ these shapes can be found at the web site
 \end{center}
 \begin{center}
 \begin{tabular}{ccc}
-\includegraphics{normal} & \includegraphics{dot} & \includegraphics{odot} \\
-normal & dot & odot \\
-\includegraphics{inv} & \includegraphics{invdot} & \includegraphics{invodot} \\
-inv & invdot & invodot \\
+\includegraphics{normal} & \includegraphics{dot} & \includegraphics{inv} \\
+normal & dot & inv \\
 \includegraphics{crow} & \includegraphics{tee} & \includegraphics{vee} \\
 crow & tee & vee \\
-\includegraphics{diamond} & \includegraphics{no_arrow} & \\
-diamond & none & \\
+\includegraphics{diamondarrow} & \includegraphics{no_arrow} & \includegraphics{boxarrow} \\
+diamond & none & box \\
+\includegraphics{curve} & \includegraphics{icurve} & \\
+curve & icurve & \\
 \end{tabular}
 \end{center}
+Arrowhead descriptions support a simple grammar to allow more complex, derived shapes,
+such as the examples below.
+\begin{center}
+\begin{tabular}{ccc}
+\includegraphics{odot} & \includegraphics{invdot} & \includegraphics{invodot} \\
+odot & invdot & invodot \\
+\end{tabular}
+\end{center}
+The web page cited above describes this grammar in detail.
 
 \clearpage
 \section{Color Names}

diff --git a/doc/dotguide/icurve.dot b/doc/dotguide/icurve.dot
new file mode 100644 (file)
index 0000000..f084e77
--- /dev/null
+++ b/doc/dotguide/icurve.dot
@@ -0,0 +1,7 @@
+digraph G {
+  rankdir=LR;
+  T [shape=point];
+  H [label=""];
+  T -> H [arrowsize=1.5,arrowhead=icurve];
+}
+