summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2010-12-06 22:43:55 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2010-12-06 22:43:55 +0000
commitcf4e9a6c3825cabc7cd4c39c894d72cc4f1ff2ac (patch)
tree91825e034da622b62fd018afc22e7269af490fbe
parenta71c133efb7026da05ac2f7f41a6926bc5824a63 (diff)
Never print .P, .PP, and .LP header content.
From kristaps@.
-rw-r--r--usr.bin/mandoc/man_html.c7
-rw-r--r--usr.bin/mandoc/man_term.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c
index 6301ddc3906..54e62530832 100644
--- a/usr.bin/mandoc/man_html.c
+++ b/usr.bin/mandoc/man_html.c
@@ -1,4 +1,4 @@
-/* $Id: man_html.c,v 1.21 2010/11/29 02:26:45 schwarze Exp $ */
+/* $Id: man_html.c,v 1.22 2010/12/06 22:43:54 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -544,8 +544,10 @@ man_PP_pre(MAN_ARGS)
struct roffsu su;
int i;
- if (MAN_BLOCK != n->type)
+ if (MAN_BODY == n->type)
return(1);
+ if (MAN_HEAD == n->type)
+ return(0);
i = 0;
@@ -562,6 +564,7 @@ man_PP_pre(MAN_ARGS)
PAIR_STYLE_INIT(&tag, h);
print_otag(h, TAG_DIV, i, &tag);
+
return(1);
}
diff --git a/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c
index 0b8a8d5cdc2..1a4280fc81b 100644
--- a/usr.bin/mandoc/man_term.c
+++ b/usr.bin/mandoc/man_term.c
@@ -1,4 +1,4 @@
-/* $Id: man_term.c,v 1.53 2010/11/29 02:26:45 schwarze Exp $ */
+/* $Id: man_term.c,v 1.54 2010/12/06 22:43:54 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -510,7 +510,7 @@ pre_PP(DECL_ARGS)
break;
}
- return(1);
+ return(MAN_HEAD != n->type);
}