Merge release 1.10.4 (all code by kristaps@), providing four new features:

1) Proper .Bk support: allow output line breaks at input line breaks,
but keep input lines together in the output, finally fixing
synopses like aucat(1), mail(1) and tmux(1).
2) Mostly finished -Tps (PostScript) output.
3) Implement -Thtml output for .Nm blocks and .Bk -words.
4) Allow iterative interpolation of user-defined roff(7) strings.
Also contains some minor bugfixes and some performance improvements.

1 files changed, 53 insertions, 9 deletions

diff --git a/usr.bin/mandoc/term_ascii.c b/usr.bin/mandoc/term_ascii.c
index da20706ac42..21b1abbe226 100644
--- a/usr.bin/mandoc/term_ascii.c
+++ b/usr.bin/mandoc/term_ascii.c
@@ -1,6 +1,6 @@
-/*	$Id: term_ascii.c,v 1.2 2010/06/26 19:08:00 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.3 2010/07/13 01:09:13 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,12 +30,14 @@
 #include "term.h"
 #include "main.h"
 
-static	void		  ascii_endline(struct termp *);
-static	void		  ascii_letter(struct termp *, char);
-static	void		  ascii_begin(struct termp *);
+static	double		  ascii_hspan(const struct termp *,
+				const struct roffsu *);
+static	size_t		  ascii_width(const struct termp *, char);
 static	void		  ascii_advance(struct termp *, size_t);
+static	void		  ascii_begin(struct termp *);
 static	void		  ascii_end(struct termp *);
-static	size_t		  ascii_width(const struct termp *, char);
+static	void		  ascii_endline(struct termp *);
+static	void		  ascii_letter(struct termp *, char);
 
 
 void *
@@ -51,12 +53,13 @@ ascii_alloc(char *outopts)
 	p->tabwidth = 5;
 	p->defrmargin = 78;
 
-	p->type = TERMTYPE_CHAR;
-	p->letter = ascii_letter;
+	p->advance = ascii_advance;
 	p->begin = ascii_begin;
 	p->end = ascii_end;
 	p->endline = ascii_endline;
-	p->advance = ascii_advance;
+	p->hspan = ascii_hspan;
+	p->letter = ascii_letter;
+	p->type = TERMTYPE_CHAR;
 	p->width = ascii_width;
 
 	toks[0] = "width";
@@ -79,6 +82,7 @@ ascii_alloc(char *outopts)
 }
 
 
+/* ARGSUSED */
 static size_t
 ascii_width(const struct termp *p, char c)
 {
@@ -139,3 +143,43 @@ ascii_advance(struct termp *p, size_t len)
 	for (i = 0; i < len; i++)
 		putchar(' ');
 }
+
+
+/* ARGSUSED */
+static double
+ascii_hspan(const struct termp *p, const struct roffsu *su)
+{
+	double		 r;
+
+	/*
+	 * Approximate based on character width.  These are generated
+	 * entirely by eyeballing the screen, but appear to be correct.
+	 */
+
+	switch (su->unit) {
+	case (SCALE_CM):
+		r = 4 * su->scale;
+		break;
+	case (SCALE_IN):
+		r = 10 * su->scale;
+		break;
+	case (SCALE_PC):
+		r = (10 * su->scale) / 6;
+		break;
+	case (SCALE_PT):
+		r = (10 * su->scale) / 72;
+		break;
+	case (SCALE_MM):
+		r = su->scale / 1000;
+		break;
+	case (SCALE_VS):
+		r = su->scale * 2 - 1;
+		break;
+	default:
+		r = su->scale;
+		break;
+	}
+
+	return(r);
+}
+