version 1.68, 2011/04/09 15:29:40 |
version 1.77, 2011/11/03 20:48:52 |
Line 46 struct man_valid { |
|
Line 46 struct man_valid { |
|
|
|
static int check_bline(CHKARGS); |
static int check_bline(CHKARGS); |
static int check_eq0(CHKARGS); |
static int check_eq0(CHKARGS); |
static int check_ft(CHKARGS); |
|
static int check_le1(CHKARGS); |
static int check_le1(CHKARGS); |
static int check_ge2(CHKARGS); |
static int check_ge2(CHKARGS); |
static int check_le5(CHKARGS); |
static int check_le5(CHKARGS); |
static int check_par(CHKARGS); |
static int check_par(CHKARGS); |
static int check_part(CHKARGS); |
static int check_part(CHKARGS); |
static int check_root(CHKARGS); |
static int check_root(CHKARGS); |
static int check_sec(CHKARGS); |
|
static void check_text(CHKARGS); |
static void check_text(CHKARGS); |
|
|
static int post_AT(CHKARGS); |
static int post_AT(CHKARGS); |
|
static int post_vs(CHKARGS); |
static int post_fi(CHKARGS); |
static int post_fi(CHKARGS); |
|
static int post_ft(CHKARGS); |
static int post_nf(CHKARGS); |
static int post_nf(CHKARGS); |
|
static int post_sec(CHKARGS); |
static int post_TH(CHKARGS); |
static int post_TH(CHKARGS); |
static int post_UC(CHKARGS); |
static int post_UC(CHKARGS); |
|
static int pre_sec(CHKARGS); |
|
|
static v_check posts_at[] = { post_AT, NULL }; |
static v_check posts_at[] = { post_AT, NULL }; |
|
static v_check posts_br[] = { post_vs, check_eq0, NULL }; |
static v_check posts_eq0[] = { check_eq0, NULL }; |
static v_check posts_eq0[] = { check_eq0, NULL }; |
static v_check posts_fi[] = { check_eq0, post_fi, NULL }; |
static v_check posts_fi[] = { check_eq0, post_fi, NULL }; |
static v_check posts_le1[] = { check_le1, NULL }; |
static v_check posts_ft[] = { post_ft, NULL }; |
static v_check posts_ft[] = { check_ft, NULL }; |
|
static v_check posts_nf[] = { check_eq0, post_nf, NULL }; |
static v_check posts_nf[] = { check_eq0, post_nf, NULL }; |
static v_check posts_par[] = { check_par, NULL }; |
static v_check posts_par[] = { check_par, NULL }; |
static v_check posts_part[] = { check_part, NULL }; |
static v_check posts_part[] = { check_part, NULL }; |
static v_check posts_sec[] = { check_sec, NULL }; |
static v_check posts_sec[] = { post_sec, NULL }; |
|
static v_check posts_sp[] = { post_vs, check_le1, NULL }; |
static v_check posts_th[] = { check_ge2, check_le5, post_TH, NULL }; |
static v_check posts_th[] = { check_ge2, check_le5, post_TH, NULL }; |
static v_check posts_uc[] = { post_UC, NULL }; |
static v_check posts_uc[] = { post_UC, NULL }; |
static v_check pres_bline[] = { check_bline, NULL }; |
static v_check pres_bline[] = { check_bline, NULL }; |
|
static v_check pres_sec[] = { check_bline, pre_sec, NULL}; |
|
|
|
|
static const struct man_valid man_valids[MAN_MAX] = { |
static const struct man_valid man_valids[MAN_MAX] = { |
{ NULL, posts_eq0 }, /* br */ |
{ NULL, posts_br }, /* br */ |
{ pres_bline, posts_th }, /* TH */ |
{ pres_bline, posts_th }, /* TH */ |
{ pres_bline, posts_sec }, /* SH */ |
{ pres_sec, posts_sec }, /* SH */ |
{ pres_bline, posts_sec }, /* SS */ |
{ pres_sec, posts_sec }, /* SS */ |
{ pres_bline, NULL }, /* TP */ |
{ pres_bline, NULL }, /* TP */ |
{ pres_bline, posts_par }, /* LP */ |
{ pres_bline, posts_par }, /* LP */ |
{ pres_bline, posts_par }, /* PP */ |
{ pres_bline, posts_par }, /* PP */ |
Line 99 static const struct man_valid man_valids[MAN_MAX] = { |
|
Line 102 static const struct man_valid man_valids[MAN_MAX] = { |
|
{ NULL, NULL }, /* IR */ |
{ NULL, NULL }, /* IR */ |
{ NULL, NULL }, /* RI */ |
{ NULL, NULL }, /* RI */ |
{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */ |
{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */ |
{ NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */ |
{ NULL, posts_sp }, /* sp */ /* FIXME: should warn only. */ |
{ pres_bline, posts_nf }, /* nf */ |
{ pres_bline, posts_nf }, /* nf */ |
{ pres_bline, posts_fi }, /* fi */ |
{ pres_bline, posts_fi }, /* fi */ |
{ NULL, NULL }, /* RE */ |
{ NULL, NULL }, /* RE */ |
Line 206 check_root(CHKARGS) |
|
Line 209 check_root(CHKARGS) |
|
} |
} |
|
|
static void |
static void |
check_text(CHKARGS) |
check_text(CHKARGS) |
{ |
{ |
char *p, *pp, *cpp; |
char *cp, *p; |
int pos; |
|
size_t sz; |
|
|
|
p = n->string; |
if (MAN_LITERAL & m->flags) |
pos = n->pos + 1; |
return; |
|
|
while ('\0' != *p) { |
cp = n->string; |
sz = strcspn(p, "\t\\"); |
for (p = cp; NULL != (p = strchr(p, '\t')); p++) |
|
man_pmsg(m, n->line, (int)(p - cp), MANDOCERR_BADTAB); |
p += (int)sz; |
|
pos += (int)sz; |
|
|
|
if ('\t' == *p) { |
|
if ( ! (MAN_LITERAL & m->flags)) |
|
man_pmsg(m, n->line, pos, MANDOCERR_BADTAB); |
|
p++; |
|
pos++; |
|
continue; |
|
} else if ('\0' == *p) |
|
break; |
|
|
|
pos++; |
|
pp = ++p; |
|
|
|
if (ESCAPE_ERROR == mandoc_escape |
|
((const char **)&pp, NULL, NULL)) { |
|
man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE); |
|
break; |
|
} |
|
|
|
cpp = p; |
|
while (NULL != (cpp = memchr(cpp, ASCII_HYPH, pp - cpp))) |
|
*cpp = '-'; |
|
|
|
pos += pp - p; |
|
p = pp; |
|
} |
|
} |
} |
|
|
#define INEQ_DEFINE(x, ineq, name) \ |
#define INEQ_DEFINE(x, ineq, name) \ |
Line 266 INEQ_DEFINE(2, >=, ge2) |
|
Line 239 INEQ_DEFINE(2, >=, ge2) |
|
INEQ_DEFINE(5, <=, le5) |
INEQ_DEFINE(5, <=, le5) |
|
|
static int |
static int |
check_ft(CHKARGS) |
post_ft(CHKARGS) |
{ |
{ |
char *cp; |
char *cp; |
int ok; |
int ok; |
Line 322 check_ft(CHKARGS) |
|
Line 295 check_ft(CHKARGS) |
|
} |
} |
|
|
static int |
static int |
check_sec(CHKARGS) |
pre_sec(CHKARGS) |
{ |
{ |
|
|
if (MAN_HEAD == n->type && 0 == n->nchild) { |
if (MAN_BLOCK == n->type) |
man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT); |
m->flags &= ~MAN_LITERAL; |
return(0); |
|
} else if (MAN_BODY == n->type && 0 == n->nchild) |
|
mandoc_msg(MANDOCERR_ARGCWARN, m->parse, n->line, |
|
n->pos, "want children (have none)"); |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
|
static int |
|
post_sec(CHKARGS) |
|
{ |
|
|
|
if ( ! (MAN_HEAD == n->type && 0 == n->nchild)) |
|
return(1); |
|
|
|
man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT); |
|
return(0); |
|
} |
|
|
static int |
static int |
check_part(CHKARGS) |
check_part(CHKARGS) |
{ |
{ |
Line 414 post_TH(CHKARGS) |
|
Line 392 post_TH(CHKARGS) |
|
if (n && n->string) { |
if (n && n->string) { |
for (p = n->string; '\0' != *p; p++) { |
for (p = n->string; '\0' != *p; p++) { |
/* Only warn about this once... */ |
/* Only warn about this once... */ |
if (isalpha((u_char)*p) && ! isupper((u_char)*p)) { |
if (isalpha((unsigned char)*p) && |
|
! isupper((unsigned char)*p)) { |
man_nmsg(m, n, MANDOCERR_UPPERCASE); |
man_nmsg(m, n, MANDOCERR_UPPERCASE); |
break; |
break; |
} |
} |
Line 436 post_TH(CHKARGS) |
|
Line 415 post_TH(CHKARGS) |
|
|
|
if (n) |
if (n) |
n = n->next; |
n = n->next; |
if (n) |
if (n && n->string && '\0' != n->string[0]) { |
pos = n->pos; |
pos = n->pos; |
m->meta.date = mandoc_normdate |
m->meta.date = mandoc_normdate |
(m->parse, n ? n->string : NULL, line, pos); |
(m->parse, n->string, line, pos); |
|
} else |
|
m->meta.date = mandoc_strdup(""); |
|
|
/* TITLE MSEC DATE ->SOURCE<- VOL */ |
/* TITLE MSEC DATE ->SOURCE<- VOL */ |
|
|
Line 495 post_UC(CHKARGS) |
|
Line 476 post_UC(CHKARGS) |
|
const char *p, *s; |
const char *p, *s; |
|
|
n = n->child; |
n = n->child; |
n = m->last->child; |
|
|
|
if (NULL == n || MAN_TEXT != n->type) |
if (NULL == n || MAN_TEXT != n->type) |
p = bsd_versions[0]; |
p = bsd_versions[0]; |
Line 559 post_AT(CHKARGS) |
|
Line 539 post_AT(CHKARGS) |
|
free(m->meta.source); |
free(m->meta.source); |
|
|
m->meta.source = mandoc_strdup(p); |
m->meta.source = mandoc_strdup(p); |
|
return(1); |
|
} |
|
|
|
static int |
|
post_vs(CHKARGS) |
|
{ |
|
|
|
/* |
|
* Don't warn about this because it occurs in pod2man and would |
|
* cause considerable (unfixable) warnage. |
|
*/ |
|
if (NULL == n->prev && MAN_ROOT == n->parent->type) |
|
man_node_delete(m, n); |
|
|
return(1); |
return(1); |
} |
} |