version 1.5, 2009/03/31 13:50:19 |
version 1.7, 2009/04/12 19:19:57 |
Line 328 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
Line 328 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
{ |
{ |
int res; |
int res; |
|
|
res = mdoc_tokhash_find(mdoc->htab, p); |
res = mdoc_hash_find(mdoc->htab, p); |
if (MDOC_PARSED & mdoc_macros[from].flags) |
if (MDOC_PARSED & mdoc_macros[from].flags) |
return(res); |
return(res); |
if (MDOC_MAX == res) |
if (MDOC_MAX == res) |
Line 871 in_line(MACRO_PROT_ARGS) |
|
Line 871 in_line(MACRO_PROT_ARGS) |
|
tok, arg)) |
tok, arg)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
} else if ( ! nc && 0 == cnt) |
} else if ( ! nc && 0 == cnt) { |
|
mdoc_argv_free(arg); |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
return(0); |
return(0); |
|
} |
c = mdoc_macro(mdoc, c, line, la, pos, buf); |
c = mdoc_macro(mdoc, c, line, la, pos, buf); |
if (0 == c) |
if (0 == c) |
return(0); |
return(0); |
Line 924 in_line(MACRO_PROT_ARGS) |
|
Line 926 in_line(MACRO_PROT_ARGS) |
|
if (0 == c) |
if (0 == c) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
} else if ( ! nc && 0 == cnt) |
} else if ( ! nc && 0 == cnt) { |
|
mdoc_argv_free(arg); |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
return(0); |
return(0); |
|
} |
|
|
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
Line 1473 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
Line 1477 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
*/ |
*/ |
|
|
c = quoted ? MDOC_MAX : |
c = quoted ? MDOC_MAX : |
mdoc_tokhash_find(mdoc->htab, &buf[la]); |
mdoc_hash_find(mdoc->htab, &buf[la]); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX != c) { |
if ( ! mdoc_macro(mdoc, c, line, la, &i, buf)) |
if ( ! mdoc_macro(mdoc, c, line, la, &i, buf)) |