diff --git a/doc/source/global.make b/doc/source/global.make index 41825e2..6580aa8 100644 --- a/doc/source/global.make +++ b/doc/source/global.make @@ -18,6 +18,9 @@ env = openout_any=a openin_any=a %.dvi : %.tex $(env) latex -halt-on-error -interaction=nonstopmode -output-format=dvi $< -# xfig used to produce/maintain figures. this converts to eps +# xfig used to produce/maintain figures. These convert to usable formats. %.eps: %.fig fig2dev -L eps <$< >$@ + +%.pdf: %.fig + fig2dev -L pdf <$< >$@ diff --git a/doc/source/ic_user/ic_user.tex b/doc/source/ic_user/ic_user.tex index ac76369..8de617c 100644 --- a/doc/source/ic_user/ic_user.tex +++ b/doc/source/ic_user/ic_user.tex @@ -5,7 +5,7 @@ %% Mods: 01 Sep 2013 : Converted from {X}fm source %% ============================================================================================ -\documentclass[letterpaper,8pt]{paper} +\documentclass[letterpaper]{paper} %\author{E.~Scott~Daniels} \title{Inception Cloud User's Guide} \usepackage{graphicx} diff --git a/doc/source/ic_user/makefile b/doc/source/ic_user/makefile index 16f9983..3b718c4 100644 --- a/doc/source/ic_user/makefile +++ b/doc/source/ic_user/makefile @@ -21,12 +21,12 @@ promote:: $(build_list) cp $$f ../;\ done -ic_user.pdf:: ic_user.tex $(sec_list:%=%.tex) $(fig_list:%=%.eps) +ic_user.pdf:: ic_user.tex $(sec_list:%=%.tex) $(fig_list:%=%.pdf) # everything except final doc files clean: - rm -f *converted-to.pdf *.eps *.aux *.log || true + rm -f $(fig_list:%=%.pdf) *.eps *.aux *.log || true # everything except the source nuke: - rm -f $(build_list) *converted-to.pdf *.eps *.aux *.log || true + rm -f $(build_list) $(fig_list:%=%.pdf) *.eps *.aux *.log || true diff --git a/doc/source/ic_user/running.tex b/doc/source/ic_user/running.tex index 56094ed..7d657db 100644 --- a/doc/source/ic_user/running.tex +++ b/doc/source/ic_user/running.tex @@ -20,7 +20,7 @@ The following sections describe how orchestrator is used. \begin{figure} \centering - \includegraphics[width=\linewidth]{start_overview.eps} + \includegraphics[width=\linewidth]{start_overview.pdf} \tiny \caption{\small The environment, after orchestrator has created ICVMs, showing the communication path between orchestrator and the ICVMs. \label{fg_overview} \normalsize @@ -179,7 +179,7 @@ The admin user ID and password are admin/admin by default. \begin{figure} \centering - \includegraphics[width=\linewidth]{inception_final.eps} + \includegraphics[width=\linewidth]{inception_final.pdf} \caption{ \small The virtual environment after cleanup showing path of browser traffic with the dashboard. \label{fg_final}\normalsize diff --git a/doc/source/ic_user/using.tex b/doc/source/ic_user/using.tex index c1d452f..b443226 100644 --- a/doc/source/ic_user/using.tex +++ b/doc/source/ic_user/using.tex @@ -10,7 +10,7 @@ OpenStack (virtual plane) environment. \begin{figure}[!ht] \centering - \includegraphics[width=\linewidth]{inception_planes.eps} + \includegraphics[width=\linewidth]{inception_planes.pdf} \tiny \caption{\small The relationship between the inception plane and the virtual plane. \label{fg_planes}\normalsize