version 1.229, 2014/11/19 03:08:17 |
version 1.231, 2014/11/28 03:14:18 |
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 394 node_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 383 node_alloc(struct mdoc *mdoc, int line, int pos, |
|
return(p); |
return(p); |
} |
} |
|
|
int |
void |
mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
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); |
|
} |
} |
|
|
int |
struct mdoc_node * |
mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
assert(mdoc->first); |
assert(mdoc->first); |
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(p); |
} |
} |
|
|
int |
struct mdoc_node * |
mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
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(p); |
} |
} |
|
|
int |
void |
mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, |
mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, |
struct mdoc_node *body, enum mdoc_endbody end) |
struct mdoc_node *body, enum mdoc_endbody end) |
{ |
{ |
Line 443 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po |
|
Line 427 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); |
|
} |
} |
|
|
int |
struct mdoc_node * |
mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
Line 475 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 457 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(p); |
} |
} |
|
|
int |
void |
mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
Line 500 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 480 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); |
|
} |
} |
|
|
int |
void |
mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) |
mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
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); |
|
} |
} |
|
|
void |
void |
Line 601 mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node * |
|
Line 574 mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node * |
|
mdoc_node_free(p); |
mdoc_node_free(p); |
} |
} |
|
|
int |
void |
mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) |
mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) |
{ |
{ |
|
|
mdoc_node_unlink(mdoc, p); |
mdoc_node_unlink(mdoc, p); |
return(node_append(mdoc, p)); |
node_append(mdoc, p); |
} |
} |
|
|
/* |
/* |
Line 690 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 663 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
line, (int)(ws-buf), NULL); |
line, (int)(ws-buf), NULL); |
|
|
if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { |
if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { |
mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, |
mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, |
line, (int)(c - buf), NULL); |
line, (int)(c - buf), NULL); |
|
|
Line 699 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 672 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
* blank lines aren't allowed, but enough manuals assume this |
* blank lines aren't allowed, but enough manuals assume this |
* behaviour that we want to work around it. |
* behaviour that we want to work around it. |
*/ |
*/ |
if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL)) |
mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL); |
return(0); |
|
|
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
mdoc_valid_post(mdoc); |
return(mdoc_valid_post(mdoc)); |
return(1); |
} |
} |
|
|
if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) |
mdoc_word_alloc(mdoc, line, offs, buf+offs); |
return(0); |
|
|
|
if (MDOC_LITERAL & mdoc->flags) |
if (mdoc->flags & MDOC_LITERAL) |
return(1); |
return(1); |
|
|
/* |
/* |