===================================================================
RCS file: /cvs/mandoc/Attic/mdocterm.c,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- mandoc/Attic/mdocterm.c	2009/02/23 09:33:34	1.4
+++ mandoc/Attic/mdocterm.c	2009/02/25 12:09:20	1.9
@@ -1,4 +1,4 @@
-	/* $Id: mdocterm.c,v 1.4 2009/02/23 09:33:34 kristaps Exp $ */
+	/* $Id: mdocterm.c,v 1.9 2009/02/25 12:09:20 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -24,9 +24,19 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef __OpenBSD__
+#include <time.h>
+#endif
+
 #include "mmain.h"
 #include "term.h"
 
+#ifdef __NetBSD__
+#define xisspace(x) isspace((int)(x))
+#else
+#define	xisspace(x) isspace((x))
+#endif
+
 enum	termstyle {
 	STYLE_CLEAR,
 	STYLE_BOLD,
@@ -61,9 +71,6 @@ main(int argc, char *argv[])
 	const struct mdoc *mdoc;
 	struct termp	 termp;
 
-	extern int	 optreset;
-	extern int	 optind;
-
 	p = mmain_alloc();
 
 	if ( ! mmain_getopt(p, argc, argv, NULL, NULL, NULL, NULL))
@@ -136,11 +143,11 @@ flushln(struct termp *p)
 		 * Count up visible word characters.  Control sequences
 		 * (starting with the CSI) aren't counted. 
 		 */
-		assert( ! isspace(p->buf[i]));
+		assert( ! xisspace(p->buf[i]));
 
 		/* LINTED */
 		for (j = i, vsz = 0; j < p->col; j++) {
-			if (isspace(p->buf[j]))
+			if (xisspace(p->buf[j]))
 				break;
 			else if (27 == p->buf[j]) {
 				assert(j + 4 <= p->col);
@@ -166,10 +173,9 @@ flushln(struct termp *p)
 			for (j = 0; j < p->offset; j++)
 				putchar(' ');
 			vis = 0;
-		} else if (vis + vsz >= maxvis) {
+		} else if (vis + vsz >= maxvis)
 			/* FIXME */
 			errx(1, "word breaks right margin");
-		}
 
 		/* 
 		 * Write out the word and a trailing space.  Omit the
@@ -177,7 +183,7 @@ flushln(struct termp *p)
 		 */
 
 		for ( ; i < p->col; i++) {
-			if (isspace(p->buf[i]))
+			if (xisspace(p->buf[i]))
 				break;
 			putchar(p->buf[i]);
 		}
@@ -299,6 +305,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;
@@ -378,7 +388,7 @@ word(struct termp *p, const char *word)
 
 	/* LINTED */
 	for (j = i = 0; i < len; i++) {
-		if ( ! isspace(word[i])) {
+		if ( ! xisspace(word[i])) {
 			j++;
 			continue;
 		}
@@ -400,28 +410,46 @@ 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;
 
 	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. */
 
+	switch (pair.type) {
+	case (TERMPAIR_FLAG):
+		p->flags |= pair.data.flag;
+		break;
+	default:
+		break;
+	}
+
 	if (dochild && node->child)
 		body(p, meta, node->child);
 
+	switch (pair.type) {
+	case (TERMPAIR_FLAG):
+		p->flags &= ~pair.data.flag;
+		break;
+	default:
+		break;
+	}
+
 	/* 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. */
 
@@ -444,10 +472,10 @@ footer(struct termp *p, const struct mdoc_meta *meta)
 
 	tm = localtime(&meta->date);
 
-#ifdef __linux__
-	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
+#ifdef __OpenBSD__
 	if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+#else
+	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
 #endif
 		err(1, "strftime");