Merge; make prose nicer

.hgignore

@@ -4,12 +4,12 @@ syntax: glob
 
 *.depend
 *.vo
-*/Makefile.coq
-*/.coq_globals
+Makefile.coq
+.coq_globals
 
 */coqdoc.sty
 */cpdt.*
 */*.log
 
-book/html/coqdoc.css
-book/html/*.html
+html/coqdoc.css
+html/*.html

Makefile

@@ -21,7 +21,7 @@ clean:: Makefile.coq
 	rm -f Makefile.coq .depend $(GLOBALS) \
 		latex/*.sty latex/cpdt.*
 
-doc: latex/cpdt.dvi html
+doc: latex/cpdt.dvi latex/cpdt.pdf html
 
 latex/cpdt.tex: $(VS)
 	cd src ; coqdoc --latex $(VS_DOC) \
@@ -31,6 +31,9 @@ latex/cpdt.tex: $(VS)
 latex/cpdt.dvi: latex/cpdt.tex
 	cd latex ; latex cpdt ; latex cpdt
 
+latex/cpdt.pdf: latex/cpdt.dvi
+	cd latex ; pdflatex cpdt
+
 html: $(VS)
 	cd src ; coqdoc $(VS_DOC) -toc \
 		--glob-from ../$(GLOBALS) \