summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2010-12-06 22:10:14 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2010-12-06 22:10:14 +0000
commit2131988aa3472105a2067d04c42151159fe3515d (patch)
treedc93dc18a1bdbf46ee7f363cb61f5c1841ed6045
parent06811f8b859a05f9e03926e7738072c6f7fbbc50 (diff)
Do not follow .D1 and .Dl inside .Bd with a blank line.
Kristaps@ came up with this improvement when he merged my patch introducing support for nested displays.
-rw-r--r--usr.bin/mandoc/mdoc_html.c6
-rw-r--r--usr.bin/mandoc/mdoc_term.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c
index a83235cd6da..50e2e4e9bfb 100644
--- a/usr.bin/mandoc/mdoc_html.c
+++ b/usr.bin/mandoc/mdoc_html.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_html.c,v 1.38 2010/12/01 22:02:29 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.39 2010/12/06 22:10:13 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -1329,6 +1329,10 @@ mdoc_bd_pre(MDOC_ARGS)
/* FALLTHROUGH */
case (MDOC_Bl):
/* FALLTHROUGH */
+ case (MDOC_D1):
+ /* FALLTHROUGH */
+ case (MDOC_Dl):
+ /* FALLTHROUGH */
case (MDOC_Lp):
/* FALLTHROUGH */
case (MDOC_Pp):
diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c
index 1b519bd6a16..f447c24d4b4 100644
--- a/usr.bin/mandoc/mdoc_term.c
+++ b/usr.bin/mandoc/mdoc_term.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_term.c,v 1.114 2010/12/01 22:02:29 schwarze Exp $ */
+/* $Id: mdoc_term.c,v 1.115 2010/12/06 22:10:13 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -1592,6 +1592,10 @@ termp_bd_pre(DECL_ARGS)
/* FALLTHROUGH */
case (MDOC_Bl):
/* FALLTHROUGH */
+ case (MDOC_D1):
+ /* FALLTHROUGH */
+ case (MDOC_Dl):
+ /* FALLTHROUGH */
case (MDOC_Lp):
/* FALLTHROUGH */
case (MDOC_Pp):