From b709c19723ec14ffdac70e5c89c8b64e2f6d8192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Wed, 6 May 1998 16:09:44 -0700
Subject: [PATCH] now works again
Rev: tutorial/.cvsignore:1.9
Rev: tutorial/Makefile:1.14
Rev: tutorial/Wmml.pmod:1.19
Rev: tutorial/html.pike:1.14
Rev: tutorial/html_onepage.pike:1.2
Rev: tutorial/wmmltohtml2:1.5
---
tutorial/.cvsignore | 9 +++++----
tutorial/.gitignore | 9 +++++----
tutorial/Makefile | 2 +-
tutorial/Wmml.pmod | 5 +++--
tutorial/html.pike | 5 ++++-
tutorial/html_onepage.pike | 1 +
tutorial/wmmltohtml2 | 1 +
7 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/tutorial/.cvsignore b/tutorial/.cvsignore
index 12ae4ed113..e0223570a8 100644
--- a/tutorial/.cvsignore
+++ b/tutorial/.cvsignore
@@ -1,8 +1,13 @@
+*.files
+*.md
.nfs*
+Image.wmml
___tmp.*
extra_textflows.mif
illustration*.gif
illustration_cache
+man
+tut*.html
tutorial-foo.wmml
tutorial.aux
tutorial.dvi
@@ -11,7 +16,3 @@ tutorial.log
tutorial.mif
tutorial.tex
tutorial_*.html
-tut*.html
-*.md
-*.files
-man
diff --git a/tutorial/.gitignore b/tutorial/.gitignore
index 8af7a5e23c..417652e73a 100644
--- a/tutorial/.gitignore
+++ b/tutorial/.gitignore
@@ -1,8 +1,13 @@
+/*.files
+/*.md
/.nfs*
+/Image.wmml
/___tmp.*
/extra_textflows.mif
/illustration*.gif
/illustration_cache
+/man
+/tut*.html
/tutorial-foo.wmml
/tutorial.aux
/tutorial.dvi
@@ -11,7 +16,3 @@
/tutorial.mif
/tutorial.tex
/tutorial_*.html
-/tut*.html
-/*.md
-/*.files
-/man
diff --git a/tutorial/Makefile b/tutorial/Makefile
index 51645d5594..c7b1771b51 100644
--- a/tutorial/Makefile
+++ b/tutorial/Makefile
@@ -28,7 +28,7 @@ the_image_module.html: Image.wmml the_image_module.wmml
./wmmltohtml2 <the_image_module.wmml html the_image_module
clean:
- rm *.html illustration_cache illustration*.gif
+ rm *.html *.md illustration_cache illustration*.gif
export:
tar czvTf tutorial.files tutorial.tar.gz
diff --git a/tutorial/Wmml.pmod b/tutorial/Wmml.pmod
index 2da5186425..dfcaaf948b 100644
--- a/tutorial/Wmml.pmod
+++ b/tutorial/Wmml.pmod
@@ -1,4 +1,5 @@
#include "types.h"
+import ".";
import Sgml;
SGML low_make_concrete_wmml(SGML data);
@@ -929,8 +930,8 @@ string image_to_gif(TAG data, float dpi)
{
case "fig":
werror("Converting ");
- Process.system("fig2dev -L ps "+params->src+" ___tmp.ps;echo showpage >>___tmp.ps");
- Process.system("gs -q -sDEVICE=pbmraw -r225 -g2500x2500 -sOutputFile=___tmp.ppm ___tmp.ps </dev/null >/dev/null");
+ Process.system("/bin/sh -c 'fig2dev -L ps "+params->src+" ___tmp.ps;echo showpage >>___tmp.ps'");
+ Process.system("/bin/sh -c 'gs -q -sDEVICE=pbmraw -r225 -g2500x2500 -sOutputFile=___tmp.ppm ___tmp.ps </dev/null >/dev/null'");
object o=Image.image()->fromppm(Stdio.read_file("___tmp.ppm"))->autocrop()->scale(1.0/3)->rotate(-90);
o=Image.image(o->xsize()+40, o->ysize()+40, 255,255,255)->paste(o,20,20);
rm("___tmp.ps");
diff --git a/tutorial/html.pike b/tutorial/html.pike
index 4c180858ad..6a1baf3220 100644
--- a/tutorial/html.pike
+++ b/tutorial/html.pike
@@ -1,4 +1,5 @@
#include "types.h"
+import ".";
inherit Stdio.File : out;
SGML html_toc;
@@ -388,10 +389,12 @@ SGML convert(SGML data)
break;
case "ex_identifier":
- case "ex_string":
case "ex_commend":
ret+=convert(data->data);
continue;
+ case "ex_string":
+ ret+=convert(replace(data->data," "," "));
+ continue;
case "example": data->tag="blockquote";break;
case "ex_keyword": data->tag="b";break;
diff --git a/tutorial/html_onepage.pike b/tutorial/html_onepage.pike
index 1041d80426..ad5f2bb67d 100644
--- a/tutorial/html_onepage.pike
+++ b/tutorial/html_onepage.pike
@@ -1,4 +1,5 @@
#include "types.h"
+import ".";
inherit "html";
SGML low_split(SGML data) { return data; }
diff --git a/tutorial/wmmltohtml2 b/tutorial/wmmltohtml2
index 36001a3130..4c24b37bf9 100755
--- a/tutorial/wmmltohtml2
+++ b/tutorial/wmmltohtml2
@@ -1,6 +1,7 @@
#!/usr/local/bin/pike
import Stdio;
+import ".";
#include "types.h"
--
GitLab