version 1.218, 2014/07/06 19:09:00 |
version 1.223, 2014/08/06 15:09:05 |
Line 104 const struct mdoc_node * |
|
Line 104 const struct mdoc_node * |
|
mdoc_node(const struct mdoc *mdoc) |
mdoc_node(const struct mdoc *mdoc) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & mdoc->flags)); |
|
return(mdoc->first); |
return(mdoc->first); |
} |
} |
|
|
Line 112 const struct mdoc_meta * |
|
Line 111 const struct mdoc_meta * |
|
mdoc_meta(const struct mdoc *mdoc) |
mdoc_meta(const struct mdoc *mdoc) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & mdoc->flags)); |
|
return(&mdoc->meta); |
return(&mdoc->meta); |
} |
} |
|
|
Line 125 mdoc_free1(struct mdoc *mdoc) |
|
Line 123 mdoc_free1(struct mdoc *mdoc) |
|
|
|
if (mdoc->first) |
if (mdoc->first) |
mdoc_node_delete(mdoc, mdoc->first); |
mdoc_node_delete(mdoc, mdoc->first); |
if (mdoc->meta.title) |
free(mdoc->meta.msec); |
free(mdoc->meta.title); |
free(mdoc->meta.vol); |
if (mdoc->meta.os) |
free(mdoc->meta.arch); |
free(mdoc->meta.os); |
free(mdoc->meta.date); |
if (mdoc->meta.name) |
free(mdoc->meta.title); |
free(mdoc->meta.name); |
free(mdoc->meta.os); |
if (mdoc->meta.arch) |
free(mdoc->meta.name); |
free(mdoc->meta.arch); |
|
if (mdoc->meta.vol) |
|
free(mdoc->meta.vol); |
|
if (mdoc->meta.msec) |
|
free(mdoc->meta.msec); |
|
if (mdoc->meta.date) |
|
free(mdoc->meta.date); |
|
} |
} |
|
|
/* |
/* |
Line 189 mdoc_free(struct mdoc *mdoc) |
|
Line 180 mdoc_free(struct mdoc *mdoc) |
|
*/ |
*/ |
struct mdoc * |
struct mdoc * |
mdoc_alloc(struct roff *roff, struct mparse *parse, |
mdoc_alloc(struct roff *roff, struct mparse *parse, |
char *defos, int quick) |
const char *defos, int quick) |
{ |
{ |
struct mdoc *p; |
struct mdoc *p; |
|
|
Line 205 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
Line 196 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
return(p); |
return(p); |
} |
} |
|
|
/* |
|
* Climb back up the parse tree, validating open scopes. Mostly calls |
|
* through to macro_end() in macro.c. |
|
*/ |
|
int |
int |
mdoc_endparse(struct mdoc *mdoc) |
mdoc_endparse(struct mdoc *mdoc) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & mdoc->flags)); |
return(mdoc_macroend(mdoc)); |
if (mdoc_macroend(mdoc)) |
|
return(1); |
|
mdoc->flags |= MDOC_HALT; |
|
return(0); |
|
} |
} |
|
|
int |
int |
Line 225 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
Line 208 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert( ! (MDOC_HALT & mdoc->flags)); |
|
|
|
/* No text before an initial macro. */ |
|
|
|
if (SEC_NONE == mdoc->lastnamed) { |
|
mdoc_pmsg(mdoc, ep->ln, ep->pos, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
|
n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); |
n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); |
n->eqn = ep; |
n->eqn = ep; |
|
|
Line 249 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
Line 223 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert( ! (MDOC_HALT & mdoc->flags)); |
|
|
|
/* No text before an initial macro. */ |
|
|
|
if (SEC_NONE == mdoc->lastnamed) { |
|
mdoc_pmsg(mdoc, sp->line, 0, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
|
n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n->span = sp; |
n->span = sp; |
|
|
|
|
mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) |
mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & mdoc->flags)); |
|
|
|
mdoc->flags |= MDOC_NEWLINE; |
mdoc->flags |= MDOC_NEWLINE; |
|
|
/* |
/* |
Line 301 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 264 mdoc_macro(MACRO_PROT_ARGS) |
|
{ |
{ |
assert(tok < MDOC_MAX); |
assert(tok < MDOC_MAX); |
|
|
/* If we're in the body, deny prologue calls. */ |
if (mdoc->flags & MDOC_PBODY) { |
|
if (tok == MDOC_Dt) { |
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
mandoc_vmsg(MANDOCERR_DT_LATE, |
MDOC_PBODY & mdoc->flags) { |
mdoc->parse, line, ppos, |
mandoc_vmsg(MANDOCERR_PROLOG_ONLY, mdoc->parse, |
"Dt %s", buf + *pos); |
line, ppos, "%s", mdoc_macronames[tok]); |
return(1); |
return(1); |
} |
} |
} else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) { |
|
if (mdoc->meta.title == NULL) { |
/* If we're in the prologue, deny "body" macros. */ |
mandoc_vmsg(MANDOCERR_DT_NOTITLE, |
|
mdoc->parse, line, ppos, "%s %s", |
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
mdoc_macronames[tok], buf + *pos); |
! (MDOC_PBODY & mdoc->flags)) { |
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
mandoc_vmsg(MANDOCERR_PROLOG_BAD, mdoc->parse, |
} |
line, ppos, "%s", mdoc_macronames[tok]); |
|
if (NULL == mdoc->meta.msec) |
|
mdoc->meta.msec = mandoc_strdup("1"); |
|
if (NULL == mdoc->meta.title) |
|
mdoc->meta.title = mandoc_strdup("UNKNOWN"); |
|
if (NULL == mdoc->meta.vol) |
if (NULL == mdoc->meta.vol) |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
if (NULL == mdoc->meta.os) |
|
mdoc->meta.os = mandoc_strdup("LOCAL"); |
|
if (NULL == mdoc->meta.date) |
|
mdoc->meta.date = mandoc_normdate |
|
(mdoc->parse, NULL, line, ppos); |
|
mdoc->flags |= MDOC_PBODY; |
mdoc->flags |= MDOC_PBODY; |
} |
} |
|
|
Line 722 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 675 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
char *c, *ws, *end; |
char *c, *ws, *end; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
/* No text before an initial macro. */ |
|
|
|
if (SEC_NONE == mdoc->lastnamed) { |
|
mdoc_pmsg(mdoc, line, offs, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
|
assert(mdoc->last); |
assert(mdoc->last); |
n = mdoc->last; |
n = mdoc->last; |
|
|
Line 875 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 821 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
|
|
if (MDOC_MAX == tok) { |
if (MDOC_MAX == tok) { |
mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
ln, sv, "%s", buf + sv - 1); |
ln, sv, buf + sv - 1); |
return(1); |
return(1); |
} |
} |
|
|
Line 904 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 850 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
* into macro processing. |
* into macro processing. |
*/ |
*/ |
|
|
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { |
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) |
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf)); |
goto err; |
|
return(1); |
|
} |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
assert(mdoc->last); |
assert(mdoc->last); |
Line 921 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 864 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->norm->Bl.type) { |
LIST_column == n->norm->Bl.type) { |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) |
return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); |
goto err; |
|
return(1); |
|
} |
} |
|
|
/* |
/* |
Line 937 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 878 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) |
return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); |
goto err; |
|
return(1); |
|
} |
} |
|
|
/* Normal processing of a macro. */ |
/* Normal processing of a macro. */ |
|
|
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
goto err; |
return(0); |
|
|
/* In quick mode (for mandocdb), abort after the NAME section. */ |
/* In quick mode (for mandocdb), abort after the NAME section. */ |
|
|
Line 954 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 893 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
return(2); |
return(2); |
|
|
return(1); |
return(1); |
|
|
err: /* Error out. */ |
|
|
|
mdoc->flags |= MDOC_HALT; |
|
return(0); |
|
} |
} |
|
|
enum mdelim |
enum mdelim |