initial import of changes from 9front bikeshedding; bundle rc-httpd

apps/wman/app.rc

@@ -71,7 +71,6 @@ fn wman_get_section_desc {
 
 fn wman_page_gen {
     #troff -manhtml $1| troff2html -t 'Plan 9 from User Space'
-    # Using GNU col here to remove nroffs garbage (eg., from .ft B); p9p has no col(1) :(
     troff -N -m$wman_tmac $1 | wman_out_filter
 }
 
@@ -80,10 +79,11 @@ fn wman_out_filter {
 }
 
 fn wman_default_out_filter {
+    # Using GNU col here to remove nroffs garbage (eg., from .ft B); p9p has no col(1) :(
     escape_html \
     | sed 's!([\.\-a-zA-Z0-9]+)\(('^`{echo $wman_cat_list|tr ' ' '|'}^')\)!<a href="../\2/\1">&</a>!g' \
-    | awk '/^$/ {if(n != 1) print; n=1; next} /./ {n=0; print}'
-
+    | awk '/^$/ {if(n != 1) print; n=1; next} /./ {n=0; print}' \
+    | col -x
 }
 
 

apps/wman/man_page.tpl

@@ -1,7 +1,3 @@
 <pre>
-%{
-
-wman_page_gen $wman_page_file
-
-%}
+% wman_page_gen $wman_page_file
 </pre>

apps/wman/page_list.tpl

@@ -1,11 +1,8 @@
-% d=`{wman_get_section_desc $wman_cat} 
-<h1>Manual pages - Section %($wman_cat%): %($"d%)</h1>
 
+% d=`{wman_get_section_desc $wman_cat}
+<h1>Manual pages - Section
+% echo $wman_cat': '$"d2
+</h1>
 <ul style="float:left">
-%{
-wman_ls_pages $wman_cat_path \
-    | awk -F/ '{ print "<li><a href=\""$(NF)"\">"$(NF)"</a></li>" }
-    NR%20 == 0 { print "</ul><ul style=\"float: left\">" }'
-%}
+% wman_ls_pages $wman_cat_path | awk -F/ '{ print "<li><a href=\""$(NF)"\">"$(NF)"</a></li>" } NR%20 == 0 { print "</ul><ul style=\"float: left\">" }'
 </ul>
-