version 1.228, 2014/10/20 15:50:24 |
version 1.230, 2014/11/28 01:05:43 |
Line 89 static void mdoc_free1(struct mdoc *); |
|
Line 89 static void mdoc_free1(struct mdoc *); |
|
static void mdoc_alloc1(struct mdoc *); |
static void mdoc_alloc1(struct mdoc *); |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
enum mdoct, enum mdoc_type); |
enum mdoct, enum mdoc_type); |
static int node_append(struct mdoc *, |
static void node_append(struct mdoc *, struct mdoc_node *); |
struct mdoc_node *); |
|
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
|
|
Line 207 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
Line 206 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
n->eqn = ep; |
n->eqn = ep; |
if (ep->ln > mdoc->last->line) |
if (ep->ln > mdoc->last->line) |
n->flags |= MDOC_LINE; |
n->flags |= MDOC_LINE; |
|
node_append(mdoc, n); |
if ( ! node_append(mdoc, n)) |
|
return(0); |
|
|
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
Line 222 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
Line 218 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
|
|
n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n->span = sp; |
n->span = sp; |
|
node_append(mdoc, n); |
if ( ! node_append(mdoc, n)) |
|
return(0); |
|
|
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
Line 285 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 278 mdoc_macro(MACRO_PROT_ARGS) |
|
} |
} |
|
|
|
|
static int |
static void |
node_append(struct mdoc *mdoc, struct mdoc_node *p) |
node_append(struct mdoc *mdoc, struct mdoc_node *p) |
{ |
{ |
|
|
Line 329 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 322 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
break; |
break; |
} |
} |
|
|
if ( ! mdoc_valid_pre(mdoc, p)) |
mdoc_valid_pre(mdoc, p); |
return(0); |
|
|
|
switch (p->type) { |
switch (p->type) { |
case MDOC_HEAD: |
case MDOC_HEAD: |
Line 357 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 349 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
case MDOC_TBL: |
case MDOC_TBL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_TEXT: |
case MDOC_TEXT: |
if ( ! mdoc_valid_post(mdoc)) |
mdoc_valid_post(mdoc); |
return(0); |
|
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static struct mdoc_node * |
static struct mdoc_node * |
Line 400 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 389 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); |
p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); |
if ( ! node_append(mdoc, p)) |
node_append(mdoc, p); |
return(0); |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
Line 415 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 403 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
assert(mdoc->last); |
assert(mdoc->last); |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); |
p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); |
if ( ! node_append(mdoc, p)) |
node_append(mdoc, p); |
return(0); |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
Line 427 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 414 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); |
p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); |
if ( ! node_append(mdoc, p)) |
node_append(mdoc, p); |
return(0); |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
Line 443 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po |
|
Line 429 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po |
|
p->pending = body; |
p->pending = body; |
p->norm = body->norm; |
p->norm = body->norm; |
p->end = end; |
p->end = end; |
if ( ! node_append(mdoc, p)) |
node_append(mdoc, p); |
return(0); |
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
Line 475 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 460 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
default: |
default: |
break; |
break; |
} |
} |
|
node_append(mdoc, p); |
if ( ! node_append(mdoc, p)) |
|
return(0); |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
Line 500 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 483 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
default: |
default: |
break; |
break; |
} |
} |
|
node_append(mdoc, p); |
if ( ! node_append(mdoc, p)) |
|
return(0); |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
Line 514 mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 495 mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, |
|
|
|
n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT); |
n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT); |
n->string = roff_strdup(mdoc->roff, p); |
n->string = roff_strdup(mdoc->roff, p); |
|
node_append(mdoc, n); |
if ( ! node_append(mdoc, n)) |
|
return(0); |
|
|
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
Line 606 mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node * |
|
Line 584 mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node * |
|
{ |
{ |
|
|
mdoc_node_unlink(mdoc, p); |
mdoc_node_unlink(mdoc, p); |
return(node_append(mdoc, p)); |
node_append(mdoc, p); |
|
return(1); |
} |
} |
|
|
/* |
/* |
Line 704 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 683 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
|
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
return(mdoc_valid_post(mdoc)); |
mdoc_valid_post(mdoc); |
|
return(1); |
} |
} |
|
|
if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) |
if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) |
Line 734 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 714 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
static int |
static int |
mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) |
mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) |
{ |
{ |
|
struct mdoc_node *n; |
|
const char *cp; |
enum mdoct tok; |
enum mdoct tok; |
int i, sv; |
int i, sv; |
char mac[5]; |
char mac[5]; |
struct mdoc_node *n; |
|
|
|
sv = offs; |
sv = offs; |
|
|
/* |
/* |
* Copy the first word into a nil-terminated buffer. |
* Copy the first word into a nil-terminated buffer. |
* Stop copying when a tab, space, or eoln is encountered. |
* Stop when a space, tab, escape, or eoln is encountered. |
*/ |
*/ |
|
|
i = 0; |
i = 0; |
while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] && |
while (i < 4 && strchr(" \t\\", buf[offs]) == NULL) |
'\t' != buf[offs]) |
|
mac[i++] = buf[offs++]; |
mac[i++] = buf[offs++]; |
|
|
mac[i] = '\0'; |
mac[i] = '\0'; |
|
|
tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
|
|
if (MDOC_MAX == tok) { |
if (tok == MDOC_MAX) { |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
ln, sv, buf + sv - 1); |
ln, sv, buf + sv - 1); |
return(1); |
return(1); |
} |
} |
|
|
/* Disregard the first trailing tab, if applicable. */ |
/* Skip a leading escape sequence or tab. */ |
|
|
if ('\t' == buf[offs]) |
switch (buf[offs]) { |
|
case '\\': |
|
cp = buf + offs + 1; |
|
mandoc_escape(&cp, NULL, NULL); |
|
offs = cp - buf; |
|
break; |
|
case '\t': |
offs++; |
offs++; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
/* Jump to the next non-whitespace word. */ |
/* Jump to the next non-whitespace word. */ |
|
|