===================================================================
RCS file: /cvs/mandoc/Attic/ml.c,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -p -r1.3 -r1.7
--- mandoc/Attic/ml.c	2008/12/03 19:21:58	1.3
+++ mandoc/Attic/ml.c	2008/12/05 19:45:15	1.7
@@ -1,4 +1,4 @@
-/* $Id: ml.c,v 1.3 2008/12/03 19:21:58 kristaps Exp $ */
+/* $Id: ml.c,v 1.7 2008/12/05 19:45:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,6 +16,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -30,34 +31,187 @@ extern	size_t		  strlcpy(char *, const char *, size_t)
 
 
 int
+ml_putstring(struct md_mbuf *p, const char *buf, size_t *pos)
+{
+
+	return(ml_nputstring(p, buf, strlen(buf), pos));
+}
+
+
+int
 ml_nputstring(struct md_mbuf *p, 
 		const char *buf, size_t sz, size_t *pos)
 {
-	int		 i;
+	int		 i, v;
+	const char	*seq;
+	size_t		 ssz;
 
 	for (i = 0; i < (int)sz; i++) {
 		switch (buf[i]) {
-		case ('&'):
-			if ( ! ml_nputs(p, "&amp;", 5, pos))
+
+		/* Escaped value. */
+		case ('\\'):
+			if (-1 == (v = rofftok_scan(buf, &i)))
 				return(0);
+
+			switch (v) {
+			case (ROFFTok_Sp_A):
+				seq = "\\a";
+				ssz = 2;
+				break;
+			case (ROFFTok_Sp_B):
+				seq = "\\b";
+				ssz = 2;
+				break;
+			case (ROFFTok_Sp_F):
+				seq = "\\f";
+				ssz = 2;
+				break;
+			case (ROFFTok_Sp_N):
+				seq = "\\n";
+				ssz = 2;
+				break;
+			case (ROFFTok_Sp_R):
+				seq = "\\r";
+				ssz = 2;
+				break;
+			case (ROFFTok_Sp_T):
+				seq = "\\t";
+				ssz = 2;
+				break;
+			case (ROFFTok_Sp_V):
+				seq = "\\v";
+				ssz = 2;
+				break;
+			case (ROFFTok_Sp_0):
+				seq = "\\0";
+				ssz = 2;
+				break;
+			case (ROFFTok_Space):
+				seq = "&nbsp;";
+				ssz = 6;
+				break;
+			case (ROFFTok_Hyphen):
+				seq = "&#8208;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Em):
+				seq = "&#8212;";
+				ssz = 7;
+				break;
+			case (ROFFTok_En):
+				seq = "&#8211;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Ge):
+				seq = "&#8805;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Le):
+				seq = "&#8804;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Rquote):
+				seq = "&#8221;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Lquote):
+				seq = "&#8220;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Uparrow):
+				seq = "&#8593;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Acute):
+				seq = "&#180;";
+				ssz = 6;
+				break;
+			case (ROFFTok_Grave):
+				seq = "&#96;";
+				ssz = 5;
+				break;
+			case (ROFFTok_Pi):
+				seq = "&#960;";
+				ssz = 6;
+				break;
+			case (ROFFTok_Ne):
+				seq = "&#8800;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Lt):
+				seq = "&lt;";
+				ssz = 4;
+				break;
+			case (ROFFTok_Gt):
+				seq = "&gt;";
+				ssz = 4;
+				break;
+			case (ROFFTok_Plusmin):
+				seq = "&#177;";
+				ssz = 6;
+				break;
+			case (ROFFTok_Infty):
+				seq = "&#8734;";
+				ssz = 7;
+				break;
+			case (ROFFTok_Bar):
+				seq = "&#124;";
+				ssz = 6;
+				break;
+			case (ROFFTok_Nan):
+				seq = "Nan";
+				ssz = 3;
+				break;
+			case (ROFFTok_Quote):
+				seq = "&quot;";
+				ssz = 6;
+				break;
+			case (ROFFTok_Slash):
+				seq = "\\";
+				ssz = 1;
+				break;
+			case (ROFFTok_Null):
+				seq = "";
+				ssz = 0;
+				break;
+			default:
+				return(0);
+			}
 			break;
+
+		/* Ampersand ml-escape. */
+		case ('&'):
+			seq = "&amp;";
+			ssz = 5;
+			break;
+
+		/* Quotation ml-escape. */
 		case ('"'):
-			if ( ! ml_nputs(p, "&quot;", 6, pos))
-				return(0);
+			seq = "&quot;";
+			ssz = 6;
 			break;
+
+		/* Lt ml-escape. */
 		case ('<'):
-			if ( ! ml_nputs(p, "&lt;", 4, pos))
-				return(0);
+			seq = "&lt;";
+			ssz = 4;
 			break;
+
+		/* Gt ml-escape. */
 		case ('>'):
-			if ( ! ml_nputs(p, "&gt;", 4, pos))
-				return(0);
+			seq = "&gt;";
+			ssz = 4;
 			break;
+
 		default:
-			if ( ! ml_nputs(p, &buf[i], 1, pos))
-				return(0);
+			seq = &buf[i];
+			ssz = 1;
 			break;
 		}
+
+		if (ssz > 0 && ! ml_nputs(p, seq, ssz, pos))
+			return(-1);
 	}
 	return(1);
 }
@@ -67,10 +221,14 @@ int
 ml_nputs(struct md_mbuf *p, const char *buf, size_t sz, size_t *pos)
 {
 
+	if (0 == sz)
+		return(1);
+
 	if ( ! md_buf_puts(p, buf, sz))
 		return(0);
 
-	*pos += sz;
+	if (pos)
+		*pos += sz;
 	return(1);
 }
 
@@ -80,10 +238,14 @@ ml_puts(struct md_mbuf *p, const char *buf, size_t *po
 {
 	size_t		 sz;
 
-	sz = strlen(buf);
+	if (0 == (sz = strlen(buf)))
+		return(1);
+
 	if ( ! md_buf_puts(p, buf, sz))
 		return(0);
-	*pos += sz;
+
+	if (pos)
+		*pos += sz;
 	return(1);
 }