modify makefile in tex-zh, make it right for creating pdf

hanjunchao · hanjunchao · commit f9cf4cb5ef8a · 2010-10-25T22:44:18.000+08:00
diff --git a/thinkpython/tex-zh/Makefile b/thinkpython/tex-zh/Makefile
@@ -17,14 +17,14 @@ PDFFLAGS = -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress \
 	ps2pdf $(PDFFLAGS) $<
 
 all:	book.tex
-	xetex book
+	xelatex book
 	makeindex book
-	xetex book
-	dvips -t letter -Ppdf -o thinkpython.ps book
+	xelatex book
+#	dvips -t letter -Ppdf -o thinkpython.ps book
 #	dvips -T 6.75in,9.25in -Ppdf -o thinkpython.ps book
 #	dvips -t b5 -Ppdf -o thinkpython.ps book
 #	dvips -T 7in,10in -Ppdf -o thinkpython.ps book
-	gv thinkpython.ps
+#	gv thinkpython.ps
 
 html:	book.tex header.html footer.html
 	rm -rf html
diff --git a/thinkpython/tex-zh/book.tex b/thinkpython/tex-zh/book.tex
@@ -15,8 +15,7 @@
 %
 
 \documentclass[10pt]{book}
-\usepackage[width=5.5in,height=8.5in,
-	hmarginratio=3:2,vmarginratio=1:1]{geometry} %指定了{h,v}marginratio,width和height被忽略了，可以不用指定(参考geometry.pdf, $texdoc geometry.pdf)。
+\usepackage[width=5.5in,height=8.5in,hmarginratio=3:2,vmarginratio=1:1]{geometry} %指定了{h,v}marginratio,width和height被忽略了，可以不用指定(参考geometry.pdf, $texdoc geometry.pdf)。
 
 %下面的这些包，你可能需要安装texlive-latex-extra（in Debian/Ubuntu)
 \usepackage{pslatex}  %

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`%`
`16`	`16`
`17`	`17`	`\documentclass[10pt]{book}`
`18`		`-\usepackage[width=5.5in,height=8.5in,`
`19`		`- hmarginratio=3:2,vmarginratio=1:1]{geometry} %指定了{h,v}marginratio,width和height被忽略了，可以不用指定(参考geometry.pdf, $texdoc geometry.pdf)。`
	`18`	`+\usepackage[width=5.5in,height=8.5in,hmarginratio=3:2,vmarginratio=1:1]{geometry} %指定了{h,v}marginratio,width和height被忽略了，可以不用指定(参考geometry.pdf, $texdoc geometry.pdf)。`
`20`	`19`
`21`	`20`	`%下面的这些包，你可能需要安装texlive-latex-extra（in Debian/Ubuntu)`
`22`	`21`	`\usepackage{pslatex} %`