From effbe773a8326c575a28cfefb23efc57ef79cb73 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Thu, 4 Aug 2011 12:43:53 -0400
Subject: [PATCH] latex compatibility fixes for systems that don't have
 MinionPro

---
 doc/compiling.tex | 15 +++++++++------
 doc/macros.sty    | 10 +++++++---
 doc/main.tex      |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/doc/compiling.tex b/doc/compiling.tex
index c1e7be0a..3c53f63a 100644
--- a/doc/compiling.tex
+++ b/doc/compiling.tex
@@ -136,17 +136,20 @@ in the root directory.
 \subsubsection{Releasing Ubuntu packages}
 To redistribute Ubuntu packages over the Internet, it is convenient to 
 put them into an \code{apt}-compatible repository. To prepare such a
-repository, put the two \code{deb}-files built in the last section, as well as the 
-\code{collada-dom} \code{deb}-files into a new directory and inside
-it, run
+repository, put the two \code{deb}-files built in the last section, 
+as well as the \code{collada-dom} \code{deb}-files into a public directory 
+made available by a HTTP server and inside it, run
 \begin{shell}
-$\text{\$}$ dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
+$path-to-htdocs\text{\$}$ dpkg-scanpackages path/to/deb-directory /dev/null | gzip -9c > path/to/deb-directory/Packages.gz
 \end{shell}
 This will create a respository index file named \code{Packages.gz}.
-Finally, the whole directory can be uploaded to some public location
+Note that you must execute this command in the root directory of the
+HTTP server's web directory and provide the relative path to the 
+package files -- otherwise, the index file will specify the wrong package 
+paths. Finally, the whole directory can be uploaded to some public location
 and then referenced by placing a line following the pattern
 \begin{shell}
-deb http://<url-to-package-directory> ./
+deb http://<path-to-deb-directory> ./
 \end{shell}
 into the \code{/etc/apt/sources.list} file.
 
diff --git a/doc/macros.sty b/doc/macros.sty
index 50e8e495..fc0cd8d4 100644
--- a/doc/macros.sty
+++ b/doc/macros.sty
@@ -27,7 +27,11 @@
 \newcolumntype{P}[1]{>{\RaggedRight\hspace{0pt}}p{#1}}
 \newcommand{\MtsVer}{\color{lstattrib}\texttt{"\MitsubaVersion"}}
 
-\newcommand{\showbreak}{$\rhookswarrow$ }
+
+\IfFileExists{MinionPro.sty}
+   {\newcommand{\showbreak}{$\rhookswarrow$ }}
+   {\newcommand{\showbreak}{$\hookleftarrow$ }}
+
 \newcommand{\parheader}[1]{\vspace{2mm}\textbf{\color{myblue}#1}}
 
 \newcommand{\otoprule}{\midrule[.8pt]}
@@ -35,7 +39,7 @@
 \newcommand{\parameters}[1]{
 	\setlength\fboxrulebackup\fboxrule
 	\setlength\fboxrule{0.8pt}
-	\begin{figure}[h]\centering\arrayrulecolor{lstframe}
+	\begin{figure}[htbp]\centering\arrayrulecolor{lstframe}
 	\fcolorbox{lstframe}{lstshade}{\begin{tabular}{@{\hspace{3mm}}P{3cm}P{2.2cm}p{8.3cm}@{\hspace{3mm}}}
  		%\toprule
 		\\[-2.2ex]
@@ -48,7 +52,7 @@
 	}
 	
 \newcommand{\renderings}[1]{
-	\begin{figure}[h!]
+	\begin{figure}[htbp!]
 		\setcounter{subfigure}{0}
 		\centering
 		\hfill
diff --git a/doc/main.tex b/doc/main.tex
index 21cffd0d..8cb6c783 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -31,7 +31,7 @@
 
 \IfFileExists{MinionPro.sty}
    {\usepackage[opticals,fullfamily,lf]{MinionPro}}
-      {\message{Package MinionPro.sty was not found.}}
+   {\usepackage{charter}\message{Package MinionPro.sty was not found. Reverting to charter.}}
 
 \setcounter{secnumdepth}{3}
 \setcounter{tocdepth}{3}