# HG changeset patch
# User Shingo W. Kagami
# Date 1284843348 -32400
# Node ID 105778ace30acd8c00b41091f284ae1c92b19f30
# Parent  8b90d57759c9b83c7203611ad50c7586caecbca2
Have ppt_printout_ps.vbs take the printer name as an argument.
Misc. changes in Makefile.sample.

diff -r 8b90d57759c9 -r 105778ace30a tex/Makefile.sample
--- a/tex/Makefile.sample	Mon Sep 13 03:54:21 2010 +0900
+++ b/tex/Makefile.sample	Sun Sep 19 05:55:48 2010 +0900
@@ -6,16 +6,18 @@
 
 PRN2EPS = c:/cygwin/home/swk/lib/tex/prn2eps.pl
 PPTPRINT = c:/cygwin/home/swk/lib/tex/ppt_printout_ps.vbs
+PRINTER = "Generic PostScript Writer"
 
 dvi: $(TARGET).dvi
 pdf: $(TARGET).pdf
 
-# $(TARGET).pdf: $(TARGET).dvi
+#$(TARGET).pdf: $(TARGET).dvi
 #	dvipsk -Pdl $(TARGET).dvi
 #	-pdfclose --file $(TARGET).pdf
 #	cygstart $(TARGET).ps
 #	@while test ! -e $(TARGET).pdf; do echo -n .; sleep 2; done
 #	rm $(TARGET).ps
+#	pdfopen --file $(TARGET).pdf --back
 
 $(TARGET).pdf: $(TARGET).dvi
 	-pdfclose --file $(TARGET).pdf
@@ -27,10 +29,10 @@
 #	jbibtex $(TARGET)
 #	platex $(TARGET)
 	platex $(TARGET)
-	grep Warning $(TARGET).log
+	-grep Warning $(TARGET).log
 
 %.md5: %.prn
 	$(PRN2EPS) $<
 
 %.prn: %.ppt
-	wscript $(PPTPRINT) `cygpath -wa $<` `cygpath -wa $*.prn` > $*.note.txt
+	wscript $(PPTPRINT) $(PRINTER) `cygpath -wa $<` `cygpath -wa $*.prn` > $*.note.txt
diff -r 8b90d57759c9 -r 105778ace30a tex/ppt_printout_ps.vbs
--- a/tex/ppt_printout_ps.vbs	Mon Sep 13 03:54:21 2010 +0900
+++ b/tex/ppt_printout_ps.vbs	Sun Sep 19 05:55:48 2010 +0900
@@ -1,10 +1,12 @@
+Dim printer
 Dim filein
 Dim fileout
-If WScript.Arguments.Count <> 2 then
+If WScript.Arguments.Count <> 3 then
    WScript.quit
 End If
-filein = WScript.Arguments.item(0)
-fileout = WScript.Arguments.item(1)
+printer = WScript.Arguments.item(0)
+filein = WScript.Arguments.item(1)
+fileout = WScript.Arguments.item(2)
 
 Dim pptApp
 Dim pptPres
@@ -19,7 +21,7 @@
  .PrintColorType = ppPrintColor
  .FitToPage = msoFalse
  .FrameSlides = msoFalse
- .ActivePrinter = "Generic PostScript Writer"
+ .ActivePrinter = printer
  .PrintInBackground = False 
 End With
 pptPres.PrintOut , , fileout