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.250 and 1.255

version 1.250, 2014/10/11 21:14:16

version 1.255, 2014/11/17 06:44:58

Line 70 static void check_args(struct mdoc *, struct mdoc_nod

static int child_an(const struct mdoc_node *);

static enum mdoc_sec a2sec(const char *);

static size_t macro2len(enum mdoct);

static void rewrite_macro2len(char **);

static int ebool(POST_ARGS);

static int berr_ge1(POST_ARGS);

Line 88 static int post_bf(POST_ARGS);

Line 89 static int post_bf(POST_ARGS);

static int post_bk(POST_ARGS);

static int post_bl(POST_ARGS);

static int post_bl_block(POST_ARGS);

static int post_bl_block_width(POST_ARGS);

static int post_bl_block_tag(POST_ARGS);

static int post_bl_head(POST_ARGS);

static int post_bx(POST_ARGS);

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

{ NULL, NULL }, /* Eo */

{ NULL, NULL }, /* Fx */

{ NULL, NULL }, /* Ms */

{ NULL, ewarn_eq0 }, /* No */

{ NULL, NULL }, /* No */

{ NULL, post_ns }, /* Ns */

{ NULL, NULL }, /* Nx */

{ NULL, NULL }, /* Ox */

Line 353 mdoc_valid_post(struct mdoc *mdoc)

case MDOC_ROOT:

return(post_root(mdoc));

default:

* Closing delimiters are not special at the

* beginning of a block, opening delimiters

* are not special at the end.

if (n->child != NULL)

n->child->flags &= ~MDOC_DELIMC;

if (n->last != NULL)

n->last->flags &= ~MDOC_DELIMO;

/* Call the macro's postprocessor. */

p = mdoc_valids[n->tok].post;

return(*p ? (*p)(mdoc) : 1);

}

Line 597 pre_bl(PRE_ARGS)

Line 611 pre_bl(PRE_ARGS)

mdoc->parse, argv->line,

argv->pos, "Bl -width %s",

argv->value[0]);

rewrite_macro2len(argv->value);

n->norm->Bl.width = argv->value[0];

break;

case MDOC_Offset:

Line 611 pre_bl(PRE_ARGS)

Line 626 pre_bl(PRE_ARGS)

mdoc->parse, argv->line,

argv->pos, "Bl -offset %s",

argv->value[0]);

rewrite_macro2len(argv->value);

n->norm->Bl.offs = argv->value[0];

break;

default:

Line 758 pre_bd(PRE_ARGS)

Line 774 pre_bd(PRE_ARGS)

mdoc->parse, argv->line,

argv->pos, "Bd -offset %s",

argv->value[0]);

rewrite_macro2len(argv->value);

n->norm->Bd.offs = argv->value[0];

break;

case MDOC_Compact:

Line 1004 post_eoln(POST_ARGS)

Line 1021 post_eoln(POST_ARGS)

static int

post_fname(POST_ARGS)

{

const struct mdoc_node *n;

size_t pos;

const char *cp;

size_t pos;

n = mdoc->last->child;

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

if (n->string[pos] != '\0')

cp = n->string + pos;

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

mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse,

n->line, n->pos + pos, n->string);

return(1);

Line 1030 post_fo(POST_ARGS)

Line 1049 post_fo(POST_ARGS)

hwarn_eq1(mdoc);

bwarn_ge1(mdoc);

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

if (mdoc->last->type == MDOC_HEAD && mdoc->last->nchild)

post_fname(mdoc);

return(1);

}

Line 1157 post_defaults(POST_ARGS)

Line 1176 post_defaults(POST_ARGS)

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))

return(0);

break;

case MDOC_Li:

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))

return(0);

break;

case MDOC_Pa:

/* FALLTHROUGH */

case MDOC_Mt:

Line 1334 post_bl_block(POST_ARGS)

Line 1349 post_bl_block(POST_ARGS)

if ( ! post_bl_block_tag(mdoc))

return(0);

assert(n->norm->Bl.width);

} else if (NULL != n->norm->Bl.width) {

if ( ! post_bl_block_width(mdoc))

return(0);

assert(n->norm->Bl.width);

}

for (ni = n->body->child; ni; ni = ni->next) {

Line 1377 post_bl_block(POST_ARGS)

Line 1388 post_bl_block(POST_ARGS)

return(1);

}

static int

post_bl_block_width(POST_ARGS)

* If the argument of -offset or -width is a macro,

* replace it with the associated default width.

void

rewrite_macro2len(char **arg)

{

size_t width;

int i;

enum mdoct tok;

struct mdoc_node *n;

char buf[24];

n = mdoc->last;

if (*arg == NULL)

return;

else if ( ! strcmp(*arg, "Ds"))

* Calculate the real width of a list from the -width string,

* which may contain a macro (with a known default width), a

* literal string, or a scaling width.

* If the value to -width is a macro, then we re-write it to be

* the macro's width as set in share/tmac/mdoc/doc-common.

if (0 == strcmp(n->norm->Bl.width, "Ds"))

width = 6;

else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))

else if ((tok = mdoc_hash_find(*arg)) == MDOC_MAX)

return(1);

return;

else

width = macro2len(tok);

/* The value already exists: free and reallocate it. */

free(*arg);

mandoc_asprintf(arg, "%zun", width);

assert(n->args);

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

if (MDOC_Width == n->args->argv[i].arg)

break;

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

(void)snprintf(buf, sizeof(buf), "%un", (unsigned int)width);

free(n->args->argv[i].value[0]);

n->args->argv[i].value[0] = mandoc_strdup(buf);

/* Set our width! */

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

return(1);

}

static int

Line 1435 post_bl_block_tag(POST_ARGS)

Line 1423 post_bl_block_tag(POST_ARGS)

* Calculate the -width for a `Bl -tag' list if it hasn't been

* provided. Uses the first head macro. NOTE AGAIN: this is

* ONLY if the -width argument has NOT been provided. See

* post_bl_block_width() for converting the -width string.

* rewrite_macro2len() for converting the -width string.

sz = 10;

Line 1987 post_sh_see_also(POST_ARGS)

Line 1975 post_sh_see_also(POST_ARGS)

mdoc->parse, n->line, n->pos,

"%s(%s) after %s(%s)", name,

sec, lastname, lastsec);

else if (cmp == 0 && strcmp(lastname, name) > 0)

else if (cmp == 0 &&

strcasecmp(lastname, name) > 0)

mandoc_vmsg(MANDOCERR_XR_ORDER,

mdoc->parse, n->line, n->pos,

"%s after %s", name, lastname);

CVSweb