===================================================================
RCS file: /cvs/mandoc/tbl_term.c,v
retrieving revision 1.17
retrieving revision 1.27
diff -u -p -r1.17 -r1.27
--- mandoc/tbl_term.c	2011/01/10 14:56:06	1.17
+++ mandoc/tbl_term.c	2014/04/20 16:46:05	1.27
@@ -1,6 +1,7 @@
-/*	$Id: tbl_term.c,v 1.17 2011/01/10 14:56:06 kristaps Exp $ */
+/*	$Id: tbl_term.c,v 1.27 2014/04/20 16:46:05 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,17 +31,17 @@
 static	size_t	term_tbl_len(size_t, void *);
 static	size_t	term_tbl_strlen(const char *, void *);
 static	void	tbl_char(struct termp *, char, size_t);
-static	void	tbl_data(struct termp *, const struct tbl *,
-			const struct tbl_dat *, 
+static	void	tbl_data(struct termp *, const struct tbl_opts *,
+			const struct tbl_dat *,
 			const struct roffcol *);
-static	void	tbl_hframe(struct termp *, const struct tbl_span *);
-static	void	tbl_literal(struct termp *, const struct tbl_dat *, 
+static	size_t	tbl_rulewidth(struct termp *, const struct tbl_head *);
+static	void	tbl_hframe(struct termp *, const struct tbl_span *, int);
+static	void	tbl_literal(struct termp *, const struct tbl_dat *,
 			const struct roffcol *);
-static	void	tbl_number(struct termp *, const struct tbl *, 
-			const struct tbl_dat *, 
+static	void	tbl_number(struct termp *, const struct tbl_opts *,
+			const struct tbl_dat *,
 			const struct roffcol *);
 static	void	tbl_hrule(struct termp *, const struct tbl_span *);
-static	void	tbl_vframe(struct termp *, const struct tbl *);
 static	void	tbl_vrule(struct termp *, const struct tbl_head *);
 
 
@@ -65,7 +66,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 	const struct tbl_dat	*dp;
 	struct roffcol		*col;
 	int			 spans;
-	size_t		   	 rmargin, maxrmargin;
+	size_t			 rmargin, maxrmargin;
 
 	rmargin = tp->rmargin;
 	maxrmargin = tp->maxrmargin;
@@ -94,12 +95,20 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
 	/* Horizontal frame at the start of boxed tables. */
 
-	if (TBL_SPAN_FIRST & sp->flags)
-		tbl_hframe(tp, sp);
+	if (TBL_SPAN_FIRST & sp->flags) {
+		if (TBL_OPT_DBOX & sp->opts->opts)
+			tbl_hframe(tp, sp, 1);
+		if (TBL_OPT_DBOX & sp->opts->opts ||
+		    TBL_OPT_BOX  & sp->opts->opts)
+			tbl_hframe(tp, sp, 0);
+	}
 
 	/* Vertical frame at the start of each row. */
 
-	tbl_vframe(tp, sp->tbl);
+	if ((TBL_OPT_BOX | TBL_OPT_DBOX) & sp->opts->opts ||
+	    sp->head->vert)
+		term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
+		    TBL_SPAN_DHORIZ == sp->pos ? "+" : "|");
 
 	/*
 	 * Now print the actual data itself depending on the span type.
@@ -108,39 +117,35 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 	 */
 
 	switch (sp->pos) {
-	case (TBL_SPAN_HORIZ):
+	case TBL_SPAN_HORIZ:
 		/* FALLTHROUGH */
-	case (TBL_SPAN_DHORIZ):
+	case TBL_SPAN_DHORIZ:
 		tbl_hrule(tp, sp);
 		break;
-	case (TBL_SPAN_DATA):
+	case TBL_SPAN_DATA:
 		/* Iterate over template headers. */
 		dp = sp->first;
 		spans = 0;
 		for (hp = sp->head; hp; hp = hp->next) {
-			/* 
+
+			/*
 			 * If the current data header is invoked during
 			 * a spanner ("spans" > 0), don't emit anything
 			 * at all.
 			 */
-			switch (hp->pos) {
-			case (TBL_HEAD_VERT):
-				/* FALLTHROUGH */
-			case (TBL_HEAD_DVERT):
-				if (spans <= 0)
-					tbl_vrule(tp, hp);
-				continue;
-			case (TBL_HEAD_DATA):
-				break;
-			}
 
 			if (--spans >= 0)
 				continue;
 
+			/* Separate columns. */
+
+			if (NULL != hp->prev)
+				tbl_vrule(tp, hp);
+
 			col = &tp->tbl.cols[hp->ident];
-			tbl_data(tp, sp->tbl, dp, col);
+			tbl_data(tp, sp->opts, dp, col);
 
-			/* 
+			/*
 			 * Go to the next data cell and assign the
 			 * number of subsequent spans, if applicable.
 			 */
@@ -153,7 +158,12 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 		break;
 	}
 
-	tbl_vframe(tp, sp->tbl);
+	/* Vertical frame at the end of each row. */
+
+	if ((TBL_OPT_BOX | TBL_OPT_DBOX) & sp->opts->opts ||
+	    sp->layout->vert)
+		term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
+		    TBL_SPAN_DHORIZ == sp->pos ? "+" : " |");
 	term_flushln(tp);
 
 	/*
@@ -162,7 +172,15 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 	 */
 
 	if (TBL_SPAN_LAST & sp->flags) {
-		tbl_hframe(tp, sp);
+		if (TBL_OPT_DBOX & sp->opts->opts ||
+		    TBL_OPT_BOX  & sp->opts->opts) {
+			tbl_hframe(tp, sp, 0);
+			tp->skipvsp = 1;
+		}
+		if (TBL_OPT_DBOX & sp->opts->opts) {
+			tbl_hframe(tp, sp, 1);
+			tp->skipvsp = 2;
+		}
 		assert(tp->tbl.cols);
 		free(tp->tbl.cols);
 		tp->tbl.cols = NULL;
@@ -174,92 +192,73 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
 }
 
+/*
+ * Horizontal rules extend across the entire table.
+ * Calculate the width by iterating over columns.
+ */
+static size_t
+tbl_rulewidth(struct termp *tp, const struct tbl_head *hp)
+{
+	size_t		 width;
+
+	width = tp->tbl.cols[hp->ident].width;
+
+	/* Account for leading blanks. */
+	if (hp->prev)
+		width += 2 - hp->vert;
+
+	/* Account for trailing blank. */
+	width++;
+
+	return(width);
+}
+
+/*
+ * Rules inside the table can be single or double
+ * and have crossings with vertical rules marked with pluses.
+ */
 static void
 tbl_hrule(struct termp *tp, const struct tbl_span *sp)
 {
 	const struct tbl_head *hp;
 	char		 c;
-	size_t		 width;
 
-	/*
-	 * An hrule extends across the entire table and is demarked by a
-	 * standalone `_' or whatnot in lieu of a table row.  Spanning
-	 * headers are marked by a `+', as are table boundaries.
-	 */
-
 	c = '-';
 	if (TBL_SPAN_DHORIZ == sp->pos)
 		c = '=';
 
-	/* FIXME: don't use `+' between data and a spanner! */
-
 	for (hp = sp->head; hp; hp = hp->next) {
-		width = tp->tbl.cols[hp->ident].width;
-		switch (hp->pos) {
-		case (TBL_HEAD_DATA):
-			tbl_char(tp, c, width);
-			break;
-		case (TBL_HEAD_DVERT):
-			tbl_char(tp, '+', width);
-			/* FALLTHROUGH */
-		case (TBL_HEAD_VERT):
-			tbl_char(tp, '+', width);
-			break;
-		default:
-			abort();
-			/* NOTREACHED */
-		}
+		if (hp->prev && hp->vert)
+			tbl_char(tp, '+', hp->vert);
+		tbl_char(tp, c, tbl_rulewidth(tp, hp));
 	}
 }
 
+/*
+ * Rules above and below the table are always single
+ * and have an additional plus at the beginning and end.
+ * For double frames, this function is called twice,
+ * and the outer one does not have crossings.
+ */
 static void
-tbl_hframe(struct termp *tp, const struct tbl_span *sp)
+tbl_hframe(struct termp *tp, const struct tbl_span *sp, int outer)
 {
 	const struct tbl_head *hp;
-	size_t		 width;
 
-	if ( ! (TBL_OPT_BOX & sp->tbl->opts || 
-			TBL_OPT_DBOX & sp->tbl->opts))
-		return;
-
-	/* 
-	 * Print out the horizontal part of a frame or double frame.  A
-	 * double frame has an unbroken `-' outer line the width of the
-	 * table, bordered by `+'.  The frame (or inner frame, in the
-	 * case of the double frame) is a `-' bordered by `+' and broken
-	 * by `+' whenever a span is encountered.
-	 */
-
-	if (TBL_OPT_DBOX & sp->tbl->opts) {
-		term_word(tp, "+");
-		for (hp = sp->head; hp; hp = hp->next) {
-			width = tp->tbl.cols[hp->ident].width;
-			tbl_char(tp, '-', width);
-		}
-		term_word(tp, "+");
-		term_flushln(tp);
-	}
-
 	term_word(tp, "+");
 	for (hp = sp->head; hp; hp = hp->next) {
-		width = tp->tbl.cols[hp->ident].width;
-		switch (hp->pos) {
-		case (TBL_HEAD_DATA):
-			tbl_char(tp, '-', width);
-			break;
-		default:
-			tbl_char(tp, '+', width);
-			break;
-		}
+		if (hp->prev && hp->vert)
+			tbl_char(tp, (outer ? '-' : '+'), hp->vert);
+		tbl_char(tp, '-', tbl_rulewidth(tp, hp));
 	}
 	term_word(tp, "+");
 	term_flushln(tp);
 }
 
 static void
-tbl_data(struct termp *tp, const struct tbl *tbl,
-		const struct tbl_dat *dp, 
-		const struct roffcol *col)
+tbl_data(struct termp *tp, const struct tbl_opts *opts,
+	const struct tbl_dat *dp,
+	const struct roffcol *col)
 {
 
 	if (NULL == dp) {
@@ -269,42 +268,45 @@ tbl_data(struct termp *tp, const struct tbl *tbl,
 	assert(dp->layout);
 
 	switch (dp->pos) {
-	case (TBL_DATA_NONE):
+	case TBL_DATA_NONE:
 		tbl_char(tp, ASCII_NBRSP, col->width);
 		return;
-	case (TBL_DATA_HORIZ):
+	case TBL_DATA_HORIZ:
 		/* FALLTHROUGH */
-	case (TBL_DATA_NHORIZ):
+	case TBL_DATA_NHORIZ:
 		tbl_char(tp, '-', col->width);
 		return;
-	case (TBL_DATA_NDHORIZ):
+	case TBL_DATA_NDHORIZ:
 		/* FALLTHROUGH */
-	case (TBL_DATA_DHORIZ):
+	case TBL_DATA_DHORIZ:
 		tbl_char(tp, '=', col->width);
 		return;
 	default:
 		break;
 	}
-	
+
 	switch (dp->layout->pos) {
-	case (TBL_CELL_HORIZ):
+	case TBL_CELL_HORIZ:
 		tbl_char(tp, '-', col->width);
 		break;
-	case (TBL_CELL_DHORIZ):
+	case TBL_CELL_DHORIZ:
 		tbl_char(tp, '=', col->width);
 		break;
-	case (TBL_CELL_LONG):
+	case TBL_CELL_LONG:
 		/* FALLTHROUGH */
-	case (TBL_CELL_CENTRE):
+	case TBL_CELL_CENTRE:
 		/* FALLTHROUGH */
-	case (TBL_CELL_LEFT):
+	case TBL_CELL_LEFT:
 		/* FALLTHROUGH */
-	case (TBL_CELL_RIGHT):
+	case TBL_CELL_RIGHT:
 		tbl_literal(tp, dp, col);
 		break;
-	case (TBL_CELL_NUMBER):
-		tbl_number(tp, tbl, dp, col);
+	case TBL_CELL_NUMBER:
+		tbl_number(tp, opts, dp, col);
 		break;
+	case TBL_CELL_DOWN:
+		tbl_char(tp, ASCII_NBRSP, col->width);
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
@@ -315,27 +317,14 @@ static void
 tbl_vrule(struct termp *tp, const struct tbl_head *hp)
 {
 
-	switch (hp->pos) {
-	case (TBL_HEAD_VERT):
-		term_word(tp, "|");
-		break;
-	case (TBL_HEAD_DVERT):
-		term_word(tp, "||");
-		break;
-	default:
-		break;
-	}
+	tbl_char(tp, ASCII_NBRSP, 1);
+	if (0 < hp->vert)
+		tbl_char(tp, '|', hp->vert);
+	if (2 > hp->vert)
+		tbl_char(tp, ASCII_NBRSP, 2 - hp->vert);
 }
 
 static void
-tbl_vframe(struct termp *tp, const struct tbl *tbl)
-{
-
-	if (TBL_OPT_BOX & tbl->opts || TBL_OPT_DBOX & tbl->opts)
-		term_word(tp, "|");
-}
-
-static void
 tbl_char(struct termp *tp, char c, size_t len)
 {
 	size_t		i, sz;
@@ -351,34 +340,40 @@ tbl_char(struct termp *tp, char c, size_t len)
 }
 
 static void
-tbl_literal(struct termp *tp, const struct tbl_dat *dp, 
+tbl_literal(struct termp *tp, const struct tbl_dat *dp,
 		const struct roffcol *col)
 {
-	size_t		 padl, padr, ssz;
+	struct tbl_head		*hp;
+	size_t			 width, len, padl, padr;
+	int			 spans;
 
-	padl = padr = 0;
-
 	assert(dp->string);
+	len = term_strlen(tp, dp->string);
 
-	ssz = term_len(tp, 1);
+	hp = dp->layout->head->next;
+	width = col->width;
+	for (spans = dp->spans; spans--; hp = hp->next)
+		width += tp->tbl.cols[hp->ident].width + 3;
 
+	padr = width > len ? width - len : 0;
+	padl = 0;
+
 	switch (dp->layout->pos) {
-	case (TBL_CELL_LONG):
-		padl = ssz;
-		padr = col->width - term_strlen(tp, dp->string) - ssz;
+	case TBL_CELL_LONG:
+		padl = term_len(tp, 1);
+		padr = padr > padl ? padr - padl : 0;
 		break;
-	case (TBL_CELL_CENTRE):
-		padl = col->width - term_strlen(tp, dp->string);
-		if (padl % 2)
-			padr++;
-		padl /= 2;
-		padr += padl;
+	case TBL_CELL_CENTRE:
+		if (2 > padr)
+			break;
+		padl = padr / 2;
+		padr -= padl;
 		break;
-	case (TBL_CELL_RIGHT):
-		padl = col->width - term_strlen(tp, dp->string);
+	case TBL_CELL_RIGHT:
+		padl = padr;
+		padr = 0;
 		break;
 	default:
-		padr = col->width - term_strlen(tp, dp->string);
 		break;
 	}
 
@@ -388,7 +383,7 @@ tbl_literal(struct termp *tp, const struct tbl_dat *dp
 }
 
 static void
-tbl_number(struct termp *tp, const struct tbl *tbl,
+tbl_number(struct termp *tp, const struct tbl_opts *opts,
 		const struct tbl_dat *dp,
 		const struct roffcol *col)
 {
@@ -406,12 +401,12 @@ tbl_number(struct termp *tp, const struct tbl *tbl,
 
 	sz = term_strlen(tp, dp->string);
 
-	buf[0] = tbl->decimal;
+	buf[0] = opts->decimal;
 	buf[1] = '\0';
 
 	psz = term_strlen(tp, buf);
 
-	if (NULL != (cp = strrchr(dp->string, tbl->decimal))) {
+	if (NULL != (cp = strrchr(dp->string, opts->decimal))) {
 		buf[1] = '\0';
 		for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
 			buf[0] = dp->string[i];
@@ -421,13 +416,11 @@ tbl_number(struct termp *tp, const struct tbl *tbl,
 	} else
 		d = sz + psz;
 
-	sz += term_len(tp, 2);
-	d += term_len(tp, 1);
-
 	padl = col->decimal - d;
 
 	tbl_char(tp, ASCII_NBRSP, padl);
 	term_word(tp, dp->string);
-	tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
+	if (col->width > sz + padl)
+		tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
 }