version 1.278, 2015/10/12 00:08:16 |
version 1.282, 2015/10/21 23:51:11 |
|
|
#include "roff_int.h" |
#include "roff_int.h" |
#include "libroff.h" |
#include "libroff.h" |
|
|
/* Maximum number of nested if-else conditionals. */ |
|
#define RSTACK_MAX 128 |
|
|
|
/* Maximum number of string expansions per line, to break infinite loops. */ |
/* Maximum number of string expansions per line, to break infinite loops. */ |
#define EXPAND_LIMIT 1000 |
#define EXPAND_LIMIT 1000 |
|
|
Line 316 struct roffreg { |
|
Line 313 struct roffreg { |
|
|
|
struct roff { |
struct roff { |
struct mparse *parse; /* parse point */ |
struct mparse *parse; /* parse point */ |
const struct mchars *mchars; /* character table */ |
|
struct roffnode *last; /* leaf of stack */ |
struct roffnode *last; /* leaf of stack */ |
int *rstack; /* stack of inverted `ie' values */ |
int *rstack; /* stack of inverted `ie' values */ |
struct roffreg *regtab; /* number registers */ |
struct roffreg *regtab; /* number registers */ |
Line 901 roff_free(struct roff *r) |
|
Line 897 roff_free(struct roff *r) |
|
} |
} |
|
|
struct roff * |
struct roff * |
roff_alloc(struct mparse *parse, const struct mchars *mchars, int options) |
roff_alloc(struct mparse *parse, int options) |
{ |
{ |
struct roff *r; |
struct roff *r; |
|
|
r = mandoc_calloc(1, sizeof(struct roff)); |
r = mandoc_calloc(1, sizeof(struct roff)); |
r->parse = parse; |
r->parse = parse; |
r->mchars = mchars; |
|
r->options = options; |
r->options = options; |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->rstackpos = -1; |
r->rstackpos = -1; |
Line 1012 roff_node_append(struct roff_man *man, struct roff_nod |
|
Line 1007 roff_node_append(struct roff_man *man, struct roff_nod |
|
|
|
switch (man->next) { |
switch (man->next) { |
case ROFF_NEXT_SIBLING: |
case ROFF_NEXT_SIBLING: |
|
if (man->last->next != NULL) { |
|
n->next = man->last->next; |
|
man->last->next->prev = n; |
|
} else |
|
man->last->parent->last = n; |
man->last->next = n; |
man->last->next = n; |
n->prev = man->last; |
n->prev = man->last; |
n->parent = man->last->parent; |
n->parent = man->last->parent; |
Line 1019 roff_node_append(struct roff_man *man, struct roff_nod |
|
Line 1019 roff_node_append(struct roff_man *man, struct roff_nod |
|
case ROFF_NEXT_CHILD: |
case ROFF_NEXT_CHILD: |
man->last->child = n; |
man->last->child = n; |
n->parent = man->last; |
n->parent = man->last; |
|
n->parent->last = n; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
} |
} |
n->parent->nchild++; |
n->parent->nchild++; |
n->parent->last = n; |
man->last = n; |
|
|
/* |
|
* Copy over the normalised-data pointer of our parent. Not |
|
* everybody has one, but copying a null pointer is fine. |
|
*/ |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BODY: |
|
if (n->end != ENDBODY_NOT) |
|
break; |
|
/* FALLTHROUGH */ |
|
case ROFFT_TAIL: |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
n->norm = n->parent->norm; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
if (man->macroset == MACROSET_MDOC) |
|
mdoc_valid_pre(man, n); |
|
|
|
switch (n->type) { |
|
case ROFFT_HEAD: |
|
assert(n->parent->type == ROFFT_BLOCK); |
|
n->parent->head = n; |
n->parent->head = n; |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (n->end) |
if (n->end != ENDBODY_NOT) |
break; |
return; |
assert(n->parent->type == ROFFT_BLOCK); |
|
n->parent->body = n; |
n->parent->body = n; |
break; |
break; |
case ROFFT_TAIL: |
case ROFFT_TAIL: |
assert(n->parent->type == ROFFT_BLOCK); |
|
n->parent->tail = n; |
n->parent->tail = n; |
break; |
break; |
default: |
default: |
break; |
return; |
} |
} |
man->last = n; |
|
|
/* |
|
* Copy over the normalised-data pointer of our parent. Not |
|
* everybody has one, but copying a null pointer is fine. |
|
*/ |
|
|
|
n->norm = n->parent->norm; |
|
assert(n->parent->type == ROFFT_BLOCK); |
} |
} |
|
|
void |
void |
Line 1077 roff_word_alloc(struct roff_man *man, int line, int po |
|
Line 1061 roff_word_alloc(struct roff_man *man, int line, int po |
|
n->string = roff_strdup(man->roff, word); |
n->string = roff_strdup(man->roff, word); |
roff_node_append(man, n); |
roff_node_append(man, n); |
if (man->macroset == MACROSET_MDOC) |
if (man->macroset == MACROSET_MDOC) |
mdoc_valid_post(man); |
n->flags |= MDOC_VALID | MDOC_ENDED; |
else |
else |
man_valid_post(man); |
man_valid_post(man); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
Line 1165 roff_addtbl(struct roff_man *man, const struct tbl_spa |
|
Line 1149 roff_addtbl(struct roff_man *man, const struct tbl_spa |
|
n->span = tbl; |
n->span = tbl; |
roff_node_append(man, n); |
roff_node_append(man, n); |
if (man->macroset == MACROSET_MDOC) |
if (man->macroset == MACROSET_MDOC) |
mdoc_valid_post(man); |
n->flags |= MDOC_VALID | MDOC_ENDED; |
else |
else |
man_valid_post(man); |
man_valid_post(man); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
Line 1344 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1328 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
esc = mandoc_escape(&cp, &stnam, &inaml); |
esc = mandoc_escape(&cp, &stnam, &inaml); |
if (esc == ESCAPE_ERROR || |
if (esc == ESCAPE_ERROR || |
(esc == ESCAPE_SPECIAL && |
(esc == ESCAPE_SPECIAL && |
mchars_spec2cp(r->mchars, stnam, inaml) < 0)) |
mchars_spec2cp(stnam, inaml) < 0)) |
mandoc_vmsg(MANDOCERR_ESC_BAD, |
mandoc_vmsg(MANDOCERR_ESC_BAD, |
r->parse, ln, (int)(stesc - buf->buf), |
r->parse, ln, (int)(stesc - buf->buf), |
"%.*s", (int)(cp - stesc), stesc); |
"%.*s", (int)(cp - stesc), stesc); |