version 1.175, 2011/01/01 12:18:37 |
version 1.179, 2011/02/06 22:05:20 |
Line 106 const struct mdoc_node * |
|
Line 106 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 114 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); |
|
|
mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) |
mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) |
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
assert( ! (MDOC_HALT & m->flags)); |
return(0); |
|
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) { |
if (SEC_NONE == m->lastnamed) { |
/* FIXME: grab from span. */ |
mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT); |
mdoc_pmsg(m, 0, 0, MANDOCERR_NOTEXT); |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
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 391 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 389 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 550 mdoc_span_alloc(struct mdoc *m, const struct tbl_span |
|
Line 550 mdoc_span_alloc(struct mdoc *m, const struct tbl_span |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
/* FIXME: grab from tbl_span. */ |
n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n = node_alloc(m, 0, 0, MDOC_MAX, MDOC_TBL); |
|
n->span = sp; |
n->span = sp; |
|
|
if ( ! node_append(m, n)) |
if ( ! node_append(m, n)) |