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

+*.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

tutorial/.gitignore

+/*.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

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 

tutorial/Wmml.pmod

 #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");

tutorial/html.pike

 #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;

tutorial/html_onepage.pike

 #include "types.h"
+import ".";
 inherit "html";
 
 SGML low_split(SGML data) { return data; }

tutorial/wmmltohtml2

 #!/usr/local/bin/pike
 
 import Stdio;
+import ".";
 
 #include "types.h"