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.228 and 1.233

version 1.228, 2014/07/05 12:34:17

version 1.233, 2014/07/30 12:58:21

Line 100 static int post_dt(POST_ARGS);

static int post_en(POST_ARGS);

static int post_es(POST_ARGS);

static int post_eoln(POST_ARGS);

static int post_ex(POST_ARGS);

static int post_hyph(POST_ARGS);

static int post_ignpar(POST_ARGS);

static int post_it(POST_ARGS);

Line 116 static int post_sh(POST_ARGS);

Line 117 static int post_sh(POST_ARGS);

static int post_sh_body(POST_ARGS);

static int post_sh_head(POST_ARGS);

static int post_st(POST_ARGS);

static int post_std(POST_ARGS);

static int post_vt(POST_ARGS);

static int pre_an(PRE_ARGS);

static int pre_bd(PRE_ARGS);

Line 149 static v_post posts_dl[] = { post_literal, bwarn_ge1,

static v_post posts_dt[] = { post_dt, post_prol, NULL };

static v_post posts_en[] = { post_en, NULL };

static v_post posts_es[] = { post_es, NULL };

static v_post posts_ex[] = { post_ex, NULL };

static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };

static v_post posts_hyph[] = { post_hyph, NULL };

static v_post posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL };

Line 165 static v_post posts_sh[] = { post_ignpar,hwarn_ge1,po

Line 166 static v_post posts_sh[] = { post_ignpar,hwarn_ge1,po

static v_post posts_sp[] = { post_par, ewarn_le1, NULL };

static v_post posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL };

static v_post posts_st[] = { post_st, NULL };

static v_post posts_std[] = { post_std, NULL };

static v_post posts_text[] = { ewarn_ge1, NULL };

static v_post posts_text1[] = { ewarn_eq1, NULL };

static v_post posts_vt[] = { post_vt, NULL };

Line 207 static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Dv */

{ NULL, NULL }, /* Er */

{ NULL, NULL }, /* Ev */

{ pres_std, posts_std }, /* Ex */

{ pres_std, posts_ex }, /* Ex */

{ NULL, NULL }, /* Fa */

{ NULL, posts_text }, /* Fd */

{ NULL, NULL }, /* Fl */

Line 221 static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Op */

{ pres_obsolete, NULL }, /* Ot */

{ NULL, posts_defaults }, /* Pa */

{ pres_std, posts_std }, /* Rv */

{ pres_std, NULL }, /* Rv */

{ NULL, posts_st }, /* St */

{ NULL, NULL }, /* Va */

{ NULL, posts_vt }, /* Vt */

Line 534 check_argv(struct mdoc *mdoc, struct mdoc_node *n, str

for (i = 0; i < (int)v->sz; i++)

check_text(mdoc, v->line, v->pos, v->value[i]);

/* FIXME: move to post_std(). */

if (MDOC_Std == v->arg)

if ( ! (v->sz || mdoc->meta.name))

mdoc_nmsg(mdoc, n, MANDOCERR_NONAME);

}

static void

Line 551 check_text(struct mdoc *mdoc, int ln, int pos, char *p

Line 545 check_text(struct mdoc *mdoc, int ln, int pos, char *p

return;

for (cp = p; NULL != (p = strchr(p, '\t')); p++)

mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);

mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,

ln, pos + (int)(p - cp), NULL);

}

static int

Line 801 pre_bd(PRE_ARGS)

Line 796 pre_bd(PRE_ARGS)

switch (argv->arg) {

case MDOC_Centred:

dt = DISP_centred;

dt = DISP_centered;

break;

case MDOC_Ragged:

dt = DISP_ragged;

Line 1127 post_nm(POST_ARGS)

Line 1122 post_nm(POST_ARGS)

mdoc_deroff(&mdoc->meta.name, mdoc->last);

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

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

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NM_NONAME);

mdoc->meta.name = mandoc_strdup("UNKNOWN");

}

return(1);

}

Line 1767 post_rs(POST_ARGS)

Line 1760 post_rs(POST_ARGS)

}

* Make sure only certain types of nodes are allowed within the

* the `Rs' body. Delete offending nodes and raise a warning.

* Do this before re-ordering for the sake of clarity.

next = NULL;

for (nn = mdoc->last->child; nn; nn = next) {

for (i = 0; i < RSORD_MAX; i++)

if (nn->tok == rsord[i])

break;

if (i < RSORD_MAX) {

if (MDOC__J == rsord[i] || MDOC__B == rsord[i])

mdoc->last->norm->Rs.quote_T++;

next = nn->next;

continue;

}

next = nn->next;

mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse,

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

mdoc_node_delete(mdoc, nn);

}

* Nothing to sort if only invalid nodes were found

* inside the `Rs' body.

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

return(1);

* The full `Rs' block needs special handling to order the

* sub-elements according to `rsord'. Pick through each element

* and correctly order it. This is a insertion sort.

* and correctly order it. This is an insertion sort.

next = NULL;

Line 1812 post_rs(POST_ARGS)

Line 1772 post_rs(POST_ARGS)

if (rsord[i] == nn->tok)

break;

if (i == RSORD_MAX) {

mandoc_msg(MANDOCERR_RS_BAD,

mdoc->parse, nn->line, nn->pos,

mdoc_macronames[nn->tok]);

i = -1;

} else if (MDOC__J == nn->tok || MDOC__B == nn->tok)

mdoc->last->norm->Rs.quote_T++;

* Remove `nn' from the chain. This somewhat

* repeats mdoc_node_unlink(), but since we're

Line 1837 post_rs(POST_ARGS)

Line 1805 post_rs(POST_ARGS)

for (j = 0; j < RSORD_MAX; j++)

if (rsord[j] == prev->tok)

break;

if (j == RSORD_MAX)

j = -1;

if (j <= i)

break;

Line 2406 post_os(POST_ARGS)

Line 2376 post_os(POST_ARGS)

#else /*!OSNAME */

if (NULL == defbuf) {

if (-1 == uname(&utsname)) {

mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);

mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,

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

defbuf = mandoc_strdup("UNKNOWN");

} else

mandoc_asprintf(&defbuf, "%s %s",

Line 2417 post_os(POST_ARGS)

Line 2388 post_os(POST_ARGS)

return(1);

}

* If no argument is provided,

* fill in the name of the current manual page.

static int

post_std(POST_ARGS)

post_ex(POST_ARGS)

{

struct mdoc_node *nn, *n;

struct mdoc_node *n;

n = mdoc->last;

* Macros accepting `-std' as an argument have the name of the

* current document (`Nm') filled in as the argument if it's not

* provided.

if (n->child)

return(1);

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

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

mdoc_nmsg(mdoc, n, MANDOCERR_EX_NONAME);

return(1);

}

nn = n;

mdoc->next = MDOC_NEXT_CHILD;

if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name))

return(0);

mdoc->last = nn;

mdoc->last = n;

return(1);

}

CVSweb