version 1.311, 2017/01/08 00:11:24 |
version 1.314, 2017/01/10 13:47:00 |
Line 297 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 297 mdoc_node_validate(struct roff_man *mdoc) |
|
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
if (n->sec != SEC_SYNOPSIS || n->parent->tok != MDOC_Fd) |
if (n->sec != SEC_SYNOPSIS || |
|
(n->parent->tok != MDOC_Cd && n->parent->tok != MDOC_Fd)) |
check_text(mdoc, n->line, n->pos, n->string); |
check_text(mdoc, n->line, n->pos, n->string); |
break; |
break; |
case ROFFT_EQN: |
case ROFFT_EQN: |
Line 316 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 317 mdoc_node_validate(struct roff_man *mdoc) |
|
*/ |
*/ |
|
|
if (n->child != NULL) |
if (n->child != NULL) |
n->child->flags &= ~MDOC_DELIMC; |
n->child->flags &= ~NODE_DELIMC; |
if (n->last != NULL) |
if (n->last != NULL) |
n->last->flags &= ~MDOC_DELIMO; |
n->last->flags &= ~NODE_DELIMO; |
|
|
/* Call the macro's postprocessor. */ |
/* Call the macro's postprocessor. */ |
|
|
Line 944 post_defaults(POST_ARGS) |
|
Line 945 post_defaults(POST_ARGS) |
|
case MDOC_Ar: |
case MDOC_Ar: |
mdoc->next = ROFF_NEXT_CHILD; |
mdoc->next = ROFF_NEXT_CHILD; |
roff_word_alloc(mdoc, nn->line, nn->pos, "file"); |
roff_word_alloc(mdoc, nn->line, nn->pos, "file"); |
|
mdoc->last->flags |= NODE_NOSRC; |
roff_word_alloc(mdoc, nn->line, nn->pos, "..."); |
roff_word_alloc(mdoc, nn->line, nn->pos, "..."); |
|
mdoc->last->flags |= NODE_NOSRC; |
break; |
break; |
case MDOC_Pa: |
case MDOC_Pa: |
case MDOC_Mt: |
case MDOC_Mt: |
mdoc->next = ROFF_NEXT_CHILD; |
mdoc->next = ROFF_NEXT_CHILD; |
roff_word_alloc(mdoc, nn->line, nn->pos, "~"); |
roff_word_alloc(mdoc, nn->line, nn->pos, "~"); |
|
mdoc->last->flags |= NODE_NOSRC; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
|
|
post_ns(POST_ARGS) |
post_ns(POST_ARGS) |
{ |
{ |
|
|
if (mdoc->last->flags & MDOC_LINE) |
if (mdoc->last->flags & NODE_LINE) |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
} |
} |
Line 1940 post_dd(POST_ARGS) |
|
Line 1944 post_dd(POST_ARGS) |
|
char *datestr; |
char *datestr; |
|
|
n = mdoc->last; |
n = mdoc->last; |
|
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->meta.date != NULL) { |
if (mdoc->meta.date != NULL) { |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
n->line, n->pos, "Dd"); |
n->line, n->pos, "Dd"); |
Line 1957 post_dd(POST_ARGS) |
|
Line 1963 post_dd(POST_ARGS) |
|
if (n->child == NULL || n->child->string[0] == '\0') { |
if (n->child == NULL || n->child->string[0] == '\0') { |
mdoc->meta.date = mdoc->quick ? mandoc_strdup("") : |
mdoc->meta.date = mdoc->quick ? mandoc_strdup("") : |
mandoc_normdate(mdoc->parse, NULL, n->line, n->pos); |
mandoc_normdate(mdoc->parse, NULL, n->line, n->pos); |
goto out; |
return; |
} |
} |
|
|
datestr = NULL; |
datestr = NULL; |
Line 1969 post_dd(POST_ARGS) |
|
Line 1975 post_dd(POST_ARGS) |
|
datestr, n->line, n->pos); |
datestr, n->line, n->pos); |
free(datestr); |
free(datestr); |
} |
} |
out: |
|
roff_node_delete(mdoc, n); |
|
} |
} |
|
|
static void |
static void |
Line 1981 post_dt(POST_ARGS) |
|
Line 1985 post_dt(POST_ARGS) |
|
char *p; |
char *p; |
|
|
n = mdoc->last; |
n = mdoc->last; |
|
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->flags & MDOC_PBODY) { |
if (mdoc->flags & MDOC_PBODY) { |
mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse, |
n->line, n->pos, "Dt"); |
n->line, n->pos, "Dt"); |
goto out; |
return; |
} |
} |
|
|
if (mdoc->meta.title != NULL) |
if (mdoc->meta.title != NULL) |
Line 2036 post_dt(POST_ARGS) |
|
Line 2042 post_dt(POST_ARGS) |
|
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
"Dt %s", mdoc->meta.title); |
"Dt %s", mdoc->meta.title); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
goto out; /* msec and arch remain NULL. */ |
return; /* msec and arch remain NULL. */ |
} |
} |
|
|
mdoc->meta.msec = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
Line 2054 post_dt(POST_ARGS) |
|
Line 2060 post_dt(POST_ARGS) |
|
/* Optional third argument: architecture. */ |
/* Optional third argument: architecture. */ |
|
|
if ((nn = nn->next) == NULL) |
if ((nn = nn->next) == NULL) |
goto out; |
return; |
|
|
for (p = nn->string; *p != '\0'; p++) |
for (p = nn->string; *p != '\0'; p++) |
*p = tolower((unsigned char)*p); |
*p = tolower((unsigned char)*p); |
Line 2065 post_dt(POST_ARGS) |
|
Line 2071 post_dt(POST_ARGS) |
|
if ((nn = nn->next) != NULL) |
if ((nn = nn->next) != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
nn->line, nn->pos, "Dt ... %s", nn->string); |
nn->line, nn->pos, "Dt ... %s", nn->string); |
|
|
out: |
|
roff_node_delete(mdoc, n); |
|
} |
} |
|
|
static void |
static void |
Line 2095 post_os(POST_ARGS) |
|
Line 2098 post_os(POST_ARGS) |
|
struct roff_node *n; |
struct roff_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
|
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->meta.os != NULL) |
if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
Line 2115 post_os(POST_ARGS) |
|
Line 2120 post_os(POST_ARGS) |
|
mdoc->meta.os = NULL; |
mdoc->meta.os = NULL; |
deroff(&mdoc->meta.os, n); |
deroff(&mdoc->meta.os, n); |
if (mdoc->meta.os) |
if (mdoc->meta.os) |
goto out; |
return; |
|
|
if (mdoc->defos) { |
if (mdoc->defos) { |
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
goto out; |
return; |
} |
} |
|
|
#ifdef OSNAME |
#ifdef OSNAME |
Line 2136 post_os(POST_ARGS) |
|
Line 2141 post_os(POST_ARGS) |
|
} |
} |
mdoc->meta.os = mandoc_strdup(defbuf); |
mdoc->meta.os = mandoc_strdup(defbuf); |
#endif /*!OSNAME*/ |
#endif /*!OSNAME*/ |
|
|
out: |
|
roff_node_delete(mdoc, n); |
|
} |
} |
|
|
/* |
/* |