summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Daniels <daniels@research.att.com>2013-09-18 16:14:57 -0400
committerScott Daniels <daniels@research.att.com>2013-09-18 16:24:12 -0400
commite19ee84e503eb0748083a86b3132d7c2d00410eb (patch)
treeb16b9add193932722d5bb600690b13b6f8764e06
parent5a3a0f0581f7e9d70937d198aa26ed7635874ae9 (diff)
Illustrations are now generated into PDF files to support older versions of tex
Versions of LaTex prior to 2010 do not supprot the inclusion of encapsulated postscript files. Changes have been made to generate PDF files for each of the illustrations in the document, clean up these temporary PDF files when `make clean` is executed, and to embed them rather than .eps files when the document is compiled. Change-Id: I2a802a82cb0ead4eb379f81f0a1ed441ce2967f1
Notes
Notes (review): Verified+2: Jenkins Approved+1: Andrew Forrest <forrest@research.att.com> Code-Review+2: Andrew Forrest <forrest@research.att.com> Submitted-by: Jenkins Submitted-at: Wed, 18 Sep 2013 20:31:40 +0000 Reviewed-on: https://review.openstack.org/47245 Project: stackforge/inception Branch: refs/heads/master
-rw-r--r--doc/source/global.make5
-rw-r--r--doc/source/ic_user/ic_user.tex2
-rw-r--r--doc/source/ic_user/makefile6
-rw-r--r--doc/source/ic_user/running.tex4
-rw-r--r--doc/source/ic_user/using.tex2
5 files changed, 11 insertions, 8 deletions
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
18%.dvi : %.tex 18%.dvi : %.tex
19 $(env) latex -halt-on-error -interaction=nonstopmode -output-format=dvi $< 19 $(env) latex -halt-on-error -interaction=nonstopmode -output-format=dvi $<
20 20
21# xfig used to produce/maintain figures. this converts to eps 21# xfig used to produce/maintain figures. These convert to usable formats.
22%.eps: %.fig 22%.eps: %.fig
23 fig2dev -L eps <$< >$@ 23 fig2dev -L eps <$< >$@
24
25%.pdf: %.fig
26 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 @@
5%% Mods: 01 Sep 2013 : Converted from {X}fm source 5%% Mods: 01 Sep 2013 : Converted from {X}fm source
6%% ============================================================================================ 6%% ============================================================================================
7 7
8\documentclass[letterpaper,8pt]{paper} 8\documentclass[letterpaper]{paper}
9%\author{E.~Scott~Daniels} 9%\author{E.~Scott~Daniels}
10\title{Inception Cloud User's Guide} 10\title{Inception Cloud User's Guide}
11\usepackage{graphicx} 11\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)
21 cp $$f ../;\ 21 cp $$f ../;\
22 done 22 done
23 23
24ic_user.pdf:: ic_user.tex $(sec_list:%=%.tex) $(fig_list:%=%.eps) 24ic_user.pdf:: ic_user.tex $(sec_list:%=%.tex) $(fig_list:%=%.pdf)
25 25
26# everything except final doc files 26# everything except final doc files
27clean: 27clean:
28 rm -f *converted-to.pdf *.eps *.aux *.log || true 28 rm -f $(fig_list:%=%.pdf) *.eps *.aux *.log || true
29 29
30# everything except the source 30# everything except the source
31nuke: 31nuke:
32 rm -f $(build_list) *converted-to.pdf *.eps *.aux *.log || true 32 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.
20 20
21\begin{figure} 21\begin{figure}
22 \centering 22 \centering
23 \includegraphics[width=\linewidth]{start_overview.eps} 23 \includegraphics[width=\linewidth]{start_overview.pdf}
24 \tiny 24 \tiny
25 \caption{\small The environment, after orchestrator has created ICVMs, showing the communication path between orchestrator and the ICVMs. 25 \caption{\small The environment, after orchestrator has created ICVMs, showing the communication path between orchestrator and the ICVMs.
26 \label{fg_overview} \normalsize 26 \label{fg_overview} \normalsize
@@ -179,7 +179,7 @@ The admin user ID and password are admin/admin by default.
179 179
180\begin{figure} 180\begin{figure}
181 \centering 181 \centering
182 \includegraphics[width=\linewidth]{inception_final.eps} 182 \includegraphics[width=\linewidth]{inception_final.pdf}
183 \caption{ 183 \caption{
184 \small The virtual environment after cleanup showing path of browser traffic with the dashboard. 184 \small The virtual environment after cleanup showing path of browser traffic with the dashboard.
185 \label{fg_final}\normalsize 185 \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.
10 10
11\begin{figure}[!ht] 11\begin{figure}[!ht]
12 \centering 12 \centering
13 \includegraphics[width=\linewidth]{inception_planes.eps} 13 \includegraphics[width=\linewidth]{inception_planes.pdf}
14 \tiny 14 \tiny
15 \caption{\small The relationship between the inception plane and the virtual plane. 15 \caption{\small The relationship between the inception plane and the virtual plane.
16 \label{fg_planes}\normalsize 16 \label{fg_planes}\normalsize