version 1.229, 2014/07/06 19:09:00 |
version 1.230, 2014/07/07 16:12:20 |
Line 1768 post_rs(POST_ARGS) |
|
Line 1768 post_rs(POST_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Make sure only certain types of nodes are allowed within the |
|
* the `Rs' body. Delete offending nodes and raise a warning. |
|
* Do this before re-ordering for the sake of clarity. |
|
*/ |
|
|
|
next = NULL; |
|
for (nn = mdoc->last->child; nn; nn = next) { |
|
for (i = 0; i < RSORD_MAX; i++) |
|
if (nn->tok == rsord[i]) |
|
break; |
|
|
|
if (i < RSORD_MAX) { |
|
if (MDOC__J == rsord[i] || MDOC__B == rsord[i]) |
|
mdoc->last->norm->Rs.quote_T++; |
|
next = nn->next; |
|
continue; |
|
} |
|
|
|
next = nn->next; |
|
mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse, |
|
nn->line, nn->pos, mdoc_macronames[nn->tok]); |
|
mdoc_node_delete(mdoc, nn); |
|
} |
|
|
|
/* |
|
* Nothing to sort if only invalid nodes were found |
|
* inside the `Rs' body. |
|
*/ |
|
|
|
if (NULL == mdoc->last->child) |
|
return(1); |
|
|
|
/* |
|
* The full `Rs' block needs special handling to order the |
* The full `Rs' block needs special handling to order the |
* sub-elements according to `rsord'. Pick through each element |
* sub-elements according to `rsord'. Pick through each element |
* and correctly order it. This is a insertion sort. |
* and correctly order it. This is an insertion sort. |
*/ |
*/ |
|
|
next = NULL; |
next = NULL; |
Line 1813 post_rs(POST_ARGS) |
|
Line 1780 post_rs(POST_ARGS) |
|
if (rsord[i] == nn->tok) |
if (rsord[i] == nn->tok) |
break; |
break; |
|
|
|
if (i == RSORD_MAX) { |
|
mandoc_msg(MANDOCERR_RS_BAD, |
|
mdoc->parse, nn->line, nn->pos, |
|
mdoc_macronames[nn->tok]); |
|
i = -1; |
|
} else if (MDOC__J == nn->tok || MDOC__B == nn->tok) |
|
mdoc->last->norm->Rs.quote_T++; |
|
|
/* |
/* |
* Remove `nn' from the chain. This somewhat |
* Remove `nn' from the chain. This somewhat |
* repeats mdoc_node_unlink(), but since we're |
* repeats mdoc_node_unlink(), but since we're |
Line 1838 post_rs(POST_ARGS) |
|
Line 1813 post_rs(POST_ARGS) |
|
for (j = 0; j < RSORD_MAX; j++) |
for (j = 0; j < RSORD_MAX; j++) |
if (rsord[j] == prev->tok) |
if (rsord[j] == prev->tok) |
break; |
break; |
|
if (j == RSORD_MAX) |
|
j = -1; |
|
|
if (j <= i) |
if (j <= i) |
break; |
break; |