From 1d4e2c60a5e3dc90cf35c40cb7d7ac6f9acf2f9a Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 27 Sep 2010 21:25:29 +0000 Subject: Merge the last bits of 1.10.6 (released today), most were already in: * ignore double-.Pp * ignore .Pp before .Bd and .Bl (unless -compact in specified) * avoid double blank line upon .Pp, .br and friends in literal context * cast enums to int when passing them to exit(3) to please lint(1) While merging, fix a regression introduced by kristaps@: Outside literal mode, double blank lines must both be printed. To achieve this again after kristaps@ improvements in 1.10.6, treat such blank lines as .sp (instead of .Pp as in 1.10.5) and drop .Pp before .sp just like dropping .Pp before .Pp. --- usr.bin/mandoc/mandoc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'usr.bin/mandoc/mandoc.h') diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index d9c9f8e05e1..79835c52e62 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.13 2010/09/26 20:19:58 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.14 2010/09/27 21:25:28 schwarze Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons * @@ -99,6 +99,7 @@ enum mandocerr { MANDOCERR_FONTTYPE, /* missing font type */ MANDOCERR_ARGSLOST, /* line argument(s) will be lost */ MANDOCERR_BODYLOST, /* body argument(s) will be lost */ + MANDOCERR_IGNPAR, /* paragraph macro ignored */ MANDOCERR_FATAL, /* ===== end of fatal errors ===== */ -- cgit v1.2.3