Backed out PUNCT changes (again).

1 files changed, 13 insertions, 13 deletions

diff --git a/validate.c b/validate.c
index 7eb665c3..79615394 100644
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.2 2008/11/29 16:11:42 kristaps Exp $ */
+/* $Id: validate.c,v 1.3 2008/11/30 12:41:45 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -94,9 +94,12 @@ mbuf_newline(struct md_valid *p)
 static int
 mbuf_data(struct md_valid *p, char *buf)
 {
+	int		 space;
 	size_t		 sz;
 	char		*bufp;
 
+	space = 1; /* FIXME */
+
 	assert(p->mbuf);
 	assert(0 != p->indent);
 
@@ -133,10 +136,7 @@ mbuf_data(struct md_valid *p, char *buf)
 				continue;
 			}
 
-			if ( ! md_buf_putchar(p->mbuf, ' '))
-				return(0);
-
-			p->pos += sz + 1;
+			p->pos += sz;
 			continue;
 		}
 
@@ -145,14 +145,14 @@ mbuf_data(struct md_valid *p, char *buf)
 				return(0);
 			if ( ! mbuf_indent(p))
 				return(0);
-		}
+		} else if (space) 
+			if ( ! md_buf_putchar(p->mbuf, ' '))
+				return(0);
 
 		if ( ! md_buf_putstring(p->mbuf, bufp))
 			return(0);
-		if ( ! md_buf_putchar(p->mbuf, ' '))
-			return(0);
 
-		p->pos += sz + 1;
+		p->pos += sz + (space ? 1 : 0);
 	}
 
 	return(1);
@@ -334,14 +334,14 @@ roffin(void *arg, int tok, int *argcp, char **argvp)
 	if (0 == p->pos && ! mbuf_indent(p))
 		return(0);
 
-	if ( ! md_buf_putstring(p->mbuf, "<"))
+	if ( ! md_buf_putstring(p->mbuf, " <"))
 		return(0);
 	if ( ! md_buf_putstring(p->mbuf, toknames[tok]))
 		return(0);
 	if ( ! md_buf_putstring(p->mbuf, ">"))
 		return(0);
 
-	p->pos += strlen(toknames[tok]) + 2;
+	p->pos += strlen(toknames[tok]) + 3;
 
 	return(1);
 }
@@ -362,10 +362,10 @@ roffout(void *arg, int tok)
 		return(0);
 	if ( ! md_buf_putstring(p->mbuf, toknames[tok]))
 		return(0);
-	if ( ! md_buf_putstring(p->mbuf, "> "))
+	if ( ! md_buf_putstring(p->mbuf, ">"))
 		return(0);
 
-	p->pos += strlen(toknames[tok]) + 3;
+	p->pos += strlen(toknames[tok]) + 2;
 
 	return(1);
 }