===================================================================
RCS file: /cvs/mandoc/Attic/mdocterm.c,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- mandoc/Attic/mdocterm.c	2009/02/23 15:34:53	1.7
+++ mandoc/Attic/mdocterm.c	2009/02/25 13:30:53	1.11
@@ -1,4 +1,4 @@
-	/* $Id: mdocterm.c,v 1.7 2009/02/23 15:34:53 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.11 2009/02/25 13:30:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -200,7 +200,7 @@ flushln(struct termp *p)
 	 */
 
 	if (p->flags & TERMP_NOBREAK) {
-		for ( ; vis <= maxvis; vis++)
+		for ( ; vis < maxvis; vis++)
 			putchar(' ');
 	} else
 		putchar('\n');
@@ -221,6 +221,7 @@ newln(struct termp *p)
 	if (0 == p->col) 
 		return;
 	flushln(p);
+	p->flags &= ~TERMP_NOLPAD;
 }
 
 
@@ -305,6 +306,10 @@ pescape(struct termp *p, const char *word, size_t *i, 
 			stringa(p, "<-");
 		else if ('-' == word[*i] && '>' == word[*i + 1])
 			stringa(p, "->");
+		else if ('l' == word[*i] && 'q' == word[*i + 1])
+			chara(p, '\"');
+		else if ('r' == word[*i] && 'q' == word[*i + 1])
+			chara(p, '\"');
 
 		(*i)++;
 		return;
@@ -406,28 +411,38 @@ body(struct termp *p, const struct mdoc_meta *meta,
 		const struct mdoc_node *node)
 {
 	int		 dochild;
+	struct termpair	 pair;
 
 	/* Pre-processing. */
 
 	dochild = 1;
+	pair.type = 0;
+	pair.offset = pair.rmargin = 0;
+	pair.flag = 0;
 
 	if (MDOC_TEXT != node->type) {
 		if (termacts[node->tok].pre)
-			if ( ! (*termacts[node->tok].pre)(p, meta, node))
+			if ( ! (*termacts[node->tok].pre)(p, &pair, meta, node))
 				dochild = 0;
 	} else /* MDOC_TEXT == node->type */
 		word(p, node->data.text.string);
 
 	/* Children. */
 
+	if (TERMPAIR_FLAG & pair.type)
+		p->flags |= pair.flag;
+
 	if (dochild && node->child)
 		body(p, meta, node->child);
 
+	if (TERMPAIR_FLAG & pair.type)
+		p->flags &= ~pair.flag;
+
 	/* Post-processing. */
 
 	if (MDOC_TEXT != node->type)
 		if (termacts[node->tok].post)
-			(*termacts[node->tok].post)(p, meta, node);
+			(*termacts[node->tok].post)(p, &pair, meta, node);
 
 	/* Siblings. */