version 1.29, 2009/01/14 11:58:24 |
version 1.30, 2009/01/15 15:46:45 |
Line 393 mdoc_macro(struct mdoc *mdoc, int tok, |
|
Line 393 mdoc_macro(struct mdoc *mdoc, int tok, |
|
static int |
static int |
mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) |
mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) |
{ |
{ |
const char *on, *ot, *act; |
const char *nn, *nt, *on, *ot, *act; |
|
|
assert(mdoc->last); |
assert(mdoc->last); |
assert(mdoc->first); |
assert(mdoc->first); |
Line 406 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
Line 406 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
else |
else |
on = mdoc_macronames[mdoc->last->tok]; |
on = mdoc_macronames[mdoc->last->tok]; |
|
|
/* FIXME: put this into util.c. */ |
if (MDOC_TEXT == p->type) |
switch (mdoc->last->type) { |
nn = "<text>"; |
case (MDOC_TEXT): |
else if (MDOC_ROOT == p->type) |
ot = "text"; |
nn = "<root>"; |
break; |
else |
case (MDOC_BODY): |
nn = mdoc_macronames[p->tok]; |
ot = "body"; |
|
break; |
|
case (MDOC_ELEM): |
|
ot = "elem"; |
|
break; |
|
case (MDOC_HEAD): |
|
ot = "head"; |
|
break; |
|
case (MDOC_TAIL): |
|
ot = "tail"; |
|
break; |
|
case (MDOC_BLOCK): |
|
ot = "block"; |
|
break; |
|
case (MDOC_ROOT): |
|
ot = "root"; |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
|
ot = mdoc_type2a(mdoc->last->type); |
|
nt = mdoc_type2a(p->type); |
|
|
switch (mdoc->next) { |
switch (mdoc->next) { |
case (MDOC_NEXT_SIBLING): |
case (MDOC_NEXT_SIBLING): |
mdoc->last->next = p; |
mdoc->last->next = p; |
Line 474 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
Line 456 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
} |
} |
|
|
mdoc->last = p; |
mdoc->last = p; |
mdoc_msg(mdoc, "parse: %s of %s `%s'", act, ot, on); |
mdoc_msg(mdoc, "parse: %s `%s' %s of %s `%s'", |
|
nt, nn, act, ot, on); |
return(1); |
return(1); |
} |
} |
|
|