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.299 and 1.308

version 1.299, 2015/10/21 23:51:11

version 1.308, 2016/08/20 14:43:50

Line 1

/* $Id$ */

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

Line 502 post_bl_norm(POST_ARGS)

mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,

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

n->norm->Bl.type = LIST_item;

mdoclt = MDOC_Item;

}

Line 885 post_display(POST_ARGS)

Line 886 post_display(POST_ARGS)

n = mdoc->last;

switch (n->type) {

case ROFFT_BODY:

if (n->end != ENDBODY_NOT)

if (n->end != ENDBODY_NOT) {

break;

if (n->tok == MDOC_Bd &&

if (n->child == NULL)

n->body->parent->args == NULL)

roff_node_delete(mdoc, n);

} else if (n->child == NULL)

mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

else if (n->tok == MDOC_D1)

Line 895 post_display(POST_ARGS)

Line 898 post_display(POST_ARGS)

break;

case ROFFT_BLOCK:

if (n->tok == MDOC_Bd) {

if (n->args == NULL) {

mandoc_msg(MANDOCERR_BD_NOARG,

mdoc->parse, n->line, n->pos, "Bd");

mdoc->next = ROFF_NEXT_SIBLING;

while (n->body->child != NULL)

mdoc_node_relink(mdoc,

n->body->child);

roff_node_delete(mdoc, n);

break;

}

post_bd(mdoc);

post_prevpar(mdoc);

}

Line 1053 post_it(POST_ARGS)

Line 1066 post_it(POST_ARGS)

mdoc_argnames[nbl->args->argv[0].arg]);

/* FALLTHROUGH */

case LIST_item:

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

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

mandoc_vmsg(MANDOCERR_ARG_SKIP,

mdoc->parse, nit->line, nit->pos,

"It %s", nit->head->child->string);

"It %s", nch->string == NULL ?

mdoc_macronames[nch->tok] : nch->string);

break;

case LIST_column:

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

Line 1268 post_bl_head(POST_ARGS)

Line 1282 post_bl_head(POST_ARGS)

argv = nbl->args->argv + j;

i = argv->sz;

argv->sz += nh->nchild;

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

argv->sz++;

argv->value = mandoc_reallocarray(argv->value,

argv->sz, sizeof(char *));

Line 1281 post_bl_head(POST_ARGS)

Line 1296 post_bl_head(POST_ARGS)

nnext = nch->next;

roff_node_delete(NULL, nch);

}

nh->nchild = 0;

nh->child = NULL;

}

Line 1315 post_bl(POST_ARGS)

Line 1329 post_bl(POST_ARGS)

return;

}

while (nchild != NULL) {

nnext = nchild->next;

if (nchild->tok == MDOC_It ||

(nchild->tok == MDOC_Sm &&

nchild->next != NULL &&

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

nchild->next->tok == MDOC_It)) {

nchild = nnext;

nchild = nchild->next;

continue;

}

* 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, which cannot be moved

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

* into an implicit row.

if (nchild->prev != NULL) {

mdoc->last = nchild;

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) {

mdoc_node_relink(mdoc, nchild);

if ((nchild = nnext) == NULL)

break;

nnext = nchild->next;

mdoc->next = ROFF_NEXT_SIBLING;

}

mdoc->last = nbody;

continue;

}

mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,

nchild->line, nchild->pos,

mdoc_macronames[nchild->tok]);

Line 1335 post_bl(POST_ARGS)

Line 1379 post_bl(POST_ARGS)

nblock = nbody->parent;

nprev = nblock->prev;

nparent = nblock->parent;

nnext = nchild->next;

* Unlink this child.

assert(nchild->prev == NULL);

nbody->child = nnext;

if (--nbody->nchild == 0) {

if (nnext == NULL)

nbody->child = NULL;

nbody->last = NULL;

assert(nnext == NULL);

else

} else {

nbody->child = nnext;

nnext->prev = NULL;

}

* Relink this child.

Line 1360 post_bl(POST_ARGS)

Line 1399 post_bl(POST_ARGS)

nchild->next = nblock;

nblock->prev = nchild;

nparent->nchild++;

if (nprev == NULL)

nparent->child = nchild;

else

Line 1678 post_sh_see_also(POST_ARGS)

Line 1716 post_sh_see_also(POST_ARGS)

n = mdoc->last->child;

lastname = lastsec = lastpunct = NULL;

while (n != NULL) {

if (n->tok != MDOC_Xr || n->nchild < 2)

if (n->tok != MDOC_Xr ||

n->child == NULL ||

n->child->next == NULL)

break;

/* Process one .Xr node. */

Line 1734 child_an(const struct roff_node *n)

Line 1774 child_an(const struct roff_node *n)

{

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

if ((n->tok == MDOC_An && n->nchild) || child_an(n))

if ((n->tok == MDOC_An && n->child != NULL) || child_an(n))

return 1;

return 0;

}

Line 1751 post_sh_authors(POST_ARGS)

Line 1791 post_sh_authors(POST_ARGS)

static void

post_sh_head(POST_ARGS)

{

const char *goodsec;

struct roff_node *nch;

enum roff_sec sec;

const char *goodsec;

enum roff_sec sec;

* Process a new section. Sections are either "named" or

Line 1765 post_sh_head(POST_ARGS)

Line 1806 post_sh_head(POST_ARGS)

/* The NAME should be first. */

if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)

if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)

mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,

mdoc->last->line, mdoc->last->pos,

mdoc->last->line, mdoc->last->pos, "Sh %s",

"Sh %s", secnames[sec]);

sec != SEC_CUSTOM ? secnames[sec] :

(nch = mdoc->last->child) == NULL ? "" :

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

mdoc_macronames[nch->tok]);

/* The SYNOPSIS gets special attention in other areas. */

Line 1921 post_par(POST_ARGS)

Line 1965 post_par(POST_ARGS)

post_prevpar(mdoc);

if (np->tok == MDOC_sp) {

if (np->nchild > 1)

if (np->child != NULL && np->child->next != NULL)

mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,

np->child->next->line, np->child->next->pos,

"sp ... %s", np->child->next->string);

CVSweb