From c7de3e54fe45e13781de9377eadcff9339bb8dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Fri, 23 Jul 1999 14:53:51 -0700 Subject: [PATCH] bugfixes Rev: tutorial/Wmml.pmod:1.41 Rev: tutorial/latex.pike:1.14 Rev: tutorial/pdflatex.pike:1.6 --- tutorial/Wmml.pmod | 8 +++++--- tutorial/latex.pike | 10 +++++++++- tutorial/pdflatex.pike | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tutorial/Wmml.pmod b/tutorial/Wmml.pmod index 60faccb6cc..6f2276e1a0 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 d047360cb6..28d2f387d4 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 ec9d42b552..4150bff1ed 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; -- GitLab