summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-09-27 09:26:27 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-09-27 09:26:27 +0000
commit5e146dc806363b4ffaa3ee4856b6564254b5299a (patch)
tree5b894f7c481f45415b4faa09eaa7ff002f9bb87a
parent56b8aa498cd01ec108cbf961007a5fb70b85996a (diff)
downloadmandoc-5e146dc806363b4ffaa3ee4856b6564254b5299a.tar.gz
Ignore double-`Pp' and `Pp' before `Bd' and `Bl' (unless -compact is
specified).
-rw-r--r--TODO4
-rw-r--r--main.c1
-rw-r--r--mandoc.h1
-rw-r--r--mdoc_validate.c26
4 files changed, 25 insertions, 7 deletions
diff --git a/TODO b/TODO
index 2687eb20..bf8903eb 100644
--- a/TODO
+++ b/TODO
@@ -145,10 +145,6 @@
on the next line, it must be indented by -width, not width+1;
see "rule block|pass" in OpenBSD ifconfig(8).
-- Bogus .Pp before .Bl should not cause a double blank line,
- see "The route utility provides the following simple commands:"
- in OpenBSD route(8).
-
************************************************************************
* performance issues
************************************************************************
diff --git a/main.c b/main.c
index 721b9037..24c574c2 100644
--- a/main.c
+++ b/main.c
@@ -174,6 +174,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"missing font type",
"line argument(s) will be lost",
"body argument(s) will be lost",
+ "paragraph macro ignored",
"generic fatal error",
diff --git a/mandoc.h b/mandoc.h
index f7c2bd02..91678edf 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -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 ===== */
diff --git a/mdoc_validate.c b/mdoc_validate.c
index a9f4e56c..0f1d8a1d 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -100,6 +100,7 @@ static int pre_display(PRE_ARGS);
static int pre_dt(PRE_ARGS);
static int pre_it(PRE_ARGS);
static int pre_os(PRE_ARGS);
+static int pre_pp(PRE_ARGS);
static int pre_rv(PRE_ARGS);
static int pre_sh(PRE_ARGS);
static int pre_ss(PRE_ARGS);
@@ -129,8 +130,8 @@ static v_post posts_vt[] = { post_vt, NULL };
static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
static v_post posts_wtext[] = { ewarn_ge1, NULL };
static v_pre pres_an[] = { pre_an, NULL };
-static v_pre pres_bd[] = { pre_display, pre_bd, NULL };
-static v_pre pres_bl[] = { pre_bl, NULL };
+static v_pre pres_bd[] = { pre_display, pre_bd, pre_pp, NULL };
+static v_pre pres_bl[] = { pre_bl, pre_pp, NULL };
static v_pre pres_d1[] = { pre_display, NULL };
static v_pre pres_dd[] = { pre_dd, NULL };
static v_pre pres_dt[] = { pre_dt, NULL };
@@ -139,6 +140,7 @@ static v_pre pres_ex[] = { NULL, NULL };
static v_pre pres_fd[] = { NULL, NULL };
static v_pre pres_it[] = { pre_it, NULL };
static v_pre pres_os[] = { pre_os, NULL };
+static v_pre pres_pp[] = { pre_pp, NULL };
static v_pre pres_rv[] = { pre_rv, NULL };
static v_pre pres_sh[] = { pre_sh, NULL };
static v_pre pres_ss[] = { pre_ss, NULL };
@@ -150,7 +152,7 @@ const struct valids mdoc_valids[MDOC_MAX] = {
{ pres_os, NULL }, /* Os */
{ pres_sh, posts_sh }, /* Sh */
{ pres_ss, posts_ss }, /* Ss */
- { NULL, posts_notext }, /* Pp */
+ { pres_pp, posts_notext }, /* Pp */
{ pres_d1, posts_wline }, /* D1 */
{ pres_d1, posts_wline }, /* Dl */
{ pres_bd, posts_bd_bk }, /* Bd */
@@ -1465,3 +1467,21 @@ post_sh_head(POST_ARGS)
return(1);
}
+
+
+static int
+pre_pp(PRE_ARGS)
+{
+
+ if (NULL == mdoc->last || MDOC_Pp != mdoc->last->tok)
+ return(1);
+
+ if (MDOC_Bl == n->tok && n->data.Bl->comp)
+ return(1);
+ if (MDOC_Bd == n->tok && n->data.Bd->comp)
+ return(1);
+
+ mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
+ mdoc_node_delete(mdoc, mdoc->last);
+ return(1);
+}