version 1.45, 2009/01/20 20:56:21 |
version 1.49, 2009/02/21 15:34:46 |
Line 91 static int bwarn_ge1(struct mdoc *); |
|
Line 91 static int bwarn_ge1(struct mdoc *); |
|
static int ewarn_ge1(struct mdoc *); |
static int ewarn_ge1(struct mdoc *); |
static int ebool(struct mdoc *); |
static int ebool(struct mdoc *); |
static int post_sh(struct mdoc *); |
static int post_sh(struct mdoc *); |
|
static int post_sh_body(struct mdoc *); |
|
static int post_sh_head(struct mdoc *); |
static int post_bl(struct mdoc *); |
static int post_bl(struct mdoc *); |
static int post_it(struct mdoc *); |
static int post_it(struct mdoc *); |
static int post_ex(struct mdoc *); |
static int post_ex(struct mdoc *); |
Line 148 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 150 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ pres_prologue, posts_text }, /* Dd */ |
{ pres_prologue, posts_text }, /* Dd */ |
{ pres_prologue, NULL }, /* Dt */ |
{ pres_prologue, NULL }, /* Dt */ |
{ pres_prologue, NULL }, /* Os */ |
{ pres_prologue, NULL }, /* Os */ |
/* FIXME: NAME section internal ordering. */ |
|
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ NULL, posts_pp }, /* Pp */ |
{ NULL, posts_pp }, /* Pp */ |
|
|
pre_it(struct mdoc *mdoc, struct mdoc_node *node) |
pre_it(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
|
|
|
/* TODO: -width attribute must be specified for -tag. */ |
|
/* TODO: children too big for -width? */ |
|
|
if (MDOC_BLOCK != node->type) |
if (MDOC_BLOCK != node->type) |
return(1); |
return(1); |
return(pre_check_parent(mdoc, node, MDOC_Bl, MDOC_BODY)); |
return(pre_check_parent(mdoc, node, MDOC_Bl, MDOC_BODY)); |
|
|
pre_prologue(struct mdoc *mdoc, struct mdoc_node *node) |
pre_prologue(struct mdoc *mdoc, struct mdoc_node *node) |
{ |
{ |
|
|
if (SEC_PROLOGUE != mdoc->sec_lastn) |
if (SEC_PROLOGUE != mdoc->lastnamed) |
return(mdoc_nerr(mdoc, node, "macro may only be invoked in the prologue")); |
return(mdoc_nerr(mdoc, node, "macro may only be invoked in the prologue")); |
assert(MDOC_ELEM == node->type); |
assert(MDOC_ELEM == node->type); |
|
|
Line 903 post_it(struct mdoc *mdoc) |
|
Line 907 post_it(struct mdoc *mdoc) |
|
#define TYPE_NONE (0) |
#define TYPE_NONE (0) |
#define TYPE_BODY (1) |
#define TYPE_BODY (1) |
#define TYPE_HEAD (2) |
#define TYPE_HEAD (2) |
|
#define TYPE_OHEAD (3) |
size_t i, argc; |
size_t i, argc; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
Line 949 post_it(struct mdoc *mdoc) |
|
Line 954 post_it(struct mdoc *mdoc) |
|
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Item): |
case (MDOC_Item): |
/* FALLTHROUGH */ |
|
case (MDOC_Column): |
|
type = TYPE_BODY; |
type = TYPE_BODY; |
sv = n->data.block.argv[(int)i].arg; |
sv = n->data.block.argv[(int)i].arg; |
break; |
break; |
|
case (MDOC_Column): |
|
type = TYPE_OHEAD; |
|
sv = n->data.block.argv[(int)i].arg; |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
assert(TYPE_NONE != type); |
assert(TYPE_NONE != type); |
|
|
|
n = mdoc->last->data.block.head; |
|
assert(n); |
|
|
if (TYPE_HEAD == type) { |
if (TYPE_HEAD == type) { |
n = mdoc->last->data.block.head; |
|
assert(n); |
|
if (NULL == n->child) |
if (NULL == n->child) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) |
return(0); |
return(0); |
Line 973 post_it(struct mdoc *mdoc) |
|
Line 981 post_it(struct mdoc *mdoc) |
|
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) |
return(0); |
return(0); |
|
|
return(1); |
} else if (TYPE_BODY == type) { |
|
if (n->child) |
|
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no line parameters")) |
|
return(0); |
|
|
|
n = mdoc->last->data.block.body; |
|
assert(n); |
|
if (NULL == n->child) |
|
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) |
|
return(0); |
|
} else { |
|
if (NULL == n->child) |
|
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) |
|
return(0); |
|
|
|
n = mdoc->last->data.block.body; |
|
assert(n); |
|
if (n->child) |
|
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no body children")) |
|
return(0); |
} |
} |
|
|
assert(TYPE_BODY == type); |
if (MDOC_Column != sv) |
assert(mdoc->last->data.block.head); |
|
|
|
n = mdoc->last->data.block.head; |
|
assert(n); |
|
if (n->child) |
|
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no line parameters")) |
|
return(0); |
|
|
|
n = mdoc->last->data.block.body; |
|
assert(n); |
|
if (NULL == n->child) |
|
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) |
|
return(0); |
|
|
|
assert(-1 != sv); |
|
if (MDOC_Column != sv) |
|
return(1); |
return(1); |
|
|
/* Make sure the number of columns is sane. */ |
/* Make sure the number of columns is sane. */ |
Line 1009 post_it(struct mdoc *mdoc) |
|
Line 1020 post_it(struct mdoc *mdoc) |
|
#undef TYPE_NONE |
#undef TYPE_NONE |
#undef TYPE_BODY |
#undef TYPE_BODY |
#undef TYPE_HEAD |
#undef TYPE_HEAD |
|
#undef TYPE_OHEAD |
} |
} |
|
|
|
|
|
|
post_root(struct mdoc *mdoc) |
post_root(struct mdoc *mdoc) |
{ |
{ |
|
|
if (NULL == mdoc->last->child) |
if (NULL == mdoc->first->child) |
return(mdoc_err(mdoc, "document has no data")); |
return(mdoc_err(mdoc, "document has no data")); |
if (NULL == mdoc->meta.title) |
if (SEC_PROLOGUE == mdoc->lastnamed) |
return(mdoc_err(mdoc, "document has incomplete prologue")); |
return(mdoc_err(mdoc, "document has incomplete prologue")); |
if (NULL == mdoc->meta.os) |
if (MDOC_BLOCK != mdoc->first->child->type) |
return(mdoc_err(mdoc, "document has incomplete prologue")); |
return(mdoc_err(mdoc, "document expects `%s' macro after prologue", mdoc_macronames[MDOC_Sh])); |
if (0 == mdoc->meta.date) |
if (MDOC_Sh != mdoc->first->child->tok) |
return(mdoc_err(mdoc, "document has incomplete prologue")); |
return(mdoc_err(mdoc, "document expects `%s' macro after prologue", mdoc_macronames[MDOC_Sh])); |
return(1); |
return(1); |
} |
} |
|
|
|
|
/* Warn if conventional sections are out of order. */ |
|
static int |
static int |
post_sh(struct mdoc *mdoc) |
post_sh(struct mdoc *mdoc) |
{ |
{ |
|
|
|
if (MDOC_HEAD == mdoc->last->type) |
|
return(post_sh_head(mdoc)); |
|
if (MDOC_BODY == mdoc->last->type) |
|
return(post_sh_body(mdoc)); |
|
return(1); |
|
} |
|
|
|
|
|
static int |
|
post_sh_body(struct mdoc *mdoc) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
assert(MDOC_Sh == mdoc->last->tok); |
|
if (SEC_NAME != mdoc->lastnamed) |
|
return(1); |
|
|
|
if (NULL == (n = mdoc->last->child)) |
|
return(mdoc_err(mdoc, "section NAME must contain %s as the first body child", mdoc_macronames[MDOC_Nm])); |
|
if (MDOC_ELEM != n->type || MDOC_Nm != n->tok) |
|
return(mdoc_err(mdoc, "section NAME must contain %s as the first body child", mdoc_macronames[MDOC_Nm])); |
|
if (NULL == (n = n->next)) |
|
return(mdoc_err(mdoc, "section NAME must contain %s as the second body child", mdoc_macronames[MDOC_Nd])); |
|
if (MDOC_ELEM != n->type || MDOC_Nd != n->tok) |
|
return(mdoc_err(mdoc, "section NAME must contain %s as the second body child", mdoc_macronames[MDOC_Nd])); |
|
if (NULL == (n = n->next)) |
|
return(1); |
|
|
|
return(mdoc_warn(mdoc, WARN_SYNTAX, "section NAME usually limited to %s and %s body children", |
|
mdoc_macronames[MDOC_Nm], mdoc_macronames[MDOC_Nd])); |
|
} |
|
|
|
|
|
static int |
|
post_sh_head(struct mdoc *mdoc) |
|
{ |
char buf[64]; |
char buf[64]; |
enum mdoc_sec sec; |
enum mdoc_sec sec; |
|
|
if (MDOC_HEAD != mdoc->last->type) |
|
return(1); |
|
assert(MDOC_Sh == mdoc->last->tok); |
assert(MDOC_Sh == mdoc->last->tok); |
|
|
if ( ! xstrlcats(buf, mdoc->last->child, 64)) |
if ( ! xstrlcats(buf, mdoc->last->child, 64)) |
return(mdoc_err(mdoc, "macro parameters too long")); |
return(mdoc_err(mdoc, "macro parameters too long")); |
|
|
if (SEC_CUSTOM == (sec = mdoc_atosec(buf))) |
sec = mdoc_atosec(buf); |
|
|
|
if (SEC_BODY == mdoc->lastnamed && SEC_NAME != sec) |
|
return(mdoc_err(mdoc, "section NAME must be first")); |
|
if (SEC_CUSTOM == sec) |
return(1); |
return(1); |
if (sec > mdoc->sec_lastn) |
if (sec == mdoc->lastnamed) |
return(1); |
|
if (sec == mdoc->sec_lastn) |
|
return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated")); |
return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated")); |
return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order")); |
if (sec < mdoc->lastnamed) |
|
return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order")); |
|
|
|
return(1); |
} |
} |
|
|
|
|