version 1.111, 2010/07/19 11:11:54 |
version 1.114, 2010/07/26 13:45:49 |
Line 145 static v_pre pres_ss[] = { pre_ss, NULL }; |
|
Line 145 static v_pre pres_ss[] = { pre_ss, NULL }; |
|
|
|
const struct valids mdoc_valids[MDOC_MAX] = { |
const struct valids mdoc_valids[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
{ pres_dd, posts_text }, /* Dd */ |
{ pres_dd, posts_wtext }, /* Dd */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_os, NULL }, /* Os */ |
{ pres_os, NULL }, /* Os */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_sh, posts_sh }, /* Sh */ |
Line 453 check_argv(struct mdoc *m, struct mdoc_node *n, struct |
|
Line 453 check_argv(struct mdoc *m, struct mdoc_node *n, struct |
|
|
|
|
|
static int |
static int |
check_text(struct mdoc *mdoc, int line, int pos, char *p) |
check_text(struct mdoc *m, int ln, int pos, char *p) |
{ |
{ |
int c; |
int c; |
|
size_t sz; |
|
|
/* |
|
* FIXME: we absolutely cannot let \b get through or it will |
|
* destroy some assumptions in terms of format. |
|
*/ |
|
|
|
for ( ; *p; p++, pos++) { |
for ( ; *p; p++, pos++) { |
|
sz = strcspn(p, "\t\\"); |
|
p += (int)sz; |
|
|
|
if ('\0' == *p) |
|
break; |
|
|
|
pos += (int)sz; |
|
|
if ('\t' == *p) { |
if ('\t' == *p) { |
if ( ! (MDOC_LITERAL & mdoc->flags)) |
if (MDOC_LITERAL & m->flags) |
if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR)) |
continue; |
return(0); |
if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB)) |
} else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p) |
continue; |
if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR)) |
return(0); |
return(0); |
} |
|
|
if ('\\' != *p) |
/* Check the special character. */ |
continue; |
|
|
|
c = mandoc_special(p); |
c = mandoc_special(p); |
if (c) { |
if (c) { |
Line 481 check_text(struct mdoc *mdoc, int line, int pos, char |
|
Line 484 check_text(struct mdoc *mdoc, int line, int pos, char |
|
continue; |
continue; |
} |
} |
|
|
c = mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADESCAPE); |
c = mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE); |
if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags) && ! c) |
if ( ! (MDOC_IGN_ESCAPE & m->pflags) && ! c) |
return(c); |
return(c); |
} |
} |
|
|
Line 490 check_text(struct mdoc *mdoc, int line, int pos, char |
|
Line 493 check_text(struct mdoc *mdoc, int line, int pos, char |
|
} |
} |
|
|
|
|
|
|
|
|
static int |
static int |
check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) |
check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) |
{ |
{ |
Line 509 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
Line 510 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
} |
} |
|
|
|
|
|
|
static int |
static int |
pre_display(PRE_ARGS) |
pre_display(PRE_ARGS) |
{ |
{ |
Line 624 pre_bl(PRE_ARGS) |
|
Line 624 pre_bl(PRE_ARGS) |
|
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
return(0); |
return(0); |
break; |
break; |
|
default: |
|
continue; |
} |
} |
|
|
/* Check: duplicate auxiliary arguments. */ |
/* Check: duplicate auxiliary arguments. */ |
|
|
post_bf(POST_ARGS) |
post_bf(POST_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
int arg; |
enum mdocargt arg; |
|
|
/* |
/* |
* Unlike other data pointers, these are "housed" by the HEAD |
* Unlike other data pointers, these are "housed" by the HEAD |