version 1.137, 2014/07/07 21:36:20 |
version 1.139, 2014/08/01 17:27:44 |
Line 424 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 424 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
return(REWIND_NONE); |
return(REWIND_NONE); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Sh: |
case MDOC_Sh: |
|
if (MDOC_ROOT == p->parent->type) |
|
return(REWIND_THIS); |
if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || |
if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || |
MDOC_Sh == p->tok) |
MDOC_Sh == p->tok) |
return(REWIND_MORE); |
return(REWIND_MORE); |
Line 1035 blk_full(MACRO_PROT_ARGS) |
|
Line 1037 blk_full(MACRO_PROT_ARGS) |
|
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
|
/* Skip items outside lists. */ |
|
|
|
if (tok == MDOC_It) { |
|
for (n = mdoc->last; n; n = n->parent) |
|
if (n->tok == MDOC_Bl) |
|
break; |
|
if (n == NULL) { |
|
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
|
line, ppos, "It %s", buf + *pos); |
|
if ( ! mdoc_elem_alloc(mdoc, line, ppos, |
|
MDOC_br, NULL)) |
|
return(0); |
|
return(rew_elem(mdoc, MDOC_br)); |
|
} |
|
} |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
Line 1767 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1785 phrase_ta(MACRO_PROT_ARGS) |
|
n = n->parent; |
n = n->parent; |
if (NULL == n || LIST_column != n->norm->Bl.type) { |
if (NULL == n || LIST_column != n->norm->Bl.type) { |
mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, |
mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, |
line, ppos, NULL); |
line, ppos, "Ta"); |
return(1); |
return(1); |
} |
} |
|
|