From 83ebeb7edf0ca04c143ab437f1108207473e65c5 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Sat, 25 Jun 2011 18:46:20 +0200
Subject: [PATCH] nicer typesetting

---
 doc/main.tex         | 22 ++++++++++++----------
 doc/section_bsdf.tex |  1 -
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/doc/main.tex b/doc/main.tex
index 2f166f6d..9cd28251 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -5,9 +5,7 @@
 
 \usepackage[english]{babel}
 \usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{lmodern}
-\usepackage{charter}
+\usepackage[utf8]{inputenc}
 \usepackage{graphicx}
 \usepackage{array}
 \usepackage{booktabs}
@@ -15,8 +13,14 @@
 \usepackage{listings}
 \usepackage{amsmath}
 \usepackage{enumerate}
-\usepackage{calc}
-\usepackage[utf8]{inputenc}
+
+% Make sure that ligatures remain searchable in the PDF
+\input glyphtounicode
+\pdfgentounicode=1
+
+\IfFileExists{MinionPro.sty}
+   {\usepackage[opticals,fullfamily,lf]{MinionPro}}
+      {\message{Package MinionPro.sty was not found.}}
 
 \setcounter{secnumdepth}{3}
 \setcounter{tocdepth}{3}
@@ -38,9 +42,7 @@
 
 \typearea[current]{last}
 \raggedbottom
-
-\usepackage[expansion=false]{microtype}
-\UseMicrotypeSet[protrusion]{basictext}
+\usepackage[expansion=false, babel=true]{microtype}
 \renewcommand*\ttdefault{txtt}
 
 \usepackage{scrpage2}
@@ -61,7 +63,7 @@
 \definecolor{lstshade}{gray}{0.94}
 \definecolor{lstframe}{gray}{0.75}
 \definecolor{lstcomment}{gray}{0.5}
-\definecolor{lstattrib}{rgb}{0,0.25,0}
+\definecolor{lstattrib}{rgb}{0,0.34,0}
 
 % Cite a figure/listing
 \renewcommand{\lstlistingname}{Listing}
@@ -76,6 +78,7 @@
 
 % Listings settings
 \lstset{
+	basicstyle = \small\ttfamily\raggedright,
 	mathescape = true,
 	frame = lrtb,
 	backgroundcolor = \color{lstshade},
@@ -85,7 +88,6 @@
 	keepspaces,
 	belowskip = \smallskipamount,
 	framerule = .7pt,
-	basicstyle = \small\ttfamily\raggedright,
 	breaklines = true,
 	showstringspaces = false,
 	keywordstyle = \bfseries,
diff --git a/doc/section_bsdf.tex b/doc/section_bsdf.tex
index bcda4701..5484741d 100644
--- a/doc/section_bsdf.tex
+++ b/doc/section_bsdf.tex
@@ -11,7 +11,6 @@ the word \emph{BSDF} is used synonymously with the term ``surface
 scattering model''. This is an abbreviation for 
 \emph{Bidirectional Scattering Distribution Function}, a more 
 precise technical description of the model's properties.
-
 In Mitsuba, BSDFs are assigned to \emph{shapes}, which
 describe the visible surfaces in the scene. In the scene 
 description language, this assignment must