version 1.114, 2011/11/16 22:39:05 |
version 1.123, 2014/01/05 20:26:36 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 40 const char *const __man_macronames[MAN_MAX] = { |
|
Line 41 const char *const __man_macronames[MAN_MAX] = { |
|
"RI", "na", "sp", "nf", |
"RI", "na", "sp", "nf", |
"fi", "RE", "RS", "DT", |
"fi", "RE", "RS", "DT", |
"UC", "PD", "AT", "in", |
"UC", "PD", "AT", "in", |
"ft" |
"ft", "OP", "EX", "EE", |
|
"UR", "UE" |
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
Line 60 static int man_descope(struct man *, int, int); |
|
Line 62 static int man_descope(struct man *, int, int); |
|
|
|
|
|
const struct man_node * |
const struct man_node * |
man_node(const struct man *m) |
man_node(const struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & m->flags)); |
assert( ! (MAN_HALT & man->flags)); |
return(m->first); |
return(man->first); |
} |
} |
|
|
|
|
const struct man_meta * |
const struct man_meta * |
man_meta(const struct man *m) |
man_meta(const struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & m->flags)); |
assert( ! (MAN_HALT & man->flags)); |
return(&m->meta); |
return(&man->meta); |
} |
} |
|
|
|
|
Line 96 man_free(struct man *man) |
|
Line 98 man_free(struct man *man) |
|
|
|
|
|
struct man * |
struct man * |
man_alloc(struct roff *roff, struct mparse *parse) |
man_alloc(struct roff *roff, struct mparse *parse, int quick) |
{ |
{ |
struct man *p; |
struct man *p; |
|
|
Line 104 man_alloc(struct roff *roff, struct mparse *parse) |
|
Line 106 man_alloc(struct roff *roff, struct mparse *parse) |
|
|
|
man_hash_init(); |
man_hash_init(); |
p->parse = parse; |
p->parse = parse; |
|
p->quick = quick; |
p->roff = roff; |
p->roff = roff; |
|
|
man_alloc1(p); |
man_alloc1(p); |
Line 112 man_alloc(struct roff *roff, struct mparse *parse) |
|
Line 115 man_alloc(struct roff *roff, struct mparse *parse) |
|
|
|
|
|
int |
int |
man_endparse(struct man *m) |
man_endparse(struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & m->flags)); |
assert( ! (MAN_HALT & man->flags)); |
if (man_macroend(m)) |
if (man_macroend(man)) |
return(1); |
return(1); |
m->flags |= MAN_HALT; |
man->flags |= MAN_HALT; |
return(0); |
return(0); |
} |
} |
|
|
|
|
int |
int |
man_parseln(struct man *m, int ln, char *buf, int offs) |
man_parseln(struct man *man, int ln, char *buf, int offs) |
{ |
{ |
|
|
m->flags |= MAN_NEWLINE; |
man->flags |= MAN_NEWLINE; |
|
|
assert( ! (MAN_HALT & m->flags)); |
assert( ! (MAN_HALT & man->flags)); |
|
|
return (mandoc_getcontrol(buf, &offs) ? |
return (roff_getcontrol(man->roff, buf, &offs) ? |
man_pmacro(m, ln, buf, offs) : |
man_pmacro(man, ln, buf, offs) : |
man_ptext(m, ln, buf, offs)); |
man_ptext(man, ln, buf, offs)); |
} |
} |
|
|
|
|
Line 157 man_free1(struct man *man) |
|
Line 160 man_free1(struct man *man) |
|
|
|
|
|
static void |
static void |
man_alloc1(struct man *m) |
man_alloc1(struct man *man) |
{ |
{ |
|
|
memset(&m->meta, 0, sizeof(struct man_meta)); |
memset(&man->meta, 0, sizeof(struct man_meta)); |
m->flags = 0; |
man->flags = 0; |
m->last = mandoc_calloc(1, sizeof(struct man_node)); |
man->last = mandoc_calloc(1, sizeof(struct man_node)); |
m->first = m->last; |
man->first = man->last; |
m->last->type = MAN_ROOT; |
man->last->type = MAN_ROOT; |
m->last->tok = MAN_MAX; |
man->last->tok = MAN_MAX; |
m->next = MAN_NEXT_CHILD; |
man->next = MAN_NEXT_CHILD; |
} |
} |
|
|
|
|
Line 234 man_node_append(struct man *man, struct man_node *p) |
|
Line 237 man_node_append(struct man *man, struct man_node *p) |
|
|
|
|
|
static struct man_node * |
static struct man_node * |
man_node_alloc(struct man *m, int line, int pos, |
man_node_alloc(struct man *man, int line, int pos, |
enum man_type type, enum mant tok) |
enum man_type type, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
Line 245 man_node_alloc(struct man *m, int line, int pos, |
|
Line 248 man_node_alloc(struct man *m, int line, int pos, |
|
p->type = type; |
p->type = type; |
p->tok = tok; |
p->tok = tok; |
|
|
if (MAN_NEWLINE & m->flags) |
if (MAN_NEWLINE & man->flags) |
p->flags |= MAN_LINE; |
p->flags |= MAN_LINE; |
m->flags &= ~MAN_NEWLINE; |
man->flags &= ~MAN_NEWLINE; |
return(p); |
return(p); |
} |
} |
|
|
|
|
int |
int |
man_elem_alloc(struct man *m, int line, int pos, enum mant tok) |
man_elem_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
p = man_node_alloc(m, line, pos, MAN_ELEM, tok); |
p = man_node_alloc(man, line, pos, MAN_ELEM, tok); |
if ( ! man_node_append(m, p)) |
if ( ! man_node_append(man, p)) |
return(0); |
return(0); |
m->next = MAN_NEXT_CHILD; |
man->next = MAN_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_tail_alloc(struct man *m, int line, int pos, enum mant tok) |
man_tail_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
p = man_node_alloc(m, line, pos, MAN_TAIL, tok); |
p = man_node_alloc(man, line, pos, MAN_TAIL, tok); |
if ( ! man_node_append(m, p)) |
if ( ! man_node_append(man, p)) |
return(0); |
return(0); |
m->next = MAN_NEXT_CHILD; |
man->next = MAN_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_head_alloc(struct man *m, int line, int pos, enum mant tok) |
man_head_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
p = man_node_alloc(m, line, pos, MAN_HEAD, tok); |
p = man_node_alloc(man, line, pos, MAN_HEAD, tok); |
if ( ! man_node_append(m, p)) |
if ( ! man_node_append(man, p)) |
return(0); |
return(0); |
m->next = MAN_NEXT_CHILD; |
man->next = MAN_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_body_alloc(struct man *m, int line, int pos, enum mant tok) |
man_body_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
p = man_node_alloc(m, line, pos, MAN_BODY, tok); |
p = man_node_alloc(man, line, pos, MAN_BODY, tok); |
if ( ! man_node_append(m, p)) |
if ( ! man_node_append(man, p)) |
return(0); |
return(0); |
m->next = MAN_NEXT_CHILD; |
man->next = MAN_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_block_alloc(struct man *m, int line, int pos, enum mant tok) |
man_block_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
p = man_node_alloc(m, line, pos, MAN_BLOCK, tok); |
p = man_node_alloc(man, line, pos, MAN_BLOCK, tok); |
if ( ! man_node_append(m, p)) |
if ( ! man_node_append(man, p)) |
return(0); |
return(0); |
m->next = MAN_NEXT_CHILD; |
man->next = MAN_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
int |
int |
man_word_alloc(struct man *m, int line, int pos, const char *word) |
man_word_alloc(struct man *man, int line, int pos, const char *word) |
{ |
{ |
struct man_node *n; |
struct man_node *n; |
|
|
n = man_node_alloc(m, line, pos, MAN_TEXT, MAN_MAX); |
n = man_node_alloc(man, line, pos, MAN_TEXT, MAN_MAX); |
n->string = roff_strdup(m->roff, word); |
n->string = roff_strdup(man->roff, word); |
|
|
if ( ! man_node_append(m, n)) |
if ( ! man_node_append(man, n)) |
return(0); |
return(0); |
|
|
m->next = MAN_NEXT_SIBLING; |
man->next = MAN_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
|
|
Line 347 man_node_free(struct man_node *p) |
|
Line 350 man_node_free(struct man_node *p) |
|
|
|
|
|
void |
void |
man_node_delete(struct man *m, struct man_node *p) |
man_node_delete(struct man *man, struct man_node *p) |
{ |
{ |
|
|
while (p->child) |
while (p->child) |
man_node_delete(m, p->child); |
man_node_delete(man, p->child); |
|
|
man_node_unlink(m, p); |
man_node_unlink(man, p); |
man_node_free(p); |
man_node_free(p); |
} |
} |
|
|
int |
int |
man_addeqn(struct man *m, const struct eqn *ep) |
man_addeqn(struct man *man, const struct eqn *ep) |
{ |
{ |
struct man_node *n; |
struct man_node *n; |
|
|
assert( ! (MAN_HALT & m->flags)); |
assert( ! (MAN_HALT & man->flags)); |
|
|
n = man_node_alloc(m, ep->ln, ep->pos, MAN_EQN, MAN_MAX); |
n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX); |
n->eqn = ep; |
n->eqn = ep; |
|
|
if ( ! man_node_append(m, n)) |
if ( ! man_node_append(man, n)) |
return(0); |
return(0); |
|
|
m->next = MAN_NEXT_SIBLING; |
man->next = MAN_NEXT_SIBLING; |
return(man_descope(m, ep->ln, ep->pos)); |
return(man_descope(man, ep->ln, ep->pos)); |
} |
} |
|
|
int |
int |
man_addspan(struct man *m, const struct tbl_span *sp) |
man_addspan(struct man *man, const struct tbl_span *sp) |
{ |
{ |
struct man_node *n; |
struct man_node *n; |
|
|
assert( ! (MAN_HALT & m->flags)); |
assert( ! (MAN_HALT & man->flags)); |
|
|
n = man_node_alloc(m, sp->line, 0, MAN_TBL, MAN_MAX); |
n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX); |
n->span = sp; |
n->span = sp; |
|
|
if ( ! man_node_append(m, n)) |
if ( ! man_node_append(man, n)) |
return(0); |
return(0); |
|
|
m->next = MAN_NEXT_SIBLING; |
man->next = MAN_NEXT_SIBLING; |
return(man_descope(m, sp->line, 0)); |
return(man_descope(man, sp->line, 0)); |
} |
} |
|
|
static int |
static int |
man_descope(struct man *m, int line, int offs) |
man_descope(struct man *man, int line, int offs) |
{ |
{ |
/* |
/* |
* Co-ordinate what happens with having a next-line scope open: |
* Co-ordinate what happens with having a next-line scope open: |
Line 400 man_descope(struct man *m, int line, int offs) |
|
Line 403 man_descope(struct man *m, int line, int offs) |
|
* out the block scope (also if applicable). |
* out the block scope (also if applicable). |
*/ |
*/ |
|
|
if (MAN_ELINE & m->flags) { |
if (MAN_ELINE & man->flags) { |
m->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
return(0); |
return(0); |
} |
} |
|
|
if ( ! (MAN_BLINE & m->flags)) |
if ( ! (MAN_BLINE & man->flags)) |
return(1); |
return(1); |
m->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
return(0); |
return(0); |
return(man_body_alloc(m, line, offs, m->last->tok)); |
return(man_body_alloc(man, line, offs, man->last->tok)); |
} |
} |
|
|
static int |
static int |
man_ptext(struct man *m, int line, char *buf, int offs) |
man_ptext(struct man *man, int line, char *buf, int offs) |
{ |
{ |
int i; |
int i; |
|
|
/* Literal free-form text whitespace is preserved. */ |
/* Literal free-form text whitespace is preserved. */ |
|
|
if (MAN_LITERAL & m->flags) { |
if (MAN_LITERAL & man->flags) { |
if ( ! man_word_alloc(m, line, offs, buf + offs)) |
if ( ! man_word_alloc(man, line, offs, buf + offs)) |
return(0); |
return(0); |
return(man_descope(m, line, offs)); |
return(man_descope(man, line, offs)); |
} |
} |
|
|
/* Pump blank lines directly into the backend. */ |
|
|
|
for (i = offs; ' ' == buf[i]; i++) |
for (i = offs; ' ' == buf[i]; i++) |
/* Skip leading whitespace. */ ; |
/* Skip leading whitespace. */ ; |
|
|
|
/* |
|
* Blank lines are ignored right after headings |
|
* but add a single vertical space elsewhere. |
|
*/ |
|
|
if ('\0' == buf[i]) { |
if ('\0' == buf[i]) { |
/* Allocate a blank entry. */ |
/* Allocate a blank entry. */ |
if ( ! man_word_alloc(m, line, offs, "")) |
if (MAN_SH != man->last->tok && |
return(0); |
MAN_SS != man->last->tok) { |
return(man_descope(m, line, offs)); |
if ( ! man_elem_alloc(man, line, offs, MAN_sp)) |
|
return(0); |
|
man->next = MAN_NEXT_SIBLING; |
|
} |
|
return(1); |
} |
} |
|
|
/* |
/* |
Line 450 man_ptext(struct man *m, int line, char *buf, int offs |
|
Line 460 man_ptext(struct man *m, int line, char *buf, int offs |
|
|
|
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { |
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { |
if (i > 1 && '\\' != buf[i - 2]) |
if (i > 1 && '\\' != buf[i - 2]) |
man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE); |
man_pmsg(man, line, i - 1, MANDOCERR_EOLNSPACE); |
|
|
for (--i; i && ' ' == buf[i]; i--) |
for (--i; i && ' ' == buf[i]; i--) |
/* Spin back to non-space. */ ; |
/* Spin back to non-space. */ ; |
Line 461 man_ptext(struct man *m, int line, char *buf, int offs |
|
Line 471 man_ptext(struct man *m, int line, char *buf, int offs |
|
buf[i] = '\0'; |
buf[i] = '\0'; |
} |
} |
|
|
if ( ! man_word_alloc(m, line, offs, buf + offs)) |
if ( ! man_word_alloc(man, line, offs, buf + offs)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 471 man_ptext(struct man *m, int line, char *buf, int offs |
|
Line 481 man_ptext(struct man *m, int line, char *buf, int offs |
|
*/ |
*/ |
|
|
assert(i); |
assert(i); |
if (mandoc_eos(buf, (size_t)i, 0)) |
if (mandoc_eos(buf, (size_t)i)) |
m->last->flags |= MAN_EOS; |
man->last->flags |= MAN_EOS; |
|
|
return(man_descope(m, line, offs)); |
return(man_descope(man, line, offs)); |
} |
} |
|
|
static int |
static int |
man_pmacro(struct man *m, int ln, char *buf, int offs) |
man_pmacro(struct man *man, int ln, char *buf, int offs) |
{ |
{ |
int i, ppos; |
int i, ppos; |
enum mant tok; |
enum mant tok; |
Line 486 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 496 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
struct man_node *n; |
struct man_node *n; |
|
|
if ('"' == buf[offs]) { |
if ('"' == buf[offs]) { |
man_pmsg(m, ln, offs, MANDOCERR_BADCOMMENT); |
man_pmsg(man, ln, offs, MANDOCERR_BADCOMMENT); |
return(1); |
return(1); |
} else if ('\0' == buf[offs]) |
} else if ('\0' == buf[offs]) |
return(1); |
return(1); |
Line 508 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 518 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX; |
tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX; |
|
|
if (MAN_MAX == tok) { |
if (MAN_MAX == tok) { |
mandoc_vmsg(MANDOCERR_MACRO, m->parse, ln, |
mandoc_vmsg(MANDOCERR_MACRO, man->parse, ln, |
ppos, "%s", buf + ppos - 1); |
ppos, "%s", buf + ppos - 1); |
return(1); |
return(1); |
} |
} |
Line 524 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 534 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
*/ |
*/ |
|
|
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
man_pmsg(m, ln, offs - 1, MANDOCERR_EOLNSPACE); |
man_pmsg(man, ln, offs - 1, MANDOCERR_EOLNSPACE); |
|
|
/* |
/* |
* Remove prior ELINE macro, as it's being clobbered by a new |
* Remove prior ELINE macro, as it's being clobbered by a new |
Line 533 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 543 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
*/ |
*/ |
|
|
if ( ! (MAN_NSCOPED & man_macros[tok].flags) && |
if ( ! (MAN_NSCOPED & man_macros[tok].flags) && |
m->flags & MAN_ELINE) { |
man->flags & MAN_ELINE) { |
n = m->last; |
n = man->last; |
assert(MAN_TEXT != n->type); |
assert(MAN_TEXT != n->type); |
|
|
/* Remove repeated NSCOPED macros causing ELINE. */ |
/* Remove repeated NSCOPED macros causing ELINE. */ |
Line 542 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 552 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
if (MAN_NSCOPED & man_macros[n->tok].flags) |
if (MAN_NSCOPED & man_macros[n->tok].flags) |
n = n->parent; |
n = n->parent; |
|
|
mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, |
mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line, |
n->pos, "%s breaks %s", man_macronames[tok], |
n->pos, "%s breaks %s", man_macronames[tok], |
man_macronames[n->tok]); |
man_macronames[n->tok]); |
|
|
man_node_delete(m, n); |
man_node_delete(man, n); |
m->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
} |
} |
|
|
/* |
/* |
* Remove prior BLINE macro that is being clobbered. |
* Remove prior BLINE macro that is being clobbered. |
*/ |
*/ |
if ((m->flags & MAN_BLINE) && |
if ((man->flags & MAN_BLINE) && |
(MAN_BSCOPE & man_macros[tok].flags)) { |
(MAN_BSCOPE & man_macros[tok].flags)) { |
n = m->last; |
n = man->last; |
|
|
/* Might be a text node like 8 in |
/* Might be a text node like 8 in |
* .TP 8 |
* .TP 8 |
Line 573 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 583 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
assert(MAN_BLOCK == n->type); |
assert(MAN_BLOCK == n->type); |
assert(MAN_SCOPED & man_macros[n->tok].flags); |
assert(MAN_SCOPED & man_macros[n->tok].flags); |
|
|
mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, |
mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line, |
n->pos, "%s breaks %s", man_macronames[tok], |
n->pos, "%s breaks %s", man_macronames[tok], |
man_macronames[n->tok]); |
man_macronames[n->tok]); |
|
|
man_node_delete(m, n); |
man_node_delete(man, n); |
m->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
} |
} |
|
|
/* |
/* |
Line 587 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 597 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
* when they exit. |
* when they exit. |
*/ |
*/ |
|
|
if (MAN_BLINE & m->flags) |
if (MAN_BLINE & man->flags) |
m->flags |= MAN_BPLINE; |
man->flags |= MAN_BPLINE; |
|
|
/* Call to handler... */ |
/* Call to handler... */ |
|
|
assert(man_macros[tok].fp); |
assert(man_macros[tok].fp); |
if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &offs, buf)) |
if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf)) |
goto err; |
goto err; |
|
|
|
/* In quick mode (for mandocdb), abort after the NAME section. */ |
|
|
|
if (man->quick && MAN_SH == tok && |
|
strcmp(man->last->prev->child->string, "NAME")) |
|
return(2); |
|
|
/* |
/* |
* We weren't in a block-line scope when entering the |
* We weren't in a block-line scope when entering the |
* above-parsed macro, so return. |
* above-parsed macro, so return. |
*/ |
*/ |
|
|
if ( ! (MAN_BPLINE & m->flags)) { |
if ( ! (MAN_BPLINE & man->flags)) { |
m->flags &= ~MAN_ILINE; |
man->flags &= ~MAN_ILINE; |
return(1); |
return(1); |
} |
} |
m->flags &= ~MAN_BPLINE; |
man->flags &= ~MAN_BPLINE; |
|
|
/* |
/* |
* If we're in a block scope, then allow this macro to slip by |
* If we're in a block scope, then allow this macro to slip by |
* without closing scope around it. |
* without closing scope around it. |
*/ |
*/ |
|
|
if (MAN_ILINE & m->flags) { |
if (MAN_ILINE & man->flags) { |
m->flags &= ~MAN_ILINE; |
man->flags &= ~MAN_ILINE; |
return(1); |
return(1); |
} |
} |
|
|
Line 622 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 638 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
* now, as the next line will close out the block scope. |
* now, as the next line will close out the block scope. |
*/ |
*/ |
|
|
if (MAN_ELINE & m->flags) |
if (MAN_ELINE & man->flags) |
return(1); |
return(1); |
|
|
/* Close out the block scope opened in the prior line. */ |
/* Close out the block scope opened in the prior line. */ |
|
|
assert(MAN_BLINE & m->flags); |
assert(MAN_BLINE & man->flags); |
m->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
return(0); |
return(0); |
return(man_body_alloc(m, ln, ppos, m->last->tok)); |
return(man_body_alloc(man, ln, ppos, man->last->tok)); |
|
|
err: /* Error out. */ |
err: /* Error out. */ |
|
|
m->flags |= MAN_HALT; |
man->flags |= MAN_HALT; |
return(0); |
return(0); |
} |
} |
|
|
/* |
/* |
* Unlink a node from its context. If "m" is provided, the last parse |
* Unlink a node from its context. If "man" is provided, the last parse |
* point will also be adjusted accordingly. |
* point will also be adjusted accordingly. |
*/ |
*/ |
static void |
static void |
man_node_unlink(struct man *m, struct man_node *n) |
man_node_unlink(struct man *man, struct man_node *n) |
{ |
{ |
|
|
/* Adjust siblings. */ |
/* Adjust siblings. */ |
Line 665 man_node_unlink(struct man *m, struct man_node *n) |
|
Line 681 man_node_unlink(struct man *m, struct man_node *n) |
|
|
|
/* Adjust parse point, if applicable. */ |
/* Adjust parse point, if applicable. */ |
|
|
if (m && m->last == n) { |
if (man && man->last == n) { |
/*XXX: this can occur when bailing from validation. */ |
/*XXX: this can occur when bailing from validation. */ |
/*assert(NULL == n->next);*/ |
/*assert(NULL == n->next);*/ |
if (n->prev) { |
if (n->prev) { |
m->last = n->prev; |
man->last = n->prev; |
m->next = MAN_NEXT_SIBLING; |
man->next = MAN_NEXT_SIBLING; |
} else { |
} else { |
m->last = n->parent; |
man->last = n->parent; |
m->next = MAN_NEXT_CHILD; |
man->next = MAN_NEXT_CHILD; |
} |
} |
} |
} |
|
|
if (m && m->first == n) |
if (man && man->first == n) |
m->first = NULL; |
man->first = NULL; |
} |
} |
|
|
const struct mparse * |
const struct mparse * |
man_mparse(const struct man *m) |
man_mparse(const struct man *man) |
{ |
{ |
|
|
assert(m && m->parse); |
assert(man && man->parse); |
return(m->parse); |
return(man->parse); |
} |
} |