head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.04.05.09.27.32;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2011.01.13.10.14.16;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 1.11.1:

The earlier libroff, libmdoc, and libman soup have been merged into
a single library, libmandoc, which manages all aspects of parsing
real manuals (from line-handling to tbl parsing).

Beyond this structural change, initial eqn functionality is in
place. For the time being, this is limited to the recognition of
equation blocks; future version of mdocml will expand upon this
framework.

As usual, many general fixes and improvements have also occured.
In particular, a great deal of redundancy and superfluous code has
been removed with the merging of the backend libraries.
@
text
@$NetBSD: patch-aa,v 1.1 2011/01/13 10:14:16 wiz Exp $

Post-release patch from upstream fixing a core dump in pcap-save*.

--- tbl_data.c.orig	2011-01-07 15:07:54.000000000 +0000
+++ tbl_data.c
@@@@ -167,13 +167,19 @@@@ tbl_data(struct tbl_node *tbl, int ln, c
 	/* 
 	 * Choose a layout row: take the one following the last parsed
 	 * span's.  If that doesn't exist, use the last parsed span's.
-	 * If there's no last parsed span, use the first row.  This can
-	 * be NULL!
+	 * If there's no last parsed span, use the first row.  Lastly,
+	 * if the last span was a horizontal line, use the same layout
+	 * (it doesn't "consume" the layout).
+	 *
+	 * In the end, this can be NULL!
 	 */
 
 	if (tbl->last_span) {
 		assert(tbl->last_span->layout);
-		rp = tbl->last_span->layout->next;
+		if (tbl->last_span->pos == TBL_SPAN_DATA)
+			rp = tbl->last_span->layout->next;
+		else
+			rp = tbl->last_span->layout;
 		if (NULL == rp)
 			rp = tbl->last_span->layout;
 	} else
@


1.1
log
@Add post-release patch from upstream that joerg deems critical.
Ride update.
@
text
@d1 1
a1 1
$NetBSD$
@