From b35e18840fdc536364e4d41b021fe53af309bb59 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 5 Dec 2010 15:37:30 +0000 Subject: Merge schwarze@'s changes allowing nested displays. Tweak the patch by making sure output doesn't add a superfluous newline with the nested displays. Also add a COMPATIBILITY note. Rename a macro (DATESIZ) to be in line with OpenBSD (DATESIZE). --- mandoc.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mandoc.h') diff --git a/mandoc.h b/mandoc.h index 207dbe2b..b2a84ac1 100644 --- a/mandoc.h +++ b/mandoc.h @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.26 2010/12/01 16:54:25 kristaps Exp $ */ +/* $Id: mandoc.h,v 1.27 2010/12/05 15:37:30 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons * @@ -69,6 +69,7 @@ enum mandocerr { MANDOCERR_NAMESECFIRST, /* NAME section must come first */ MANDOCERR_BADBOOL, /* bad Boolean value */ MANDOCERR_CHILD, /* child violates parent syntax */ + MANDOCERR_NESTEDDISP, /* displays may not be nested */ MANDOCERR_BADATT, /* bad AT&T symbol */ MANDOCERR_BADSTANDARD, /* bad standard */ MANDOCERR_LISTREP, /* list type repeated */ @@ -106,8 +107,6 @@ enum mandocerr { MANDOCERR_FATAL, /* ===== start of fatal errors ===== */ MANDOCERR_COLUMNS, /* column syntax is inconsistent */ - /* FIXME: this should be a MANDOCERR_ERROR */ - MANDOCERR_NESTEDDISP, /* displays may not be nested */ MANDOCERR_BADDISP, /* unsupported display type */ MANDOCERR_SCOPEFATAL, /* blocks badly nested */ MANDOCERR_SYNTNOSCOPE, /* no scope to rewind: syntax violated */ -- cgit v1.2.3