[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit d0c74f9d5fb2ecf25b902ec34b3754b6e21c0540
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Jul 22 10:58:42 2008 +1000

    Removed obsolete charset option for html doc generation
    
    darcs-hash:20080722005842-d4795-d9a35a6d4392bbb47351a99e02249f9478c30cd6.gz

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 1a44f61..3bf1553 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -57,7 +57,8 @@ examples: examples.dvi crossref.sh
 	rm -f $(DOC).html
 	mv -f $(DOC)[0-9][0-9][0-9].png $(DOC)
 ##	fixme: the character conversion below is a workaround for a bug in hevea version < 1.09
-	for f in *.html; do konwert iso1-utf8 < $$f > $(DOC)/$$f; rm -f $$f; done
+##	for f in *.html; do konwert iso1-utf8 < $$f > $(DOC)/$$f; rm -f $$f; done
+	mv -f *.html $(DOC)
 	cat $(DOC).css ../share/darcs.css > $(DOC)/$(DOC).css
 	sh ../share/fixnav.sh $(DOC)
 	cp -f ../share/contents.png ../share/next.png ../share/prev.png $(DOC)
diff --git a/doc/examples/gfs2doc.in b/doc/examples/gfs2doc.in
index 4ff71a6..cf2e83a 100755
--- a/doc/examples/gfs2doc.in
+++ b/doc/examples/gfs2doc.in
@@ -60,7 +60,7 @@ for d in sys.argv[1:]:
     os.mkdir(hname)
     os.symlink("../" + example.name, hname + "/" + example.name)
     if os.system("cd " + wdname + \
-		 "&& hevea -fix -charset ISO8859-1 " + example.name + ".tex" + \
+		 "&& hevea -fix " + example.name + ".tex" + \
 		 "&& imagen -res 600 -extra \"pnmscale 0.24\" " + example.name + " " + \
 		 "&& mv " + example.name + "[0-9][0-9][0-9].png " + example.name + ".html " + \
 		 hname + \

-- 
Gerris Flow Solver