version 1.174, 2011/01/01 10:51:30 |
version 1.177, 2011/01/03 11:27:33 |
Line 98 static int node_append(struct mdoc *, |
|
Line 98 static int node_append(struct mdoc *, |
|
struct mdoc_node *); |
struct mdoc_node *); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
|
static int mdoc_span_alloc(struct mdoc *, |
|
const struct tbl_span *); |
|
|
|
|
const struct mdoc_node * |
const struct mdoc_node * |
mdoc_node(const struct mdoc *m) |
mdoc_node(const struct mdoc *m) |
{ |
{ |
|
|
return(MDOC_HALT & m->flags ? NULL : m->first); |
assert( ! (MDOC_HALT & m->flags)); |
|
return(m->first); |
} |
} |
|
|
|
|
Line 112 const struct mdoc_meta * |
|
Line 115 const struct mdoc_meta * |
|
mdoc_meta(const struct mdoc *m) |
mdoc_meta(const struct mdoc *m) |
{ |
{ |
|
|
return(MDOC_HALT & m->flags ? NULL : &m->meta); |
assert( ! (MDOC_HALT & m->flags)); |
|
return(&m->meta); |
} |
} |
|
|
|
|
|
|
mdoc_endparse(struct mdoc *m) |
mdoc_endparse(struct mdoc *m) |
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
assert( ! (MDOC_HALT & m->flags)); |
return(0); |
if (mdoc_macroend(m)) |
else if (mdoc_macroend(m)) |
|
return(1); |
return(1); |
m->flags |= MDOC_HALT; |
m->flags |= MDOC_HALT; |
return(0); |
return(0); |
} |
} |
|
|
|
int |
|
mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) |
|
{ |
|
|
|
assert( ! (MDOC_HALT & m->flags)); |
|
|
|
/* No text before an initial macro. */ |
|
|
|
if (SEC_NONE == m->lastnamed) { |
|
/* FIXME: grab from span. */ |
|
mdoc_pmsg(m, 0, 0, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
|
return(mdoc_span_alloc(m, sp)); |
|
} |
|
|
|
|
/* |
/* |
* Main parse routine. Parses a single line -- really just hands off to |
* Main parse routine. Parses a single line -- really just hands off to |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
|
|
mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) |
mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) |
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
assert( ! (MDOC_HALT & m->flags)); |
return(0); |
|
|
|
m->flags |= MDOC_NEWLINE; |
m->flags |= MDOC_NEWLINE; |
|
|
Line 371 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 390 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
mdoc->last = p; |
mdoc->last = p; |
|
|
switch (p->type) { |
switch (p->type) { |
|
case (MDOC_TBL): |
|
/* FALLTHROUGH */ |
case (MDOC_TEXT): |
case (MDOC_TEXT): |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
Line 522 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
Line 543 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
if ( ! node_append(m, p)) |
if ( ! node_append(m, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
m->next = MDOC_NEXT_CHILD; |
|
return(1); |
|
} |
|
|
|
static int |
|
mdoc_span_alloc(struct mdoc *m, const struct tbl_span *sp) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
/* FIXME: grab from tbl_span. */ |
|
n = node_alloc(m, 0, 0, MDOC_MAX, MDOC_TBL); |
|
n->span = sp; |
|
|
|
if ( ! node_append(m, n)) |
|
return(0); |
|
|
|
m->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
|
|