===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- mandoc/term.c	2009/02/21 21:00:06	1.6
+++ mandoc/term.c	2009/02/22 15:50:45	1.8
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.6 2009/02/21 21:00:06 kristaps Exp $ */
+/* $Id: term.c,v 1.8 2009/02/22 15:50:45 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -24,6 +24,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __linux__
+#include <time.h>
+#endif
+
 #include "term.h"
 
 enum	termstyle {
@@ -46,6 +50,10 @@ static	void		  pescape(struct termp *, 
 static	void		  chara(struct termp *, char);
 static	void		  style(struct termp *, enum termstyle);
 
+#ifdef __linux__
+extern	size_t		  strlcat(char *, const char *, size_t);
+extern	size_t		  strlcpy(char *, const char *, size_t);
+#endif
 
 void
 flushln(struct termp *p)
@@ -74,6 +82,18 @@ flushln(struct termp *p)
 		for (j = 0; j < p->offset; j++)
 			putchar(' ');
 
+	/*
+	 * If we're literal, print out verbatim.
+	 */
+	if (p->flags & TERMP_LITERAL) {
+		/* FIXME: count non-printing chars. */
+		for (i = 0; i < p->col; i++)
+			putchar(p->buf[i]);
+		putchar('\n');
+		p->col = 0;
+		return;
+	}
+
 	for (i = 0; i < p->col; i++) {
 		/*
 		 * Count up visible word characters.  Control sequences
@@ -259,9 +279,10 @@ pword(struct termp *p, const char *word, size_t len)
 {
 	size_t		 i;
 
-	assert(len > 0);
+	/*assert(len > 0);*/ /* Can be, if literal. */
 
-	if ( ! (p->flags & TERMP_NOSPACE))
+	if ( ! (p->flags & TERMP_NOSPACE) && 
+			! (p->flags & TERMP_LITERAL))
 		chara(p, ' ');
 
 	p->flags &= ~TERMP_NOSPACE;
@@ -290,12 +311,17 @@ word(struct termp *p, const char *word)
 {
 	size_t 		 i, j, len;
 
-	if (mdoc_isdelim(word))
-		p->flags |= TERMP_NOSPACE;
+	if (p->flags & TERMP_LITERAL) {
+		pword(p, word, strlen(word));
+		return;
+	}
 
 	len = strlen(word);
 	assert(len > 0);
 
+	if (mdoc_isdelim(word))
+		p->flags |= TERMP_NOSPACE;
+
 	/* LINTED */
 	for (j = i = 0; i < len; i++) {
 		if ( ! isspace(word[i])) {
@@ -363,7 +389,12 @@ termprint_footer(struct termp *p, const struct mdoc_me
 		err(1, "malloc");
 
 	tm = localtime(&meta->date);
+
+#ifdef __linux__
+	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+#else
 	if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+#endif
 		err(1, "strftime");
 
 	osz = strlcpy(os, meta->os, p->rmargin);