mandoc/mdoc_validate.c - diff

Return to mdoc_validate.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_validate.c between version 1.370 and 1.385

version 1.370, 2019/03/04 11:40:09

version 1.385, 2020/04/18 20:40:10

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

Line 15

* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

* Validation module for mdoc(7) syntax trees used by mandoc(1).

#include "config.h"

Line 39

Line 41

#include "libmandoc.h"

#include "roff_int.h"

#include "libmdoc.h"

#include "tag.h"

/* FIXME: .Bl -diag can't have non-text children in HEAD. */

Line 64 static size_t macro2len(enum roff_tok);

Line 67 static size_t macro2len(enum roff_tok);

static void rewrite_macro2len(struct roff_man *, char **);

static int similar(const char *, const char *);

static void post_abort(POST_ARGS);

static void post_abort(POST_ARGS) __attribute__((__noreturn__));

static void post_an(POST_ARGS);

static void post_an_norm(POST_ARGS);

static void post_at(POST_ARGS);

Line 82 static void post_dd(POST_ARGS);

Line 85 static void post_dd(POST_ARGS);

static void post_delim(POST_ARGS);

static void post_delim_nb(POST_ARGS);

static void post_dt(POST_ARGS);

static void post_em(POST_ARGS);

static void post_en(POST_ARGS);

static void post_er(POST_ARGS);

static void post_es(POST_ARGS);

static void post_eoln(POST_ARGS);

static void post_ex(POST_ARGS);

Line 91 static void post_fn(POST_ARGS);

Line 96 static void post_fn(POST_ARGS);

static void post_fname(POST_ARGS);

static void post_fo(POST_ARGS);

static void post_hyph(POST_ARGS);

static void post_ignpar(POST_ARGS);

static void post_it(POST_ARGS);

static void post_lb(POST_ARGS);

static void post_nd(POST_ARGS);

Line 104 static void post_prevpar(POST_ARGS);

Line 108 static void post_prevpar(POST_ARGS);

static void post_root(POST_ARGS);

static void post_rs(POST_ARGS);

static void post_rv(POST_ARGS);

static void post_section(POST_ARGS);

static void post_sh(POST_ARGS);

static void post_sh_head(POST_ARGS);

static void post_sh_name(POST_ARGS);

Line 113 static void post_sm(POST_ARGS);

Line 118 static void post_sm(POST_ARGS);

static void post_st(POST_ARGS);

static void post_std(POST_ARGS);

static void post_sx(POST_ARGS);

static void post_tag(POST_ARGS);

static void post_tg(POST_ARGS);

static void post_useless(POST_ARGS);

static void post_xr(POST_ARGS);

static void post_xx(POST_ARGS);

Line 122 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

Line 129 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

post_dt, /* Dt */

post_os, /* Os */

post_sh, /* Sh */

post_ignpar, /* Ss */

post_section, /* Ss */

post_par, /* Pp */

post_display, /* D1 */

post_display, /* Dl */

Line 136 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

Line 143 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

NULL, /* Ap */

post_defaults, /* Ar */

NULL, /* Cd */

post_delim_nb, /* Cm */

post_tag, /* Cm */

post_delim_nb, /* Dv */

post_tag, /* Dv */

post_delim_nb, /* Er */

post_er, /* Er */

post_delim_nb, /* Ev */

post_tag, /* Ev */

post_ex, /* Ex */

post_fa, /* Fa */

NULL, /* Fd */

post_delim_nb, /* Fl */

post_tag, /* Fl */

post_fn, /* Fn */

post_delim_nb, /* Ft */

post_delim_nb, /* Ic */

post_tag, /* Ic */

post_delim_nb, /* In */

post_defaults, /* Li */

post_tag, /* Li */

post_nd, /* Nd */

post_nm, /* Nm */

post_delim_nb, /* Op */

Line 186 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

Line 193 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

NULL, /* Dq */

NULL, /* Ec */

NULL, /* Ef */

post_delim_nb, /* Em */

post_em, /* Em */

NULL, /* Eo */

post_xx, /* Fx */

post_delim_nb, /* Ms */

post_tag, /* Ms */

NULL, /* No */

post_tag, /* No */

post_ns, /* Ns */

post_xx, /* Nx */

post_xx, /* Ox */

Line 209 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

Line 216 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

post_delim_nb, /* Sq */

post_sm, /* Sm */

post_sx, /* Sx */

post_delim_nb, /* Sy */

post_em, /* Sy */

post_useless, /* Tn */

post_xx, /* Ux */

NULL, /* Xc */

Line 238 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

Line 245 static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] =

NULL, /* %Q */

NULL, /* %U */

NULL, /* Ta */

post_tg, /* Tg */

};

#define RSORD_MAX 14 /* Number of `Rs' blocks. */

Line 285 static const char * const secnames[SEC__MAX] = {

Line 293 static const char * const secnames[SEC__MAX] = {

NULL

};

static int fn_prio = TAG_STRONG;

/* Validate the subtree rooted at mdoc->last. */

void

mdoc_validate(struct roff_man *mdoc)

Line 1090 post_st(POST_ARGS)

Line 1100 post_st(POST_ARGS)

}

static void

post_tg(POST_ARGS)

{

struct roff_node *n; /* The .Tg node. */

struct roff_node *nch; /* The first child of the .Tg node. */

struct roff_node *nn; /* The next node after the .Tg node. */

struct roff_node *np; /* The parent of the next node. */

struct roff_node *nt; /* The TEXT node containing the tag. */

size_t len; /* The number of bytes in the tag. */

/* Find the next node. */

n = mdoc->last;

for (nn = n; nn != NULL; nn = nn->parent) {

if (nn->next != NULL) {

nn = nn->next;

break;

}

/* Find the tag. */

nt = nch = n->child;

if (nch == NULL && nn != NULL && nn->child != NULL &&

nn->child->type == ROFFT_TEXT)

nt = nn->child;

/* Validate the tag. */

if (nt == NULL || *nt->string == '\0')

mandoc_msg(MANDOCERR_MACRO_EMPTY, n->line, n->pos, "Tg");

if (nt == NULL) {

roff_node_delete(mdoc, n);

return;

}

len = strcspn(nt->string, " \t\\");

if (nt->string[len] != '\0')

mandoc_msg(MANDOCERR_TG_SPC, nt->line,

nt->pos + len, "Tg %s", nt->string);

/* Keep only the first argument. */

if (nch != NULL && nch->next != NULL) {

mandoc_msg(MANDOCERR_ARG_EXCESS, nch->next->line,

nch->next->pos, "Tg ... %s", nch->next->string);

while (nch->next != NULL)

roff_node_delete(mdoc, nch->next);

}

/* Drop the macro if the first argument is invalid. */

if (len == 0 || nt->string[len] != '\0') {

roff_node_delete(mdoc, n);

return;

}

/* By default, tag the .Tg node itself. */

if (nn == NULL || nn->flags & NODE_ID)

nn = n;

/* Explicit tagging of specific macros. */

switch (nn->tok) {

case MDOC_Sh:

case MDOC_Ss:

case MDOC_Fo:

nn = nn->head->child == NULL ? n : nn->head;

break;

case MDOC_It:

np = nn->parent;

while (np->tok != MDOC_Bl)

np = np->parent;

switch (np->norm->Bl.type) {

case LIST_column:

break;

case LIST_diag:

case LIST_hang:

case LIST_inset:

case LIST_ohang:

case LIST_tag:

nn = nn->head;

break;

case LIST_bullet:

case LIST_dash:

case LIST_enum:

case LIST_hyphen:

case LIST_item:

nn = nn->body->child == NULL ? n : nn->body;

break;

default:

abort();

}

break;

case MDOC_Bd:

case MDOC_Bl:

case MDOC_D1:

case MDOC_Dl:

nn = nn->body->child == NULL ? n : nn->body;

break;

case MDOC_Pp:

break;

case MDOC_Cm:

case MDOC_Dv:

case MDOC_Em:

case MDOC_Er:

case MDOC_Ev:

case MDOC_Fl:

case MDOC_Fn:

case MDOC_Ic:

case MDOC_Li:

case MDOC_Ms:

case MDOC_No:

case MDOC_Sy:

if (nn->child == NULL)

nn = n;

break;

default:

nn = n;

break;

}

tag_put(nt->string, TAG_MANUAL, nn);

if (nn != n)

n->flags |= NODE_NOPRT;

}

static void

post_obsolete(POST_ARGS)

{

struct roff_node *n;

Line 1181 post_bf(POST_ARGS)

Line 1310 post_bf(POST_ARGS)

static void

post_fname(POST_ARGS)

{

const struct roff_node *n;

struct roff_node *n, *nch;

const char *cp;

size_t pos;

n = mdoc->last->child;

n = mdoc->last;

pos = strcspn(n->string, "()");

nch = n->child;

cp = n->string + pos;

cp = nch->string;

if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*')))

if (*cp == '(') {

mandoc_msg(MANDOCERR_FN_PAREN, n->line, n->pos + pos,

if (cp[strlen(cp + 1)] == ')')

"%s", n->string);

return;

pos = 0;

} else {

pos = strcspn(cp, "()");

if (cp[pos] == '\0') {

if (n->sec == SEC_DESCRIPTION ||

n->sec == SEC_CUSTOM)

tag_put(NULL, fn_prio++, n);

return;

}

mandoc_msg(MANDOCERR_FN_PAREN, nch->line, nch->pos + pos, "%s", cp);

}

static void

post_fn(POST_ARGS)

{

post_fname(mdoc);

post_fa(mdoc);

}

Line 1360 post_display(POST_ARGS)

Line 1499 post_display(POST_ARGS)

static void

post_defaults(POST_ARGS)

{

struct roff_node *nn;

struct roff_node *n;

if (mdoc->last->child != NULL) {

n = mdoc->last;

if (n->child != NULL) {

post_delim_nb(mdoc);

return;

}

mdoc->next = ROFF_NEXT_CHILD;

switch (n->tok) {

* The `Ar' defaults to "file ..." if no value is provided as an

* argument; the `Mt' and `Pa' macros use "~"; the `Li' just

* gets an empty string.

nn = mdoc->last;

switch (nn->tok) {

case MDOC_Ar:

mdoc->next = ROFF_NEXT_CHILD;

roff_word_alloc(mdoc, n->line, n->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, n->line, n->pos, "...");

mdoc->last->flags |= NODE_NOSRC;

break;

case MDOC_Pa:

case MDOC_Mt:

mdoc->next = ROFF_NEXT_CHILD;

roff_word_alloc(mdoc, n->line, n->pos, "~");

roff_word_alloc(mdoc, nn->line, nn->pos, "~");

mdoc->last->flags |= NODE_NOSRC;

break;

default:

abort();

}

mdoc->last = nn;

mdoc->last->flags |= NODE_NOSRC;

mdoc->last = n;

}

static void

Line 1445 post_an(POST_ARGS)

Line 1575 post_an(POST_ARGS)

}

static void

post_en(POST_ARGS)

post_em(POST_ARGS)

{

post_tag(mdoc);

tag_put(NULL, TAG_FALLBACK, mdoc->last);

}

static void

post_en(POST_ARGS)

{

post_obsolete(mdoc);

if (mdoc->last->type == ROFFT_BLOCK)

mdoc->last->norm->Es = mdoc->last_es;

}

static void

post_es(POST_ARGS)

post_er(POST_ARGS)

{

struct roff_node *n;

n = mdoc->last;

if (n->sec == SEC_ERRORS &&

(n->parent->tok == MDOC_It ||

(n->parent->tok == MDOC_Bq &&

n->parent->parent->parent->tok == MDOC_It)))

tag_put(NULL, TAG_STRONG, n);

post_delim_nb(mdoc);

}

static void

post_tag(POST_ARGS)

{

struct roff_node *n;

n = mdoc->last;

if ((n->prev == NULL ||

(n->prev->type == ROFFT_TEXT &&

strcmp(n->prev->string, "|") == 0)) &&

(n->parent->tok == MDOC_It ||

(n->parent->tok == MDOC_Xo &&

n->parent->parent->prev == NULL &&

n->parent->parent->parent->tok == MDOC_It)))

tag_put(NULL, TAG_STRONG, n);

post_delim_nb(mdoc);

}

static void

post_es(POST_ARGS)

{

post_obsolete(mdoc);

mdoc->last_es = mdoc->last;

}

Line 1553 post_it(POST_ARGS)

Line 1719 post_it(POST_ARGS)

if ((nch = nit->head->child) != NULL)

mandoc_msg(MANDOCERR_ARG_SKIP,

nit->line, nit->pos, "It %s",

nch->string == NULL ? roff_name[nch->tok] :

nch->type == ROFFT_TEXT ? nch->string :

nch->string);

roff_name[nch->tok]);

break;

case LIST_column:

cols = (int)nbl->norm->Bl.ncols;

Line 1717 post_bl_head(POST_ARGS)

Line 1883 post_bl_head(POST_ARGS)

static void

post_bl(POST_ARGS)

{

struct roff_node *nparent, *nprev; /* of the Bl block */

struct roff_node *nbody; /* of the Bl */

struct roff_node *nblock, *nbody; /* of the Bl */

struct roff_node *nchild, *nnext; /* of the Bl body */

const char *prev_Er;

int order;

Line 1739 post_bl(POST_ARGS)

Line 1904 post_bl(POST_ARGS)

if (nbody->end != ENDBODY_NOT)

return;

nchild = nbody->child;

if (nchild == NULL) {

* Up to the first item, move nodes before the list,

mandoc_msg(MANDOCERR_BLK_EMPTY,

* but leave transparent nodes where they are

nbody->line, nbody->pos, "Bl");

* if they precede an item.

return;

* The next non-transparent node is kept in nchild.

* It only needs to be updated after a non-transparent

* node was moved out, and at the very beginning

* when no node at all was moved yet.

nchild = mdoc->last;

for (;;) {

if (nchild == mdoc->last)

nchild = roff_node_child(nbody);

if (nchild == NULL) {

mdoc->last = nbody;

mandoc_msg(MANDOCERR_BLK_EMPTY,

nbody->line, nbody->pos, "Bl");

return;

}

if (nchild->tok == MDOC_It) {

mdoc->last = nbody;

break;

}

mandoc_msg(MANDOCERR_BL_MOVE, nbody->child->line,

nbody->child->pos, "%s", roff_name[nbody->child->tok]);

if (nbody->parent->prev == NULL) {

mdoc->last = nbody->parent->parent;

mdoc->next = ROFF_NEXT_CHILD;

} else {

mdoc->last = nbody->parent->prev;

mdoc->next = ROFF_NEXT_SIBLING;

}

roff_node_relink(mdoc, nbody->child);

}

* We have reached the first item,

* so moving nodes out is no longer possible.

* But in .Bl -column, the first rows may be implicit,

* that is, they may not start with .It macros.

* Such rows may be followed by nodes generated on the

* roff level, for example .TS.

* Wrap such roff nodes into an implicit row.

while (nchild != NULL) {

nnext = nchild->next;

if (nchild->tok == MDOC_It) {

if (nchild->tok == MDOC_It ||

nchild = roff_node_next(nchild);

(nchild->tok == MDOC_Sm &&

nnext != NULL && nnext->tok == MDOC_It)) {

nchild = nnext;

continue;

}

nnext = nchild->next;

mdoc->last = nchild->prev;

* In .Bl -column, the first rows may be implicit,

mdoc->next = ROFF_NEXT_SIBLING;

* that is, they may not start with .It macros.

roff_block_alloc(mdoc, nchild->line, nchild->pos, MDOC_It);

* Such rows may be followed by nodes generated on the

roff_head_alloc(mdoc, nchild->line, nchild->pos, MDOC_It);

* roff level, for example .TS, which cannot be moved

mdoc->next = ROFF_NEXT_SIBLING;

* out of the list. In that case, wrap such roff nodes

roff_body_alloc(mdoc, nchild->line, nchild->pos, MDOC_It);

* into an implicit row.

while (nchild->tok != MDOC_It) {

roff_node_relink(mdoc, nchild);

if (nnext == NULL)

if (nchild->prev != NULL) {

break;

mdoc->last = nchild;

nchild = nnext;

nnext = nchild->next;

mdoc->next = ROFF_NEXT_SIBLING;

roff_block_alloc(mdoc, nchild->line,

nchild->pos, MDOC_It);

roff_head_alloc(mdoc, nchild->line,

nchild->pos, MDOC_It);

mdoc->next = ROFF_NEXT_SIBLING;

roff_body_alloc(mdoc, nchild->line,

nchild->pos, MDOC_It);

while (nchild->tok != MDOC_It) {

roff_node_relink(mdoc, nchild);

if ((nchild = nnext) == NULL)

break;

nnext = nchild->next;

mdoc->next = ROFF_NEXT_SIBLING;

}

mdoc->last = nbody;

continue;

}

mdoc->last = nbody;

mandoc_msg(MANDOCERR_BL_MOVE, nchild->line, nchild->pos,

"%s", roff_name[nchild->tok]);

* Move the node out of the Bl block.

* First, collect all required node pointers.

nblock = nbody->parent;

nprev = nblock->prev;

nparent = nblock->parent;

* Unlink this child.

nbody->child = nnext;

if (nnext == NULL)

nbody->last = NULL;

else

nnext->prev = NULL;

* Relink this child.

nchild->parent = nparent;

nchild->prev = nprev;

nchild->next = nblock;

nblock->prev = nchild;

if (nprev == NULL)

nparent->child = nchild;

else

nprev->next = nchild;

nchild = nnext;

}

if (mdoc->meta.os_e != MANDOC_OS_NETBSD)

Line 1898 post_sm(POST_ARGS)

Line 2048 post_sm(POST_ARGS)

static void

post_root(POST_ARGS)

{

const char *openbsd_arch[] = {

"alpha", "amd64", "arm64", "armv7", "hppa", "i386",

"landisk", "loongson", "luna88k", "macppc", "mips64",

"octeon", "sgi", "socppc", "sparc64", NULL

};

const char *netbsd_arch[] = {

"acorn26", "acorn32", "algor", "alpha", "amiga",

"arc", "atari",

"bebox", "cats", "cesfic", "cobalt", "dreamcast",

"emips", "evbarm", "evbmips", "evbppc", "evbsh3", "evbsh5",

"hp300", "hpcarm", "hpcmips", "hpcsh", "hppa",

"i386", "ibmnws", "luna68k",

"mac68k", "macppc", "mipsco", "mmeye", "mvme68k", "mvmeppc",

"netwinder", "news68k", "newsmips", "next68k",

"pc532", "playstation2", "pmax", "pmppc", "prep",

"sandpoint", "sbmips", "sgimips", "shark",

"sparc", "sparc64", "sun2", "sun3",

"vax", "walnut", "x68k", "x86", "x86_64", "xen", NULL

};

const char **arches[] = { NULL, netbsd_arch, openbsd_arch };

struct roff_node *n;

const char **arch;

/* Add missing prologue data. */

if (mdoc->meta.date == NULL)

mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :

mdoc->meta.date = mandoc_normdate(NULL, NULL);

mandoc_normdate(mdoc, NULL, 0, 0);

if (mdoc->meta.title == NULL) {

mandoc_msg(MANDOCERR_DT_NOTITLE, 0, 0, "EOF");

Line 1946 post_root(POST_ARGS)

Line 2073 post_root(POST_ARGS)

"(OpenBSD)" : "(NetBSD)");

if (mdoc->meta.arch != NULL &&

(arch = arches[mdoc->meta.os_e]) != NULL) {

arch_valid(mdoc->meta.arch, mdoc->meta.os_e) == 0) {

while (*arch != NULL && strcmp(*arch, mdoc->meta.arch))

n = mdoc->meta.first->child;

arch++;

while (n->tok != MDOC_Dt ||

if (*arch == NULL) {

n->child == NULL ||

n = mdoc->meta.first->child;

n->child->next == NULL ||

while (n->tok != MDOC_Dt ||

n->child->next->next == NULL)

n->child == NULL ||

n = n->next;

n->child->next == NULL ||

n = n->child->next->next;

n->child->next->next == NULL)

mandoc_msg(MANDOCERR_ARCH_BAD, n->line, n->pos,

n = n->next;

"Dt ... %s %s", mdoc->meta.arch,

n = n->child->next->next;

mdoc->meta.os_e == MANDOC_OS_OPENBSD ?

mandoc_msg(MANDOCERR_ARCH_BAD, n->line, n->pos,

"(OpenBSD)" : "(NetBSD)");

"Dt ... %s %s", mdoc->meta.arch,

mdoc->meta.os_e == MANDOC_OS_OPENBSD ?

"(OpenBSD)" : "(NetBSD)");

}

/* Check that we begin with a proper `Sh'. */

Line 2075 post_rs(POST_ARGS)

Line 2198 post_rs(POST_ARGS)

static void

post_hyph(POST_ARGS)

{

struct roff_node *nch;

struct roff_node *n, *nch;

char *cp;

for (nch = mdoc->last->child; nch != NULL; nch = nch->next) {

n = mdoc->last;

for (nch = n->child; nch != NULL; nch = nch->next) {

if (nch->type != ROFFT_TEXT)

continue;

cp = nch->string;

Line 2087 post_hyph(POST_ARGS)

Line 2211 post_hyph(POST_ARGS)

while (*(++cp) != '\0')

if (*cp == '-' &&

isalpha((unsigned char)cp[-1]) &&

isalpha((unsigned char)cp[1]))

isalpha((unsigned char)cp[1])) {

if (n->tag == NULL && n->flags & NODE_ID)

n->tag = mandoc_strdup(nch->string);

*cp = ASCII_HYPH;

}

Line 2113 post_sx(POST_ARGS)

Line 2240 post_sx(POST_ARGS)

static void

post_sh(POST_ARGS)

{

post_section(mdoc);

post_ignpar(mdoc);

switch (mdoc->last->type) {

case ROFFT_HEAD:

post_sh_head(mdoc);

Line 2345 post_sh_head(POST_ARGS)

Line 2471 post_sh_head(POST_ARGS)

roff_setreg(mdoc->roff, "nS", 0, '=');

mdoc->flags &= ~MDOC_SYNOPSIS;

}

if (sec == SEC_DESCRIPTION)

fn_prio = TAG_STRONG;

/* Mark our last section. */

Line 2445 post_xr(POST_ARGS)

Line 2573 post_xr(POST_ARGS)

}

static void

post_ignpar(POST_ARGS)

post_section(POST_ARGS)

{

struct roff_node *np;

struct roff_node *n, *nch;

char *cp, *tag;

switch (mdoc->last->type) {

n = mdoc->last;

switch (n->type) {

case ROFFT_BLOCK:

post_prevpar(mdoc);

return;

case ROFFT_HEAD:

tag = NULL;

deroff(&tag, n);

if (tag != NULL) {

for (cp = tag; *cp != '\0'; cp++)

if (*cp == ' ')

*cp = '_';

if ((nch = n->child) != NULL &&

nch->type == ROFFT_TEXT &&

strcmp(nch->string, tag) == 0)

tag_put(NULL, TAG_WEAK, n);

else

tag_put(tag, TAG_FALLBACK, n);

free(tag);

}

post_delim(mdoc);

post_hyph(mdoc);

return;

Line 2462 post_ignpar(POST_ARGS)

Line 2606 post_ignpar(POST_ARGS)

default:

return;

}

if ((nch = n->child) != NULL &&

if ((np = mdoc->last->child) != NULL)

(nch->tok == MDOC_Pp || nch->tok == ROFF_br ||

if (np->tok == MDOC_Pp ||

nch->tok == ROFF_sp)) {

np->tok == ROFF_br || np->tok == ROFF_sp) {

mandoc_msg(MANDOCERR_PAR_SKIP, nch->line, nch->pos,

mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos,

"%s after %s", roff_name[nch->tok],

"%s after %s", roff_name[np->tok],

roff_name[n->tok]);

roff_name[mdoc->last->tok]);

roff_node_delete(mdoc, nch);

roff_node_delete(mdoc, np);

}

if ((nch = n->last) != NULL &&

(nch->tok == MDOC_Pp || nch->tok == ROFF_br)) {

if ((np = mdoc->last->last) != NULL)

mandoc_msg(MANDOCERR_PAR_SKIP, nch->line, nch->pos,

if (np->tok == MDOC_Pp || np->tok == ROFF_br) {

"%s at the end of %s", roff_name[nch->tok],

mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos,

roff_name[n->tok]);

"%s at the end of %s", roff_name[np->tok],

roff_node_delete(mdoc, nch);

roff_name[mdoc->last->tok]);

}

roff_node_delete(mdoc, np);

}

static void

post_prevpar(POST_ARGS)

{

struct roff_node *n;

struct roff_node *n, *np;

n = mdoc->last;

if (NULL == n->prev)

return;

if (n->type != ROFFT_ELEM && n->type != ROFFT_BLOCK)

return;

if ((np = roff_node_prev(n)) == NULL)

return;

* Don't allow `Pp' prior to a paragraph-type

* block: `Pp' or non-compact `Bd' or `Bl'.

if (n->prev->tok != MDOC_Pp && n->prev->tok != ROFF_br)

if (np->tok != MDOC_Pp && np->tok != ROFF_br)

return;

if (n->tok == MDOC_Bl && n->norm->Bl.comp)

return;

Line 2506 post_prevpar(POST_ARGS)

Line 2648 post_prevpar(POST_ARGS)

if (n->tok == MDOC_It && n->parent->norm->Bl.comp)

return;

mandoc_msg(MANDOCERR_PAR_SKIP, n->prev->line, n->prev->pos,

mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos,

"%s before %s", roff_name[n->prev->tok], roff_name[n->tok]);

"%s before %s", roff_name[np->tok], roff_name[n->tok]);

roff_node_delete(mdoc, n->prev);

roff_node_delete(mdoc, np);

}

static void

Line 2516 post_par(POST_ARGS)

Line 2658 post_par(POST_ARGS)

{

struct roff_node *np;

fn_prio = TAG_STRONG;

post_prevpar(mdoc);

np = mdoc->last;

Line 2528 static void

Line 2671 static void

post_dd(POST_ARGS)

{

struct roff_node *n;

char *datestr;

n = mdoc->last;

n->flags |= NODE_NOPRT;

Line 2545 post_dd(POST_ARGS)

Line 2687 post_dd(POST_ARGS)

mandoc_msg(MANDOCERR_PROLOG_ORDER,

n->line, n->pos, "Dd after Os");

if (n->child == NULL || n->child->string[0] == '\0') {

if (mdoc->quick && n != NULL)

mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :

mdoc->meta.date = mandoc_strdup("");

mandoc_normdate(mdoc, NULL, n->line, n->pos);

else

return;

mdoc->meta.date = mandoc_normdate(n->child, n);

}

datestr = NULL;

deroff(&datestr, n);

if (mdoc->quick)

mdoc->meta.date = datestr;

else {

mdoc->meta.date = mandoc_normdate(mdoc,

datestr, n->line, n->pos);

free(datestr);

}

static void

CVSweb