From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 21 Apr 2016 15:39:16 +0000 (+0200)
Subject: and back to pdflatex:p
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=35b20109eb2257ce8f2c4fab4f3a548b40e4c200;p=mc1516pa.git

and back to pdflatex:p
---

diff --git a/report2/.gitignore b/report2/.gitignore
index 0cbdd0c..7b76df3 100644
--- a/report2/.gitignore
+++ b/report2/.gitignore
@@ -2,6 +2,5 @@
 *.log
 *.aux
 *.fmt
-*.eps
 *.toc
-*.dvi
+*.png
diff --git a/report2/Makefile b/report2/Makefile
index 6ab35a3..0298273 100644
--- a/report2/Makefile
+++ b/report2/Makefile
@@ -1,24 +1,21 @@
-LATEX:=latex
+LATEX:=pdflatex
 DOCUMENT:=report
-GRAPHS:=toy.eps toy2.eps toy3.eps
+GRAPHS:=toy.png toy2.png toy3.png
 
 .PHONY: all clean
 .SECONDARY: $(DOCUMENT).fmt $(GRAPHS)
 
 all: $(DOCUMENT).pdf
 
-%.dvi: %.tex %.fmt implementation.tex results.tex $(GRAPHS)
+%.pdf: %.tex %.fmt implementation.tex results.tex $(GRAPHS)
 	$(LATEX) $<
 	$(LATEX) $<
 
-%.pdf: %.dvi
-	dvipdfm $<
-
-%.eps: %.dot
-	dot -Teps $< > $@
+%.png: %.dot
+	dot -Tpng $< > $@
 
 %.fmt: pre.tex
 	$(LATEX) -ini -shell-escape -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
 clean:
-	$(RM) -rv $(addprefix $(DOCUMENT).,fmt log aux dvi) *.pdf *.dvi *.eps
+	$(RM) -rv $(addprefix $(DOCUMENT).,fmt log aux dvi pdf) *.png
diff --git a/report2/implementation.tex b/report2/implementation.tex
index f694ab4..40bef7f 100644
--- a/report2/implementation.tex
+++ b/report2/implementation.tex
@@ -91,7 +91,7 @@ Figure~\ref{fig:toy}. Variables $0, 2, 4$ represent $i_1$, $6, 8, 10$ represent
 $i_2$ and lastly $12, 14, 16$ represents $i_3$.
 \begin{figure}[p]
 	\centering
-	\includegraphics[scale=0.1]{toy.eps}
+	\includegraphics[width=\textwidth]{toy.png}
 	\caption{Initial state encoding of the example~\label{fig:toy}}
 \end{figure}
 
@@ -101,7 +101,7 @@ the BDD shown in Figure~\ref{fig:toy2}.
 
 \begin{figure}[p]
 	\centering
-	\includegraphics[scale=0.1]{toy2.eps}
+	\includegraphics[width=.5\textwidth]{toy2.png}
 	\caption{Goal state encoding of the example~\label{fig:toy2}}
 \end{figure}
 
@@ -116,7 +116,7 @@ values $0, 0, 1$ thus encoding free.
 
 \begin{figure}[p]
 	\centering
-	\includegraphics[scale=0.1]{toy3.eps}
+	\includegraphics[width=.8\textwidth]{toy3.png}
 	\caption{Sub-BDD of a move~\label{fig:toy3}}
 \end{figure}
 
diff --git a/report2/pre.tex b/report2/pre.tex
index 06b1825..7662be6 100644
--- a/report2/pre.tex
+++ b/report2/pre.tex
@@ -1,9 +1,9 @@
 \documentclass{article}
 
-\usepackage{a4wide}
 \usepackage{amsmath}
 \usepackage{amssymb}
 \usepackage{booktabs}
+\usepackage[a4paper]{geometry}
 \usepackage{graphicx}
 \usepackage{listings}
 
diff --git a/report2/toy2.dot b/report2/toy2.dot
index 7c94229..c564abb 100644
--- a/report2/toy2.dot
+++ b/report2/toy2.dot
@@ -4,8 +4,8 @@ digraph "DD" {
 	graph [dpi = 300];
 	node [nodesep=0.75];
 	edge[weight=2, dir=forward];
-	"0" [shape=box, label="F", style=filled, shape=box, height=0.3, width=0.3];
-	"8000000000000000" [shape=box, label="T", style=filled, shape=box, height=0.3,
+	"0" [shape=box, label="F", style=filled, height=0.3, width=0.3];
+	"8000000000000000" [shape=box, label="T", style=filled, height=0.3,
 	width=0.3];
 	root [style=invis];
 	root -> "1b" [style=solid];
diff --git a/report2/toy3.dot b/report2/toy3.dot
index 0905394..e9f44f1 100644
--- a/report2/toy3.dot
+++ b/report2/toy3.dot
@@ -4,7 +4,7 @@ digraph DD {
 	graph [dpi = 300];
 	node [nodesep=0.75];
 	edge[weight=2, dir=forward];
-	t [label="...", style=filled, shape=box, height=0.3, width=0.3];
+	t [label="...", style=filled, shape=triangle, height=0.3, width=0.3];
 	f [label="F", style=filled, shape=box, height=0.3, width=0.3];
 	root [style=invis];
 	root -> "0" [style=solid];