version 1.231, 2014/11/28 03:14:18 |
version 1.234, 2015/01/15 04:26:40 |
Line 190 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
Line 190 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
return(p); |
return(p); |
} |
} |
|
|
int |
void |
mdoc_endparse(struct mdoc *mdoc) |
mdoc_endparse(struct mdoc *mdoc) |
{ |
{ |
|
|
return(mdoc_macroend(mdoc)); |
mdoc_macroend(mdoc); |
} |
} |
|
|
int |
void |
mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 208 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
Line 208 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
n->flags |= MDOC_LINE; |
n->flags |= MDOC_LINE; |
node_append(mdoc, n); |
node_append(mdoc, n); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
|
} |
} |
|
|
int |
void |
mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp) |
mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 220 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
Line 219 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
n->span = sp; |
n->span = sp; |
node_append(mdoc, n); |
node_append(mdoc, n); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
|
} |
} |
|
|
/* |
/* |
Line 250 mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 248 mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int |
|
mdoc_ptext(mdoc, ln, buf, offs)); |
mdoc_ptext(mdoc, ln, buf, offs)); |
} |
} |
|
|
int |
void |
mdoc_macro(MACRO_PROT_ARGS) |
mdoc_macro(MACRO_PROT_ARGS) |
{ |
{ |
assert(tok < MDOC_MAX); |
assert(tok < MDOC_MAX); |
Line 260 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 258 mdoc_macro(MACRO_PROT_ARGS) |
|
mandoc_vmsg(MANDOCERR_DT_LATE, |
mandoc_vmsg(MANDOCERR_DT_LATE, |
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"Dt %s", buf + *pos); |
"Dt %s", buf + *pos); |
return(1); |
return; |
} |
} |
} else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) { |
} else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) { |
if (mdoc->meta.title == NULL) { |
if (mdoc->meta.title == NULL) { |
Line 273 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 271 mdoc_macro(MACRO_PROT_ARGS) |
|
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->flags |= MDOC_PBODY; |
mdoc->flags |= MDOC_PBODY; |
} |
} |
|
(*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf); |
return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf)); |
|
} |
} |
|
|
|
|
Line 606 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 603 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
LIST_column == n->norm->Bl.type) { |
LIST_column == n->norm->Bl.type) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); |
mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); |
|
return(1); |
} |
} |
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
Line 615 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 613 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); |
mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); |
|
return(1); |
} |
} |
|
|
/* |
/* |
Line 693 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 692 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
|
|
if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) |
if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) |
mdoc->last->flags |= MDOC_EOS; |
mdoc->last->flags |= MDOC_EOS; |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 765 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 763 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) { |
return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf)); |
mdoc_macro(mdoc, tok, ln, sv, &offs, buf); |
|
return(1); |
|
} |
|
|
n = mdoc->last; |
n = mdoc->last; |
assert(mdoc->last); |
assert(mdoc->last); |
Line 779 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 779 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; |
return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); |
mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); |
|
return(1); |
} |
} |
|
|
/* |
/* |
Line 793 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 794 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; |
return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); |
mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); |
|
return(1); |
} |
} |
|
|
/* Normal processing of a macro. */ |
/* Normal processing of a macro. */ |
|
|
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
mdoc_macro(mdoc, tok, ln, sv, &offs, buf); |
return(0); |
|
|
|
/* In quick mode (for mandocdb), abort after the NAME section. */ |
/* In quick mode (for mandocdb), abort after the NAME section. */ |
|
|