From 574196d698f3e5437d19e6f9476046f2bf09156f Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Fri, 29 May 2009 19:28:17 +0200
Subject: update gipfelweb Makefile and html script

---
 examples/Makefile    |  8 +++++---
 examples/gipfel2html | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'examples')

diff --git a/examples/Makefile b/examples/Makefile
index 0c20df5..062c88c 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -26,11 +26,11 @@ dirs:
 	mkdir -p gipfelweb/gipfel
 
 gipfelweb/slides/%.jpg: %.jpg
-	anytopnm $< | pamscale -xyfit 10000 500 | pnmtojpeg -quality 94 > $@
+	anytopnm $< | pamscale -f lanczos -xyfit 20000 500 | pnmtojpeg -quality 94 > $@
 	jhead -te $< $@
 
 gipfelweb/thumbs/%.jpg: %.jpg
-	anytopnm $< | pamscale -xyfit 400 50 | pnmtojpeg -quality 80 > $@
+	anytopnm $< | pamscale -f point -xyfit 400 50 | pnmtojpeg -quality 80 > $@
 
 gipfelweb/gipfel/%.pos: %.jpg
 	gipfel -p $< > $@
@@ -41,13 +41,15 @@ gipfelweb/gipfel/%.imgs: gipfelweb/slides/%.jpg %.opts gipfelweb/gipfel/index.gi
 gipfelweb/gipfel/%.imgs: gipfelweb/slides/%.jpg gipfelweb/gipfel/index.gipfel
 	gipfel -V 0.05 -e gipfelweb/gipfel/index.gipfel $< > $@
 
+gipfelweb/gipfel/%.hills: gipfelweb/slides/%.jpg %.opts
+	gipfel `cat $*.opts` -E $< > $@
+
 gipfelweb/gipfel/%.hills: gipfelweb/slides/%.jpg
 	gipfel -V 0.05 -E $< > $@
 
 gipfelweb/gipfel/index.gipfel: $(positions)
 	cat $(positions) > gipfelweb/gipfel/index.gipfel
 
-
 gipfelweb/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.imgs %.title $(thumbs)
 	gipfel2html images "`cat $*.title`" $* > $@
 
diff --git a/examples/gipfel2html b/examples/gipfel2html
index b07f009..c8df477 100755
--- a/examples/gipfel2html
+++ b/examples/gipfel2html
@@ -100,12 +100,22 @@ cat << EOF
 </td></tr>
 </table>
 <br/>
-Move the mouse over the image to see other images of which the 
-viewpoint is visible.
-Move the mouse over the rectangle to see a thumbnail.
+<b>Created with <a href="http://www.ecademix.com/JohannesHofmann/gipfel.html">gipfel</a></b>
 <br/>
 <br/>
+EOF
+
+if [ "$MODE" = "images" ]; then
+	echo Move the mouse over the image to see other images.
+else
+	echo Move the mouse over the image to see known mountains.
+fi
 
+cat << EOF
+<br/>
+Move the mouse over the rectangle to see details.
+<br/>
+<br/>
 This image is visible on these images:<br/>
 EOF
 
-- 
cgit v1.2.3