version 1.164, 2010/08/29 11:29:51 |
version 1.173, 2010/12/25 13:50:37 |
Line 286 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 286 mdoc_macro(MACRO_PROT_ARGS) |
|
! (MDOC_PBODY & m->flags)) { |
! (MDOC_PBODY & m->flags)) { |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) |
return(0); |
return(0); |
|
if (NULL == m->meta.msec) |
|
m->meta.msec = mandoc_strdup("1"); |
if (NULL == m->meta.title) |
if (NULL == m->meta.title) |
m->meta.title = mandoc_strdup("UNKNOWN"); |
m->meta.title = mandoc_strdup("UNKNOWN"); |
if (NULL == m->meta.vol) |
if (NULL == m->meta.vol) |
Line 326 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 328 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
|
|
p->parent->nchild++; |
p->parent->nchild++; |
|
|
|
/* |
|
* Copy over the normalised-data pointer of our parent. Not |
|
* everybody has one, but copying a null pointer is fine. |
|
*/ |
|
|
|
switch (p->type) { |
|
case (MDOC_BODY): |
|
/* FALLTHROUGH */ |
|
case (MDOC_TAIL): |
|
/* FALLTHROUGH */ |
|
case (MDOC_HEAD): |
|
p->norm = p->parent->norm; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
if ( ! mdoc_valid_pre(mdoc, p)) |
if ( ! mdoc_valid_pre(mdoc, p)) |
return(0); |
return(0); |
if ( ! mdoc_action_pre(mdoc, p)) |
|
return(0); |
|
|
|
switch (p->type) { |
switch (p->type) { |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
Line 356 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 373 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
case (MDOC_TEXT): |
case (MDOC_TEXT): |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
if ( ! mdoc_action_post(mdoc)) |
|
return(0); |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 462 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
Line 477 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
p->args = args; |
p->args = args; |
if (p->args) |
if (p->args) |
(args->refcnt)++; |
(args->refcnt)++; |
|
|
|
switch (tok) { |
|
case (MDOC_Bd): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bf): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Rs): |
|
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
if ( ! node_append(m, p)) |
if ( ! node_append(m, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
m->next = MDOC_NEXT_CHILD; |
Line 479 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
Line 509 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
p->args = args; |
p->args = args; |
if (p->args) |
if (p->args) |
(args->refcnt)++; |
(args->refcnt)++; |
|
|
|
switch (tok) { |
|
case (MDOC_An): |
|
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
if ( ! node_append(m, p)) |
if ( ! node_append(m, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
m->next = MDOC_NEXT_CHILD; |
|
|
mdoc_node_free(struct mdoc_node *p) |
mdoc_node_free(struct mdoc_node *p) |
{ |
{ |
|
|
/* |
if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type) |
* XXX: if these end up being problematic in terms of memory |
free(p->norm); |
* management and dereferencing freed blocks, then make them |
|
* into reference-counted double-pointers. |
|
*/ |
|
|
|
if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type) |
|
if (p->data.Bd) |
|
free(p->data.Bd); |
|
if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type) |
|
if (p->data.Bl) |
|
free(p->data.Bl); |
|
if (MDOC_Bf == p->tok && MDOC_HEAD == p->type) |
|
if (p->data.Bf) |
|
free(p->data.Bf); |
|
|
|
if (p->string) |
if (p->string) |
free(p->string); |
free(p->string); |
if (p->args) |
if (p->args) |
Line 554 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) |
|
Line 579 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) |
|
n->parent->nchild--; |
n->parent->nchild--; |
if (n->parent->child == n) |
if (n->parent->child == n) |
n->parent->child = n->prev ? n->prev : n->next; |
n->parent->child = n->prev ? n->prev : n->next; |
|
if (n->parent->last == n) |
|
n->parent->last = n->prev ? n->prev : NULL; |
} |
} |
|
|
/* Adjust parse point, if applicable. */ |
/* Adjust parse point, if applicable. */ |
Line 621 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 648 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->data.Bl->type) { |
LIST_column == n->norm->Bl.type) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
Line 630 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 657 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->data.Bl->type) { |
LIST_column == n->parent->norm->Bl.type) { |
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
Line 691 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 718 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
return(0); |
return(0); |
|
|
/* |
/* |
* Insert a `Pp' in the case of a blank line. Technically, |
* Insert a `sp' in the case of a blank line. Technically, |
* 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(m, line, offs, MDOC_Pp, NULL)) |
if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL)) |
return(0); |
return(0); |
|
|
m->next = MDOC_NEXT_SIBLING; |
m->next = MDOC_NEXT_SIBLING; |
Line 758 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 785 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
|
|
/* |
/* |
* Copy the first word into a nil-terminated buffer. |
* Copy the first word into a nil-terminated buffer. |
* Stop copying when a tab, space, backslash, or eoln is encountered. |
* Stop copying when a tab, space, or eoln is encountered. |
*/ |
*/ |
|
|
j = 0; |
j = 0; |
while (j < 4 && '\0' != buf[i] && |
while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i]) |
' ' != buf[i] && |
|
'\t' != buf[i] && |
|
'\\' != buf[i]) |
|
mac[j++] = buf[i++]; |
mac[j++] = buf[i++]; |
mac[j] = '\0'; |
mac[j] = '\0'; |
|
|
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
if (MDOC_MAX == tok) { |
if (MDOC_MAX == tok) { |
mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, |
mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1); |
"unknown macro: %s%s", |
|
buf, strlen(buf) > 3 ? "..." : ""); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 816 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 838 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->data.Bl->type) { |
LIST_column == n->norm->Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
Line 832 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 854 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->data.Bl->type) { |
LIST_column == n->parent->norm->Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |