wikifmt: more complete title to name= anchor translation

1 files changed, 12 insertions, 2 deletions

diff --git a/sys/src/cmd/aux/wikifmt.c b/sys/src/cmd/aux/wikifmt.c
index a28e5e2d6..935dc40b2 100644
--- a/sys/src/cmd/aux/wikifmt.c
+++ b/sys/src/cmd/aux/wikifmt.c
@@ -190,10 +190,20 @@ heading(void)
 		if((*pos >= 'a' && *pos <= 'z')
 		|| (*pos >= 'A' && *pos <= 'Z')
 		|| (*pos >= '0' && *pos <= '9')
-		|| (*pos == '-'))
+		|| (strchr("!#$%&()_+,-./{|}~:;=?@[\\]^_`", *pos) != 0))
 			output(pos, 1);
-		else
+		else if(*pos == ' ' || *pos == '\t')
 			output("_", 1);
+		else if(*pos == '<')
+			output("&lt;", 4);
+		else if(*pos == '>')
+			output("&gt;", 4);
+		else if(*pos == '&')
+			output("&amp;", 5);
+		else if(*pos == '"')
+			output("&quot;", 6);
+		else if(*pos == '\'')
+			output("&#39;", 5);
 		pos++;
 	}
 	string("\"></a>");