[m-rev.] Make minor corrections to the Mercury Tutorial

[Paul Bone]

I asked Thibaut about the spelling of Et voil\`a.

---

Make minor corrections to the Mercury Tutorial.

01-mercury-by-example.polytex:
hello-world.tex:
    Fix the spelling of Et Voila!  The 'a' has a ` symbol.

Makefile:
    Fix the use of .PHONY
    
    Make all the first target and therefore the default target.

    Generate PDF output via pdfdvi rather than pdflatex.

book.tex:
    This is an intermediate file generated from book.polytex, it has been
    removed from version control.

    Also note that the last version of this file in CVS doesn't match that
    generated by 'make'.  It seems that a substitution rule was inconsistently
    applied.

    This is not shown in the diff.

Index: 01-mercury-by-example.polytex
===================================================================
RCS file: /home/mercury1/repository/books/tutorial/01-mercury-by-example.polytex,v
retrieving revision 1.4
diff -u -p -b -r1.4 01-mercury-by-example.polytex
--- 01-mercury-by-example.polytex	8 Jan 2009 05:15:14 -0000	1.4
+++ 01-mercury-by-example.polytex	29 Jun 2010 00:05:23 -0000
@@ -96,7 +96,7 @@ Making hello
 $ ./hello
 Hello, World!
 %endcode
-Et voila!  (By default, #mmc --make# will construct a local #Mercury#
+Et voil\`a!  (By default, #mmc --make# will construct a local #Mercury#
 directory, if necessary, to hold intermediate files generated during
 compilation.)
 
Index: Makefile
===================================================================
RCS file: /home/mercury1/repository/books/tutorial/Makefile,v
retrieving revision 1.5
diff -u -p -b -r1.5 Makefile
--- Makefile	19 Jun 2006 08:22:42 -0000	1.5
+++ Makefile	29 Jun 2010 01:57:32 -0000
@@ -1,17 +1,18 @@
-.PHONY: book.dvi book.ps book.pdf
-
+.PHONY: all
 
+all: book.dvi book.ps book.pdf
 
-book.dvi:
+book.dvi: book.polytex
 	for i in *.polytex; do echo "$$(ls -l $$i | gawk '{print "Last edited", $$6, $$7, $$8}')" > $$i.date; done
 	./create-diffs-if-necessary
 	./polytex book.polytex
 
 book.ps: book.dvi
-	dvips book.dvi
+	dvips book
+
+book.ps.gz: book.ps
 	gzip -c book.ps > book.ps.gz
 
-book.pdf: book.ps
-	pdflatex book.tex
+book.pdf: book.dvi
+	dvipdf book
 
-all: book.dvi book.ps book.pdf
Index: hello-world.tex
===================================================================
RCS file: /home/mercury1/repository/books/tutorial/hello-world.tex,v
retrieving revision 1.4
diff -u -p -b -r1.4 hello-world.tex
--- hello-world.tex	16 Apr 2003 02:11:53 -0000	1.4
+++ hello-world.tex	29 Jun 2010 01:47:40 -0000
@@ -140,7 +140,7 @@ We build and run the @hello@ program lik
 > ./hello
   Hello, World!
 \end{myverbatim}
-Et voila!
+Et voil\`a!
 
 \subsection{Goals and Conjunctions}
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 489 bytes
Desc: Digital signature
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20100629/77d614b5/attachment.sig>