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

Stephane Popinet popinet at users.sf.net
Fri May 15 02:53:29 UTC 2009


The following commit has been merged in the upstream branch:
commit 229e5c584a76a8b8cf3c88dc90a545b4ec5c3f63
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Feb 20 14:14:13 2007 +1100

    Workaround for character encoding bug in hevea 1.08
    
    darcs-hash:20070220031413-d4795-87986837623557e271e89a681c85d20a3c6c17de.gz

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 24d3562..92a0ec8 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -42,11 +42,13 @@ clean-generic:
 DOC = examples
 
 examples: examples.ps.gz
-	hevea -fix -charset ISO8859-1 $(DOC).tex
+	hevea -fix $(DOC).tex
 	imagen -res 600 -extra "pnmscale 0.24" $(DOC)
 	hacha $(DOC).html
 	rm -f $(DOC).html
-	mv -f $(DOC)[0-9][0-9][0-9].png *.html $(DOC)
+	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
 	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/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index ff89580..bb52206 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -16,10 +16,12 @@ clean-generic:
 tutorial.tar.gz: tutorial.ps.gz
 	rm -r -f tutorial
 	sed 's/input{pdf.tex}/usepackage{graphicx}\\newcommand{\\gfx}{eps}/g' < tutorial.tex | sed "s/GFS_VERSION/`$(top_srcdir)/src/gerris2D -V 2>&1 | awk '{ if ($$5 == "version") print $$6}'`/g" | sed 's/\\today/'"`date +\"%B %e, %Y\"`/g" > tutorial1.tex
-	hevea -fix -charset ISO8859-1 tutorial1.tex
+	hevea -fix tutorial1.tex
 	imagen -res 600 -extra "pnmscale 0.24" tutorial1
 	mkdir tutorial
-	mv -f tutorial1[0-9][0-9][0-9].png tutorial1.html tutorial
+	mv -f tutorial1[0-9][0-9][0-9].png tutorial
+##	fixme: the character conversion below is a workaround for a bug in hevea version < 1.09
+	konwert iso1-utf8 < tutorial1.html > tutorial/tutorial1.html
 	cp ../share/darcs.css tutorial/tutorial.css
 	rm -f tutorial1.h{tml,aux,ind,toc} tutorial1.image.tex
 	tar cf tutorial.tar tutorial
diff --git a/test/Makefile.am b/test/Makefile.am
index 872b726..9f9a994 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,11 +38,13 @@ clean-generic:
 DOC = tests
 
 tests: tests.ps.gz
-	hevea -fix -charset ISO8859-1 $(DOC).tex
-	imagen -res 400 -extra "pnmscale 0.24" $(DOC)
+	hevea -fix $(DOC).tex
+	imagen -res 500 -extra "pnmscale 0.24" $(DOC)
 	hacha $(DOC).html
 	rm -f $(DOC).html
-	mv -f $(DOC)[0-9][0-9][0-9].png *.html $(DOC)
+	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
 	cat $(DOC).css ../doc/share/darcs.css > $(DOC)/$(DOC).css
 	sh ../doc/share/fixnav.sh $(DOC)
 	cp -f ../doc/share/contents.png ../doc/share/next.png ../doc/share/prev.png $(DOC)

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list