version 1.172, 2010/12/24 14:00:40 |
version 1.174, 2011/01/01 10:51:30 |
Line 277 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 277 mdoc_macro(MACRO_PROT_ARGS) |
|
/* If we're in the body, deny prologue calls. */ |
/* If we're in the body, deny prologue calls. */ |
|
|
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
MDOC_PBODY & m->flags) |
MDOC_PBODY & m->flags) { |
return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY)); |
mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY); |
|
return(1); |
|
} |
|
|
/* If we're in the prologue, deny "body" macros. */ |
/* If we're in the prologue, deny "body" macros. */ |
|
|
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
! (MDOC_PBODY & m->flags)) { |
! (MDOC_PBODY & m->flags)) { |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG); |
return(0); |
|
if (NULL == m->meta.msec) |
if (NULL == m->meta.msec) |
m->meta.msec = mandoc_strdup("1"); |
m->meta.msec = mandoc_strdup("1"); |
if (NULL == m->meta.title) |
if (NULL == m->meta.title) |
Line 484 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
Line 485 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
case (MDOC_Bf): |
case (MDOC_Bf): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bl): |
case (MDOC_Bl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Rs): |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
break; |
break; |
default: |
default: |
Line 627 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 630 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
|
|
if ('\\' == buf[offs] && |
if ('\\' == buf[offs] && |
'.' == buf[offs + 1] && |
'.' == buf[offs + 1] && |
'"' == buf[offs + 2]) |
'"' == buf[offs + 2]) { |
return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT)); |
mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT); |
|
return(1); |
|
} |
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) |
if (SEC_NONE == m->lastnamed) { |
return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT)); |
mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
assert(m->last); |
assert(m->last); |
n = m->last; |
n = m->last; |
Line 708 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 715 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
*end = '\0'; |
*end = '\0'; |
|
|
if (ws) |
if (ws) |
if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE)) |
mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE); |
return(0); |
|
|
|
if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) { |
if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) { |
if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN)) |
mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN); |
return(0); |
|
|
|
/* |
/* |
* Insert a `sp' in the case of a blank line. Technically, |
* Insert a `sp' in the case of a blank line. Technically, |
Line 813 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 818 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE)) |
mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE); |
goto err; |
|
|
|
/* |
/* |
* If an initial macro or a list invocation, divert directly |
* If an initial macro or a list invocation, divert directly |