X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makerules;h=4c57ce5a83e6472cf6b7d829877f724f9576d2ba;hb=cca27cd4ba53269697547653abe2843f0a7cb5c4;hp=797f6f3b93c0f840327434c319e833766786c919;hpb=b0e3282d9facb94fa903dc3ae65e3358bf3e63bb;p=ga.git

diff --git a/Makerules b/Makerules
index 797f6f3..4c57ce5 100644
--- a/Makerules
+++ b/Makerules
@@ -8,17 +8,23 @@ all: $P.ps
 #%.pdf: %.tex ../sgr.tex ../ga.bib
 #	pdfcsplain $<
 
-%.pdf: %.ps
-	ps2pdf $< $@
-
 %.ps: %.dvi
 	dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
 
-%-booklet.ps: %.ps
-	psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+#%-booklet.ps: %.ps
+#	psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+
+#%-2in1.ps: %.ps
+#	pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+
+%.pdf: %.ps
+	ps2pdf $< $@
+
+%-2in1.pdf: %.pdf
+	pspdftool 'nup(2, paper=a4)' $< $@
 
-%-2in1.ps: %.ps
-	pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+%-booklet.pdf: %.pdf
+	pspdftool 'book nup(2, paper=a4)' $< $@
 
 mostlyclean:
 	rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg *.toc
@@ -28,8 +34,8 @@ clean:: mostlyclean
 
 ifndef CUSTOM_UPLOAD
 upload::
-	make $P-booklet.ps
-	scp -C $P-booklet.ps jabberwock:www/vyuka/ga/$P-booklet.ps
+	make $P-booklet.pdf
+	scp -C $P-booklet.pdf jabberwock:www/vyuka/ga/
 endif
 
 .SECONDARY: