diff --git a/tutorial/Wmml.pmod b/tutorial/Wmml.pmod index 60faccb6cce9d73a338f7bd49f6502c0a0acd357..6f2276e1a08a59646ed0c040029bb3e4ad7653d5 100644 --- a/tutorial/Wmml.pmod +++ b/tutorial/Wmml.pmod @@ -787,12 +787,14 @@ SGML low_make_concrete_wmml(SGML data) { title="see also"; SGML tmp=({}); - string *tmp=(replace(get_text(args), + string *tmp2=(replace(get_text(args), ({" ","\n"}),({"",""}))/",")-({""}); - if(!sizeof(tmp)) + if(!sizeof(tmp2)) continue; - foreach(tmp,string name) + array(string) tmp=({}); + + foreach(tmp2,string name) { tmp+=({ Tag("link",(["to": diff --git a/tutorial/latex.pike b/tutorial/latex.pike index d047360cb6461a66f4336b50b157d3f156654102..28d2f387d44a99c4a4f46ee0070a7a69fcbe2d4c 100644 --- a/tutorial/latex.pike +++ b/tutorial/latex.pike @@ -29,6 +29,8 @@ string packages = \\usepackage{colortbl} "; +string latex = "latex"; + object wcache=.Cache("latex_wcache"); @@ -64,7 +66,7 @@ array(float) find_line_width(array(SGML) data) rm("___tmp.tex"); Stdio.write_file("___tmp.tex",x); - string tmp=Process.popen("latex '\\scrollmode\\input ___tmp.tex'"); + string tmp=Process.popen(latex+" '\\scrollmode\\input ___tmp.tex'"); sscanf(tmp,"%{%*slength=%f%}",array lengths); // werror("%O\n",lengths); @@ -502,6 +504,12 @@ string convert_table(TAG table) table[row]+=({Cell(Sgml.Tag("td",0,0,({})),1)})* ( columns - sizeof(table[row])); } + + werror("Converting table %02dx%02d %s.\n",columns,sizeof(table), + String.implode_nicely(( nicer? ({ "nicer" }) : ({}) ) + + ( framed? ({ "framed" }) : ({}) ) + + ( border? ({ "border" }) : ({}) ) + + ( spaced? ({ "spaced" }) : ({})) )); array(SGML) tmp=(table * ({}))->tag->data; diff --git a/tutorial/pdflatex.pike b/tutorial/pdflatex.pike index ec9d42b552ca470b52d1b44aa6bcb7a9c4ce5afe..4150bff1ede0cc9234d7e2703411b65defae1dc1 100644 --- a/tutorial/pdflatex.pike +++ b/tutorial/pdflatex.pike @@ -22,6 +22,8 @@ string packages= \\usepackage{colortbl} "; +string latex="pdflatex"; + string convert_gfx(TAG tag) { string file;