From dd42bfc2ad1775d98f125d4804d158f641ff0781 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Wed, 21 Jul 1999 17:13:06 +0200
Subject: [PATCH] jpg -> jpeg
Rev: tutorial/Gfx.pmod:1.8
Rev: tutorial/Makefile:1.44
Rev: tutorial/pdflatex.pike:1.5
---
tutorial/Gfx.pmod | 8 ++++----
tutorial/Makefile | 8 +++-----
tutorial/pdflatex.pike | 1 +
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/tutorial/Gfx.pmod b/tutorial/Gfx.pmod
index 45fa5a0835..26032d4c52 100644
--- a/tutorial/Gfx.pmod
+++ b/tutorial/Gfx.pmod
@@ -54,9 +54,9 @@ string mkgif(mixed o,void|mapping options)
string mkjpg(mixed o,void|mapping options)
{
- if(!options) options=([]);
+ if(!options) options=(["quality":100]);
string g=Image.JPEG.encode(o,options);
- return cached_write(g,"jpg");
+ return cached_write(g,"jpeg");
}
#define PAPER_COLOUR 255,255,255
@@ -254,7 +254,7 @@ mapping read_image(string file, float|void wanted_dpi)
string gettext(string s)
{
string tmp=(s/".")[-1];
- if(tmp=="jpeg") tmp="jpg";
+ if(tmp=="jpeg") tmp="jpeg";
return tmp;
}
@@ -466,7 +466,7 @@ array convert(mapping params,
switch(fmt)
{
case "gif": ret=mkgif(o->image,o); break;
- case "jpg": ret=mkjpg(o->image,o); break;
+ case "jpeg": case "jpg": ret=mkjpg(o->image,o); break;
case "eps": ret=mkeps(o->image,o); break;
case "png": ret=mkpng(o->image,o); break;
case "pdf": ret=mkpdf(o->image,o); break;
diff --git a/tutorial/Makefile b/tutorial/Makefile
index b80780adaf..e4235f2f58 100644
--- a/tutorial/Makefile
+++ b/tutorial/Makefile
@@ -108,9 +108,7 @@ export:
tar czvTf tutorial.files tutorial.tar.gz
tar czvTf tutorial_onepage.files tutorial_onepage.tar.gz
-mirar_www: Image.wmml the_image_module.html
- ln -f `cat the_image_module.files` /home/mirar/www/image
-
mirar_www_tutorial: mirar_tutorial
- ln -f `cat tutorial.files` /home/mirar/www/pike_tutorial
-
+ rm /home/mirar/www/pike_tutorial/tutorial* /home/mirar/www/pike_tutorial/gfx/*
+ ln -f `cat tutorial.files | grep -v ^gfx/` /home/mirar/www/pike_tutorial
+ ln -f `cat tutorial.files | grep ^gfx/` /home/mirar/www/pike_tutorial/gfx
diff --git a/tutorial/pdflatex.pike b/tutorial/pdflatex.pike
index 489cc29813..ec9d42b552 100644
--- a/tutorial/pdflatex.pike
+++ b/tutorial/pdflatex.pike
@@ -46,6 +46,7 @@ string convert_gfx(TAG tag)
case "png":
case "jpg":
+ case "jpeg":
// return "\\epsfbox{"+file+"}";
return sprintf("\\pdfimageresolution=%d\n\\includegraphics{%s}",
--
GitLab