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.79 and 1.109

version 1.79, 2010/05/17 22:11:42

version 1.109, 2010/07/04 21:59:30

Line 23

#include <assert.h>

#include <ctype.h>

#include <limits.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

Line 33

Line 34

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

/* TODO: ignoring Pp (it's superfluous in some invocations). */

#define PRE_ARGS struct mdoc *mdoc, const struct mdoc_node *n

#define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n

#define POST_ARGS struct mdoc *mdoc

typedef int (*v_pre)(PRE_ARGS);

Line 46 struct valids {

Line 47 struct valids {

static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);

static int check_stdarg(PRE_ARGS);

static int check_text(struct mdoc *, int, int, const char *);

static int check_text(struct mdoc *, int, int, char *);

static int check_argv(struct mdoc *,

const struct mdoc_node *,

struct mdoc_node *, struct mdoc_argv *);

const struct mdoc_argv *);

static int check_args(struct mdoc *, struct mdoc_node *);

static int check_args(struct mdoc *,

const struct mdoc_node *);

static int err_child_lt(struct mdoc *, const char *, int);

static int warn_child_lt(struct mdoc *, const char *, int);

static int err_child_gt(struct mdoc *, const char *, int);

Line 82 static int post_at(POST_ARGS);

Line 81 static int post_at(POST_ARGS);

static int post_bf(POST_ARGS);

static int post_bl(POST_ARGS);

static int post_bl_head(POST_ARGS);

static int post_dt(POST_ARGS);

static int post_it(POST_ARGS);

static int post_lb(POST_ARGS);

static int post_nm(POST_ARGS);

Line 91 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_eoln(POST_ARGS);

static int post_vt(POST_ARGS);

static int pre_an(PRE_ARGS);

static int pre_bd(PRE_ARGS);

Line 106 static int pre_ss(PRE_ARGS);

Line 107 static int pre_ss(PRE_ARGS);

static v_post posts_an[] = { post_an, NULL };

static v_post posts_at[] = { post_at, NULL };

static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NULL };

static v_post posts_bd_bk[] = { hwarn_eq0, bwarn_ge1, NULL };

static v_post posts_bf[] = { hwarn_le1, post_bf, NULL };

static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL };

static v_post posts_bool[] = { eerr_eq1, ebool, NULL };

static v_post posts_eoln[] = { post_eoln, NULL };

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

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

static v_post posts_it[] = { post_it, NULL };

static v_post posts_lb[] = { eerr_eq1, post_lb, NULL };

Line 126 static v_post posts_text1[] = { eerr_eq1, NULL };

Line 129 static v_post posts_text1[] = { eerr_eq1, NULL };

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

static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL };

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

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

static v_pre pres_an[] = { pre_an, NULL };

static v_pre pres_bd[] = { pre_display, pre_bd, NULL };

static v_pre pres_bl[] = { pre_bl, NULL };

Line 137 static v_pre pres_er[] = { NULL, NULL };

Line 139 static v_pre pres_er[] = { NULL, NULL };

static v_pre pres_ex[] = { NULL, NULL };

static v_pre pres_fd[] = { NULL, NULL };

static v_pre pres_it[] = { pre_it, NULL };

static v_pre pres_lb[] = { NULL, NULL };

static v_pre pres_os[] = { pre_os, NULL };

static v_pre pres_rv[] = { pre_rv, NULL };

static v_pre pres_sh[] = { pre_sh, NULL };

Line 146 static v_pre pres_ss[] = { pre_ss, NULL };

Line 147 static v_pre pres_ss[] = { pre_ss, NULL };

const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Ap */

{ pres_dd, posts_text }, /* Dd */

{ pres_dt, NULL }, /* Dt */

{ pres_dt, posts_dt }, /* Dt */

{ pres_os, NULL }, /* Os */

{ pres_sh, posts_sh }, /* Sh */

{ pres_ss, posts_ss }, /* Ss */

{ NULL, posts_notext }, /* Pp */

{ pres_d1, posts_wline }, /* D1 */

{ pres_d1, posts_wline }, /* Dl */

{ pres_bd, posts_bd }, /* Bd */

{ pres_bd, posts_bd_bk }, /* Bd */

{ NULL, NULL }, /* Ed */

{ pres_bl, posts_bl }, /* Bl */

{ NULL, NULL }, /* El */

Line 184 const struct valids mdoc_valids[MDOC_MAX] = {

Line 185 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_st }, /* St */

{ NULL, NULL }, /* Va */

{ NULL, posts_vt }, /* Vt */

{ NULL, posts_xr }, /* Xr */

{ NULL, posts_wtext }, /* Xr */

{ NULL, posts_text }, /* %A */

{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */

{ NULL, posts_text }, /* %D */ /* FIXME: check date with mandoc_a2time(). */

Line 244 const struct valids mdoc_valids[MDOC_MAX] = {

Line 245 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Fc */

{ NULL, NULL }, /* Oo */

{ NULL, NULL }, /* Oc */

{ NULL, posts_wline }, /* Bk */

{ NULL, posts_bd_bk }, /* Bk */

{ NULL, NULL }, /* Ek */

{ NULL, posts_notext }, /* Bt */

{ NULL, posts_eoln }, /* Bt */

{ NULL, NULL }, /* Hf */

{ NULL, NULL }, /* Fr */

{ NULL, posts_notext }, /* Ud */

{ NULL, posts_eoln }, /* Ud */

{ pres_lb, posts_lb }, /* Lb */

{ NULL, posts_lb }, /* Lb */

{ NULL, posts_notext }, /* Lp */

{ NULL, posts_text }, /* Lk */

{ NULL, posts_text }, /* Mt */

Line 265 const struct valids mdoc_valids[MDOC_MAX] = {

Line 266 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_notext }, /* br */

{ NULL, posts_sp }, /* sp */

{ NULL, posts_text1 }, /* %U */

{ NULL, NULL }, /* Ta */

};

int

mdoc_valid_pre(struct mdoc *mdoc, const struct mdoc_node *n)

mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)

{

v_pre *p;

int line, pos;

const char *tp;

char *tp;

if (MDOC_TEXT == n->type) {

tp = n->string;

Line 391 CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */

Line 393 CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */

CHECK_CHILD_DEFN(warn, lt, <) /* warn_child_lt() */

CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0) /* bwarn_ge1() */

CHECK_BODY_DEFN(ge1, err, err_child_gt, 0) /* berr_ge1() */

CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_gt1() */

CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_ge1() */

CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */

CHECK_ELEM_DEFN(le1, err, err_child_lt, 2) /* eerr_le1() */

CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0) /* eerr_eq0() */

Line 415 check_stdarg(PRE_ARGS)

Line 417 check_stdarg(PRE_ARGS)

static int

check_args(struct mdoc *m, const struct mdoc_node *n)

check_args(struct mdoc *m, struct mdoc_node *n)

{

int i;

Line 432 check_args(struct mdoc *m, const struct mdoc_node *n)

Line 434 check_args(struct mdoc *m, const struct mdoc_node *n)

static int

check_argv(struct mdoc *m, const struct mdoc_node *n,

check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)

const struct mdoc_argv *v)

{

int i;

Line 453 check_argv(struct mdoc *m, const struct mdoc_node *n,

Line 454 check_argv(struct mdoc *m, const struct mdoc_node *n,

static int

check_text(struct mdoc *mdoc, int line, int pos, const char *p)

check_text(struct mdoc *mdoc, int line, int pos, char *p)

{

int c;

* FIXME: we absolutely cannot let \b get through or it will

* destroy some assumptions in terms of format.

for ( ; *p; p++, pos++) {

if ('\t' == *p) {

if ( ! (MDOC_LITERAL & mdoc->flags))

if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))

return(0);

} else if ( ! isprint((u_char)*p))

} else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p)

if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))

return(0);

Line 531 pre_display(PRE_ARGS)

Line 537 pre_display(PRE_ARGS)

static int

pre_bl(PRE_ARGS)

{

int pos, type, width, offset;

int i, comp, dup;

const char *offs, *width;

enum mdoc_list lt;

struct mdoc_node *np;

if (MDOC_BLOCK != n->type)

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

assert(n->pending);

np = n->pending->parent;

} else

np = n->parent;

assert(np);

assert(MDOC_BLOCK == np->type);

assert(MDOC_Bl == np->tok);

assert(np->data.Bl);

n->data.Bl = np->data.Bl;

return(1);

if (NULL == n->args) {

mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);

return(0);

}

/* Make sure that only one type of list is specified. */

* First figure out which kind of list to use: bind ourselves to

* the first mentioned list type and warn about any remaining

* ones. If we find no list type, we default to LIST_item.

type = offset = width = -1;

assert(NULL == n->data.Bl);

n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl));

/* LINTED */

for (pos = 0; pos < (int)n->args->argc; pos++)

for (i = 0; n->args && i < (int)n->args->argc; i++) {

switch (n->args->argv[pos].arg) {

lt = LIST__NONE;

dup = comp = 0;

width = offs = NULL;

switch (n->args->argv[i].arg) {

/* Set list types. */

case (MDOC_Bullet):

/* FALLTHROUGH */

lt = LIST_bullet;

break;

case (MDOC_Dash):

/* FALLTHROUGH */

lt = LIST_dash;

break;

case (MDOC_Enum):

/* FALLTHROUGH */

lt = LIST_enum;

break;

case (MDOC_Hyphen):

/* FALLTHROUGH */

lt = LIST_hyphen;

break;

case (MDOC_Item):

/* FALLTHROUGH */

lt = LIST_item;

break;

case (MDOC_Tag):

/* FALLTHROUGH */

lt = LIST_tag;

break;

case (MDOC_Diag):

/* FALLTHROUGH */

lt = LIST_diag;

break;

case (MDOC_Hang):

/* FALLTHROUGH */

lt = LIST_hang;

break;

case (MDOC_Ohang):

/* FALLTHROUGH */

lt = LIST_ohang;

break;

case (MDOC_Inset):

/* FALLTHROUGH */

lt = LIST_inset;

break;

case (MDOC_Column):

lt = LIST_column;

* Note that if a duplicate is detected, we

* remove the duplicate instead of passing it

* over. If we don't do this, mdoc_action will

* become confused when it scans over multiple

* types whilst setting its bitmasks.

* FIXME: this should occur in mdoc_action.c.

if (type >= 0) {

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))

return(0);

mdoc_argn_free(n->args, pos);

break;

}

type = n->args->argv[pos].arg;

break;

/* Set list arguments. */

case (MDOC_Compact):

if (type < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))

dup = n->data.Bl->comp;

return(0);

comp = 1;

break;

case (MDOC_Width):

if (width >= 0)

dup = (NULL != n->data.Bl->width);

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))

width = n->args->argv[i].value[0];

return(0);

if (type < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))

return(0);

width = n->args->argv[pos].arg;

break;

case (MDOC_Offset):

if (offset >= 0)

/* NB: this can be empty! */

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))

if (n->args->argv[i].sz) {

return(0);

offs = n->args->argv[i].value[0];

if (type < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))

dup = (NULL != n->data.Bl->offs);

break;

}

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))

return(0);

offset = n->args->argv[pos].arg;

break;

default:

break;

}

if (type < 0) {

/* Check: duplicate auxiliary arguments. */

mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);

return(0);

if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))

return(0);

if (comp && ! dup)

n->data.Bl->comp = comp;

if (offs && ! dup)

n->data.Bl->offs = offs;

if (width && ! dup)

n->data.Bl->width = width;

/* Check: multiple list types. */

if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))

return(0);

/* Assign list type. */

if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {

n->data.Bl->type = lt;

/* Set column information, too. */

if (LIST_column == lt) {

n->data.Bl->ncols =

n->args->argv[i].sz;

n->data.Bl->cols = (const char **)

n->args->argv[i].value;

}

/* The list type should come first. */

if (n->data.Bl->type == LIST__NONE)

if (n->data.Bl->width ||

n->data.Bl->offs ||

n->data.Bl->comp)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))

return(0);

continue;

}

/* Allow lists to default to LIST_item. */

if (LIST__NONE == n->data.Bl->type) {

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE))

return(0);

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

}

* Validate the width field. Some list types don't need width

* types and should be warned about them. Others should have it

* and must also be warned.

switch (type) {

switch (n->data.Bl->type) {

case (MDOC_Tag):

case (LIST_tag):

if (width < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))

if (n->data.Bl->width)

return(0);

break;

if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))

case (MDOC_Column):

break;

return(0);

case (LIST_column):

/* FALLTHROUGH */

case (MDOC_Diag):

case (LIST_diag):

/* FALLTHROUGH */

case (MDOC_Ohang):

case (LIST_ohang):

/* FALLTHROUGH */

case (MDOC_Inset):

case (LIST_inset):

/* FALLTHROUGH */

case (MDOC_Item):

case (LIST_item):

if (width >= 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG))

if (NULL == n->data.Bl->width)

return(0);

break;

if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG))

break;

return(0);

default:

break;

}

Line 648 pre_bl(PRE_ARGS)

Line 716 pre_bl(PRE_ARGS)

static int

pre_bd(PRE_ARGS)

{

int i, type, err;

int i, dup, comp;

enum mdoc_disp dt;

const char *offs;

struct mdoc_node *np;

if (MDOC_BLOCK != n->type)

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

assert(n->pending);

np = n->pending->parent;

} else

np = n->parent;

assert(np);

assert(MDOC_BLOCK == np->type);

assert(MDOC_Bd == np->tok);

assert(np->data.Bd);

n->data.Bd = np->data.Bd;

return(1);

if (NULL == n->args) {

mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);

return(0);

}

/* Make sure that only one type of display is specified. */

assert(NULL == n->data.Bd);

n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));

/* LINTED */

for (i = 0, err = type = 0; ! err &&

for (i = 0; n->args && i < (int)n->args->argc; i++) {

i < (int)n->args->argc; i++)

dt = DISP__NONE;

dup = comp = 0;

offs = NULL;

switch (n->args->argv[i].arg) {

case (MDOC_Centred):

/* FALLTHROUGH */

dt = DISP_centred;

break;

case (MDOC_Ragged):

/* FALLTHROUGH */

dt = DISP_ragged;

break;

case (MDOC_Unfilled):

/* FALLTHROUGH */

dt = DISP_unfilled;

break;

case (MDOC_Filled):

/* FALLTHROUGH */

dt = DISP_filled;

break;

case (MDOC_Literal):

if (0 == type++)

dt = DISP_literal;

break;

case (MDOC_File):

mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);

return(0);

case (MDOC_Offset):

/* NB: this can be empty! */

if (n->args->argv[i].sz) {

offs = n->args->argv[i].value[0];

dup = (NULL != n->data.Bd->offs);

break;

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP))

}

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))

return(0);

break;

default:

case (MDOC_Compact):

comp = 1;

dup = n->data.Bd->comp;

break;

default:

abort();

/* NOTREACHED */

}

if (type)

/* Check whether we have duplicates. */

return(1);

mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);

if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))

return(0);

/* Make our auxiliary assignments. */

if (offs && ! dup)

n->data.Bd->offs = offs;

if (comp && ! dup)

n->data.Bd->comp = comp;

/* Check whether a type has already been assigned. */

if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP))

return(0);

/* Make our type assignment. */

if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE)

n->data.Bd->type = dt;

}

if (DISP__NONE == n->data.Bd->type) {

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE))

return(0);

n->data.Bd->type = DISP_ragged;

}

return(1);

}

Line 704 pre_sh(PRE_ARGS)

Line 833 pre_sh(PRE_ARGS)

if (MDOC_BLOCK != n->type)

return(1);

mdoc->regs->regs[(int)REG_nS].set = 0;

return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));

}

Line 726 static int

Line 857 static int

pre_an(PRE_ARGS)

{

if (NULL == n->args || 1 == n->args->argc)

if (NULL == n->args)

return(1);

mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT,

if (n->args->argc > 1)

n->line, n->pos,

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGCOUNT))

"line arguments == 1 (have %d)",

return(0);

n->args->argc);

return(0);

if (MDOC_Split == n->args->argv[0].arg)

n->data.An.auth = AUTH_split;

else if (MDOC_Nosplit == n->args->argv[0].arg)

n->data.An.auth = AUTH_nosplit;

else

abort();

return(1);

}

Line 745 pre_rv(PRE_ARGS)

Line 883 pre_rv(PRE_ARGS)

static int

pre_dt(PRE_ARGS)

post_dt(POST_ARGS)

{

const struct mdoc_node *nn;

const char *p;

/* FIXME: make sure is capitalised. */

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

for (p = nn->string; *p; p++) {

if (toupper((u_char)*p) == *p)

continue;

if ( ! mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE))

return(0);

break;

}

return(1);

}

static int

pre_dt(PRE_ARGS)

{

if (0 == mdoc->meta.date || mdoc->meta.os)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))

return(0);

Line 791 pre_dd(PRE_ARGS)

Line 946 pre_dd(PRE_ARGS)

static int

post_bf(POST_ARGS)

{

char *p;

struct mdoc_node *np;

struct mdoc_node *head;

int arg;

if (MDOC_BLOCK != mdoc->last->type)

return(1);

* Unlike other data pointers, these are "housed" by the HEAD

* element, which contains the goods.

head = mdoc->last->head;

if (MDOC_HEAD != mdoc->last->type) {

if (ENDBODY_NOT != mdoc->last->end) {

assert(mdoc->last->pending);

np = mdoc->last->pending->parent->head;

} else if (MDOC_BLOCK != mdoc->last->type) {

np = mdoc->last->parent->head;

} else

np = mdoc->last->head;

if (mdoc->last->args && head->child) {

assert(np);

/* FIXME: this should provide a default. */

assert(MDOC_HEAD == np->type);

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

assert(MDOC_Bf == np->tok);

return(0);

assert(np->data.Bf);

} else if (mdoc->last->args)

mdoc->last->data.Bf = np->data.Bf;

return(1);

}

if (NULL == head->child || MDOC_TEXT != head->child->type) {

np = mdoc->last;

/* FIXME: this should provide a default. */

assert(MDOC_BLOCK == np->parent->type);

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

assert(MDOC_Bf == np->parent->tok);

np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf));

* Cannot have both argument and parameter.

* If neither is specified, let it through with a warning.

if (np->parent->args && np->child) {

mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);

return(0);

} else if (NULL == np->parent->args && NULL == np->child)

return(mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE));

/* Extract argument into data. */

if (np->parent->args) {

arg = np->parent->args->argv[0].arg;

if (MDOC_Emphasis == arg)

np->data.Bf->font = FONT_Em;

else if (MDOC_Literal == arg)

np->data.Bf->font = FONT_Li;

else if (MDOC_Symbolic == arg)

np->data.Bf->font = FONT_Sy;

else

abort();

return(1);

}

p = head->child->string;

/* Extract parameter into data. */

if (0 == strcmp(p, "Em"))

if (0 == strcmp(np->child->string, "Em"))

return(1);

np->data.Bf->font = FONT_Em;

else if (0 == strcmp(p, "Li"))

else if (0 == strcmp(np->child->string, "Li"))

return(1);

np->data.Bf->font = FONT_Li;

else if (0 == strcmp(p, "Sy"))

else if (0 == strcmp(np->child->string, "Sy"))

return(1);

np->data.Bf->font = FONT_Sy;

else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE))

return(0);

mdoc_nmsg(mdoc, head, MANDOCERR_FONTTYPE);

return(1);

return(0);

}

Line 837 post_lb(POST_ARGS)

Line 1028 post_lb(POST_ARGS)

static int

post_eoln(POST_ARGS)

{

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

return(1);

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST));

}

static int

post_vt(POST_ARGS)

{

const struct mdoc_node *n;

Line 890 post_at(POST_ARGS)

Line 1091 post_at(POST_ARGS)

static int

post_an(POST_ARGS)

{

struct mdoc_node *np;

if (mdoc->last->args) {

np = mdoc->last;

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

if (AUTH__NONE != np->data.An.auth && np->child)

return(1);

return(mdoc_nmsg(mdoc, np, MANDOCERR_ARGCOUNT));

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGCOUNT));

if (AUTH__NONE != np->data.An.auth || np->child)

}

if (mdoc->last->child)

return(1);

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS));

return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS));

}

static int

post_it(POST_ARGS)

{

int type, i, cols;

int i, cols, rc;

enum mdoc_list lt;

struct mdoc_node *n, *c;

enum mandocerr er;

if (MDOC_BLOCK != mdoc->last->type)

return(1);

n = mdoc->last->parent->parent;

if (NULL == n->args) {

assert(n->data.Bl);

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

lt = n->data.Bl->type;

return(0);

}

/* Some types require block-head, some not. */

if (LIST__NONE == lt) {

/* LINTED */

for (cols = type = -1, i = 0; -1 == type &&

i < (int)n->args->argc; i++)

switch (n->args->argv[i].arg) {

case (MDOC_Tag):

/* FALLTHROUGH */

case (MDOC_Diag):

/* FALLTHROUGH */

case (MDOC_Hang):

/* FALLTHROUGH */

case (MDOC_Ohang):

/* FALLTHROUGH */

case (MDOC_Inset):

/* FALLTHROUGH */

case (MDOC_Bullet):

/* FALLTHROUGH */

case (MDOC_Dash):

/* FALLTHROUGH */

case (MDOC_Enum):

/* FALLTHROUGH */

case (MDOC_Hyphen):

/* FALLTHROUGH */

case (MDOC_Item):

type = n->args->argv[i].arg;

break;

case (MDOC_Column):

type = n->args->argv[i].arg;

cols = (int)n->args->argv[i].sz;

break;

default:

break;

}

if (-1 == type) {

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

return(0);

}

switch (type) {

switch (lt) {

case (MDOC_Tag):

case (LIST_tag):

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

if (mdoc->last->head->child)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

break;

return(0);

/* FIXME: give this a dummy value. */

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

return(0);

break;

case (MDOC_Hang):

case (LIST_hang):

/* FALLTHROUGH */

case (MDOC_Ohang):

case (LIST_ohang):

/* FALLTHROUGH */

case (MDOC_Inset):

case (LIST_inset):

/* FALLTHROUGH */

case (MDOC_Diag):

case (LIST_diag):

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

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

return(0);

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

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))

return(0);

break;

case (MDOC_Bullet):

case (LIST_bullet):

/* FALLTHROUGH */

case (MDOC_Dash):

case (LIST_dash):

/* FALLTHROUGH */

case (MDOC_Enum):

case (LIST_enum):

/* FALLTHROUGH */

case (MDOC_Hyphen):

case (LIST_hyphen):

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

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))

return(0);

/* FALLTHROUGH */

case (MDOC_Item):

case (LIST_item):

if (mdoc->last->head->child)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST))

return(0);

break;

case (LIST_column):

cols = (int)n->data.Bl->ncols;

assert(NULL == mdoc->last->head->child);

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

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))

return(0);

break;

case (MDOC_Column):

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

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))

return(0);

if (mdoc->last->body->child)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BODYLOST))

return(0);

c = mdoc->last->child;

for (i = 0; c && MDOC_HEAD == c->type; c = c->next)

i++;

if (i < cols) {

for (i = 0, c = mdoc->last->child; c; c = c->next)

if ( ! mdoc_vmsg(mdoc, MANDOCERR_ARGCOUNT,

if (MDOC_BODY == c->type)

mdoc->last->line,

i++;

mdoc->last->pos,

"columns == %d (have %d)",

if (i < cols)

cols, i))

er = MANDOCERR_ARGCOUNT;

return(0);

else if (i == cols || i == cols + 1)

break;

} else if (i == cols || i == cols + 1)

else

break;

er = MANDOCERR_SYNTARGCOUNT;

mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT,

rc = mdoc_vmsg(mdoc, er,

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

"columns == %d (have %d)", cols, i);

return(0);

return(rc);

default:

break;

}

Line 1031 post_it(POST_ARGS)

Line 1192 post_it(POST_ARGS)

static int

post_bl_head(POST_ARGS)

{

int i;

const struct mdoc_node *n;

struct mdoc_node *n;

const struct mdoc_argv *a;

assert(mdoc->last->parent);

n = mdoc->last->parent;

assert(n->args);

for (i = 0; i < (int)n->args->argc; i++) {

if (LIST_column == n->data.Bl->type) {

a = &n->args->argv[i];

if (n->data.Bl->ncols && mdoc->last->nchild) {

if (a->arg == MDOC_Column) {

mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);

if (a->sz && mdoc->last->nchild)

return(0);

return(mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS));

return(1);

}

return(1);

}

if (0 == (i = mdoc->last->nchild))

Line 1232 post_sh_body(POST_ARGS)

Line 1391 post_sh_body(POST_ARGS)

static int

post_sh_head(POST_ARGS)

{

char buf[64];

char buf[BUFSIZ];

enum mdoc_sec sec;

const struct mdoc_node *n;

Line 1254 post_sh_head(POST_ARGS)

Line 1413 post_sh_head(POST_ARGS)

/* XXX - copied from compact(). */

assert(MDOC_TEXT == n->type);

if (strlcat(buf, n->string, 64) >= 64) {

if (strlcat(buf, n->string, BUFSIZ) >= BUFSIZ) {

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

}

if (NULL == n->next)

continue;

if (strlcat(buf, " ", 64) >= 64) {

if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

}

CVSweb