version 1.218, 2014/07/02 03:48:07 |
version 1.219, 2014/07/02 05:52:25 |
Line 1385 post_bl_block(POST_ARGS) |
|
Line 1385 post_bl_block(POST_ARGS) |
|
continue; |
continue; |
} |
} |
if (NULL == ni->next) { |
if (NULL == ni->next) { |
mdoc_nmsg(mdoc, nc, MANDOCERR_MOVEPAR); |
mandoc_msg(MANDOCERR_PAR_MOVE, |
|
mdoc->parse, nc->line, nc->pos, |
|
mdoc_macronames[nc->tok]); |
if ( ! mdoc_node_relink(mdoc, nc)) |
if ( ! mdoc_node_relink(mdoc, nc)) |
return(0); |
return(0); |
} else if (0 == n->norm->Bl.comp && |
} else if (0 == n->norm->Bl.comp && |
LIST_column != n->norm->Bl.type) { |
LIST_column != n->norm->Bl.type) { |
mdoc_nmsg(mdoc, nc, MANDOCERR_IGNPAR); |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
|
mdoc->parse, nc->line, nc->pos, |
|
"%s before It", |
|
mdoc_macronames[nc->tok]); |
mdoc_node_delete(mdoc, nc); |
mdoc_node_delete(mdoc, nc); |
} else |
} else |
break; |
break; |
Line 2078 post_ignpar(POST_ARGS) |
|
Line 2083 post_ignpar(POST_ARGS) |
|
|
|
if (NULL != (np = mdoc->last->child)) |
if (NULL != (np = mdoc->last->child)) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
|
mdoc->parse, np->line, np->pos, |
|
"%s after %s", mdoc_macronames[np->tok], |
|
mdoc_macronames[mdoc->last->tok]); |
mdoc_node_delete(mdoc, np); |
mdoc_node_delete(mdoc, np); |
} |
} |
|
|
if (NULL != (np = mdoc->last->last)) |
if (NULL != (np = mdoc->last->last)) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
|
np->line, np->pos, "%s at the end of %s", |
|
mdoc_macronames[np->tok], |
|
mdoc_macronames[mdoc->last->tok]); |
mdoc_node_delete(mdoc, np); |
mdoc_node_delete(mdoc, np); |
} |
} |
|
|
Line 2116 pre_par(PRE_ARGS) |
|
Line 2127 pre_par(PRE_ARGS) |
|
if (MDOC_It == n->tok && n->parent->norm->Bl.comp) |
if (MDOC_It == n->tok && n->parent->norm->Bl.comp) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, |
|
"%s before %s", mdoc_macronames[mdoc->last->tok], |
|
mdoc_macronames[n->tok]); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
return(1); |
} |
} |
Line 2124 pre_par(PRE_ARGS) |
|
Line 2138 pre_par(PRE_ARGS) |
|
static int |
static int |
post_par(POST_ARGS) |
post_par(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *np; |
|
|
if (MDOC_ELEM != mdoc->last->type && |
if (MDOC_ELEM != mdoc->last->type && |
MDOC_BLOCK != mdoc->last->type) |
MDOC_BLOCK != mdoc->last->type) |
return(1); |
return(1); |
|
|
if (NULL == mdoc->last->prev) { |
if (NULL == (np = mdoc->last->prev)) { |
if (MDOC_Sh != mdoc->last->parent->tok && |
np = mdoc->last->parent; |
MDOC_Ss != mdoc->last->parent->tok) |
if (MDOC_Sh != np->tok && MDOC_Ss != np->tok) |
return(1); |
return(1); |
} else { |
} else { |
if (MDOC_Pp != mdoc->last->prev->tok && |
if (MDOC_Pp != np->tok && MDOC_Lp != np->tok && |
MDOC_Lp != mdoc->last->prev->tok && |
|
(MDOC_br != mdoc->last->tok || |
(MDOC_br != mdoc->last->tok || |
(MDOC_sp != mdoc->last->prev->tok && |
(MDOC_sp != np->tok && MDOC_br != np->tok))) |
MDOC_br != mdoc->last->prev->tok))) |
|
return(1); |
return(1); |
} |
} |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, |
|
"%s after %s", mdoc_macronames[mdoc->last->tok], |
|
mdoc_macronames[np->tok]); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
return(1); |
} |
} |