summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-09-14 15:36:14 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-09-14 15:36:14 +0000
commita56a160b9614f2772c5f1aa68fe4b0e7f3baf55c (patch)
tree13d9ab28831d91e2d09ea2b46b6cb65f463b7ca8
parentd2adfebbaa7840853e155aeba058fa8378e9c967 (diff)
downloadmandoc-a56a160b9614f2772c5f1aa68fe4b0e7f3baf55c.tar.gz
Remove the warning about children of .Vt blocks because actually,
.Vt type global_variable No = Dv defined_constant ; is the best way to specify in the SYNOPSIS how a global variable is initialized in the rare case where that matters. Issue noticed by jmc@.
-rw-r--r--mandoc.17
-rw-r--r--mandoc.h1
-rw-r--r--mdoc_validate.c25
-rw-r--r--read.c1
4 files changed, 1 insertions, 33 deletions
diff --git a/mandoc.1 b/mandoc.1
index 1ec15864..477b8c95 100644
--- a/mandoc.1
+++ b/mandoc.1
@@ -934,13 +934,6 @@ list block contains text or macros before the first
.Ic \&It
macro.
The offending children are moved before the beginning of the list.
-.It Sy ".Vt block has child macro"
-.Pq mdoc
-The
-.Ic \&Vt
-macro supports plain text arguments only.
-Formatting may be ugly and semantic searching
-for the affected content might not work.
.It Sy "fill mode already enabled, skipping"
.Pq man
A
diff --git a/mandoc.h b/mandoc.h
index d68f3c16..98f7da95 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -86,7 +86,6 @@ enum mandocerr {
MANDOCERR_BLK_NEST, /* blocks badly nested: macro ... */
MANDOCERR_BD_NEST, /* nested displays are not portable: macro ... */
MANDOCERR_BL_MOVE, /* moving content out of list: macro */
- MANDOCERR_VT_CHILD, /* .Vt block has child macro: macro */
MANDOCERR_FI_SKIP, /* fill mode already enabled, skipping: fi */
MANDOCERR_NF_SKIP, /* fill mode already disabled, skipping: nf */
MANDOCERR_BLK_LINE, /* line scope broken: macro breaks macro */
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 6c9fff89..426332c2 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -107,7 +107,6 @@ static void post_sh_see_also(POST_ARGS);
static void post_sh_authors(POST_ARGS);
static void post_sm(POST_ARGS);
static void post_st(POST_ARGS);
-static void post_vt(POST_ARGS);
static void pre_an(PRE_ARGS);
static void pre_bd(PRE_ARGS);
@@ -161,7 +160,7 @@ static const struct valids mdoc_valids[MDOC_MAX] = {
{ pre_std, NULL }, /* Rv */
{ NULL, post_st }, /* St */
{ NULL, NULL }, /* Va */
- { NULL, post_vt }, /* Vt */
+ { NULL, NULL }, /* Vt */
{ NULL, NULL }, /* Xr */
{ NULL, NULL }, /* %A */
{ NULL, post_hyph }, /* %B */ /* FIXME: can be used outside Rs/Re. */
@@ -933,28 +932,6 @@ post_fa(POST_ARGS)
}
static void
-post_vt(POST_ARGS)
-{
- const struct roff_node *n;
-
- /*
- * The Vt macro comes in both ELEM and BLOCK form, both of which
- * have different syntaxes (yet more context-sensitive
- * behaviour). ELEM types must have a child, which is already
- * guaranteed by the in_line parsing routine; BLOCK types,
- * specifically the BODY, should only have TEXT children.
- */
-
- if (mdoc->last->type != ROFFT_BODY)
- return;
-
- for (n = mdoc->last->child; n; n = n->next)
- if (n->type != ROFFT_TEXT)
- mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,
- n->line, n->pos, mdoc_macronames[n->tok]);
-}
-
-static void
post_nm(POST_ARGS)
{
struct roff_node *n;
diff --git a/read.c b/read.c
index 11b24ac1..5bf56123 100644
--- a/read.c
+++ b/read.c
@@ -129,7 +129,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"blocks badly nested",
"nested displays are not portable",
"moving content out of list",
- ".Vt block has child macro",
"fill mode already enabled, skipping",
"fill mode already disabled, skipping",
"line scope broken",