version 1.126, 2014/03/23 12:26:58 |
version 1.140, 2014/10/20 02:33:06 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
|
|
#include "libman.h" |
#include "libman.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
const char *const __man_macronames[MAN_MAX] = { |
const char *const __man_macronames[MAN_MAX] = { |
"br", "TH", "SH", "SS", |
"br", "TH", "SH", "SS", |
"TP", "LP", "PP", "P", |
"TP", "LP", "PP", "P", |
"IP", "HP", "SM", "SB", |
"IP", "HP", "SM", "SB", |
"BI", "IB", "BR", "RB", |
"BI", "IB", "BR", "RB", |
"R", "B", "I", "IR", |
"R", "B", "I", "IR", |
Line 45 const char *const __man_macronames[MAN_MAX] = { |
|
Line 43 const char *const __man_macronames[MAN_MAX] = { |
|
"fi", "RE", "RS", "DT", |
"fi", "RE", "RS", "DT", |
"UC", "PD", "AT", "in", |
"UC", "PD", "AT", "in", |
"ft", "OP", "EX", "EE", |
"ft", "OP", "EX", "EE", |
"UR", "UE" |
"UR", "UE", "ll" |
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
|
|
static struct man_node *man_node_alloc(struct man *, int, int, |
static struct man_node *man_node_alloc(struct man *, int, int, |
enum man_type, enum mant); |
enum man_type, enum mant); |
static int man_node_append(struct man *, |
static int man_node_append(struct man *, |
struct man_node *); |
struct man_node *); |
static void man_node_free(struct man_node *); |
static void man_node_free(struct man_node *); |
static void man_node_unlink(struct man *, |
static void man_node_unlink(struct man *, |
struct man_node *); |
struct man_node *); |
static int man_ptext(struct man *, int, char *, int); |
static int man_ptext(struct man *, int, char *, int); |
static int man_pmacro(struct man *, int, char *, int); |
static int man_pmacro(struct man *, int, char *, int); |
Line 68 const struct man_node * |
|
Line 66 const struct man_node * |
|
man_node(const struct man *man) |
man_node(const struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
return(man->first); |
return(man->first); |
} |
} |
|
|
|
|
const struct man_meta * |
const struct man_meta * |
man_meta(const struct man *man) |
man_meta(const struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
return(&man->meta); |
return(&man->meta); |
} |
} |
|
|
|
|
void |
void |
man_reset(struct man *man) |
man_reset(struct man *man) |
{ |
{ |
Line 90 man_reset(struct man *man) |
|
Line 84 man_reset(struct man *man) |
|
man_alloc1(man); |
man_alloc1(man); |
} |
} |
|
|
|
|
void |
void |
man_free(struct man *man) |
man_free(struct man *man) |
{ |
{ |
Line 99 man_free(struct man *man) |
|
Line 92 man_free(struct man *man) |
|
free(man); |
free(man); |
} |
} |
|
|
|
|
struct man * |
struct man * |
man_alloc(struct roff *roff, struct mparse *parse, int quick) |
man_alloc(struct roff *roff, struct mparse *parse, int quick) |
{ |
{ |
Line 116 man_alloc(struct roff *roff, struct mparse *parse, int |
|
Line 108 man_alloc(struct roff *roff, struct mparse *parse, int |
|
return(p); |
return(p); |
} |
} |
|
|
|
|
int |
int |
man_endparse(struct man *man) |
man_endparse(struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & man->flags)); |
return(man_macroend(man)); |
if (man_macroend(man)) |
|
return(1); |
|
man->flags |= MAN_HALT; |
|
return(0); |
|
} |
} |
|
|
|
|
int |
int |
man_parseln(struct man *man, int ln, char *buf, int offs) |
man_parseln(struct man *man, int ln, char *buf, int offs) |
{ |
{ |
|
|
man->flags |= MAN_NEWLINE; |
man->flags |= MAN_NEWLINE; |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
|
|
return (roff_getcontrol(man->roff, buf, &offs) ? |
return (roff_getcontrol(man->roff, buf, &offs) ? |
man_pmacro(man, ln, buf, offs) : |
man_pmacro(man, ln, buf, offs) : |
man_ptext(man, ln, buf, offs)); |
man_ptext(man, ln, buf, offs)); |
} |
} |
|
|
|
|
static void |
static void |
man_free1(struct man *man) |
man_free1(struct man *man) |
{ |
{ |
Line 161 man_free1(struct man *man) |
|
Line 144 man_free1(struct man *man) |
|
free(man->meta.msec); |
free(man->meta.msec); |
} |
} |
|
|
|
|
static void |
static void |
man_alloc1(struct man *man) |
man_alloc1(struct man *man) |
{ |
{ |
Line 185 man_node_append(struct man *man, struct man_node *p) |
|
Line 167 man_node_append(struct man *man, struct man_node *p) |
|
assert(MAN_ROOT != p->type); |
assert(MAN_ROOT != p->type); |
|
|
switch (man->next) { |
switch (man->next) { |
case (MAN_NEXT_SIBLING): |
case MAN_NEXT_SIBLING: |
man->last->next = p; |
man->last->next = p; |
p->prev = man->last; |
p->prev = man->last; |
p->parent = man->last->parent; |
p->parent = man->last->parent; |
break; |
break; |
case (MAN_NEXT_CHILD): |
case MAN_NEXT_CHILD: |
man->last->child = p; |
man->last->child = p; |
p->parent = man->last; |
p->parent = man->last; |
break; |
break; |
Line 198 man_node_append(struct man *man, struct man_node *p) |
|
Line 180 man_node_append(struct man *man, struct man_node *p) |
|
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
assert(p->parent); |
assert(p->parent); |
p->parent->nchild++; |
p->parent->nchild++; |
|
|
if ( ! man_valid_pre(man, p)) |
|
return(0); |
|
|
|
switch (p->type) { |
switch (p->type) { |
case (MAN_HEAD): |
case MAN_BLOCK: |
|
if (p->tok == MAN_SH || p->tok == MAN_SS) |
|
man->flags &= ~MAN_LITERAL; |
|
break; |
|
case MAN_HEAD: |
assert(MAN_BLOCK == p->parent->type); |
assert(MAN_BLOCK == p->parent->type); |
p->parent->head = p; |
p->parent->head = p; |
break; |
break; |
case (MAN_TAIL): |
case MAN_TAIL: |
assert(MAN_BLOCK == p->parent->type); |
assert(MAN_BLOCK == p->parent->type); |
p->parent->tail = p; |
p->parent->tail = p; |
break; |
break; |
case (MAN_BODY): |
case MAN_BODY: |
assert(MAN_BLOCK == p->parent->type); |
assert(MAN_BLOCK == p->parent->type); |
p->parent->body = p; |
p->parent->body = p; |
break; |
break; |
Line 225 man_node_append(struct man *man, struct man_node *p) |
|
Line 208 man_node_append(struct man *man, struct man_node *p) |
|
man->last = p; |
man->last = p; |
|
|
switch (p->type) { |
switch (p->type) { |
case (MAN_TBL): |
case MAN_TBL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MAN_TEXT): |
case MAN_TEXT: |
if ( ! man_valid_post(man)) |
if ( ! man_valid_post(man)) |
return(0); |
return(0); |
break; |
break; |
Line 238 man_node_append(struct man *man, struct man_node *p) |
|
Line 221 man_node_append(struct man *man, struct man_node *p) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static struct man_node * |
static struct man_node * |
man_node_alloc(struct man *man, 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 257 man_node_alloc(struct man *man, int line, int pos, |
|
Line 239 man_node_alloc(struct man *man, int line, int pos, |
|
return(p); |
return(p); |
} |
} |
|
|
|
|
int |
int |
man_elem_alloc(struct man *man, int line, int pos, enum mant tok) |
man_elem_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
Line 270 man_elem_alloc(struct man *man, int line, int pos, enu |
|
Line 251 man_elem_alloc(struct man *man, int line, int pos, enu |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_tail_alloc(struct man *man, int line, int pos, enum mant tok) |
man_tail_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
Line 283 man_tail_alloc(struct man *man, int line, int pos, enu |
|
Line 263 man_tail_alloc(struct man *man, int line, int pos, enu |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_head_alloc(struct man *man, int line, int pos, enum mant tok) |
man_head_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
Line 296 man_head_alloc(struct man *man, int line, int pos, enu |
|
Line 275 man_head_alloc(struct man *man, int line, int pos, enu |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_body_alloc(struct man *man, int line, int pos, enum mant tok) |
man_body_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
Line 309 man_body_alloc(struct man *man, int line, int pos, enu |
|
Line 287 man_body_alloc(struct man *man, int line, int pos, enu |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
man_block_alloc(struct man *man, int line, int pos, enum mant tok) |
man_block_alloc(struct man *man, int line, int pos, enum mant tok) |
{ |
{ |
Line 337 man_word_alloc(struct man *man, int line, int pos, con |
|
Line 314 man_word_alloc(struct man *man, int line, int pos, con |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* Free all of the resources held by a node. This does NOT unlink a |
* Free all of the resources held by a node. This does NOT unlink a |
* node from its context; for that, see man_node_unlink(). |
* node from its context; for that, see man_node_unlink(). |
Line 351 man_node_free(struct man_node *p) |
|
Line 327 man_node_free(struct man_node *p) |
|
free(p); |
free(p); |
} |
} |
|
|
|
|
void |
void |
man_node_delete(struct man *man, struct man_node *p) |
man_node_delete(struct man *man, struct man_node *p) |
{ |
{ |
Line 368 man_addeqn(struct man *man, const struct eqn *ep) |
|
Line 343 man_addeqn(struct man *man, const struct eqn *ep) |
|
{ |
{ |
struct man_node *n; |
struct man_node *n; |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
|
|
n = man_node_alloc(man, 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 (ep->ln > man->last->line) |
|
n->flags |= MAN_LINE; |
|
|
if ( ! man_node_append(man, n)) |
if ( ! man_node_append(man, n)) |
return(0); |
return(0); |
Line 385 man_addspan(struct man *man, const struct tbl_span *sp |
|
Line 360 man_addspan(struct man *man, const struct tbl_span *sp |
|
{ |
{ |
struct man_node *n; |
struct man_node *n; |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
|
|
n = man_node_alloc(man, 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; |
|
|
Line 408 man_descope(struct man *man, int line, int offs) |
|
Line 381 man_descope(struct man *man, int line, int offs) |
|
|
|
if (MAN_ELINE & man->flags) { |
if (MAN_ELINE & man->flags) { |
man->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent)) |
return(0); |
return(0); |
} |
} |
|
|
Line 416 man_descope(struct man *man, int line, int offs) |
|
Line 389 man_descope(struct man *man, int line, int offs) |
|
return(1); |
return(1); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent)) |
return(0); |
return(0); |
return(man_body_alloc(man, line, offs, man->last->tok)); |
return(man_body_alloc(man, line, offs, man->last->tok)); |
} |
} |
Line 453 man_ptext(struct man *man, int line, char *buf, int of |
|
Line 426 man_ptext(struct man *man, int line, char *buf, int of |
|
return(1); |
return(1); |
} |
} |
|
|
/* |
/* |
* Warn if the last un-escaped character is whitespace. Then |
* Warn if the last un-escaped character is whitespace. Then |
* strip away the remaining spaces (tabs stay!). |
* strip away the remaining spaces (tabs stay!). |
*/ |
*/ |
|
|
i = (int)strlen(buf); |
i = (int)strlen(buf); |
Line 463 man_ptext(struct man *man, int line, char *buf, int of |
|
Line 436 man_ptext(struct man *man, int line, char *buf, int of |
|
|
|
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(man, line, i - 1, MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, |
|
line, i - 1, NULL); |
|
|
for (--i; i && ' ' == buf[i]; i--) |
for (--i; i && ' ' == buf[i]; i--) |
/* Spin back to non-space. */ ; |
/* Spin back to non-space. */ ; |
Line 493 man_ptext(struct man *man, int line, char *buf, int of |
|
Line 467 man_ptext(struct man *man, int line, char *buf, int of |
|
static int |
static int |
man_pmacro(struct man *man, int ln, char *buf, int offs) |
man_pmacro(struct man *man, int ln, char *buf, int offs) |
{ |
{ |
int i, ppos; |
|
enum mant tok; |
|
char mac[5]; |
char mac[5]; |
struct man_node *n; |
struct man_node *n; |
|
enum mant tok; |
|
int i, ppos; |
|
int bline; |
|
|
if ('"' == buf[offs]) { |
|
man_pmsg(man, ln, offs, MANDOCERR_BADCOMMENT); |
|
return(1); |
|
} else if ('\0' == buf[offs]) |
|
return(1); |
|
|
|
ppos = offs; |
ppos = offs; |
|
|
/* |
/* |
Line 512 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 481 man_pmacro(struct man *man, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
i = 0; |
i = 0; |
while (i < 4 && '\0' != buf[offs] && |
while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] && |
' ' != buf[offs] && '\t' != buf[offs]) |
'\t' != buf[offs]) |
mac[i++] = buf[offs++]; |
mac[i++] = buf[offs++]; |
|
|
mac[i] = '\0'; |
mac[i] = '\0'; |
Line 521 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 490 man_pmacro(struct man *man, int ln, char *buf, int off |
|
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, man->parse, ln, |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
ppos, "%s", buf + ppos - 1); |
ln, ppos, buf + ppos - 1); |
return(1); |
return(1); |
} |
} |
|
|
Line 531 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 500 man_pmacro(struct man *man, int ln, char *buf, int off |
|
while (buf[offs] && ' ' == buf[offs]) |
while (buf[offs] && ' ' == buf[offs]) |
offs++; |
offs++; |
|
|
/* |
/* |
* Trailing whitespace. Note that tabs are allowed to be passed |
* Trailing whitespace. Note that tabs are allowed to be passed |
* into the parser as "text", so we only warn about spaces here. |
* into the parser as "text", so we only warn about spaces here. |
*/ |
*/ |
|
|
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
man_pmsg(man, ln, offs - 1, MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, |
|
ln, offs - 1, NULL); |
|
|
/* |
/* |
* Remove prior ELINE macro, as it's being clobbered by a new |
* Remove prior ELINE macro, as it's being clobbered by a new |
* macro. Note that NSCOPED macros do not close out ELINE |
* macro. Note that NSCOPED macros do not close out ELINE |
* macros---they don't print text---so we let those slip by. |
* macros---they don't print text---so we let those slip by. |
Line 555 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 525 man_pmacro(struct man *man, int ln, char *buf, int off |
|
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, man->parse, n->line, |
mandoc_vmsg(MANDOCERR_BLK_LINE, 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]); |
|
|
Line 586 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 556 man_pmacro(struct man *man, int ln, char *buf, int off |
|
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, man->parse, n->line, |
mandoc_vmsg(MANDOCERR_BLK_LINE, 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]); |
|
|
Line 594 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 564 man_pmacro(struct man *man, int ln, char *buf, int off |
|
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
} |
} |
|
|
/* |
/* Remember whether we are in next-line scope for a block head. */ |
* Save the fact that we're in the next-line for a block. In |
|
* this way, embedded roff instructions can "remember" state |
|
* when they exit. |
|
*/ |
|
|
|
if (MAN_BLINE & man->flags) |
bline = man->flags & MAN_BLINE; |
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)(man, tok, ln, ppos, &offs, buf)) |
if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf)) |
goto err; |
return(0); |
|
|
/* In quick mode (for mandocdb), abort after the NAME section. */ |
/* In quick mode (for mandocdb), abort after the NAME section. */ |
|
|
if (man->quick && MAN_SH == tok && |
if (man->quick && MAN_SH == tok) { |
strcmp(man->last->prev->child->string, "NAME")) |
n = man->last; |
return(2); |
if (MAN_BODY == n->type && |
|
strcmp(n->prev->child->string, "NAME")) |
/* |
return(2); |
* We weren't in a block-line scope when entering the |
|
* above-parsed macro, so return. |
|
*/ |
|
|
|
if ( ! (MAN_BPLINE & man->flags)) { |
|
man->flags &= ~MAN_ILINE; |
|
return(1); |
|
} |
} |
man->flags &= ~MAN_BPLINE; |
|
|
|
/* |
/* |
* If we're in a block scope, then allow this macro to slip by |
* If we are in a next-line scope for a block head, |
* without closing scope around it. |
* close it out now and switch to the body, |
|
* unless the next-line scope is allowed to continue. |
*/ |
*/ |
|
|
if (MAN_ILINE & man->flags) { |
if ( ! bline || man->flags & MAN_ELINE || |
man->flags &= ~MAN_ILINE; |
man_macros[tok].flags & MAN_NSCOPED) |
return(1); |
return(1); |
} |
|
|
|
/* |
|
* If we've opened a new next-line element scope, then return |
|
* now, as the next line will close out the block scope. |
|
*/ |
|
|
|
if (MAN_ELINE & man->flags) |
|
return(1); |
|
|
|
/* Close out the block scope opened in the prior line. */ |
|
|
|
assert(MAN_BLINE & man->flags); |
assert(MAN_BLINE & man->flags); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent)) |
return(0); |
return(0); |
return(man_body_alloc(man, ln, ppos, man->last->tok)); |
return(man_body_alloc(man, ln, ppos, man->last->tok)); |
|
|
err: /* Error out. */ |
|
|
|
man->flags |= MAN_HALT; |
|
return(0); |
|
} |
} |
|
|
/* |
/* |
Line 720 man_deroff(char **dest, const struct man_node *n) |
|
Line 662 man_deroff(char **dest, const struct man_node *n) |
|
return; |
return; |
} |
} |
|
|
/* Skip leading whitespace. */ |
/* Skip leading whitespace and escape sequences. */ |
|
|
for (cp = n->string; '\0' != *cp; cp++) |
cp = n->string; |
if (0 == isspace((unsigned char)*cp)) |
while ('\0' != *cp) { |
|
if ('\\' == *cp) { |
|
cp++; |
|
mandoc_escape((const char **)&cp, NULL, NULL); |
|
} else if (isspace((unsigned char)*cp)) |
|
cp++; |
|
else |
break; |
break; |
|
} |
|
|
/* Skip trailing whitespace. */ |
/* Skip trailing whitespace. */ |
|
|