Various small fixes.

[doc/ips] / ips.tex

diff --git a/ips.tex b/ips.tex
index 8702127..47c8f96 100644 (file)
--- a/ips.tex
+++ b/ips.tex
@@ -2,8 +2,7 @@
 %%%
 %%% Main document sequencing for IPS course
 
-\ifx\printslides\notdef\documentclass[a4, article, twoside]{seminar}\fi
-\usepackage{ips}
+\documentclass{ips}
 
 \title{Introduction to Provable Security}
 \author{Mark Wooding}
@@ -39,8 +38,7 @@
 %% \include{zk}
 %% \include{chan}
 
-\section{Answers to exercises}
-\answers
+\ifipsanswers\section{Answers to exercises}\answers\fi
 
 \section{Acknowledgements}
 
@@ -48,10 +46,11 @@ A great deal of the material covered here, particularly the earlier stuff, is
 derived from \cite{Goldwasser:1999:LNC}.  Of course, any errors are mine
 alone.
 
-\ifarticle\bibliography{cryptography,mdw-crypto}\else
+\xcalways\def\bibl{\bibliography{mdw-crypto,cryptography2000,cryptography}}\x
+\ifarticle\bibl\else
 \begin{slide}
   \head{References} \sectionmark{References}
-  \bibliography{cryptography,mdw-crypto}
+  \bibl
 \end{slide}
 \fi